diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java index 7be595936..fd1f72206 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import static com.gtnewhorizons.angelica.transform.BlockTransformer.*; @@ -72,6 +73,8 @@ public class RedirectorTransformer implements IClassTransformer { ); private static int remaps = 0; + private static final Set blockSubclasses = Collections.newSetFromMap(new ConcurrentHashMap<>()); + static { glCapRedirects.put(org.lwjgl.opengl.GL11.GL_ALPHA_TEST, "AlphaTest"); glCapRedirects.put(org.lwjgl.opengl.GL11.GL_BLEND, "Blend"); @@ -131,6 +134,7 @@ public class RedirectorTransformer implements IClassTransformer { methodRedirects.put(EXTBlendFunc, RedirectMap.newMap().add("glBlendFuncSeparateEXT", "tryBlendFuncSeparate")); methodRedirects.put(ARBMultiTexture, RedirectMap.newMap().add("glActiveTextureARB")); methodRedirects.put(Project, RedirectMap.newMap().add("gluPerspective")); + blockSubclasses.add(BlockClass); } @Override @@ -153,6 +157,11 @@ public class RedirectorTransformer implements IClassTransformer { final ClassNode cn = new ClassNode(); cr.accept(cn, 0); + // Track subclasses of Block + if (blockSubclasses.contains(cn.superName)) { + blockSubclasses.add(cn.name); + } + boolean changed = false; for (MethodNode mn : cn.methods) { if (transformedName.equals("net.minecraft.client.renderer.OpenGlHelper") && (mn.name.equals("glBlendFunc") || mn.name.equals("func_148821_a"))) { @@ -226,7 +235,7 @@ public class RedirectorTransformer implements IClassTransformer { } } else if ((node.getOpcode() == Opcodes.GETFIELD || node.getOpcode() == Opcodes.PUTFIELD) && node instanceof FieldInsnNode fNode) { - if(fNode.owner.equals(BlockClass)) { + if(blockSubclasses.contains(fNode.owner)) { Pair fieldToRedirect = null; for(Pair blockPairs : BlockBoundsFields) { if(fNode.name.equals(blockPairs.getLeft()) || fNode.name.equals(blockPairs.getRight())) {