GT++ ASM Cleanup (#3238)

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

1 files changed, 7 insertions, 35 deletions

diff --git a/src/main/java/gregtech/asm/GTCorePlugin.java b/src/main/java/gregtech/asm/GTCorePlugin.java
index 30bc193701..3b8aa08d16 100644
--- a/src/main/java/gregtech/asm/GTCorePlugin.java
+++ b/src/main/java/gregtech/asm/GTCorePlugin.java
@@ -1,6 +1,5 @@
 package gregtech.asm;
 
-import java.io.File;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -10,17 +9,12 @@ import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
 import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader;
 
 import bartworks.common.configs.Configuration;
-import cpw.mods.fml.relauncher.FMLInjectionData;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import gregtech.mixin.Mixin;
 import gtPlusPlus.core.config.ASMConfiguration;
-import gtPlusPlus.preloader.PreloaderCore;
-import gtPlusPlus.preloader.asm.PreloaderDummyContainer;
-import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler;
 
-@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE) // Load as late as possible (after fastcraft/OptiFine).
 @IFMLLoadingPlugin.MCVersion("1.7.10")
-@IFMLLoadingPlugin.TransformerExclusions({ "bartworks.ASM", "gtPlusPlus.preloader", "gregtech.asm" })
+@IFMLLoadingPlugin.TransformerExclusions({ "gregtech.asm" })
 @IFMLLoadingPlugin.Name("GregTech 5 Unofficial core plugin")
 public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
 
@@ -33,23 +27,16 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
         }
     }
 
-    public static File minecraftDir;
-    private static Boolean islwjgl3Present = null;
-
-    public GTCorePlugin() {
-        // Injection Code taken from CodeChickenLib
-        if (minecraftDir != null) return; // get called twice, once for IFMLCallHook
-        minecraftDir = (File) FMLInjectionData.data()[6];
-    }
+    private static boolean DEV_ENVIRONMENT;
 
     @Override
     public String[] getASMTransformerClass() {
-        return new String[] { Preloader_Transformer_Handler.class.getName() };
+        return null;
     }
 
     @Override
     public String getModContainerClass() {
-        return PreloaderDummyContainer.class.getName();
+        return null;
     }
 
     @Override
@@ -59,13 +46,7 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
 
     @Override
     public void injectData(Map<String, Object> data) {
-        // GT++
-        PreloaderCore.DEV_ENVIRONMENT = !(boolean) data.get("runtimeDeobfuscationEnabled");
-        File mcDir = (File) data.get("mcLocation");
-        if (mcDir != null && mcDir.exists()) {
-            PreloaderCore.setMinecraftDirectory(mcDir);
-        }
-        PreloaderCore.DEBUG_MODE = ASMConfiguration.debug.debugMode;
+        DEV_ENVIRONMENT = !(boolean) data.get("runtimeDeobfuscationEnabled");
     }
 
     @Override
@@ -83,17 +64,8 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
         return Mixin.getEarlyMixins(loadedCoreMods);
     }
 
-    public static boolean islwjgl3Present() {
-        if (islwjgl3Present == null) {
-            try {
-                final String className = "org/lwjgl/system/Platform.class";
-                islwjgl3Present = ClassLoader.getSystemClassLoader()
-                    .getResource(className) != null;
-            } catch (Exception e) {
-                islwjgl3Present = Boolean.FALSE;
-            }
-        }
-        return islwjgl3Present;
+    public static boolean isDevEnv() {
+        return DEV_ENVIRONMENT;
     }
 
 }