From 962e7527a4ef7ec4c579738f5341bf1933de973d Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 18 May 2026 12:39:20 -0700 Subject: [PATCH] Register later (#1763) --- .../loading/fml/compat/CompatHandlers.java | 1 - ...IsbrhTessellatorAbuseClassTransformer.java | 43 +++++++++++-------- .../fml/tweakers/AngelicaLateTweaker.java | 6 +++ .../RFBIsbrhTessellatorAbuseTransformer.java | 4 +- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/CompatHandlers.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/CompatHandlers.java index d483b1c24..42da20705 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/CompatHandlers.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/CompatHandlers.java @@ -56,7 +56,6 @@ public enum CompatHandlers { if (!handlers.isEmpty()) { transformers.add("com.gtnewhorizons.angelica.loading.fml.transformers.GenericCompatTransformer"); } - transformers.add("com.gtnewhorizons.angelica.loading.fml.transformers.IsbrhTessellatorAbuseClassTransformer"); return transformers; } } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/IsbrhTessellatorAbuseClassTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/IsbrhTessellatorAbuseClassTransformer.java index 3a2d2d3e1..d46282045 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/IsbrhTessellatorAbuseClassTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/IsbrhTessellatorAbuseClassTransformer.java @@ -1,6 +1,6 @@ package com.gtnewhorizons.angelica.loading.fml.transformers; -import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; +import com.gtnewhorizon.gtnhlib.asm.ClassConstantPoolParser; import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; import net.minecraft.launchwrapper.IClassTransformer; import org.apache.logging.log4j.LogManager; @@ -15,8 +15,10 @@ import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; public class IsbrhTessellatorAbuseClassTransformer implements IClassTransformer { + public static final String ISBRH = "cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler"; + private static final Logger LOGGER = LogManager.getLogger("IsbrhTessellatorAbuse"); - private static final String ISBRH = "cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler"; + private static final ClassConstantPoolParser CST_POOL_PARSER = new ClassConstantPoolParser(ISBRH); private static final String TESSELLATOR = "net/minecraft/client/renderer/Tessellator"; private static final String RENDER_WORLD_BLOCK_DESC = "(Lnet/minecraft/world/IBlockAccess;IIILnet/minecraft/block/Block;ILnet/minecraft/client/renderer/RenderBlocks;)Z"; @@ -24,10 +26,6 @@ public class IsbrhTessellatorAbuseClassTransformer implements IClassTransformer private final String startDrawingQuads; private final String startDrawing; - public IsbrhTessellatorAbuseClassTransformer() { - this(AngelicaClientTweaker.isObfEnv()); - } - public IsbrhTessellatorAbuseClassTransformer(boolean isObf) { this.draw = isObf ? "func_78381_a" : "draw"; this.startDrawingQuads = isObf ? "func_78382_b" : "startDrawingQuads"; @@ -35,20 +33,25 @@ public class IsbrhTessellatorAbuseClassTransformer implements IClassTransformer } public boolean shouldTransform(byte[] classBytes) { - final ClassReader cr = new ClassReader(classBytes); - for (String iface : cr.getInterfaces()) { - if (ISBRH.equals(iface)) return true; - } - return false; + return CST_POOL_PARSER.find(classBytes); } public boolean transformClassNode(String transformedName, ClassNode cn) { - boolean changed = false; - for (MethodNode mn : cn.methods) { - if (!"renderWorldBlock".equals(mn.name) || !RENDER_WORLD_BLOCK_DESC.equals(mn.desc)) continue; + MethodNode target = null; + for (int i = 0, n = cn.methods.size(); i < n; i++) { + final MethodNode mn = cn.methods.get(i); + if ("renderWorldBlock".equals(mn.name) && RENDER_WORLD_BLOCK_DESC.equals(mn.desc)) { + target = mn; + break; + } + } + if (target == null) return false; - for (AbstractInsnNode insn : mn.instructions.toArray()) { - if (!(insn instanceof MethodInsnNode min) || min.getOpcode() != Opcodes.INVOKEVIRTUAL || !TESSELLATOR.equals(min.owner)) continue; + boolean changed = false; + AbstractInsnNode insn = target.instructions.getFirst(); + while (insn != null) { + final AbstractInsnNode next = insn.getNext(); + if (insn instanceof MethodInsnNode min && min.getOpcode() == Opcodes.INVOKEVIRTUAL && TESSELLATOR.equals(min.owner)) { final int popOp; final boolean pushIntResult; @@ -62,15 +65,17 @@ public class IsbrhTessellatorAbuseClassTransformer implements IClassTransformer popOp = Opcodes.POP2; pushIntResult = false; } else { + insn = next; continue; } - mn.instructions.insertBefore(insn, new InsnNode(popOp)); - if (pushIntResult) mn.instructions.insertBefore(insn, new InsnNode(Opcodes.ICONST_0)); - mn.instructions.remove(insn); + target.instructions.insertBefore(insn, new InsnNode(popOp)); + if (pushIntResult) target.instructions.insertBefore(insn, new InsnNode(Opcodes.ICONST_0)); + target.instructions.remove(insn); LOGGER.info("Stripped Tessellator.{} from {}#renderWorldBlock", min.name, cn.name); changed = true; } + insn = next; } return changed; } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/AngelicaLateTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/AngelicaLateTweaker.java index 2ad868333..eeb014ebb 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/AngelicaLateTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/AngelicaLateTweaker.java @@ -2,6 +2,8 @@ package com.gtnewhorizons.angelica.loading.fml.tweakers; import com.gtnewhorizons.angelica.glsm.loading.EcosystemNarrowRules; import com.gtnewhorizons.angelica.glsm.loading.TransformerNarrower; +import com.gtnewhorizons.angelica.loading.AngelicaClientTweaker; +import com.gtnewhorizons.angelica.loading.fml.transformers.IsbrhTessellatorAbuseClassTransformer; import cpw.mods.fml.relauncher.FMLRelaunchLog; import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.ITweaker; @@ -60,6 +62,10 @@ public class AngelicaLateTweaker implements ITweaker { final List transformers = (List) transformersField.get(Launch.classLoader); transformers.removeIf(t -> t.getClass().getName().equals(EARLY_REDIRECTOR_CLASS)); + + final IClassTransformer isbrhAbuse = new IsbrhTessellatorAbuseClassTransformer(AngelicaClientTweaker.isObfEnv()); + FMLRelaunchLog.finer("Registering transformer %s", isbrhAbuse.getClass().getName()); + transformers.add(isbrhAbuse); } catch (Exception e) { FMLRelaunchLog.warning("[Angelica] Failed to remove EarlyRedirectorTransformer: %s", e.getMessage()); } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/rfb/transformers/RFBIsbrhTessellatorAbuseTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/rfb/transformers/RFBIsbrhTessellatorAbuseTransformer.java index 21718cecb..b61bddd29 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/rfb/transformers/RFBIsbrhTessellatorAbuseTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/rfb/transformers/RFBIsbrhTessellatorAbuseTransformer.java @@ -2,6 +2,7 @@ package com.gtnewhorizons.angelica.loading.rfb.transformers; import com.gtnewhorizons.angelica.loading.fml.transformers.IsbrhTessellatorAbuseClassTransformer; import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; +import com.gtnewhorizons.retrofuturabootstrap.api.ClassHeaderMetadata; import com.gtnewhorizons.retrofuturabootstrap.api.ClassNodeHandle; import com.gtnewhorizons.retrofuturabootstrap.api.ExtensibleClassLoader; import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer; @@ -40,7 +41,8 @@ public class RFBIsbrhTessellatorAbuseTransformer implements RfbClassTransformer @NotNull RfbClassTransformer.Context context, @Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) { if (!classNode.isPresent()) return false; - return inner.shouldTransform(classNode.getOriginalBytes()); + final ClassHeaderMetadata metadata = classNode.getOriginalMetadata(); + return metadata != null && metadata.binaryInterfaceNames.contains(IsbrhTessellatorAbuseClassTransformer.ISBRH); } @Override