1 files changed, 16 insertions, 21 deletions

diff --git a/src/main/java/gregtech/asm/GTCorePlugin.java b/src/main/java/gregtech/asm/GTCorePlugin.java
index a31d106bbe..0f50b78f1d 100644
--- a/src/main/java/gregtech/asm/GTCorePlugin.java
+++ b/src/main/java/gregtech/asm/GTCorePlugin.java
@@ -1,17 +1,18 @@
 package gregtech.asm;
 
 import java.io.File;
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import net.minecraftforge.common.config.Configuration;
 
-import com.github.bartimaeusnek.bartworks.ASM.BWCore;
-import com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer;
 import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
+import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;
 
 import cpw.mods.fml.relauncher.FMLInjectionData;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
+import gregtech.mixin.Mixin;
 import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.preloader.asm.AsmConfig;
 import gtPlusPlus.preloader.asm.Preloader_DummyContainer;
@@ -23,7 +24,7 @@ import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler;
     "gregtech.asm" })
 @IFMLLoadingPlugin.Name("GregTech 5 Unofficial core plugin")
 @SuppressWarnings("unused") // loaded by FML
-public class GTCorePlugin implements IFMLLoadingPlugin {
+public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
 
     public static final String BWCORE_PLUGIN_NAME = "BartWorks ASM Core Plugin";
     public static File minecraftDir;
@@ -34,17 +35,15 @@ public class GTCorePlugin implements IFMLLoadingPlugin {
         minecraftDir = (File) FMLInjectionData.data()[6];
         // do all the configuration already now...
         new ConfigHandler(new Configuration(new File(new File(minecraftDir, "config"), "bartworks.cfg")));
-        BWCoreTransformer.shouldTransform[2] = false;
     }
 
     @Override
     public String[] getASMTransformerClass() {
-        return new String[] { BWCoreTransformer.class.getName(), Preloader_Transformer_Handler.class.getName() };
+        return new String[] { Preloader_Transformer_Handler.class.getName() };
     }
 
     @Override
     public String getModContainerClass() {
-        FMLInjectionData.containers.add(BWCore.class.getName());
         return Preloader_DummyContainer.class.getName();
     }
 
@@ -62,24 +61,20 @@ public class GTCorePlugin implements IFMLLoadingPlugin {
             CORE_Preloader.setMinecraftDirectory(mcDir);
         }
         CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode;
-
-        // Bartworks
-        if (data.get("runtimeDeobfuscationEnabled") != null) {
-            BWCoreTransformer.obfs = (boolean) data.get("runtimeDeobfuscationEnabled");
-        }
-        if (data.get("coremodList") != null) {
-            for (Object o : (ArrayList) data.get("coremodList")) {
-                if (o.toString()
-                    .contains("MicdoodlePlugin")) {
-                    BWCoreTransformer.shouldTransform[2] = ConfigHandler.enabledPatches[2];
-                    break;
-                }
-            }
-        }
     }
 
     @Override
     public String getAccessTransformerClass() {
         return null;
     }
+
+    @Override
+    public String getMixinConfig() {
+        return "mixins.gregtech.early.json";
+    }
+
+    @Override
+    public List<String> getMixins(Set<String> loadedCoreMods) {
+        return Mixin.getEarlyMixins(loadedCoreMods);
+    }
 }