Merge remote-tracking branch 'lc-1337/remove-class-transformers' into dev

src/main/java/com/glodblock/github/coremod/FCClassTransformer.java

@@ -1,55 +0,0 @@
-package com.glodblock.github.coremod;
-
-import net.minecraft.launchwrapper.IClassTransformer;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-
-import com.glodblock.github.coremod.transform.ExternalStorageRegistryTransformer;
-import com.glodblock.github.coremod.transform.GuiCraftingTransformer;
-import com.glodblock.github.coremod.transform.NEITransformer;
-import com.gtnewhorizon.gtnhlib.asm.ASMUtil;
-
-public class FCClassTransformer implements IClassTransformer {
-
-    private static final Logger logger = LogManager.getLogger("ASM AE2FC");
-
-    @Override
-    public byte[] transform(String name, String transformedName, byte[] basicClass) {
-        ClassMapper tform;
-        switch (transformedName) {
-            case "appeng.client.gui.implementations.GuiCraftingCPU", "appeng.client.gui.implementations.GuiCraftConfirm", "net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftConfirm", "appeng.client.gui.widgets.GuiCraftingTree" -> tform = GuiCraftingTransformer.INSTANCE;
-            case "appeng.integration.modules.NEI" -> tform = NEITransformer.INSTANCE;
-            case "appeng.core.features.registries.ExternalStorageRegistry" -> tform = ExternalStorageRegistryTransformer.INSTANCE;
-            default -> {
-                return basicClass;
-            }
-        }
-        logger.debug("Transforming class: " + transformedName);
-        final byte[] bytes = tform.transformClass(basicClass);
-        if (FluidCraftCore.DUMP_CLASSES()) {
-            ASMUtil.saveAsRawClassFile(basicClass, transformedName + "_PRE", this);
-            ASMUtil.saveAsRawClassFile(bytes, transformedName + "_POST", this);
-        }
-        return bytes;
-    }
-
-    public abstract static class ClassMapper {
-
-        public final byte[] transformClass(byte[] code) {
-            ClassReader reader = new ClassReader(code);
-            ClassWriter writer = new ClassWriter(reader, getWriteFlags());
-            reader.accept(getClassMapper(writer), ClassReader.EXPAND_FRAMES);
-            return writer.toByteArray();
-        }
-
-        protected int getWriteFlags() {
-            return 0;
-        }
-
-        protected abstract ClassVisitor getClassMapper(ClassVisitor downstream);
-    }
-}

src/main/java/com/glodblock/github/coremod/FluidCraftCore.java

@@ -11,12 +11,9 @@ import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 @IFMLLoadingPlugin.TransformerExclusions("com.glodblock.github.coremod")
 public class FluidCraftCore implements IFMLLoadingPlugin {
 
-    private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("ae2fc.dumpClass", "false"));
-    private static boolean OBF_ENV;
-
     @Override
     public String[] getASMTransformerClass() {
-        return new String[] { FCClassTransformer.class.getName() };
+        return null;
     }
 
     @Nullable
@@ -32,17 +29,11 @@ public class FluidCraftCore implements IFMLLoadingPlugin {
     }
 
     @Override
-    public void injectData(Map<String, Object> data) {
-        OBF_ENV = (boolean) data.get("runtimeDeobfuscationEnabled");
-    }
+    public void injectData(Map<String, Object> data) {}
 
     @Nullable
     @Override
     public String getAccessTransformerClass() {
         return null;
     }
-
-    public static boolean DUMP_CLASSES() {
-        return DUMP_CLASSES || !OBF_ENV;
-    }
 }

src/main/java/com/glodblock/github/coremod/hooker/CoreModHooks.java

@@ -1,28 +0,0 @@
-package com.glodblock.github.coremod.hooker;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-import com.glodblock.github.common.item.ItemFluidDrop;
-import com.glodblock.github.common.item.ItemFluidPacket;
-
-import appeng.api.storage.data.IAEItemStack;
-import appeng.client.gui.IGuiTooltipHandler;
-
-public class CoreModHooks {
-
-    public static ItemStack displayFluid(IAEItemStack aeStack) {
-        if (aeStack.getItemStack() != null && aeStack.getItemStack().getItem() instanceof ItemFluidDrop) {
-            FluidStack fluid = ItemFluidDrop.getFluidStack(aeStack.getItemStack());
-            return ItemFluidPacket.newDisplayStack(fluid);
-        } else return aeStack.getItemStack();
-    }
-
-    public static ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey) {
-        if (gui instanceof IGuiTooltipHandler guiTooltipHandler) {
-            return guiTooltipHandler.getHoveredStack();
-        }
-        return null;
-    }
-}

src/main/java/com/glodblock/github/coremod/hooker/CoreModHooksClient.java

@@ -1,9 +0,0 @@
-package com.glodblock.github.coremod.hooker;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class CoreModHooksClient {
-
-}

src/main/java/com/glodblock/github/coremod/transform/ExternalStorageRegistryTransformer.java

@@ -1,104 +0,0 @@
-package com.glodblock.github.coremod.transform;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import com.glodblock.github.coremod.FCClassTransformer;
-
-public class ExternalStorageRegistryTransformer extends FCClassTransformer.ClassMapper {
-
-    public static final ExternalStorageRegistryTransformer INSTANCE = new ExternalStorageRegistryTransformer();
-
-    private ExternalStorageRegistryTransformer() {
-        // NO-OP
-    }
-
-    @Override
-    protected ClassVisitor getClassMapper(ClassVisitor downstream) {
-        return new TransformExternalStorageRegistry(Opcodes.ASM5, downstream);
-    }
-
-    @Override
-    protected int getWriteFlags() {
-        return ClassWriter.COMPUTE_FRAMES;
-    }
-
-    private static class TransformExternalStorageRegistry extends ClassVisitor {
-
-        public TransformExternalStorageRegistry(int api, ClassVisitor cv) {
-            super(api, cv);
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            if ("getHandler".equals(name)) {
-                return new TransformGetHandler(api, super.visitMethod(access, name, desc, signature, exceptions));
-            } else {
-                return super.visitMethod(access, name, desc, signature, exceptions);
-            }
-        }
-    }
-
-    private static class TransformGetHandler extends MethodVisitor {
-
-        private int cnt_return = 0;
-        private int cnt_if = 0;
-        private Label L6 = null;
-        private final Label L9 = new Label();
-
-        TransformGetHandler(int api, MethodVisitor mv) {
-            super(api, mv);
-        }
-
-        @Override
-        public void visitJumpInsn(int opcode, Label label) {
-            if (opcode == Opcodes.IFEQ) {
-                cnt_if++;
-            }
-            if (cnt_if == 3) {
-                L6 = label;
-                cnt_if++;
-                super.visitJumpInsn(opcode, L9);
-                return;
-            }
-            super.visitJumpInsn(opcode, label);
-        }
-
-        @Override
-        public void visitInsn(int opcode) {
-            if (opcode == Opcodes.ARETURN) {
-                cnt_return++;
-            }
-            super.visitInsn(opcode);
-            if (cnt_return == 2) {
-                super.visitLabel(L9);
-                super.visitFieldInsn(
-                        Opcodes.GETSTATIC,
-                        "com/glodblock/github/inventory/external/AEFluidTankHandler",
-                        "INSTANCE",
-                        "Lcom/glodblock/github/inventory/external/AEFluidTankHandler;");
-                super.visitVarInsn(Opcodes.ALOAD, 1);
-                super.visitVarInsn(Opcodes.ALOAD, 2);
-                super.visitVarInsn(Opcodes.ALOAD, 3);
-                super.visitVarInsn(Opcodes.ALOAD, 4);
-                super.visitMethodInsn(
-                        Opcodes.INVOKEVIRTUAL,
-                        "com/glodblock/github/inventory/external/AEFluidTankHandler",
-                        "canHandle",
-                        "(Lnet/minecraft/tileentity/TileEntity;Lnet/minecraftforge/common/util/ForgeDirection;Lappeng/api/storage/StorageChannel;Lappeng/api/networking/security/BaseActionSource;)Z",
-                        false);
-                super.visitJumpInsn(Opcodes.IFEQ, L6);
-                super.visitFieldInsn(
-                        Opcodes.GETSTATIC,
-                        "com/glodblock/github/inventory/external/AEFluidTankHandler",
-                        "INSTANCE",
-                        "Lcom/glodblock/github/inventory/external/AEFluidTankHandler;");
-                super.visitInsn(Opcodes.ARETURN);
-                cnt_return++;
-            }
-        }
-    }
-}

src/main/java/com/glodblock/github/coremod/transform/GuiCraftingTransformer.java

@@ -1,58 +0,0 @@
-package com.glodblock.github.coremod.transform;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import com.glodblock.github.coremod.FCClassTransformer;
-
-public class GuiCraftingTransformer extends FCClassTransformer.ClassMapper {
-
-    public static final GuiCraftingTransformer INSTANCE = new GuiCraftingTransformer();
-
-    private GuiCraftingTransformer() {
-        // NO-OP
-    }
-
-    @Override
-    protected ClassVisitor getClassMapper(ClassVisitor downstream) {
-        return new TransformGuiCrafting(Opcodes.ASM5, downstream);
-    }
-
-    private static class TransformGuiCrafting extends ClassVisitor {
-
-        TransformGuiCrafting(int api, ClassVisitor cv) {
-            super(api, cv);
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            if ("drawFG".equals(name) || "drawListFG".equals(name) || "drawStack".equals(name)) {
-                return new TransformFluidIcon(api, super.visitMethod(access, name, desc, signature, exceptions));
-            }
-            return super.visitMethod(access, name, desc, signature, exceptions);
-        }
-    }
-
-    private static class TransformFluidIcon extends MethodVisitor {
-
-        TransformFluidIcon(int api, MethodVisitor mv) {
-            super(api, mv);
-        }
-
-        @Override
-        public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
-            if (opcode == Opcodes.INVOKEINTERFACE && owner.equals("appeng/api/storage/data/IAEItemStack")
-                    && name.equals("getItemStack")) {
-                super.visitMethodInsn(
-                        Opcodes.INVOKESTATIC,
-                        "com/glodblock/github/coremod/hooker/CoreModHooks",
-                        "displayFluid",
-                        "(Lappeng/api/storage/data/IAEItemStack;)Lnet/minecraft/item/ItemStack;",
-                        false);
-            } else {
-                super.visitMethodInsn(opcode, owner, name, desc, itf);
-            }
-        }
-    }
-}

src/main/java/com/glodblock/github/coremod/transform/NEITransformer.java

@@ -1,93 +0,0 @@
-package com.glodblock.github.coremod.transform;
-
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import com.glodblock.github.coremod.FCClassTransformer;
-
-public class NEITransformer extends FCClassTransformer.ClassMapper {
-
-    public static final NEITransformer INSTANCE = new NEITransformer();
-
-    private NEITransformer() {
-        // NO-OP
-    }
-
-    @Override
-    protected ClassVisitor getClassMapper(ClassVisitor downstream) {
-        return new TransformNEI(Opcodes.ASM5, downstream);
-    }
-
-    private static class TransformNEI extends ClassVisitor {
-
-        TransformNEI(int api, ClassVisitor cv) {
-            super(api, cv);
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            return switch (name) {
-                case "getStackUnderMouse" -> new TransformStackUnderMouse(
-                        api,
-                        super.visitMethod(access, name, desc, signature, exceptions));
-                case "shouldShowTooltip" -> new TransformShowTooltip(
-                        api,
-                        super.visitMethod(access, name, desc, signature, exceptions));
-                default -> super.visitMethod(access, name, desc, signature, exceptions);
-            };
-        }
-    }
-
-    private static class TransformStackUnderMouse extends MethodVisitor {
-
-        TransformStackUnderMouse(int api, MethodVisitor mv) {
-            super(api, mv);
-        }
-
-        @Override
-        public void visitInsn(int opcode) {
-            if (opcode == Opcodes.ACONST_NULL) {
-                super.visitVarInsn(Opcodes.ALOAD, 1);
-                super.visitVarInsn(Opcodes.ILOAD, 2);
-                super.visitVarInsn(Opcodes.ILOAD, 3);
-                super.visitMethodInsn(
-                        Opcodes.INVOKESTATIC,
-                        "com/glodblock/github/coremod/hooker/CoreModHooks",
-                        "getStackUnderMouse",
-                        "(Lnet/minecraft/client/gui/inventory/GuiContainer;II)Lnet/minecraft/item/ItemStack;",
-                        false);
-                return;
-            }
-            super.visitInsn(opcode);
-        }
-    }
-
-    private static class TransformShowTooltip extends MethodVisitor {
-
-        int const_1 = 0;
-
-        TransformShowTooltip(int api, MethodVisitor mv) {
-            super(api, mv);
-        }
-
-        @Override
-        public void visitInsn(int opcode) {
-            if (opcode == Opcodes.ICONST_1 && const_1 == 2) {
-                super.visitVarInsn(Opcodes.ALOAD, 1);
-                super.visitMethodInsn(
-                        Opcodes.INVOKESTATIC,
-                        "com/glodblock/github/coremod/hooker/CoreModHooks",
-                        "shouldShowTooltip",
-                        "(Lnet/minecraft/client/gui/inventory/GuiContainer;)Z",
-                        false);
-                const_1++;
-                return;
-            }
-            if (opcode == Opcodes.ICONST_1) {
-                const_1++;
-            }
-            super.visitInsn(opcode);
-        }
-    }
-}