GT++ ASM Cleanup (#3238)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

7 files changed, 0 insertions, 1272 deletions

diff --git a/src/main/java/gtPlusPlus/preloader/asm/PreloaderDummyContainer.java b/src/main/java/gtPlusPlus/preloader/asm/PreloaderDummyContainer.java
deleted file mode 100644
index 8e0684e53f..0000000000
--- a/src/main/java/gtPlusPlus/preloader/asm/PreloaderDummyContainer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package gtPlusPlus.preloader.asm;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.enums.Mods.GregTech;
-
-import java.io.File;
-import java.util.Collections;
-
-import net.minecraftforge.common.config.Configuration;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
-import cpw.mods.fml.common.DummyModContainer;
-import cpw.mods.fml.common.LoadController;
-import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import gtPlusPlus.preloader.PreloaderCore;
-import gtPlusPlus.preloader.PreloaderLogger;
-
-public class PreloaderDummyContainer extends DummyModContainer {
-
-    public PreloaderDummyContainer() {
-        super(new ModMetadata());
-        ModMetadata meta = getMetadata();
-        meta.modId = PreloaderCore.MODID;
-        meta.name = PreloaderCore.NAME;
-        meta.version = PreloaderCore.VERSION;
-        meta.credits = "Roll Credits ...";
-        meta.authorList = Collections.singletonList("Alkalus");
-        meta.screenshots = new String[0];
-        meta.parent = GTPlusPlus.ID;
-    }
-
-    @Override
-    public boolean registerBus(EventBus bus, LoadController controller) {
-        bus.register(this);
-        return true;
-    }
-
-    @Subscribe
-    public void preInit(FMLPreInitializationEvent event) {
-        PreloaderLogger.INFO("Loading " + PreloaderCore.MODID + " V" + PreloaderCore.VERSION);
-        // Handle GT++ Config
-        handleConfigFile(event);
-    }
-
-    public static void handleConfigFile(final FMLPreInitializationEvent event) {
-        final Configuration config = new Configuration(
-            new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
-        config.load();
-
-        // BGM Watchdog
-        PreloaderCore.enableWatchdogBGM = config.getInt(
-            "enableWatchdogBGM",
-            "features",
-            0,
-            0,
-            Short.MAX_VALUE,
-            "Set to a value greater than 0 to reduce the ticks taken to delay between BGM tracks. Acceptable Values are 1-32767, where 0 is disabled. Vanilla Uses 12,000 & 24,000. 200 is 10s.");
-
-        // Circuits
-        PreloaderCore.enableOldGTcircuits = config.getBoolean(
-            "enableOldGTcircuits",
-            GregTech.ID,
-            false,
-            "Restores circuits and their recipes from Pre-5.09.28 times.");
-    }
-
-}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
deleted file mode 100644
index 0b41846928..0000000000
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package gtPlusPlus.preloader.asm.transformers;
-
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ACC_STATIC;
-import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.ASM5;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-import static org.objectweb.asm.Opcodes.RETURN;
-
-import java.util.ArrayList;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import org.apache.logging.log4j.Level;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-
-import com.google.common.base.Strings;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
-import cofh.core.util.oredict.OreDictionaryArbiter;
-import cofh.lib.util.ItemWrapper;
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gnu.trove.map.TMap;
-import gnu.trove.map.hash.THashMap;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-
-public class ClassTransformer_COFH_OreDictionaryArbiter {
-
-    // The qualified name of the class we plan to transform.
-    private static final String className = "cofh.core.util.oredict.OreDictionaryArbiter";
-    // cofh/core/util/oredict/OreDictionaryArbiter
-
-    private final boolean isValid;
-    private final ClassReader reader;
-    private final ClassWriter writer;
-
-    public ClassTransformer_COFH_OreDictionaryArbiter(byte[] basicClass) {
-        ClassReader aTempReader = null;
-        ClassWriter aTempWriter = null;
-        aTempReader = new ClassReader(basicClass);
-        aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
-        aTempReader.accept(new localClassVisitor(aTempWriter), 0);
-
-        if (aTempReader != null && aTempWriter != null) {
-            isValid = true;
-        } else {
-            isValid = false;
-        }
-        reader = aTempReader;
-        writer = aTempWriter;
-
-        if (reader != null && writer != null) {
-            injectMethod("registerOreDictionaryEntry");
-        }
-    }
-
-    public boolean isValidTransformer() {
-        return isValid;
-    }
-
-    public ClassReader getReader() {
-        return reader;
-    }
-
-    public ClassWriter getWriter() {
-        return writer;
-    }
-
-    public void injectMethod(String aMethodName) {
-
-        String aItemStack = "net/minecraft/item/ItemStack";
-        MethodVisitor mv;
-        if (aMethodName.equals("registerOreDictionaryEntry")) {
-            FMLRelaunchLog.log(
-                "[GT++ ASM] COFH OreDictionaryArbiter Patch",
-                Level.INFO,
-                "Injecting " + aMethodName + " into " + className + ". ItemStack: " + aItemStack);
-            mv = getWriter().visitMethod(
-                ACC_PUBLIC + ACC_STATIC,
-                "registerOreDictionaryEntry",
-                "(L" + aItemStack + ";Ljava/lang/String;)V",
-                null,
-                null);
-            mv.visitCode();
-            Label l0 = new Label();
-            mv.visitLabel(l0);
-            mv.visitLineNumber(61, l0);
-            mv.visitVarInsn(ALOAD, 0);
-            mv.visitVarInsn(ALOAD, 1);
-            mv.visitMethodInsn(
-                INVOKESTATIC,
-                "gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter$FixCOFH",
-                "registerOreDictionaryEntry",
-                "(L" + aItemStack + ";Ljava/lang/String;)V",
-                false);
-            Label l1 = new Label();
-            mv.visitLabel(l1);
-            mv.visitLineNumber(62, l1);
-            mv.visitInsn(RETURN);
-            Label l2 = new Label();
-            mv.visitLabel(l2);
-            mv.visitLocalVariable("arg", "L" + aItemStack + ";", null, l0, l2, 0);
-            mv.visitLocalVariable("arg0", "Ljava/lang/String;", null, l0, l2, 1);
-            mv.visitMaxs(2, 2);
-            mv.visitEnd();
-        }
-        FMLRelaunchLog.log("[GT++ ASM] COFH OreDictionaryArbiter Patch", Level.INFO, "Method injection complete.");
-    }
-
-    public static final class localClassVisitor extends ClassVisitor {
-
-        public localClassVisitor(ClassVisitor cv) {
-            super(ASM5, cv);
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            if (name.equals("registerOreDictionaryEntry")) {
-                FMLRelaunchLog.log("[GT++ ASM] COFH OreDictionaryArbiter Patch", Level.INFO, "Removing method " + name);
-                return null;
-            }
-            MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
-            return methodVisitor;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static class FixCOFH {
-
-        private static BiMap<String, Integer> oreIDs;
-        private static TMap<Integer, ArrayList<ItemStack>> oreStacks;
-        private static TMap<ItemWrapper, ArrayList<Integer>> stackIDs;
-        private static TMap<ItemWrapper, ArrayList<String>> stackNames;
-
-        static {
-            try {
-                oreIDs = (BiMap<String, Integer>) ReflectionUtils.getField(OreDictionaryArbiter.class, "oreIDs")
-                    .get(null);
-                oreStacks = (TMap<Integer, ArrayList<ItemStack>>) ReflectionUtils
-                    .getField(OreDictionaryArbiter.class, "oreStacks")
-                    .get(null);
-                stackIDs = (TMap<ItemWrapper, ArrayList<Integer>>) ReflectionUtils
-                    .getField(OreDictionaryArbiter.class, "stackIDs")
-                    .get(null);
-                stackNames = (TMap<ItemWrapper, ArrayList<String>>) ReflectionUtils
-                    .getField(OreDictionaryArbiter.class, "stackNames")
-                    .get(null);
-            } catch (Throwable t) {
-                oreIDs = HashBiMap.create();
-                oreStacks = new THashMap<>();
-                stackIDs = new THashMap<>();
-                stackNames = new THashMap<>();
-            }
-        }
-
-        public static void registerOreDictionaryEntry(ItemStack arg, String arg0) {
-            try {
-                if (arg == null) {
-                    return;
-                }
-                if (arg.getItem() != null && !Strings.isNullOrEmpty(arg0)) {
-                    int arg1 = OreDictionary.getOreID(arg0);
-                    oreIDs.put(arg0, Integer.valueOf(arg1));
-                    if (!oreStacks.containsKey(Integer.valueOf(arg1))) {
-                        oreStacks.put(Integer.valueOf(arg1), new ArrayList<>());
-                    }
-                    ((ArrayList<ItemStack>) oreStacks.get(Integer.valueOf(arg1))).add(arg);
-                    ItemWrapper arg2 = ItemWrapper.fromItemStack(arg);
-                    if (!stackIDs.containsKey(arg2)) {
-                        stackIDs.put(arg2, new ArrayList<>());
-                        stackNames.put(arg2, new ArrayList<>());
-                    }
-                    ((ArrayList<Integer>) stackIDs.get(arg2)).add(Integer.valueOf(arg1));
-                    ((ArrayList<String>) stackNames.get(arg2)).add(arg0);
-                }
-            } catch (Throwable t) {
-                return;
-            }
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
deleted file mode 100644
index 7aa5ff4f90..0000000000
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package gtPlusPlus.preloader.asm.transformers;
-
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.ARETURN;
-import static org.objectweb.asm.Opcodes.ASM5;
-import static org.objectweb.asm.Opcodes.ILOAD;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-import static org.objectweb.asm.Opcodes.IRETURN;
-
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-
-import org.apache.logging.log4j.Level;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-
-public class ClassTransformer_IC2_GetHarvestTool {
-
-    private final boolean isValid;
-    private final ClassReader reader;
-    private final ClassWriter writer;
-    private final String className;
-
-    private final String aName_getItemDropped;
-    private final String aName_damageDropped;
-
-    public static String getHarvestTool(int aMeta) {
-        return "wrench";
-    }
-
-    public static Item getItemDropped(Block aBlock, int meta, Random random, int fortune) {
-        return Item.getItemFromBlock(aBlock);
-    }
-
-    public static int damageDropped(int aMeta) {
-        return aMeta;
-    }
-
-    public ClassTransformer_IC2_GetHarvestTool(byte[] basicClass, boolean obfuscated, String aClassName) {
-        className = aClassName;
-        ClassReader aTempReader = null;
-        ClassWriter aTempWriter = null;
-
-        aName_getItemDropped = obfuscated ? "func_149650_a" : "getItemDropped";
-        aName_damageDropped = obfuscated ? "func_149692_a" : "damageDropped";
-
-        FMLRelaunchLog.log(
-            "[GT++ ASM] IC2 getHarvestTool Patch",
-            Level.INFO,
-            "Attempting to patch in mode " + className + ". Obfuscated? " + obfuscated);
-
-        aTempReader = new ClassReader(basicClass);
-        aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
-        aTempReader.accept(new localClassVisitor(aTempWriter, className), 0);
-
-        if (aTempReader != null && aTempWriter != null) {
-            isValid = true;
-        } else {
-            isValid = false;
-        }
-
-        FMLRelaunchLog.log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Valid patch? " + isValid + ".");
-        reader = aTempReader;
-        writer = aTempWriter;
-
-        if (reader != null && writer != null) {
-            FMLRelaunchLog.log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Attempting Method Injection.");
-            injectMethod("getHarvestTool");
-            if (aClassName.equals("ic2.core.block.machine.BlockMachine2")
-                || aClassName.equals("ic2.core.block.machine.BlockMachine3")
-                || aClassName.equals("ic2.core.block.wiring.BlockElectric")) {
-                injectMethod(aName_getItemDropped);
-                injectMethod(aName_damageDropped);
-            } else if (aClassName.equals("ic2.core.block.generator.block.BlockGenerator")
-                || aClassName.equals("ic2.core.block.machine.BlockMachine")) {
-                    injectMethod(aName_damageDropped);
-                }
-        }
-    }
-
-    public boolean isValidTransformer() {
-        return isValid;
-    }
-
-    public ClassReader getReader() {
-        return reader;
-    }
-
-    public ClassWriter getWriter() {
-        return writer;
-    }
-
-    public boolean injectMethod(String aMethodName) {
-        MethodVisitor mv;
-        boolean didInject = false;
-        String aFormattedClassName = className.replace('.', '/');
-        ClassWriter cw = getWriter();
-
-        FMLRelaunchLog.log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Injecting " + aMethodName + ".");
-        if (aMethodName.equals("getHarvestTool")) {
-            mv = getWriter().visitMethod(ACC_PUBLIC, "getHarvestTool", "(I)Ljava/lang/String;", null, null);
-            mv.visitCode();
-            Label l0 = new Label();
-            mv.visitLabel(l0);
-            mv.visitLineNumber(63, l0);
-            mv.visitVarInsn(ILOAD, 1);
-            mv.visitMethodInsn(
-                INVOKESTATIC,
-                "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool",
-                "getHarvestTool",
-                "(I)Ljava/lang/String;",
-                false);
-            mv.visitInsn(ARETURN);
-            Label l1 = new Label();
-            mv.visitLabel(l1);
-            mv.visitLocalVariable("this", "L" + aFormattedClassName + ";", null, l0, l1, 0);
-            mv.visitLocalVariable("aMeta", "I", null, l0, l1, 1);
-            mv.visitMaxs(1, 2);
-            mv.visitEnd();
-            didInject = true;
-        } else if (aMethodName.equals(aName_getItemDropped)) {
-            mv = cw.visitMethod(
-                ACC_PUBLIC,
-                aName_getItemDropped,
-                "(ILjava/util/Random;I)Lnet/minecraft/item/Item;",
-                null,
-                null);
-            mv.visitCode();
-            Label l0 = new Label();
-            mv.visitLabel(l0);
-            mv.visitLineNumber(44, l0);
-            mv.visitVarInsn(ALOAD, 0);
-            mv.visitVarInsn(ILOAD, 1);
-            mv.visitVarInsn(ALOAD, 2);
-            mv.visitVarInsn(ILOAD, 3);
-            mv.visitMethodInsn(
-                INVOKESTATIC,
-                "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool",
-                "getItemDropped",
-                "(Lnet/minecraft/block/Block;ILjava/util/Random;I)Lnet/minecraft/item/Item;",
-                false);
-            mv.visitInsn(ARETURN);
-            Label l1 = new Label();
-            mv.visitLabel(l1);
-            mv.visitLocalVariable("this", "L" + aFormattedClassName + ";", null, l0, l1, 0);
-            mv.visitLocalVariable("meta", "I", null, l0, l1, 1);
-            mv.visitLocalVariable("random", "Ljava/util/Random;", null, l0, l1, 2);
-            mv.visitLocalVariable("fortune", "I", null, l0, l1, 3);
-            mv.visitMaxs(4, 4);
-            mv.visitEnd();
-            didInject = true;
-        } else if (aMethodName.equals(aName_damageDropped)) {
-            mv = cw.visitMethod(ACC_PUBLIC, aName_damageDropped, "(I)I", null, null);
-            mv.visitCode();
-            Label l0 = new Label();
-            mv.visitLabel(l0);
-            mv.visitLineNumber(48, l0);
-            mv.visitVarInsn(ILOAD, 1);
-            mv.visitMethodInsn(
-                INVOKESTATIC,
-                "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool",
-                "damageDropped",
-                "(I)I",
-                false);
-            mv.visitInsn(IRETURN);
-            Label l1 = new Label();
-            mv.visitLabel(l1);
-            mv.visitLocalVariable("this", "L" + aFormattedClassName + ";", null, l0, l1, 0);
-            mv.visitLocalVariable("meta", "I", null, l0, l1, 1);
-            mv.visitMaxs(1, 2);
-            mv.visitEnd();
-            didInject = true;
-        }
-        FMLRelaunchLog.log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Method injection complete.");
-        return didInject;
-    }
-
-    public final class localClassVisitor extends ClassVisitor {
-
-        String aClassName;
-
-        public localClassVisitor(ClassVisitor cv, String aName) {
-            super(ASM5, cv);
-            aClassName = aName;
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            MethodVisitor methodVisitor;
-            if (aClassName.equals("ic2.core.block.machine.BlockMachine2")
-                || aClassName.equals("ic2.core.block.machine.BlockMachine3")
-                || aClassName.equals("ic2.core.block.wiring.BlockElectric")) {
-                if (name.equals(aName_getItemDropped)) {
-                    methodVisitor = null;
-                } else if (name.equals(aName_damageDropped)) {
-                    methodVisitor = null;
-                } else if (name.equals("getHarvestTool")) {
-                    methodVisitor = null;
-                } else {
-                    methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
-                }
-            } else if (aClassName.equals("ic2.core.block.generator.block.BlockGenerator")
-                || aClassName.equals("ic2.core.block.machine.BlockMachine")) {
-                    if (name.equals(aName_damageDropped)) {
-                        methodVisitor = null;
-                    } else if (name.equals("getHarvestTool")) {
-                        methodVisitor = null;
-                    } else {
-                        methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
-                    }
-                } else {
-                    if (name.equals("getHarvestTool")) {
-                        methodVisitor = null;
-                    } else {
-                        methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
-                    }
-                }
-            if (methodVisitor == null) {
-                FMLRelaunchLog
-                    .log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Found method " + name + ", removing.");
-            }
-            return methodVisitor;
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java
deleted file mode 100644
index a10f842d95..0000000000
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package gtPlusPlus.preloader.asm.transformers;
-
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ACC_STATIC;
-import static org.objectweb.asm.Opcodes.ACC_SYNCHRONIZED;
-import static org.objectweb.asm.Opcodes.ARETURN;
-import static org.objectweb.asm.Opcodes.ASM5;
-import static org.objectweb.asm.Opcodes.ILOAD;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.GameSettings;
-import net.minecraft.client.settings.KeyBinding;
-
-import org.apache.logging.log4j.Level;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gregtech.api.util.ReflectionUtil;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-
-public class ClassTransformer_LWJGL_Keyboard {
-
-    private final boolean isValid;
-    private final ClassReader reader;
-    private final ClassWriter writer;
-
-    private static final HashMap<String, String> mBadKeyCache = new HashMap<>();
-
-    /**
-     * Gets a key's name
-     *
-     * @param key The key
-     * @return a String with the key's human readable name in it or null if the key is unnamed
-     */
-    public static synchronized String getKeyName(int key) {
-        if (init()) {
-            String[] aTemp = getKeyName();
-            if (key < aTemp.length && key >= 0) {
-                return aTemp[key];
-            }
-        }
-        String aCachedValue = mBadKeyCache.get("key-" + key);
-        if (aCachedValue == null) {
-            FMLRelaunchLog.log(
-                "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
-                Level.INFO,
-                "Unable to map key code " + key + " to LWJGL keymap.");
-            FMLRelaunchLog.log(
-                "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
-                Level.INFO,
-                "Caching key value to be empty.");
-            // mBadKeyCache.put("key-"+key, getKeyName()[0x00]);
-            aCachedValue = "FIX!";
-            mBadKeyCache.put("key-" + key, aCachedValue);
-            trySetClientKey(key);
-        }
-        return aCachedValue; // Return nothing
-    }
-
-    public static void trySetClientKey(int aKey) {
-        FMLRelaunchLog.log(
-            "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
-            Level.INFO,
-            "Trying to set key value to be empty.");
-        GameSettings options = Minecraft.getMinecraft().gameSettings;
-        KeyBinding[] akeybinding = Minecraft.getMinecraft().gameSettings.keyBindings;
-        int i = akeybinding.length;
-        for (KeyBinding keybinding : akeybinding) {
-            if (keybinding != null && keybinding.getKeyCode() == aKey) {
-                options.setOptionKeyBinding(keybinding, 0);
-                FMLRelaunchLog.log(
-                    "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
-                    Level.INFO,
-                    "Set keybind " + aKey + " to 0.");
-                break;
-            }
-        }
-    }
-
-    @SuppressWarnings("rawtypes")
-    private static Class mKeyboard;
-
-    private static Field mKeyName;
-
-    @SuppressWarnings("rawtypes")
-    private static boolean init() {
-        if (mKeyName != null) {
-            return true;
-        }
-        Class aKeyboard = ReflectionUtil.getClass("org.lwjgl.input.Keyboard");
-        if (aKeyboard != null) {
-            mKeyboard = aKeyboard;
-            Field aKeyName = ReflectionUtils.getField(mKeyboard, "keyName");
-            if (aKeyName != null) {
-                mKeyName = aKeyName;
-            }
-        }
-        return mKeyName != null;
-    }
-
-    private static String[] getKeyName() {
-        if (init()) {
-            try {
-                Object o = mKeyName.get(null);
-                if (o instanceof String[]y) {
-                    return y;
-                }
-            } catch (IllegalArgumentException | IllegalAccessException e) {}
-        }
-        return new String[] {};
-    }
-
-    public ClassTransformer_LWJGL_Keyboard(byte[] basicClass, boolean isClientSettings) {
-        ClassReader aTempReader = null;
-        ClassWriter aTempWriter = null;
-        aTempReader = new ClassReader(basicClass);
-        aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
-        if (!isClientSettings) {
-            // gtPlusPlus.preloader.keyboard.BetterKeyboard.init();
-            aTempReader.accept(new PatchLWJGL(aTempWriter), 0);
-            injectLWJGLPatch(aTempWriter);
-        } else {
-            // gtPlusPlus.preloader.keyboard.BetterKeyboard.init();
-            aTempReader.accept(new PatchClientSettings(aTempWriter), 0);
-            injectClientSettingPatch(aTempWriter);
-        }
-        if (aTempReader != null && aTempWriter != null) {
-            isValid = true;
-        } else {
-            isValid = false;
-        }
-        FMLRelaunchLog
-            .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Valid? " + isValid + ".");
-        reader = aTempReader;
-        writer = aTempWriter;
-    }
-
-    public boolean isValidTransformer() {
-        return isValid;
-    }
-
-    public ClassReader getReader() {
-        return reader;
-    }
-
-    public ClassWriter getWriter() {
-        return writer;
-    }
-
-    private boolean isClientSettingsObfuscated = false;
-
-    public boolean injectLWJGLPatch(ClassWriter cw) {
-        MethodVisitor mv;
-        boolean didInject = false;
-        FMLRelaunchLog
-            .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Injecting " + "getKeyName" + ".");
-        mv = cw
-            .visitMethod(ACC_PUBLIC + ACC_STATIC + ACC_SYNCHRONIZED, "getKeyName", "(I)Ljava/lang/String;", null, null);
-        mv.visitCode();
-        Label l0 = new Label();
-        mv.visitLabel(l0);
-        mv.visitLineNumber(49, l0);
-        mv.visitVarInsn(ILOAD, 0);
-        mv.visitMethodInsn(
-            INVOKESTATIC,
-            "gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard",
-            "getKeyName",
-            "(I)Ljava/lang/String;",
-            false);
-        mv.visitInsn(ARETURN);
-        Label l1 = new Label();
-        mv.visitLabel(l1);
-        mv.visitLocalVariable("key", "I", null, l0, l1, 0);
-        mv.visitMaxs(1, 1);
-        mv.visitEnd();
-        didInject = true;
-
-        FMLRelaunchLog
-            .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete.");
-        return didInject;
-    }
-
-    public boolean injectClientSettingPatch(ClassWriter cw) {
-        MethodVisitor mv;
-        boolean didInject = false;
-        String aMethodName = this.isClientSettingsObfuscated ? "func_74298_c" : "getKeyDisplayString";
-        FMLRelaunchLog
-            .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Injecting " + aMethodName + ".");
-        mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, aMethodName, "(I)Ljava/lang/String;", null, null);
-        mv.visitCode();
-        Label l0 = new Label();
-        mv.visitLabel(l0);
-        mv.visitLineNumber(130, l0);
-        mv.visitVarInsn(ILOAD, 0);
-        mv.visitMethodInsn(
-            INVOKESTATIC,
-            "gtPlusPlus/preloader/keyboard/BetterKeyboard",
-            "getKeyDisplayString",
-            "(I)Ljava/lang/String;",
-            false);
-        mv.visitInsn(ARETURN);
-        Label l1 = new Label();
-        mv.visitLabel(l1);
-        mv.visitLocalVariable("p_74298_0_", "I", null, l0, l1, 0);
-        mv.visitMaxs(1, 1);
-        mv.visitEnd();
-        didInject = true;
-        FMLRelaunchLog
-            .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete.");
-        return didInject;
-    }
-
-    public class PatchClientSettings extends ClassVisitor {
-
-        public PatchClientSettings(ClassVisitor cv) {
-            super(ASM5, cv);
-            this.cv = cv;
-        }
-
-        private final String[] aMethodsToStrip = new String[] { "func_74298_c", "getKeyDisplayString" };
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            MethodVisitor methodVisitor;
-            boolean found = false;
-
-            for (String s : aMethodsToStrip) {
-                if (name.equals(s)) {
-                    if (name.equals(aMethodsToStrip[0])) {
-                        isClientSettingsObfuscated = true;
-                    } else {
-                        isClientSettingsObfuscated = false;
-                    }
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) {
-                methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
-            } else {
-                methodVisitor = null;
-            }
-            if (found) {
-                FMLRelaunchLog.log(
-                    "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
-                    Level.INFO,
-                    "Found method " + name + ", removing.");
-            }
-            return methodVisitor;
-        }
-    }
-
-    public class PatchLWJGL extends ClassVisitor {
-
-        public PatchLWJGL(ClassVisitor cv) {
-            super(ASM5, cv);
-            this.cv = cv;
-        }
-
-        private final String[] aMethodsToStrip = new String[] { "getKeyName" };
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            MethodVisitor methodVisitor;
-            boolean found = false;
-
-            for (String s : aMethodsToStrip) {
-                if (name.equals(s)) {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) {
-                methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
-            } else {
-                methodVisitor = null;
-            }
-            if (found) {
-                FMLRelaunchLog.log(
-                    "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
-                    Level.INFO,
-                    "Found method " + name + ", removing.");
-            }
-            return methodVisitor;
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
deleted file mode 100644
index cf8b08d40c..0000000000
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package gtPlusPlus.preloader.asm.transformers;
-
-import static org.objectweb.asm.Opcodes.AALOAD;
-import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-import static org.objectweb.asm.Opcodes.ACONST_NULL;
-import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.ARETURN;
-import static org.objectweb.asm.Opcodes.ARRAYLENGTH;
-import static org.objectweb.asm.Opcodes.ASM5;
-import static org.objectweb.asm.Opcodes.ASTORE;
-import static org.objectweb.asm.Opcodes.DUP;
-import static org.objectweb.asm.Opcodes.F_APPEND;
-import static org.objectweb.asm.Opcodes.F_CHOP;
-import static org.objectweb.asm.Opcodes.F_SAME;
-import static org.objectweb.asm.Opcodes.F_SAME1;
-import static org.objectweb.asm.Opcodes.GETSTATIC;
-import static org.objectweb.asm.Opcodes.GOTO;
-import static org.objectweb.asm.Opcodes.I2L;
-import static org.objectweb.asm.Opcodes.ICONST_0;
-import static org.objectweb.asm.Opcodes.IFEQ;
-import static org.objectweb.asm.Opcodes.IFLE;
-import static org.objectweb.asm.Opcodes.IFNONNULL;
-import static org.objectweb.asm.Opcodes.IFNULL;
-import static org.objectweb.asm.Opcodes.ILOAD;
-import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
-import static org.objectweb.asm.Opcodes.IRETURN;
-import static org.objectweb.asm.Opcodes.ISTORE;
-import static org.objectweb.asm.Opcodes.L2I;
-import static org.objectweb.asm.Opcodes.LDIV;
-import static org.objectweb.asm.Opcodes.LREM;
-import static org.objectweb.asm.Opcodes.NEW;
-
-import org.apache.logging.log4j.Level;
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-
-public class ClassTransformer_TC_ItemWispEssence {
-
-    private final boolean isValid;
-    private final ClassReader reader;
-    private final ClassWriter writer;
-
-    public ClassTransformer_TC_ItemWispEssence(byte[] basicClass, boolean obfuscated2) {
-        ClassReader aTempReader = null;
-        ClassWriter aTempWriter = null;
-        FMLRelaunchLog.log(
-            "[GT++ ASM] Thaumcraft WispEssence_Patch",
-            Level.INFO,
-            "Are we patching obfuscated methods? " + obfuscated2);
-        String aGetColour = obfuscated2 ? "func_82790_a" : "getColorFromItemStack";
-        aTempReader = new ClassReader(basicClass);
-        aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
-        aTempReader.accept(new AddAdapter(aTempWriter, new String[] { "getAspects", aGetColour }), 0);
-        injectMethod("getAspects", aTempWriter, obfuscated2);
-        injectMethod(aGetColour, aTempWriter, obfuscated2);
-        if (aTempReader != null && aTempWriter != null) {
-            isValid = true;
-        } else {
-            isValid = false;
-        }
-        FMLRelaunchLog.log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Valid? " + isValid + ".");
-        reader = aTempReader;
-        writer = aTempWriter;
-    }
-
-    public boolean isValidTransformer() {
-        return isValid;
-    }
-
-    public ClassReader getReader() {
-        return reader;
-    }
-
-    public ClassWriter getWriter() {
-        return writer;
-    }
-
-    public boolean injectMethod(String aMethodName, ClassWriter cw, boolean obfuscated) {
-        MethodVisitor mv;
-        boolean didInject = false;
-        FMLRelaunchLog.log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Injecting " + aMethodName + ".");
-
-        String aGetColour = obfuscated ? "func_82790_a" : "getColorFromItemStack";
-        String aHasTagCompound = obfuscated ? "func_77942_o" : "hasTagCompound";
-        String aGetTagCompound = obfuscated ? "func_77978_p" : "getTagCompound";
-
-        if (aMethodName.equals("getAspects")) {
-            mv = cw.visitMethod(
-                ACC_PUBLIC,
-                "getAspects",
-                "(Lnet/minecraft/item/ItemStack;)Lthaumcraft/api/aspects/AspectList;",
-                null,
-                null);
-            mv.visitCode();
-            Label l0 = new Label();
-            mv.visitLabel(l0);
-            mv.visitLineNumber(141, l0);
-            mv.visitVarInsn(ALOAD, 1);
-            Label l1 = new Label();
-            mv.visitJumpInsn(IFNONNULL, l1);
-            Label l2 = new Label();
-            mv.visitLabel(l2);
-            mv.visitLineNumber(142, l2);
-            mv.visitInsn(ACONST_NULL);
-            mv.visitInsn(ARETURN);
-            mv.visitLabel(l1);
-            mv.visitLineNumber(144, l1);
-            mv.visitFrame(F_SAME, 0, null, 0, null);
-            mv.visitVarInsn(ALOAD, 1);
-            mv.visitMethodInsn(INVOKEVIRTUAL, "net/minecraft/item/ItemStack", aHasTagCompound, "()Z", false);
-            Label l3 = new Label();
-            mv.visitJumpInsn(IFEQ, l3);
-            Label l4 = new Label();
-            mv.visitLabel(l4);
-            mv.visitLineNumber(145, l4);
-            mv.visitTypeInsn(NEW, "thaumcraft/api/aspects/AspectList");
-            mv.visitInsn(DUP);
-            mv.visitMethodInsn(INVOKESPECIAL, "thaumcraft/api/aspects/AspectList", "<init>", "()V", false);
-            mv.visitVarInsn(ASTORE, 2);
-            Label l5 = new Label();
-            mv.visitLabel(l5);
-            mv.visitLineNumber(146, l5);
-            mv.visitVarInsn(ALOAD, 2);
-            mv.visitVarInsn(ALOAD, 1);
-            mv.visitMethodInsn(
-                INVOKEVIRTUAL,
-                "net/minecraft/item/ItemStack",
-                aGetTagCompound,
-                "()Lnet/minecraft/nbt/NBTTagCompound;",
-                false);
-            mv.visitMethodInsn(
-                INVOKEVIRTUAL,
-                "thaumcraft/api/aspects/AspectList",
-                "readFromNBT",
-                "(Lnet/minecraft/nbt/NBTTagCompound;)V",
-                false);
-            Label l6 = new Label();
-            mv.visitLabel(l6);
-            mv.visitLineNumber(147, l6);
-            mv.visitVarInsn(ALOAD, 2);
-            mv.visitMethodInsn(INVOKEVIRTUAL, "thaumcraft/api/aspects/AspectList", "size", "()I", false);
-            Label l7 = new Label();
-            mv.visitJumpInsn(IFLE, l7);
-            mv.visitVarInsn(ALOAD, 2);
-            Label l8 = new Label();
-            mv.visitJumpInsn(GOTO, l8);
-            mv.visitLabel(l7);
-            mv.visitFrame(F_APPEND, 1, new Object[] { "thaumcraft/api/aspects/AspectList" }, 0, null);
-            mv.visitInsn(ACONST_NULL);
-            mv.visitLabel(l8);
-            mv.visitFrame(F_SAME1, 0, null, 1, new Object[] { "thaumcraft/api/aspects/AspectList" });
-            mv.visitInsn(ARETURN);
-            mv.visitLabel(l3);
-            mv.visitLineNumber(149, l3);
-            mv.visitFrame(F_CHOP, 1, null, 0, null);
-            mv.visitInsn(ACONST_NULL);
-            mv.visitInsn(ARETURN);
-            Label l9 = new Label();
-            mv.visitLabel(l9);
-            mv.visitLocalVariable(
-                "this",
-                "LgtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence;",
-                null,
-                l0,
-                l9,
-                0);
-            mv.visitLocalVariable("itemstack", "Lnet/minecraft/item/ItemStack;", null, l0, l9, 1);
-            mv.visitLocalVariable("aspects", "Lthaumcraft/api/aspects/AspectList;", null, l5, l3, 2);
-            mv.visitMaxs(2, 3);
-            mv.visitEnd();
-            didInject = true;
-        } else if (aMethodName.equals(aGetColour)) {
-
-            // thaumcraft/common/items/ItemWispEssence
-            mv = cw.visitMethod(ACC_PUBLIC, aGetColour, "(Lnet/minecraft/item/ItemStack;I)I", null, null);
-            AnnotationVisitor av0;
-            {
-                av0 = mv.visitAnnotation("Lcpw/mods/fml/relauncher/SideOnly;", true);
-                av0.visitEnum("value", "Lcpw/mods/fml/relauncher/Side;", "CLIENT");
-                av0.visitEnd();
-            }
-            mv.visitCode();
-            Label l0 = new Label();
-            mv.visitLabel(l0);
-            mv.visitLineNumber(197, l0);
-            mv.visitVarInsn(ALOAD, 1);
-            Label l1 = new Label();
-            mv.visitJumpInsn(IFNONNULL, l1);
-            Label l2 = new Label();
-            mv.visitLabel(l2);
-            mv.visitLineNumber(198, l2);
-            mv.visitInsn(ICONST_0);
-            mv.visitInsn(IRETURN);
-            mv.visitLabel(l1);
-            mv.visitLineNumber(200, l1);
-            mv.visitFrame(F_SAME, 0, null, 0, null);
-            mv.visitVarInsn(ALOAD, 0);
-            mv.visitVarInsn(ALOAD, 1);
-            mv.visitMethodInsn(
-                INVOKEVIRTUAL,
-                "thaumcraft/common/items/ItemWispEssence",
-                "getAspects",
-                "(Lnet/minecraft/item/ItemStack;)Lthaumcraft/api/aspects/AspectList;",
-                false);
-            Label l3 = new Label();
-            mv.visitJumpInsn(IFNULL, l3);
-            Label l4 = new Label();
-            mv.visitLabel(l4);
-            mv.visitLineNumber(201, l4);
-            mv.visitVarInsn(ALOAD, 0);
-            mv.visitVarInsn(ALOAD, 1);
-            mv.visitMethodInsn(
-                INVOKEVIRTUAL,
-                "thaumcraft/common/items/ItemWispEssence",
-                "getAspects",
-                "(Lnet/minecraft/item/ItemStack;)Lthaumcraft/api/aspects/AspectList;",
-                false);
-            mv.visitMethodInsn(
-                INVOKEVIRTUAL,
-                "thaumcraft/api/aspects/AspectList",
-                "getAspects",
-                "()[Lthaumcraft/api/aspects/Aspect;",
-                false);
-            mv.visitInsn(ICONST_0);
-            mv.visitInsn(AALOAD);
-            mv.visitMethodInsn(INVOKEVIRTUAL, "thaumcraft/api/aspects/Aspect", "getColor", "()I", false);
-            mv.visitInsn(IRETURN);
-            mv.visitLabel(l3);
-            mv.visitLineNumber(203, l3);
-            mv.visitFrame(F_SAME, 0, null, 0, null);
-            mv.visitMethodInsn(INVOKESTATIC, "java/lang/System", "currentTimeMillis", "()J", false);
-            mv.visitLdcInsn(new Long(500L));
-            mv.visitInsn(LDIV);
-            mv.visitFieldInsn(
-                GETSTATIC,
-                "thaumcraft/common/items/ItemWispEssence",
-                "displayAspects",
-                "[Lthaumcraft/api/aspects/Aspect;");
-            mv.visitInsn(ARRAYLENGTH);
-            mv.visitInsn(I2L);
-            mv.visitInsn(LREM);
-            mv.visitInsn(L2I);
-            mv.visitVarInsn(ISTORE, 3);
-            Label l5 = new Label();
-            mv.visitLabel(l5);
-            mv.visitLineNumber(204, l5);
-            mv.visitFieldInsn(
-                GETSTATIC,
-                "thaumcraft/common/items/ItemWispEssence",
-                "displayAspects",
-                "[Lthaumcraft/api/aspects/Aspect;");
-            mv.visitVarInsn(ILOAD, 3);
-            mv.visitInsn(AALOAD);
-            mv.visitMethodInsn(INVOKEVIRTUAL, "thaumcraft/api/aspects/Aspect", "getColor", "()I", false);
-            mv.visitInsn(IRETURN);
-            Label l6 = new Label();
-            mv.visitLabel(l6);
-            mv.visitLocalVariable("this", "Lthaumcraft/common/items/ItemWispEssence;", null, l0, l6, 0);
-            mv.visitLocalVariable("stack", "Lnet/minecraft/item/ItemStack;", null, l0, l6, 1);
-            mv.visitLocalVariable("par2", "I", null, l0, l6, 2);
-            mv.visitLocalVariable("idx", "I", null, l5, l6, 3);
-            mv.visitMaxs(4, 4);
-            mv.visitEnd();
-            didInject = true;
-        }
-
-        FMLRelaunchLog.log(
-            "[GT++ ASM] Thaumcraft WispEssence_Patch",
-            Level.INFO,
-            "Method injection complete. " + (obfuscated ? "Obfuscated" : "Non-Obfuscated"));
-        return didInject;
-    }
-
-    public class AddAdapter extends ClassVisitor {
-
-        public AddAdapter(ClassVisitor cv, String[] aMethods) {
-            super(ASM5, cv);
-            this.cv = cv;
-            this.aMethodsToStrip = aMethods;
-        }
-
-        private final String[] aMethodsToStrip;
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-
-            MethodVisitor methodVisitor;
-            boolean found = false;
-
-            for (String s : aMethodsToStrip) {
-                if (name.equals(s)) {
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) {
-                methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
-            } else {
-                methodVisitor = null;
-            }
-
-            if (found) {
-                FMLRelaunchLog
-                    .log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Found method " + name + ", removing.");
-            }
-            return methodVisitor;
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
deleted file mode 100644
index 89554db7a1..0000000000
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package gtPlusPlus.preloader.asm.transformers;
-
-import static org.objectweb.asm.Opcodes.ALOAD;
-import static org.objectweb.asm.Opcodes.ASM5;
-import static org.objectweb.asm.Opcodes.IFEQ;
-import static org.objectweb.asm.Opcodes.INVOKESTATIC;
-import static org.objectweb.asm.Opcodes.RETURN;
-
-import org.apache.logging.log4j.Level;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-
-public class Preloader_ClassTransformer {
-
-    public static final class OreDictionaryVisitor extends ClassVisitor {
-
-        public OreDictionaryVisitor(ClassVisitor cv) {
-            super(ASM5, cv);
-        }
-
-        @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
-            MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
-            if (name.equals("registerOreImpl") && desc.equals("(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)V")) {
-                FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Found target method. [Unobfuscated]");
-                return new RegisterOreImplVisitor(methodVisitor, false);
-            } else if (name.equals("registerOreImpl") && desc.equals("(Ljava/lang/String;Ladd;)V")) {
-                FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Found target method. [Obfuscated]");
-                return new RegisterOreImplVisitor(methodVisitor, true);
-            }
-            return methodVisitor;
-        }
-    }
-
-    private static final class RegisterOreImplVisitor extends MethodVisitor {
-
-        private final boolean mObfuscated;
-
-        public RegisterOreImplVisitor(MethodVisitor mv, boolean obfuscated) {
-            super(ASM5, mv);
-            this.mObfuscated = obfuscated;
-        }
-
-        @Override
-        public void visitCode() {
-            FMLRelaunchLog
-                .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Fixing Forge's poor attempt at an oreDictionary.");
-            super.visitCode();
-            super.visitVarInsn(ALOAD, 0);
-            super.visitVarInsn(ALOAD, 1);
-            if (!mObfuscated) {
-                FMLRelaunchLog
-                    .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Unobfuscated]");
-                super.visitMethodInsn(
-                    INVOKESTATIC,
-                    "gtPlusPlus/preloader/PreloaderGTOreDict",
-                    "shouldPreventRegistration",
-                    "(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)Z",
-                    false);
-            } else {
-                FMLRelaunchLog
-                    .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Obfuscated]");
-                super.visitMethodInsn(
-                    INVOKESTATIC,
-                    "gtPlusPlus/preloader/PreloaderGTOreDict",
-                    "shouldPreventRegistration",
-                    "(Ljava/lang/String;Ladd;)Z",
-                    false);
-            }
-            Label endLabel = new Label();
-            super.visitJumpInsn(IFEQ, endLabel);
-            super.visitInsn(RETURN);
-            super.visitLabel(endLabel);
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
deleted file mode 100644
index 4fb4225d26..0000000000
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package gtPlusPlus.preloader.asm.transformers;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import net.minecraft.launchwrapper.IClassTransformer;
-
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-
-import gregtech.asm.GTCorePlugin;
-import gtPlusPlus.core.config.ASMConfiguration;
-import gtPlusPlus.preloader.PreloaderCore;
-import gtPlusPlus.preloader.PreloaderLogger;
-import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor;
-
-public class Preloader_Transformer_Handler implements IClassTransformer {
-
-    private static final Set<String> IC2_WRENCH_PATCH_CLASS_NAMES = new HashSet<>();
-    private static final String LWJGL_KEYBOARD = "org.lwjgl.input.Keyboard";
-    private static final String MINECRAFT_GAMESETTINGS = "net.minecraft.client.settings.GameSettings";
-    private static final String FORGE_CHUNK_MANAGER = "net.minecraftforge.common.ForgeChunkManager";
-    private static final String FORGE_ORE_DICTIONARY = "net.minecraftforge.oredict.OreDictionary";
-    private static final String COFH_ORE_DICTIONARY_ARBITER = "cofh.core.util.oredict.OreDictionaryArbiter";
-    private static final String THAUMCRAFT_ITEM_WISP_ESSENCE = "thaumcraft.common.items.ItemWispEssence";
-
-    static {
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.BlockTileEntity");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.machine.BlockMachine");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.machine.BlockMachine2");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.machine.BlockMachine3");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.kineticgenerator.block.BlockKineticGenerator");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.heatgenerator.block.BlockHeatGenerator");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.generator.block.BlockGenerator");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.reactor.block.BlockReactorAccessHatch");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.reactor.block.BlockReactorChamber");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.reactor.block.BlockReactorFluidPort");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.reactor.block.BlockReactorRedstonePort");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.reactor.block.BlockReactorVessel");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.personal.BlockPersonal.class");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.wiring.BlockChargepad.class");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.wiring.BlockElectric.class");
-        IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.wiring.BlockLuminator.class");
-    }
-
-    @Override
-    public byte[] transform(String name, String transformedName, byte[] basicClass) {
-        // Fix LWJGL index array out of bounds on keybinding IDs
-        if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS))
-            && ASMConfiguration.general.enabledLwjglKeybindingFix
-            && !GTCorePlugin.islwjgl3Present()) {
-            boolean isClientSettingsClass = !transformedName.equals(LWJGL_KEYBOARD);
-            PreloaderLogger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName);
-            return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter()
-                .toByteArray();
-        }
-
-        // Fix the OreDictionary - Forge
-        if (transformedName.equals(FORGE_ORE_DICTIONARY) && ASMConfiguration.debug.enableOreDictPatch) {
-            PreloaderLogger.INFO("OreDictTransformer", "Transforming " + transformedName);
-            ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-            new ClassReader(basicClass).accept(new OreDictionaryVisitor(classWriter), 0);
-            return classWriter.toByteArray();
-        }
-
-        // Fix the OreDictionary COFH
-        if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER)
-            && (ASMConfiguration.debug.enableCofhPatch || PreloaderCore.DEV_ENVIRONMENT)) {
-            PreloaderLogger.INFO("COFH", "Transforming " + transformedName);
-            return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter()
-                .toByteArray();
-        }
-
-        if (IC2_WRENCH_PATCH_CLASS_NAMES.contains(transformedName)) {
-            PreloaderLogger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName);
-            return new ClassTransformer_IC2_GetHarvestTool(basicClass, !PreloaderCore.DEV_ENVIRONMENT, transformedName)
-                .getWriter()
-                .toByteArray();
-        }
-
-        // Fix Thaumcraft stuff
-        // Patching ItemWispEssence to allow invalid item handling
-        if (transformedName.equals(THAUMCRAFT_ITEM_WISP_ESSENCE) && ASMConfiguration.general.enableTcAspectSafety) {
-            PreloaderLogger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName);
-            return new ClassTransformer_TC_ItemWispEssence(basicClass, !PreloaderCore.DEV_ENVIRONMENT).getWriter()
-                .toByteArray();
-        }
-
-        return basicClass;
-    }
-}