GT++ ASM Cleanup (#3238)

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

29 files changed, 60 insertions, 1688 deletions

diff --git a/src/main/java/bartworks/common/commands/ClearCraftingCache.java b/src/main/java/bartworks/common/commands/ClearCraftingCache.java
index 9e164d12f7..68172190f6 100644
--- a/src/main/java/bartworks/common/commands/ClearCraftingCache.java
+++ b/src/main/java/bartworks/common/commands/ClearCraftingCache.java
@@ -17,7 +17,7 @@ import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
 
-import bartworks.ASM.BWCoreStaticReplacementMethodes;
+import bartworks.hooks.BWCoreStaticReplacementMethodes;
 
 public class ClearCraftingCache extends CommandBase {
 
diff --git a/src/main/java/bartworks/ASM/BWCoreStaticReplacementMethodes.java b/src/main/java/bartworks/hooks/BWCoreStaticReplacementMethodes.java
index 8a20495472..6110d9c32d 100644
--- a/src/main/java/bartworks/ASM/BWCoreStaticReplacementMethodes.java
+++ b/src/main/java/bartworks/hooks/BWCoreStaticReplacementMethodes.java
@@ -11,7 +11,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-package bartworks.ASM;
+package bartworks.hooks;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/src/main/java/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java b/src/main/java/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
index ed08d3ef29..c3a8442397 100644
--- a/src/main/java/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
+++ b/src/main/java/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
@@ -34,7 +34,7 @@ import com.google.common.collect.HashBiMap;
 
 import bartworks.API.recipe.BWNBTDependantCraftingRecipe;
 import bartworks.API.recipe.BartWorksRecipeMaps;
-import bartworks.ASM.BWCoreStaticReplacementMethodes;
+import bartworks.hooks.BWCoreStaticReplacementMethodes;
 import bartworks.system.material.WerkstoffLoader;
 import bartworks.util.BWUtil;
 import bartworks.util.Pair;
@@ -65,14 +65,10 @@ public class CircuitImprintLoader {
     public static void run() {
         HashSet<GTRecipe> toRem = new HashSet<>();
         HashSet<GTRecipe> toAdd = new HashSet<>();
-
         deleteCALRecipesAndTags();
         rebuildCircuitAssemblerMap(toRem, toAdd);
         exchangeRecipesInList(toRem, toAdd);
         makeCircuitImprintRecipes();
-
-        toRem = null;
-        toAdd = null;
     }
 
     private static void reAddOriginalRecipes() {
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;
     }
 
 }
diff --git a/src/main/java/gregtech/mixin/Mixin.java b/src/main/java/gregtech/mixin/Mixin.java
index b83b0d61b7..224c7b5f1c 100644
--- a/src/main/java/gregtech/mixin/Mixin.java
+++ b/src/main/java/gregtech/mixin/Mixin.java
@@ -61,6 +61,12 @@ public enum Mixin {
         .addTargetedMod(VANILLA)
         .setApplyIf(() -> true)
         .setPhase(Phase.EARLY)
+        .setSide(Side.BOTH)),
+    IC2_MACHINE_WRENCHING(new Builder("Changes the behavior of the wrenching mechanic for IC2 machines")
+        .addMixinClasses("ic2.MixinDamageDropped", "ic2.MixinHarvestTool", "ic2.MixinItemDropped")
+        .addTargetedMod(TargetedMod.IC2)
+        .setApplyIf(() -> true)
+        .setPhase(Phase.LATE)
         .setSide(Side.BOTH));
 
     public static final Logger LOGGER = LogManager.getLogger("GregTech-Mixin");
diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java
index c97c787cd3..2214e50e78 100644
--- a/src/main/java/gtPlusPlus/api/objects/Logger.java
+++ b/src/main/java/gtPlusPlus/api/objects/Logger.java
@@ -4,9 +4,9 @@ import org.apache.logging.log4j.LogManager;
 
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
+import gregtech.asm.GTCorePlugin;
 import gtPlusPlus.core.config.ASMConfiguration;
 import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.preloader.PreloaderCore;
 
 public class Logger {
 
@@ -37,8 +37,7 @@ public class Logger {
     // Non-Dev Comments
     public static void MACHINE_INFO(String s, Object... args) {
         if (enabled) {
-            boolean localPlayer = PreloaderCore.DEV_ENVIRONMENT;
-            if (Configuration.debug.MachineInfo || localPlayer) {
+            if (Configuration.debug.MachineInfo || GTCorePlugin.isDevEnv()) {
                 final String name1 = gtPlusPlus.core.util.reflect.ReflectionUtils.getMethodName(2);
                 modLogger.info("Machine Info: " + s + " | " + name1, args);
             }
@@ -48,7 +47,7 @@ public class Logger {
     // Developer Comments
     public static void WARNING(final String s) {
         if (enabled) {
-            if (PreloaderCore.DEBUG_MODE) {
+            if (ASMConfiguration.debug.debugMode) {
                 modLogger.warn(s);
             }
         }
@@ -57,7 +56,7 @@ public class Logger {
     // Errors
     public static void ERROR(final String s) {
         if (enabled) {
-            if (PreloaderCore.DEBUG_MODE) {
+            if (ASMConfiguration.debug.debugMode) {
                 modLogger.fatal(s);
             }
         }
@@ -95,7 +94,7 @@ public class Logger {
      */
     public static void DEBUG_BEES(final String s) {
         if (enabled) {
-            if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) {
+            if (GTCorePlugin.isDevEnv() || ASMConfiguration.debug.debugMode) {
                 modLogger.info("[Debug][Bees] " + s);
             }
         }
@@ -106,7 +105,7 @@ public class Logger {
      */
     public static void MATERIALS(final String s) {
         if (enabled) {
-            if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) {
+            if (GTCorePlugin.isDevEnv() || ASMConfiguration.debug.debugMode) {
                 modLogger.info("[Materials] " + s);
             }
         }
@@ -117,7 +116,7 @@ public class Logger {
      */
     public static void DEBUG_MATERIALS(final String s) {
         if (enabled) {
-            if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) {
+            if (GTCorePlugin.isDevEnv() || ASMConfiguration.debug.debugMode) {
                 modLogger.info("[Debug][Materials] " + s);
             }
         }
@@ -128,7 +127,7 @@ public class Logger {
      */
     public static void REFLECTION(final String s) {
         if (enabled) {
-            if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) {
+            if (GTCorePlugin.isDevEnv() || ASMConfiguration.debug.debugMode) {
                 modLogger.info("[Reflection] " + s);
             }
         }
@@ -139,7 +138,7 @@ public class Logger {
      */
     public static void WORLD(final String s) {
         if (enabled) {
-            if (PreloaderCore.DEV_ENVIRONMENT || PreloaderCore.DEBUG_MODE) {
+            if (GTCorePlugin.isDevEnv() || ASMConfiguration.debug.debugMode) {
                 modLogger.info("[WorldGen] " + s);
             }
         }
@@ -148,7 +147,7 @@ public class Logger {
     public static void RECIPE(String string) {
         if (enabled) {
             if (
-            /* CORE_Preloader.DEV_ENVIRONMENT || */ PreloaderCore.DEBUG_MODE) {
+            /* GTCorePlugin.isDevEnv() || */ ASMConfiguration.debug.debugMode) {
                 modLogger.info("[Recipe] " + string);
             }
         }
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index 50b4578085..4346fb9e31 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -23,6 +23,7 @@ import galaxyspace.core.entity.mob.EntityEvolvedColdBlaze;
 import gregtech.api.enums.Mods;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.config.ASMConfiguration;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.entity.InternalEntityRegistry;
 import gtPlusPlus.core.handler.BookHandler;
@@ -41,7 +42,6 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.tileentities.ModTileEntities;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.preloader.PreloaderCore;
 import gtPlusPlus.xmod.ic2.CustomInternalName;
 
 public class CommonProxy {
@@ -53,7 +53,7 @@ public class CommonProxy {
 
     public void preInit(final FMLPreInitializationEvent e) {
         Logger.INFO("Doing some house cleaning.");
-        if (PreloaderCore.DEBUG_MODE) {
+        if (ASMConfiguration.debug.debugMode) {
             Logger.INFO("Development mode enabled.");
         } else {
             Logger.WARNING("Development mode not enabled.");
diff --git a/src/main/java/gtPlusPlus/core/config/ASMConfiguration.java b/src/main/java/gtPlusPlus/core/config/ASMConfiguration.java
index d79a746642..a348998ef0 100644
--- a/src/main/java/gtPlusPlus/core/config/ASMConfiguration.java
+++ b/src/main/java/gtPlusPlus/core/config/ASMConfiguration.java
@@ -25,25 +25,16 @@ public class ASMConfiguration {
         @Config.DefaultBoolean(false)
         public boolean debugMode;
 
-        @Config.Comment("Enable/Disable COFH OreDictionaryArbiter Patch (Useful for Development)")
-        @Config.DefaultBoolean(true)
-        public boolean enableCofhPatch;
-
-        @Config.Comment("Enable/Disable Forge OreDictionary Patch (Useful for Development)")
-        @Config.DefaultBoolean(false)
-        public boolean enableOreDictPatch;
     }
 
     @Config.Comment("General section")
     public static class General {
         // General Features
 
-        @Config.Comment("Prevents the game crashing from having invalid keybinds. https://github.com/alkcorp/GTplusplus/issues/544")
-        @Config.DefaultBoolean(true)
-        public boolean enabledLwjglKeybindingFix;
+        @Config.Comment("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.")
+        @Config.DefaultInt(0)
+        @Config.RangeInt(min = 0, max = Short.MAX_VALUE)
+        public int enableWatchdogBGM;
 
-        @Config.Comment("Fixes small oversights in Thaumcraft 4.")
-        @Config.DefaultBoolean(true)
-        public boolean enableTcAspectSafety;
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
index 8f549364c1..7976cf0bf6 100644
--- a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
+++ b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
@@ -5,9 +5,9 @@ import java.lang.reflect.Field;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiTextField;
 
+import gregtech.asm.GTCorePlugin;
 import gtPlusPlus.core.gui.machine.GUIVolumetricFlaskSetter;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.PreloaderCore;
 
 public class GuiValueField extends GuiTextField {
 
@@ -36,9 +36,9 @@ public class GuiValueField extends GuiTextField {
 
     public int getLineScrollOffset() {
         Field lineScrollOffset = ReflectionUtils
-            .getField(GuiTextField.class, !PreloaderCore.DEV_ENVIRONMENT ? "field_146225_q" : "lineScrollOffset");
+            .getField(GuiTextField.class, GTCorePlugin.isDevEnv() ? "lineScrollOffset" : "field_146225_q");
         if (lineScrollOffset != null) {
-            return (int) ReflectionUtils.getFieldValue(lineScrollOffset, this);
+            return ReflectionUtils.getFieldValue(lineScrollOffset, this);
         }
         return 0;
     }
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
index 89ddb241ed..c24587fb06 100644
--- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
+++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
@@ -16,9 +16,9 @@ import net.minecraft.world.World;
 
 import baubles.api.BaubleType;
 import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.asm.GTCorePlugin;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.PreloaderCore;
 
 public class FireProtectionBauble extends BaseBauble {
 
@@ -26,7 +26,7 @@ public class FireProtectionBauble extends BaseBauble {
 
     static {
         isImmuneToFire = ReflectionUtils
-            .getField(Entity.class, !PreloaderCore.DEV_ENVIRONMENT ? "func_70045_F" : "isImmuneToFire");
+            .getField(Entity.class, !GTCorePlugin.isDevEnv() ? "func_70045_F" : "isImmuneToFire");
     }
 
     public static boolean fireImmune(Entity aEntity) {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index c64686a151..7b66ffefa1 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -36,6 +36,7 @@ import gregtech.api.util.GTUtility;
 import gregtech.common.items.MetaGeneratedTool01;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.config.ASMConfiguration;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
@@ -45,7 +46,6 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.preloader.PreloaderCore;
 import gtPlusPlus.xmod.gregtech.api.items.GTMetaTool;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGenDustGeneration;
@@ -306,7 +306,7 @@ public class ItemUtils {
     }
 
     public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, final int amount) {
-        if (PreloaderCore.DEBUG_MODE) {
+        if (ASMConfiguration.debug.debugMode) {
             Logger.modLogger.warn("Looking up: " + oredictName + " - from : ", new Exception());
         }
 
diff --git a/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java
index 01e5a087c1..d2052afb55 100644
--- a/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java
+++ b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java
@@ -18,6 +18,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Mods;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.config.ASMConfiguration;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.lib.GTPPCore.Everglades;
 import gtPlusPlus.core.material.MaterialGenerator;
@@ -28,7 +29,6 @@ import gtPlusPlus.everglades.dimension.DimensionEverglades;
 import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base;
 import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer;
 import gtPlusPlus.everglades.gen.gt.WorldGen_Ores;
-import gtPlusPlus.preloader.PreloaderCore;
 
 @Mod(
     modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES,
@@ -134,7 +134,7 @@ public class GTPPEverglades implements ActionListener {
         WorldGen_GT_Base.oreveinPercentage = 64;
         WorldGen_GT_Base.oreveinAttempts = 16;
         WorldGen_GT_Base.oreveinMaxPlacementAttempts = 4;
-        if (PreloaderCore.DEBUG_MODE || GTPPCore.DEVENV) {
+        if (ASMConfiguration.debug.debugMode || GTPPCore.DEVENV) {
             WorldGen_GT_Base.debugWorldGen = true;
         }
         DarkWorldContentLoader.run();
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
index edd41535e7..386fac65ee 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBackgroundMusicFix.java
@@ -4,10 +4,10 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import gtPlusPlus.api.interfaces.IPlugin;
+import gtPlusPlus.core.config.ASMConfiguration;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
 import gtPlusPlus.plugin.fixes.vanilla.music.MusicTocker;
-import gtPlusPlus.preloader.PreloaderCore;
 
 public class VanillaBackgroundMusicFix implements IBugFix {
 
@@ -17,11 +17,11 @@ public class VanillaBackgroundMusicFix implements IBugFix {
 
     public VanillaBackgroundMusicFix(IPlugin minstance) {
         mParent = minstance;
-        if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isClient()) {
+        if (ASMConfiguration.general.enableWatchdogBGM > 0 && Utils.isClient()) {
             mParent.log("[BGM] Registering BGM delay Fix.");
             enabled = true;
             mFixInstance = new MusicTocker(mParent);
-        } else if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isServer()) {
+        } else if (ASMConfiguration.general.enableWatchdogBGM > 0 && Utils.isServer()) {
             mParent.log("[BGM] Tried registering BGM delay Fix on Server, disabling.");
             enabled = false;
         } else {
@@ -36,7 +36,7 @@ public class VanillaBackgroundMusicFix implements IBugFix {
     }
 
     public void manage() {
-        if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isClient()) {
+        if (ASMConfiguration.general.enableWatchdogBGM > 0 && Utils.isClient()) {
             TimerTask task = new ManageTask(this.mFixInstance);
             Timer timer = new Timer("BGM-WatchDog");
             long delay = 1000 * 60;
@@ -54,7 +54,7 @@ public class VanillaBackgroundMusicFix implements IBugFix {
 
         @Override
         public void run() {
-            if (PreloaderCore.enableWatchdogBGM > 0 && Utils.isClient()) {
+            if (ASMConfiguration.general.enableWatchdogBGM > 0 && Utils.isClient()) {
                 if (!A.mVanillaManager) {
                     A.run();
                 }
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
index aa81a0378c..8395f7b3f7 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
@@ -9,11 +9,11 @@ import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
 
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.asm.GTCorePlugin;
 import gtPlusPlus.api.interfaces.IPlugin;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
-import gtPlusPlus.preloader.PreloaderCore;
 
 // TODO move this as a mixin in hodgepodge
 public class VanillaBedHeightFix implements IBugFix {
@@ -23,17 +23,12 @@ public class VanillaBedHeightFix implements IBugFix {
 
     public VanillaBedHeightFix(IPlugin minstance) {
         mParent = minstance;
-        Method m;
-        if (!PreloaderCore.DEV_ENVIRONMENT) {
-            m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class, int.class);
-        } else {
-            m = ReflectionUtils.getMethod(
-                net.minecraft.entity.player.EntityPlayer.class,
-                "sleepInBedAt",
-                int.class,
-                int.class,
-                int.class);
-        }
+        Method m = ReflectionUtils.getMethod(
+            EntityPlayer.class,
+            GTCorePlugin.isDevEnv() ? "sleepInBedAt" : "func_71018_a",
+            int.class,
+            int.class,
+            int.class);
         if (m != null) {
             mSleepInBedAt = m;
             mParent.log("Registering Bed Height Fix.");
diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
index b0e0474bdd..46dec56124 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java
@@ -14,8 +14,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.objects.XSTR;
 import gtPlusPlus.api.interfaces.IPlugin;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.config.ASMConfiguration;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.PreloaderCore;
 
 @SideOnly(Side.CLIENT)
 public class MusicTocker extends MusicTicker implements Runnable {
@@ -37,7 +37,7 @@ public class MusicTocker extends MusicTicker implements Runnable {
     }
 
     private static int getDelay() {
-        return PreloaderCore.enableWatchdogBGM;
+        return ASMConfiguration.general.enableWatchdogBGM;
     }
 
     private boolean inject() {
diff --git a/src/main/java/gtPlusPlus/preloader/PreloaderCore.java b/src/main/java/gtPlusPlus/preloader/PreloaderCore.java
deleted file mode 100644
index cabee48bc9..0000000000
--- a/src/main/java/gtPlusPlus/preloader/PreloaderCore.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package gtPlusPlus.preloader;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import cpw.mods.fml.common.versioning.ArtifactVersion;
-
-public class PreloaderCore {
-
-    public static final String NAME = "GT++ Preloader";
-    public static final String MODID = "GT++_Preloader";
-    public static final String VERSION = "0.5-Beta";
-    public static final List<ArtifactVersion> DEPENDENCIES;
-    public static final String JAVA_VERSION = System.getProperty("java.version");
-
-    public static File MC_DIR;
-    public static boolean DEV_ENVIRONMENT = false;
-    public static boolean DEBUG_MODE = false;
-    public static boolean enableOldGTcircuits = false;
-    public static int enableWatchdogBGM = 0;
-
-    public static void setMinecraftDirectory(File aDir) {
-        MC_DIR = aDir;
-    }
-
-    static {
-        ArrayList<ArtifactVersion> deps = new ArrayList<>();
-        // deps.add("required-before:gregtech;");
-        DEPENDENCIES = Collections.unmodifiableList(deps);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java b/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java
deleted file mode 100644
index 9a84bcb4b4..0000000000
--- a/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package gtPlusPlus.preloader;
-
-import static gregtech.api.enums.Mods.GregTech;
-
-import net.minecraft.item.ItemStack;
-
-import org.apache.logging.log4j.Level;
-
-import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gregtech.common.items.MetaGeneratedItem01;
-import gregtech.common.items.MetaGeneratedItem03;
-import gtPlusPlus.core.config.Configuration;