From d0948b36f361304e9c25f0f2cedc34c508622cf3 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Sat, 7 Jun 2025 12:07:14 +0200 Subject: [PATCH] No longer use Reflection for `SplashProgress.fontRenderer` (#966) * Access SplashProgress font renderer via mixins * Use AT --- .../gtnewhorizons/angelica/AngelicaMod.java | 9 +++- .../gtnewhorizons/angelica/mixins/Mixins.java | 2 +- src/main/resources/META-INF/archaicfix_at.cfg | 4 +- .../archaic/AccessorSplashProgress.java | 9 ++++ ...ogress.java => MixinSplashProgress$3.java} | 43 +++++++------------ 5 files changed, 36 insertions(+), 31 deletions(-) rename src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/{MixinSplashProgress.java => MixinSplashProgress$3.java} (80%) diff --git a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java index 00556f640..8c0cc60fa 100644 --- a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java +++ b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java @@ -15,8 +15,13 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; modid = "angelica", name = "Angelica", version = Tags.VERSION, - dependencies = " before:lwjgl3ify@[1.5.3,);" + " after:hodgepodge@[2.4.4,);" + " after:CodeChickenCore@[1.2.0,);" - + " after:archaicfix@[0.7.0,);" + " required-after:gtnhlib@[0.6.6,);", + dependencies = """ + required-after:gtnhlib@[0.6.6,);\ + before:lwjgl3ify@[1.5.3,);\ + after:hodgepodge@[2.4.4,);\ + after:CodeChickenCore@[1.2.0,);\ + after:archaicfix@[0.7.0,);\ + """, acceptedMinecraftVersions = "[1.7.10]", acceptableRemoteVersions = "*", guiFactory = "com.gtnewhorizons.angelica.config.AngelicaGuiConfigFactory") diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 52d9f6ae4..8c9784c33 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -86,7 +86,7 @@ public enum Mixins { // Not compatible with the lwjgl debug callbacks, so disable if that's enabled ARCHAIC_SPLASH(new Builder("ArchaicFix Splash").addTargetedMod(TargetedMod.VANILLA).setSide(Side.CLIENT) .setPhase(Phase.EARLY).setApplyIf(() -> AngelicaConfig.showSplashMemoryBar && !AngelicaMod.lwjglDebug).addMixinClasses( - "angelica.archaic.MixinSplashProgress" + "angelica.archaic.MixinSplashProgress$3" ,"angelica.archaic.AccessorSplashProgress" ) ), diff --git a/src/main/resources/META-INF/archaicfix_at.cfg b/src/main/resources/META-INF/archaicfix_at.cfg index 98506732f..f52cce141 100644 --- a/src/main/resources/META-INF/archaicfix_at.cfg +++ b/src/main/resources/META-INF/archaicfix_at.cfg @@ -68,4 +68,6 @@ public net.minecraft.client.renderer.EntityRenderer field_78510_Z #renderEndNano public net.minecraft.client.multiplayer.PlayerControllerMP field_78779_k #currentGameType -public net.minecraft.world.World field_72993_I # activeChunkSet \ No newline at end of file +public net.minecraft.world.World field_72993_I # activeChunkSet + +public cpw.mods.fml.client.SplashProgress$SplashFontRenderer diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/AccessorSplashProgress.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/AccessorSplashProgress.java index 0d7459ea7..b75528627 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/AccessorSplashProgress.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/AccessorSplashProgress.java @@ -1,6 +1,8 @@ package com.gtnewhorizons.angelica.mixins.early.angelica.archaic; import cpw.mods.fml.client.SplashProgress; +import cpw.mods.fml.client.SplashProgress.SplashFontRenderer; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -12,12 +14,19 @@ public interface AccessorSplashProgress { static int getBarBorderColor() { throw new AssertionError(); } + @Accessor(remap = false) static int getBarBackgroundColor() { throw new AssertionError(); } + @Accessor(remap = false) static int getFontColor() { throw new AssertionError(); } + + @Accessor(remap = false) + static SplashFontRenderer getFontRenderer() { + throw new AssertionError(); + } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/MixinSplashProgress.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/MixinSplashProgress$3.java similarity index 80% rename from src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/MixinSplashProgress.java rename to src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/MixinSplashProgress$3.java index 1374467e5..572ce4882 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/MixinSplashProgress.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/archaic/MixinSplashProgress$3.java @@ -5,9 +5,9 @@ package com.gtnewhorizons.angelica.mixins.early.angelica.archaic; import com.gtnewhorizons.angelica.Tags; import com.gtnewhorizons.angelica.config.AngelicaConfig; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; -import cpw.mods.fml.client.SplashProgress; -import net.minecraft.client.gui.FontRenderer; + +import cpw.mods.fml.client.SplashProgress.SplashFontRenderer; + import org.apache.commons.lang3.StringUtils; import org.lwjgl.opengl.Display; import org.spongepowered.asm.mixin.Final; @@ -18,8 +18,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.lang.reflect.Field; - import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D; import static org.lwjgl.opengl.GL11.glDisable; import static org.lwjgl.opengl.GL11.glEnable; @@ -30,29 +28,19 @@ import static org.lwjgl.opengl.GL11.glTranslatef; @SuppressWarnings("deprecation") @Mixin(targets = { "cpw/mods/fml/client/SplashProgress$3" }) -public class MixinSplashProgress { - private static final int memoryGoodColor = 0x78CB34; - private static final int memoryWarnColor = 0xE6E84A; - private static final int memoryLowColor = 0xE42F2F; +public class MixinSplashProgress$3 { + + private static final int MEMORY_GOOD_COLOR = 0x78CB34; + private static final int MEMORY_WARN_COLOR = 0xE6E84A; + private static final int MEMORY_LOW_COLOR = 0xE42F2F; private static float memoryColorPercent; private static long memoryColorChangeTime; - private static FontRenderer fontRenderer = null; + @Unique private static Boolean angelica$isArchaicFixPresent = null; + @Inject(method = "run", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDisable(I)V", ordinal = 1, remap = false, shift = At.Shift.AFTER), remap = false, require = 0) private void injectDrawMemoryBar(CallbackInfo ci) { - // NOTE: Disable this if you're checking for off thread GL calls via `-Dangelica.assertMainThread=true` - if(fontRenderer == null) { - try { - Field f = SplashProgress.class.getDeclaredField("fontRenderer"); - f.setAccessible(true); - fontRenderer = (FontRenderer)f.get(null); - } catch(ReflectiveOperationException e) { - AngelicaTweaker.LOGGER.error(e); - return; - } - } - // This runs before Loader.isModLoaded() works if (angelica$isArchaicFixPresent == null) { try { @@ -68,7 +56,7 @@ public class MixinSplashProgress { glTranslatef(320 - Display.getWidth() / 2 + 4, 240 + Display.getHeight() / 2 - textHeight2, 0); glScalef(2, 2, 1); glEnable(GL_TEXTURE_2D); - fontRenderer.drawString("Angelica " + Tags.VERSION, 0, angelica$isArchaicFixPresent ? -10 : 0, 0x000000); + AccessorSplashProgress.getFontRenderer().drawString("Angelica " + Tags.VERSION, 0, angelica$isArchaicFixPresent ? -10 : 0, 0x000000); glDisable(GL_TEXTURE_2D); glPopMatrix(); if(AngelicaConfig.showSplashMemoryBar) { @@ -95,6 +83,7 @@ public class MixinSplashProgress { final int freeMemory = bytesToMb(Runtime.getRuntime().freeMemory()); final int usedMemory = totalMemory - freeMemory; final float usedMemoryPercent = usedMemory / (float) maxMemory; + final SplashFontRenderer fontRenderer = AccessorSplashProgress.getFontRenderer(); glPushMatrix(); // title - message @@ -123,13 +112,13 @@ public class MixinSplashProgress { final int memoryBarColor; if (memoryColorPercent < 0.75f) { - memoryBarColor = memoryGoodColor; + memoryBarColor = MEMORY_GOOD_COLOR; } else if (memoryColorPercent < 0.85f) { - memoryBarColor = memoryWarnColor; + memoryBarColor = MEMORY_WARN_COLOR; } else { - memoryBarColor = memoryLowColor; + memoryBarColor = MEMORY_LOW_COLOR; } - setColor(memoryLowColor); + setColor(MEMORY_LOW_COLOR); glPushMatrix(); glTranslatef((barWidth - 2) * (totalMemory) / (maxMemory) - 2, 0, 0); drawBox(2, barHeight - 2);