fuck off warnings 🦅🦅

Hellish-Mods · Nov 16, 2023 · 788cb6d · 788cb6d
1 parent fd1d91e
commit 788cb6d
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 14 deletions.
diff --git a/src/main/java/mcp/mobius/waila/api/IRegistrar.java b/src/main/java/mcp/mobius/waila/api/IRegistrar.java
@@ -31,6 +31,7 @@ public interface IRegistrar {
      * @param dataProvider The data provider instance
      * @param block The highest level class to apply to
      */
+	@SuppressWarnings("rawtypes")
 	void registerStackProvider(IComponentProvider dataProvider, Class block);
 
 	/**
@@ -42,6 +43,7 @@ public interface IRegistrar {
      * @param position The position on the tooltip this applies to
      * @param block The highest level class to apply to
      */
+	@SuppressWarnings("rawtypes")
 	void registerComponentProvider(IComponentProvider dataProvider, TooltipPosition position, Class block);
 
 	/**
@@ -51,6 +53,7 @@ public interface IRegistrar {
 	 * @param dataProvider The data provider instance
 	 * @param block The highest level class to apply to
 	 */
+	@SuppressWarnings("rawtypes")
 	void registerBlockDataProvider(IServerDataProvider<TileEntity> dataProvider, Class block);
 
 	/**
@@ -59,6 +62,7 @@ public interface IRegistrar {
      * @param dataProvider The data provider instance
      * @param entity The highest level class to apply to
      */
+	@SuppressWarnings("rawtypes")
 	void registerOverrideEntityProvider(IEntityComponentProvider dataProvider, Class entity);
 
 	/**
@@ -67,6 +71,7 @@ public interface IRegistrar {
      * @param dataProvider The data provider instance
      * @param entity The highest level class to apply to
      */
+	@SuppressWarnings("rawtypes")
 	void registerEntityStackProvider(IEntityComponentProvider dataProvider, Class entity);
 
 	/**
@@ -77,6 +82,7 @@ public interface IRegistrar {
      * @param position The position on the tooltip this applies to
      * @param entity The highest level class to apply to
      */
+	@SuppressWarnings("rawtypes")
 	void registerComponentProvider(IEntityComponentProvider dataProvider, TooltipPosition position, Class entity);
 
 	/**
@@ -85,6 +91,7 @@ public interface IRegistrar {
      * @param dataProvider The data provider instance
      * @param entity The highest level class to apply to
      */
+	@SuppressWarnings("rawtypes")
 	void registerEntityDataProvider(IServerDataProvider<Entity> dataProvider, Class entity);
 
 	/**
@@ -93,6 +100,7 @@ public interface IRegistrar {
      * @param decorator The decorator instance
      * @param block The highest level class to apply to
      */
+	@SuppressWarnings("rawtypes")
 	void registerDecorator(IBlockDecorator decorator, Class block);
 
 	/**

diff --git a/src/main/java/mcp/mobius/waila/api/impl/DumpGenerator.java b/src/main/java/mcp/mobius/waila/api/impl/DumpGenerator.java
@@ -7,7 +7,7 @@
 
 @SuppressWarnings("unchecked")
 public class DumpGenerator {
-
+	@SuppressWarnings("rawtypes")
 	public static String generateInfoDump() {
 		StringBuilder builder = new StringBuilder("# Waila Handler Dump");
 
@@ -29,7 +29,8 @@ public static String generateInfoDump() {
 
 		return builder.toString();
 	}
-
+
+	@SuppressWarnings("rawtypes")
 	private static void createSection(StringBuilder builder, String subsection, Map<Class, List<Object>> providers) {
 		if (providers.isEmpty())
 			return;

diff --git a/src/main/java/mcp/mobius/waila/api/impl/WailaRegistrar.java b/src/main/java/mcp/mobius/waila/api/impl/WailaRegistrar.java
@@ -11,6 +11,7 @@
 
 import java.util.*;
 
+@SuppressWarnings("rawtypes")
 public class WailaRegistrar implements IRegistrar {
 
 	public static final WailaRegistrar INSTANCE = new WailaRegistrar();
@@ -106,7 +107,7 @@ public void registerTooltipRenderer(ResourceLocation id, ITooltipRenderer render
 		this.tooltipRenderers.put(id, renderer);
 	}
 
-	private <T, V extends Class<?>> void registerProvider(T dataProvider, V clazz, Map<V, List<T>> target) {
+	private <T, V> void registerProvider(T dataProvider, V clazz, Map<V, List<T>> target) {
 		if (clazz == null || dataProvider == null)
 			throw new RuntimeException(String.format("Trying to register a null provider or null block ! Please check the stacktrace to know what was the original registration method. [Provider : %s, Target : %s]", dataProvider.getClass().getName(), clazz));
 

diff --git a/src/main/java/mcp/mobius/waila/gui/GuiConfigWaila.java b/src/main/java/mcp/mobius/waila/gui/GuiConfigWaila.java
@@ -29,6 +29,7 @@ public GuiConfigWaila(Screen parent) {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public OptionsListWidget getOptions() {
 		ConfigGeneral general = Waila.CONFIG.get().getGeneral();
 		ConfigOverlay overlay = Waila.CONFIG.get().getOverlay();

diff --git a/src/main/java/mcp/mobius/waila/gui/GuiOptions.java b/src/main/java/mcp/mobius/waila/gui/GuiOptions.java
@@ -66,6 +66,7 @@ public void init(Minecraft client, int width, int height) {
 	}
 
 	@Override
+	@SuppressWarnings("rawtypes")
 	public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) {
 		renderBackground(matrixStack);
 		options.render(matrixStack, mouseX, mouseY, partialTicks);
@@ -93,7 +94,7 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia
 	}
 
 	@Override
-	public IGuiEventListener addWidget(IGuiEventListener listener) {
+	public <T extends IGuiEventListener> T addWidget(T listener) {
 		children.add(listener);
 		return listener;
 	}

diff --git a/src/main/java/mcp/mobius/waila/gui/config/OptionsListWidget.java b/src/main/java/mcp/mobius/waila/gui/config/OptionsListWidget.java
@@ -41,6 +41,7 @@ public int getRowWidth() {
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public void render(MatrixStack matrixStack, int mouseX, int mouseY, float delta) {
 		this.renderBackground(matrixStack);
 		int scrollPosX = this.getScrollbarPosition();
@@ -117,12 +118,14 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float delta)
 		RenderSystem.disableBlend();
 	}
 
+	@SuppressWarnings("rawtypes")
 	public void save() {
 		children().stream().filter(e -> e instanceof OptionsEntryValue).map(e -> (OptionsEntryValue) e).forEach(OptionsEntryValue::save);
 		if (diskWriter != null)
 			diskWriter.run();
 	}
 
+	@SuppressWarnings("rawtypes")
 	public void add(Entry entry) {
 		if (entry instanceof OptionsEntryValue) {
 			IGuiEventListener element = ((OptionsEntryValue) entry).getListener();

diff --git a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java
@@ -64,6 +64,7 @@ public static void renderItemIntoGUI(ItemStack stack, int x, int y, float scale)
 		renderItemModelIntoGUI(stack, x, y, renderer.getModel(stack, (World) null, (LivingEntity) null), scale);
 	}
 
+	@SuppressWarnings("deprecation")
 	protected static void renderItemModelIntoGUI(ItemStack stack, int x, int y, IBakedModel bakedmodel, float scale) {
 		ItemRenderer renderer = CLIENT.getItemRenderer();
 		TextureManager textureManager = CLIENT.textureManager;
@@ -99,18 +100,20 @@ protected static void renderItemModelIntoGUI(ItemStack stack, int x, int y, IBak
 		RenderSystem.popMatrix();
 	}
 
+	@SuppressWarnings("deprecation")
 	public static void renderStackSize(MatrixStack matrixStack, FontRenderer fr, ItemStack stack, int xPosition, int yPosition) {
 		if (!stack.isEmpty() && stack.getCount() != 1) {
 			String s = shortHandNumber(stack.getCount());
 
 			if (stack.getCount() < 1)
 				s = TextFormatting.RED + String.valueOf(stack.getCount());
 
+			Minecraft mc = Minecraft.getInstance();
 			RenderSystem.disableLighting();
 			RenderSystem.disableDepthTest();
 			RenderSystem.disableBlend();
 			matrixStack.pushPose();
-			matrixStack.translate(0, 0, Minecraft.getInstance().getItemRenderer().blitOffset + 200F);
+			matrixStack.translate(0, 0, mc.getItemRenderer().blitOffset + 200F);
 			fr.drawShadow(matrixStack, s, xPosition + 19 - 2 - fr.width(s), yPosition + 6 + 3, 16777215);
 			matrixStack.popPose();
 			RenderSystem.enableLighting();
@@ -128,16 +131,19 @@ private static String shortHandNumber(Number number) {
 		return shorthand;
 	}
 
+	@SuppressWarnings("deprecation")
 	public static void enable3DRender() {
 		RenderSystem.enableLighting();
 		RenderSystem.enableDepthTest();
 	}
 
+	@SuppressWarnings("deprecation")
 	public static void enable2DRender() {
 		RenderSystem.disableLighting();
 		RenderSystem.disableDepthTest();
 	}
 
+	@SuppressWarnings("deprecation")
 	public static void drawGradientRect(MatrixStack matrixStack, int left, int top, int right, int bottom, int startColor, int endColor) {
 		float zLevel = 0.0F;
 		Matrix4f matrix = matrixStack.last().pose();
@@ -204,6 +210,7 @@ public static List<ITextComponent> itemDisplayNameMultiline(ItemStack itemstack)
 		return namelist;
 	}
 
+	@SuppressWarnings("deprecation")
 	public static void renderIcon(MatrixStack matrixStack, int x, int y, int sx, int sy, IconUI icon) {
 		RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
 		CLIENT.getTextureManager().bind(AbstractGui.GUI_ICONS_LOCATION);

diff --git a/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java
@@ -79,6 +79,7 @@ public static void renderOverlay() {
 			renderOverlay(WailaTickHandler.instance().tooltip, new MatrixStack());
 	}
 
+	@SuppressWarnings("deprecation")
 	public static void enableGUIStandardItemLighting() {
 		RenderSystem.pushMatrix();
 		RenderSystem.rotatef(-30.0F, 0.0F, 1.0F, 0.0F);
@@ -87,6 +88,7 @@ public static void enableGUIStandardItemLighting() {
 		RenderSystem.popMatrix();
 	}
 
+	@SuppressWarnings("deprecation")
 	public static void renderOverlay(Tooltip tooltip, MatrixStack matrixStack) {
 		Minecraft.getInstance().getProfiler().push("Waila Overlay");
 		RenderContext.matrixStack = matrixStack;
@@ -160,6 +162,7 @@ public static void saveGLState() {
 		GL11.glPushAttrib(GL11.GL_CURRENT_BIT); // Leave me alone :(
 	}
 
+	@SuppressWarnings("deprecation")
 	public static void loadGLState() {
 		RenderSystem.depthMask(depthMask);
 		RenderSystem.depthFunc(depthFunc);

diff --git a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java
@@ -65,6 +65,7 @@ public void addPadding() {
 		totalSize.height += 8;
 	}
 
+	@SuppressWarnings("deprecation")
 	public void draw() {
 		Rectangle position = getPosition();
 		WailaConfig.ConfigOverlay.ConfigOverlayColor color = Waila.CONFIG.get().getOverlay().getColor();

diff --git a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java
@@ -157,19 +157,21 @@ public static WailaTickHandler instance() {
 
 	@SubscribeEvent
 	public static void onTooltip(WailaTooltipEvent event) {
+		Minecraft mc = Minecraft.getInstance();
+
 		if (event.getCurrentTip().isEmpty())
 			return;
 
 		if (!getNarrator().active() || !Waila.CONFIG.get().getGeneral().shouldEnableTextToSpeech())
 			return;
 
-		if (Minecraft.getInstance().screen != null && Minecraft.getInstance().options.chatVisibility != ChatVisibility.HIDDEN)
+		if (mc.screen != null && mc.options.chatVisibility != ChatVisibility.HIDDEN)
 			return;
 
 		if (event.getAccessor().getBlock() == Blocks.AIR && event.getAccessor().getEntity() == null)
 			return;
 
-		if (Minecraft.getInstance().level != null && Minecraft.getInstance().level.getGameTime() % 5 > 0) {
+		if (mc.level != null && mc.level.getGameTime() % 5 > 0) {
 			return;
 		}
 

diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TextTooltipRenderer.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TextTooltipRenderer.java
@@ -25,7 +25,8 @@ public Dimension getSize(CompoundNBT tag, ICommonAccessor accessor) {
 		if (component == null) {
 			return new Dimension();
 		}
-		FontRenderer fontRenderer = Minecraft.getInstance().font;
+		Minecraft mc = Minecraft.getInstance();
+		FontRenderer fontRenderer = mc.font;
 		return new Dimension(fontRenderer.width(component.getString()), fontRenderer.lineHeight + 1);
 	}
 
@@ -35,7 +36,8 @@ public void draw(CompoundNBT tag, ICommonAccessor accessor, int x, int y) {
 		if (component == null) {
 			return;
 		}
-		FontRenderer fontRenderer = Minecraft.getInstance().font;
+		Minecraft mc = Minecraft.getInstance();
+		FontRenderer fontRenderer = mc.font;
 		WailaConfig.ConfigOverlay.ConfigOverlayColor color = Waila.CONFIG.get().getOverlay().getColor();
 		IRenderTypeBuffer.Impl irendertypebuffer$impl = IRenderTypeBuffer.immediate(Tessellator.getInstance().getBuilder());
 		fontRenderer.drawInBatch(component.getVisualOrderText(), x, y, color.getFontColor(), true, new MatrixStack().last().pose(), irendertypebuffer$impl, false, 0, 15728880);

diff --git a/src/main/java/snownee/jade/addon/create/SpeedProvider.java b/src/main/java/snownee/jade/addon/create/SpeedProvider.java
@@ -1,9 +1,7 @@
 package snownee.jade.addon.create;
 
-import java.util.Arrays;
 import java.util.List;
 
-import com.google.common.collect.Iterables;
 import com.simibubi.create.content.contraptions.base.KineticTileEntity;
 import com.simibubi.create.content.contraptions.goggles.GogglesItem;
 

diff --git a/src/main/java/snownee/jade/client/renderer/StringTooltipRenderer.java b/src/main/java/snownee/jade/client/renderer/StringTooltipRenderer.java
@@ -18,19 +18,21 @@
 public class StringTooltipRenderer implements ITooltipRenderer {
 	@Override
 	public Dimension getSize(CompoundNBT tag, ICommonAccessor accessor) {
+		Minecraft mc = Minecraft.getInstance();
 		int ox = tag.getInt("x");
 		int oy = tag.getInt("y");
 		String s = tag.getString("text");
-		FontRenderer fontRenderer = Minecraft.getInstance().font;
+		FontRenderer fontRenderer = mc.font;
 		return new Dimension(ox + fontRenderer.width(s), oy + (s.isEmpty() ? 0 : 8));
 	}
 
 	@Override
 	public void draw(CompoundNBT tag, ICommonAccessor accessor, int x, int y) {
+		Minecraft mc = Minecraft.getInstance();
 		int ox = tag.getInt("x");
 		int oy = tag.getInt("y");
 		String s = tag.getString("text");
-		FontRenderer fontRenderer = Minecraft.getInstance().font;
+		FontRenderer fontRenderer = mc.font;
 		WailaConfig.ConfigOverlay.ConfigOverlayColor color = Waila.CONFIG.get().getOverlay().getColor();
 		fontRenderer.drawShadow(new MatrixStack(), s, x + ox, y + oy, color.getFontColor());
 	}

diff --git a/src/main/java/snownee/jade/client/renderer/SubStringTooltipRenderer.java b/src/main/java/snownee/jade/client/renderer/SubStringTooltipRenderer.java
@@ -25,8 +25,9 @@ public Dimension getSize(CompoundNBT tag, ICommonAccessor accessor) {
 
 	@Override
 	public void draw(CompoundNBT tag, ICommonAccessor accessor, int x, int y) {
+		Minecraft mc = Minecraft.getInstance();
 		String s = tag.getString("text");
-		FontRenderer fontRenderer = Minecraft.getInstance().font;
+		FontRenderer fontRenderer = mc.font;
 		WailaConfig.ConfigOverlay.ConfigOverlayColor color = Waila.CONFIG.get().getOverlay().getColor();
 		MatrixStack matrixStack = new MatrixStack();
 		if (PluginConfig.INSTANCE.get(JadePlugin.HARVEST_TOOL_NEW_LINE)) {