From 89d59ab3f24ecc72809d45451dd8181995e0806d Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Sun, 13 Oct 2024 00:43:59 +0200 Subject: [PATCH 1/4] Update deps --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 72d7249..4db340b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,9 +1,9 @@ // Add your dependencies here dependencies { - compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.3.7:dev") - compileOnly("com.github.GTNewHorizons:Natura:2.7.1:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.3.9:dev") + compileOnly("com.github.GTNewHorizons:Natura:2.7.4:dev") { transitive = false } compileOnly(deobfCurse("pams-harvestcraft-221857:2270206")) - runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.6.42-GTNH:dev") } From 1affc2fe625c0ca52ef589e422e051a0cabe7298 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Sun, 13 Oct 2024 00:45:27 +0200 Subject: [PATCH 2/4] Remove unnecessary call to `ObfuscationReflectionHelper.remapFieldNames` --- .../squeek/applecore/client/TooltipOverlayHandler.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/squeek/applecore/client/TooltipOverlayHandler.java b/src/main/java/squeek/applecore/client/TooltipOverlayHandler.java index 68de33d..709d103 100644 --- a/src/main/java/squeek/applecore/client/TooltipOverlayHandler.java +++ b/src/main/java/squeek/applecore/client/TooltipOverlayHandler.java @@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.RenderTickEvent; @@ -35,14 +34,7 @@ public class TooltipOverlayHandler { private static final ResourceLocation modIcons = new ResourceLocation(ModInfo.MODID_LOWER, "textures/icons.png"); - // private static final Field guiLeft = ReflectionHelper.findField(GuiContainer.class, - // ObfuscationReflectionHelper.remapFieldNames(GuiContainer.class.getName(), "guiLeft", "field_147003_i", "i")); - // private static final Field guiTop = ReflectionHelper.findField(GuiContainer.class, - // ObfuscationReflectionHelper.remapFieldNames(GuiContainer.class.getName(), "guiTop", "field_147009_r", "r")); - public static final Field theSlot = ReflectionHelper.findField( - GuiContainer.class, - ObfuscationReflectionHelper - .remapFieldNames(GuiContainer.class.getName(), "theSlot", "field_147006_u", "u")); + public static final Field theSlot = ReflectionHelper.findField(GuiContainer.class, "theSlot", "field_147006_u", "u"); private static Method getStackMouseOver = null; private static Method isNEIHidden = null; private static Field itemPanel = null; From 68e9f13c56249fa63a824100607ff61e858cb65b Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Sun, 13 Oct 2024 00:45:55 +0200 Subject: [PATCH 3/4] Rework `GuiScreenMixin` --- .../early/minecraft/GuiScreenMixin.java | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/main/java/squeek/applecore/mixins/early/minecraft/GuiScreenMixin.java b/src/main/java/squeek/applecore/mixins/early/minecraft/GuiScreenMixin.java index 82ae2c5..2102400 100644 --- a/src/main/java/squeek/applecore/mixins/early/minecraft/GuiScreenMixin.java +++ b/src/main/java/squeek/applecore/mixins/early/minecraft/GuiScreenMixin.java @@ -1,37 +1,25 @@ package squeek.applecore.mixins.early.minecraft; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; +import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +import com.llamalad7.mixinextras.sugar.Local; import squeek.applecore.client.TooltipOverlayHandler; @Mixin(GuiScreen.class) public class GuiScreenMixin { - @Inject( - method = "drawHoveringText", - at = @At(value = "INVOKE", target = "Ljava/util/List;size()I", shift = At.Shift.BEFORE), - slice = @Slice( - from = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/gui/GuiScreen;drawGradientRect(IIIIII)V", - ordinal = 0)), - locals = LocalCapture.CAPTURE_FAILHARD) - private void onDrawHoveringText(List textLines, int x, int y, FontRenderer font, CallbackInfo ci, int k, - Iterator iterator, int j2, int k2, int i1, int j1, int k1, int l1, int i2) { - TooltipOverlayHandler.toolTipX = j2; - TooltipOverlayHandler.toolTipY = k2; - TooltipOverlayHandler.toolTipW = k; - TooltipOverlayHandler.toolTipH = i1; + @Inject(at = @At(opcode = Opcodes.PUTFIELD, ordinal = 0, remap = true, target = "Lnet/minecraft/client/gui/GuiScreen;zLevel:F", value = "FIELD"), method = "drawHoveringText", remap = false) + private void onDrawHoveringText(CallbackInfo ci, @Local(ordinal = 3) int x, @Local(ordinal = 4) int y, @Local(ordinal = 2) int w, @Local(ordinal = 5) int h) { + TooltipOverlayHandler.toolTipX = x; + TooltipOverlayHandler.toolTipY = y; + TooltipOverlayHandler.toolTipW = w; + TooltipOverlayHandler.toolTipH = h; } } From e2545e5e019748dfbb5e1f7aab9f19e6b51f6e43 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Sun, 13 Oct 2024 00:48:13 +0200 Subject: [PATCH 4/4] Apply spotless --- .../applecore/client/TooltipOverlayHandler.java | 3 ++- .../mixins/early/minecraft/GuiScreenMixin.java | 13 +++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/squeek/applecore/client/TooltipOverlayHandler.java b/src/main/java/squeek/applecore/client/TooltipOverlayHandler.java index 709d103..af86547 100644 --- a/src/main/java/squeek/applecore/client/TooltipOverlayHandler.java +++ b/src/main/java/squeek/applecore/client/TooltipOverlayHandler.java @@ -34,7 +34,8 @@ public class TooltipOverlayHandler { private static final ResourceLocation modIcons = new ResourceLocation(ModInfo.MODID_LOWER, "textures/icons.png"); - public static final Field theSlot = ReflectionHelper.findField(GuiContainer.class, "theSlot", "field_147006_u", "u"); + public static final Field theSlot = ReflectionHelper + .findField(GuiContainer.class, "theSlot", "field_147006_u", "u"); private static Method getStackMouseOver = null; private static Method isNEIHidden = null; private static Field itemPanel = null; diff --git a/src/main/java/squeek/applecore/mixins/early/minecraft/GuiScreenMixin.java b/src/main/java/squeek/applecore/mixins/early/minecraft/GuiScreenMixin.java index 2102400..5a086bd 100644 --- a/src/main/java/squeek/applecore/mixins/early/minecraft/GuiScreenMixin.java +++ b/src/main/java/squeek/applecore/mixins/early/minecraft/GuiScreenMixin.java @@ -15,8 +15,17 @@ @Mixin(GuiScreen.class) public class GuiScreenMixin { - @Inject(at = @At(opcode = Opcodes.PUTFIELD, ordinal = 0, remap = true, target = "Lnet/minecraft/client/gui/GuiScreen;zLevel:F", value = "FIELD"), method = "drawHoveringText", remap = false) - private void onDrawHoveringText(CallbackInfo ci, @Local(ordinal = 3) int x, @Local(ordinal = 4) int y, @Local(ordinal = 2) int w, @Local(ordinal = 5) int h) { + @Inject( + at = @At( + opcode = Opcodes.PUTFIELD, + ordinal = 0, + remap = true, + target = "Lnet/minecraft/client/gui/GuiScreen;zLevel:F", + value = "FIELD"), + method = "drawHoveringText", + remap = false) + private void onDrawHoveringText(CallbackInfo ci, @Local(ordinal = 3) int x, @Local(ordinal = 4) int y, + @Local(ordinal = 2) int w, @Local(ordinal = 5) int h) { TooltipOverlayHandler.toolTipX = x; TooltipOverlayHandler.toolTipY = y; TooltipOverlayHandler.toolTipW = w;