Remove redundant flags (#529)

* Remove CORE.GTNH

* Remove LoadedMods.Gregtech

* Remove LoadedMods.IndustrialCraft2

* Remove LoadedMods.MiscUtils

* Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK

* clean

* Remove mention to GT versions

* Fix assembler mode

12 files changed, 150 insertions, 882 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index 2ae449e012..a33a74c151 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -42,7 +42,6 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.BaseCustomPower_MTE;
 import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
 import gtPlusPlus.xmod.gregtech.common.helpers.MachineUpdateHandler;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator;
 import ic2.core.init.BlocksItems;
 import ic2.core.init.InternalName;
 
@@ -364,28 +363,22 @@ public class Meta_GT_Proxy {
     }
 
     public static boolean setTileEntityClassAsBlacklistedInWorldAccelerator(String aClassName) {
-        if (CORE.GTNH) {
-            Class aMainModClass = ReflectionUtils.getClass("com.dreammaster.main.MainRegistry");
-            Class aCoreModConfig = ReflectionUtils.getClass("com.dreammaster.config");
-            if (aMainModClass != null && aCoreModConfig != null) {
-                Field aCoreConfig = ReflectionUtils.getField(aMainModClass, "CoreConfig");
-                if (aCoreConfig != null) {
-                    Field aBlackList = ReflectionUtils.getField(aCoreModConfig, "BlacklistedTileEntiyClassNames");
-                    Object aInstance = ReflectionUtils.getFieldValue(aCoreConfig);
-                    if (aBlackList != null && aInstance != null) {
-                        String[] aBlackListValue = (String[]) ReflectionUtils.getFieldValue(aBlackList, aInstance);
-                        if (aBlackListValue != null) {
-                            aBlackListValue = ArrayUtils.add(aBlackListValue, aClassName);
-                            ReflectionUtils.setField(aInstance, aBlackList, aBlackListValue);
-                            return true;
-                        }
+        Class aMainModClass = ReflectionUtils.getClass("com.dreammaster.main.MainRegistry");
+        Class aCoreModConfig = ReflectionUtils.getClass("com.dreammaster.config");
+        if (aMainModClass != null && aCoreModConfig != null) {
+            Field aCoreConfig = ReflectionUtils.getField(aMainModClass, "CoreConfig");
+            if (aCoreConfig != null) {
+                Field aBlackList = ReflectionUtils.getField(aCoreModConfig, "BlacklistedTileEntiyClassNames");
+                Object aInstance = ReflectionUtils.getFieldValue(aCoreConfig);
+                if (aBlackList != null && aInstance != null) {
+                    String[] aBlackListValue = (String[]) ReflectionUtils.getFieldValue(aBlackList, aInstance);
+                    if (aBlackListValue != null) {
+                        aBlackListValue = ArrayUtils.add(aBlackListValue, aClassName);
+                        ReflectionUtils.setField(aInstance, aBlackList, aBlackListValue);
+                        return true;
                     }
                 }
             }
-        } else {
-            GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames = ArrayUtils
-                    .add(GT_MetaTileEntity_WorldAccelerator.BlacklistedTileEntiyClassNames, aClassName);
-            return true;
         }
         return false;
     }
@@ -394,21 +387,8 @@ public class Meta_GT_Proxy {
         for (int i = 0; i <= 6; i++) {
             GT_ValidHeatingCoilMetas.put(i);
         }
-        if (CORE.GTNH) {
-            for (int i = 7; i <= 8; i++) {
-                GT_ValidHeatingCoilMetas.put(i);
-            }
-        }
-    }
-
-    public static boolean areWeUsingGregtech5uExperimental() {
-        final int version = GregTech_API.VERSION;
-        if ((version == 508) || (version == 507)) {
-            return false;
-        } else if (version == 509) {
-            return true;
-        } else {
-            return false;
+        for (int i = 7; i <= 8; i++) {
+            GT_ValidHeatingCoilMetas.put(i);
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
index 502674fb18..02148c3ef9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/StaticFields59.java
@@ -25,7 +25,6 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.common.GT_Proxy;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.reflect.ProxyFinder;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -97,22 +96,13 @@ public class StaticFields59 {
         Logger.INFO("[SH] Got Method: calculatePollutionReduction");
 
         // Yep...
-        if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            mAddFurnaceRecipe = getMethod(
-                    GT_ModHandler.class,
-                    "addSmeltingAndAlloySmeltingRecipe",
-                    ItemStack.class,
-                    ItemStack.class);
-            Logger.INFO("[SH] Got Method: addSmeltingAndAlloySmeltingRecipe");
-        } else {
-            mAddFurnaceRecipe = getMethod(
-                    GT_ModHandler.class,
-                    "addSmeltingAndAlloySmeltingRecipe",
-                    ItemStack.class,
-                    ItemStack.class,
-                    boolean.class);
-            Logger.INFO("[SH] Got Method: addSmeltingAndAlloySmeltingRecipe");
-        }
+        mAddFurnaceRecipe = getMethod(
+                GT_ModHandler.class,
+                "addSmeltingAndAlloySmeltingRecipe",
+                ItemStack.class,
+                ItemStack.class,
+                boolean.class);
+        Logger.INFO("[SH] Got Method: addSmeltingAndAlloySmeltingRecipe");
     }
 
     public static final synchronized Block getBlockCasings5() {
@@ -293,7 +283,7 @@ public class StaticFields59 {
                 Logger.INFO("Heating Coils are bad.");
                 mHeatingCapacity = 0;
         }
-        if (CORE.GTNH && aCoilTier <= 10) {
+        if (aCoilTier <= 10) {
             mHeatingCapacity += 1;
         }
         return mHeatingCapacity;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index f42768c451..ed3254921c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -87,103 +87,101 @@ public class GregtechFluidHandler {
             }
         }
 
-        if (LoadedMods.IndustrialCraft2) {
-            Logger.INFO("Adding in GT Fluids for various nuclear related content.");
-
-            FluidUtils.addGtFluid(
-                    "hydrofluoricAcid",
-                    "Industrial Strength Hydrofluoric Acid",
-                    GT_Materials.HydrofluoricAcid,
-                    1,
-                    120,
-                    GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L),
-                    ItemUtils.getEmptyCell(),
-                    1000,
-                    false);
-            generateIC2FluidCell("HydrofluoricAcid");
-
-            FluidUtils.generateFluidNoPrefix(
-                    "SulfurDioxide",
-                    "High Quality Sulfur Dioxide",
-                    263,
-                    GT_Materials.SulfurDioxide.mRGBa);
-
-            FluidUtils.addGtFluid(
-                    "sulfurousAcid",
-                    "Sulfurous Acid",
-                    GT_Materials.SulfurousAcid,
-                    4,
-                    75,
-                    GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L),
-                    ItemUtils.getEmptyCell(),
-                    1000,
-                    false);
-            generateIC2FluidCell("SulfurousAcid");
-
-            FluidUtils.addGtFluid(
-                    "sulfuricApatite",
-                    "Sulfuric Apatite Mix",
-                    GT_Materials.SulfuricApatite,
-                    4,
-                    500,
-                    GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L),
-                    ItemUtils.getEmptyCell(),
-                    1000,
-                    false);
-            generateIC2FluidCell("SulfuricApatite");
-
-            // Check for IHL Hydrogen Chloride
-            if (!LoadedMods.IHL || (ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null)) {
-                if (FluidUtils.getFluidStack("hydrogenchloride", 1) == null) {
-                    if (LoadedMods.IHL) {
-                        Logger.INFO(
-                                "IHL Loaded but hydrogen chloride could not be found for some reason. How about we add our own.");
-                    } else {
-                        Logger.INFO("No Suitable versions of Hydrogen Chloride available, adding our own.");
-                    }
-                    FluidUtils.addGtFluid(
-                            "hydrogenChloride",
-                            "Industrial Strength Hydrogen Chloride",
-                            GT_Materials.HydrogenChloride,
-                            4,
-                            75,
-                            GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L),
-                            ItemUtils.getEmptyCell(),
-                            1000,
-                            false);
-                    generateIC2FluidCell("HydrogenChloride");
+        Logger.INFO("Adding in GT Fluids for various nuclear related content.");
+
+        FluidUtils.addGtFluid(
+                "hydrofluoricAcid",
+                "Industrial Strength Hydrofluoric Acid",
+                GT_Materials.HydrofluoricAcid,
+                1,
+                120,
+                GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L),
+                ItemUtils.getEmptyCell(),
+                1000,
+                false);
+        generateIC2FluidCell("HydrofluoricAcid");
+
+        FluidUtils.generateFluidNoPrefix(
+                "SulfurDioxide",
+                "High Quality Sulfur Dioxide",
+                263,
+                GT_Materials.SulfurDioxide.mRGBa);
+
+        FluidUtils.addGtFluid(
+                "sulfurousAcid",
+                "Sulfurous Acid",
+                GT_Materials.SulfurousAcid,
+                4,
+                75,
+                GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L),
+                ItemUtils.getEmptyCell(),
+                1000,
+                false);
+        generateIC2FluidCell("SulfurousAcid");
+
+        FluidUtils.addGtFluid(
+                "sulfuricApatite",
+                "Sulfuric Apatite Mix",
+                GT_Materials.SulfuricApatite,
+                4,
+                500,
+                GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L),
+                ItemUtils.getEmptyCell(),
+                1000,
+                false);
+        generateIC2FluidCell("SulfuricApatite");
+
+        // Check for IHL Hydrogen Chloride
+        if (!LoadedMods.IHL || (ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 1) == null)) {
+            if (FluidUtils.getFluidStack("hydrogenchloride", 1) == null) {
+                if (LoadedMods.IHL) {
+                    Logger.INFO(
+                            "IHL Loaded but hydrogen chloride could not be found for some reason. How about we add our own.");
+                } else {
+                    Logger.INFO("No Suitable versions of Hydrogen Chloride available, adding our own.");
                 }
+                FluidUtils.addGtFluid(
+                        "hydrogenChloride",
+                        "Industrial Strength Hydrogen Chloride",
+                        GT_Materials.HydrogenChloride,
+                        4,
+                        75,
+                        GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrogenChloride, 1L),
+                        ItemUtils.getEmptyCell(),
+                        1000,
+                        false);
+                generateIC2FluidCell("HydrogenChloride");
             }
-
-            FluidUtils.addGtFluid(
-                    "sulfuricLithium",
-                    "Sulfuric Lithium Mix",
-                    GT_Materials.SulfuricLithium,
-                    4,
-                    280,
-                    GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L),
-                    ItemUtils.getEmptyCell(),
-                    1000,
-                    false);
-            generateIC2FluidCell("SulfuricLithium");
-
-            FluidUtils.addGtFluid(
-                    "lithiumHydroxide",
-                    "Lithium Hydroxide",
-                    GT_Materials.LithiumHydroxide,
-                    4,
-                    500,
-                    GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L),
-                    ItemUtils.getEmptyCell(),
-                    1000,
-                    false);
-            generateIC2FluidCell("LithiumHydroxide");
         }
+
+        FluidUtils.addGtFluid(
+                "sulfuricLithium",
+                "Sulfuric Lithium Mix",
+                GT_Materials.SulfuricLithium,
+                4,
+                280,
+                GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L),
+                ItemUtils.getEmptyCell(),
+                1000,
+                false);
+        generateIC2FluidCell("SulfuricLithium");
+
+        FluidUtils.addGtFluid(
+                "lithiumHydroxide",
+                "Lithium Hydroxide",
+                GT_Materials.LithiumHydroxide,
+                4,
+                500,
+                GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L),
+                ItemUtils.getEmptyCell(),
+                1000,
+                false);
+        generateIC2FluidCell("LithiumHydroxide");
     }
 
     private static ItemStack generateIC2FluidCell(final String fluidNameWithCaps) {
         Logger.INFO("Adding a Cell for " + fluidNameWithCaps);
-        if (LoadedMods.IndustrialCraft2 && !LoadedMods.IndustrialCraft2Classic) {
+        if (!LoadedMods.IndustrialCraft2Classic) {
             return Utils.createInternalNameAndFluidCell(fluidNameWithCaps);
         }
         return null;
@@ -191,7 +189,7 @@ public class GregtechFluidHandler {
 
     private static ItemStack generateIC2FluidCellNoOreDict(final String fluidNameWithCaps) {
         Logger.INFO("Adding a Cell for " + fluidNameWithCaps);
-        if (LoadedMods.IndustrialCraft2 && !LoadedMods.IndustrialCraft2Classic) {
+        if (!LoadedMods.IndustrialCraft2Classic) {
             return Utils.createInternalNameAndFluidCellNoOreDict(fluidNameWithCaps);
         }
         return null;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java
index 27cd5be67e..c8152dcca7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow_Item.java
@@ -12,7 +12,6 @@ import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_CoverBehavior;
 import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.LangUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
@@ -31,12 +30,7 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior {
         sQuantumChest = ReflectionUtils.getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest");
         sSuperChestGTPP = ReflectionUtils
                 .getClass("gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest");
-        if (CORE.GTNH) {
-            sSuperChestGTNH = ReflectionUtils
-                    .getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest");
-        } else {
-            sSuperChestGTNH = null;
-        }
+        sSuperChestGTNH = ReflectionUtils.getClass("gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest");
         if (sQuantumChest != null) {
             mItemAmountFields.put(0, ReflectionUtils.getField(sQuantumChest, "mItemCount"));
             mItemTypeFields.put(0, ReflectionUtils.getField(sQuantumChest, "mItemStack"));
@@ -81,7 +75,7 @@ public class GTPP_Cover_Overflow_Item extends GT_CoverBehavior {
         } else if (sSuperChestGTPP.isInstance(aMetaTileEntity)) {
             didHandle = handleDigitalChest(aMetaTileEntity, 1);
 
-        } else if (CORE.GTNH && sSuperChestGTNH != null && sSuperChestGTNH.isInstance(aMetaTileEntity)) {
+        } else if (sSuperChestGTNH != null && sSuperChestGTNH.isInstance(aMetaTileEntity)) {
             didHandle = handleDigitalChest(aMetaTileEntity, 2);
         }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 4ccec0bb93..0aa7f8cee9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -14,8 +14,6 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.objects.GT_MultiTexture;
 import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.objects.ItemData;
-import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.GT_FoodStat;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.common.covers.GT_Cover_Arm;
@@ -24,7 +22,6 @@ import gregtech.common.covers.GT_Cover_Pump;
 import gregtech.common.items.behaviors.Behaviour_DataOrb;
 import gregtech.common.items.behaviors.Behaviour_DataStick;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.handler.OldCircuitHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.StringUtils;
@@ -54,572 +51,15 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
         int tLastID = 0;
 
         registerCustomCircuits();
-        OldCircuitHandler.addCircuitItems();
 
-        if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            Logger.INFO(
-                    "Gregtech 5.09 not found, using fallback components. (I like how I have to add compat to something I added first and had stolen.)");
-            GregtechItemList.Electric_Pump_LuV.set(
-                    this.addItem(
-                            tLastID = 0,
-                            "Electric Pump (LuV)",
-                            "163920 L/sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L),
-                                    getTcAspectStack(TC_Aspects.AQUA, 1L) }));
-            GregtechItemList.Electric_Pump_ZPM.set(
-                    this.addItem(
-                            tLastID = 1,
-                            "Electric Pump (ZPM)",
-                            "655680 L/sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.ITER, 2L),
-                                    getTcAspectStack(TC_Aspects.AQUA, 2L) }));
-            GregtechItemList.Electric_Pump_UV.set(
-                    this.addItem(
-                            tLastID = 2,
-                            "Electric Pump (UV)",
-                            "2622720 L/sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.ITER, 4L),
-                                    getTcAspectStack(TC_Aspects.AQUA, 4L) }));
-            GregtechItemList.Electric_Pump_MAX.set(
-                    this.addItem(
-                            tLastID = 3,
-                            "Electric Pump (MAX)",
-                            "10490880 L/sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L),
-                                    getTcAspectStack(TC_Aspects.AQUA, 8L) }));
-            GregTech_API.registerCover(
-                    GregtechItemList.Electric_Pump_LuV.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                    new GT_Cover_Pump(8196));
-            GregTech_API.registerCover(
-                    GregtechItemList.Electric_Pump_ZPM.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[6][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                    new GT_Cover_Pump(32768));
-            GregTech_API.registerCover(
-                    GregtechItemList.Electric_Pump_UV.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[7][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                    new GT_Cover_Pump(131072));
-            GregTech_API.registerCover(
-                    GregtechItemList.Electric_Pump_MAX.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }),
-                    new GT_Cover_Pump(524288));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_LuV, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
-            // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.Tin), Character.valueOf('S'),
-            // OrePrefixes.screw.get(Materials.Tin), Character.valueOf('W'), OrePrefixes.cableGt01.get(Materials.Tin),
-            // Character.valueOf('P'), OrePrefixes.pipeMedium.get(Materials.Bronze)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_ZPM, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
-            // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.Bronze), Character.valueOf('S'),
-            // OrePrefixes.screw.get(Materials.Bronze), Character.valueOf('W'),
-            // OrePrefixes.cableGt01.get(Materials.AnyCopper), Character.valueOf('P'),
-            // OrePrefixes.pipeMedium.get(Materials.Steel)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_UV, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
-            // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.Steel), Character.valueOf('S'),
-            // OrePrefixes.screw.get(Materials.Steel), Character.valueOf('W'),
-            // OrePrefixes.cableGt01.get(Materials.Gold), Character.valueOf('P'),
-            // OrePrefixes.pipeMedium.get(Materials.StainlessSteel)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Pump_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"SXO", "dPw", "OMW", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_MAX, Character.valueOf('O'), OrePrefixes.ring.get(Materials.Rubber),
-            // Character.valueOf('X'), OrePrefixes.rotor.get(Materials.StainlessSteel), Character.valueOf('S'),
-            // OrePrefixes.screw.get(Materials.StainlessSteel), Character.valueOf('W'),
-            // OrePrefixes.cableGt01.get(Materials.Aluminium), Character.valueOf('P'),
-            // OrePrefixes.pipeMedium.get(Materials.Titanium)});
-            tLastID = 4;
-            GregtechItemList.Electric_Motor_LuV.set(
-                    this.addItem(
-                            tLastID = 4,
-                            "Electric Motor (LuV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 1L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 1L) }));
-            GregtechItemList.Electric_Motor_ZPM.set(
-                    this.addItem(
-                            tLastID = 5,
-                            "Electric Motor (ZPM)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 2L) }));
-            GregtechItemList.Electric_Motor_UV.set(
-                    this.addItem(
-                            tLastID = 6,
-                            "Electric Motor (UV)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 4L) }));
-            GregtechItemList.Electric_Motor_MAX.set(
-                    this.addItem(
-                            tLastID = 7,
-                            "Electric Motor (MAX)",
-                            "",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L),
-                                    getTcAspectStack(TC_Aspects.MOTUS, 8L) }));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
-            // OrePrefixes.stick.get(Materials.IronMagnetic), Character.valueOf('R'),
-            // OrePrefixes.stick.get(Materials.AnyIron), Character.valueOf('W'),
-            // OrePrefixes.wireGt01.get(Materials.AnyCopper), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Tin)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
-            // OrePrefixes.stick.get(Materials.SteelMagnetic), Character.valueOf('R'),
-            // OrePrefixes.stick.get(Materials.Aluminium), Character.valueOf('W'),
-            // OrePrefixes.wireGt01.get(Materials.Electrum), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Silver)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
-            // OrePrefixes.stick.get(Materials.SteelMagnetic), Character.valueOf('R'),
-            // OrePrefixes.stick.get(Materials.StainlessSteel), Character.valueOf('W'),
-            // OrePrefixes.wireGt02.get(Materials.Cupronickel), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Gold)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Electric_Motor_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"CWR", "WIW", "RWC", Character.valueOf('I'),
-            // OrePrefixes.stick.get(Materials.NeodymiumMagnetic), Character.valueOf('R'),
-            // OrePrefixes.stick.get(Materials.Titanium), Character.valueOf('W'),
-            // OrePrefixes.wireGt02.get(Materials.TungstenSteel), Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Nichrome)});
-
-            tLastID = 8;
-            GregtechItemList.Conveyor_Module_LuV.set(
-                    this.addItem(
-                            tLastID = 8,
-                            "Conveyor Module (LuV)",
-                            "1 Stack every 20 secs (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L) }));
-            GregtechItemList.Conveyor_Module_ZPM.set(
-                    this.addItem(
-                            tLastID = 9,
-                            "Conveyor Module (ZPM)",
-                            "1 Stack every 5 secs (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.ITER, 2L) }));
-            GregtechItemList.Conveyor_Module_UV.set(
-                    this.addItem(
-                            tLastID = 10,
-                            "Conveyor Module (UV)",
-                            "1 Stack every 1 sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 4L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 4L), getTcAspectStack(TC_Aspects.ITER, 4L) }));
-            GregtechItemList.Conveyor_Module_MAX.set(
-                    this.addItem(
-                            tLastID = 11,
-                            "Conveyor Module (MAX)",
-                            "1 Stack every 1/5 sec (as Cover)",
-                            new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L),
-                                    getTcAspectStack(TC_Aspects.MACHINA, 8L), getTcAspectStack(TC_Aspects.ITER, 8L) }));
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_LuV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_LuV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Tin),
-            // Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_ZPM.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_ZPM, Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.AnyCopper), Character.valueOf('R'),
-            // OrePrefixes.plate.get(Materials.Rubber)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_UV.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_UV, Character.valueOf('C'), OrePrefixes.cableGt01.get(Materials.Gold),
-            // Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber)});
-            // GT_ModHandler.addCraftingRecipe(GregtechItemList.Conveyor_Module_MAX.get(1L),
-            // //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE |
-            // //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"RRR", "MCM", "RRR", Character.valueOf('M'),
-            // GregtechItemList.Electric_Motor_MAX, Character.valueOf('C'),
-            // OrePrefixes.cableGt01.get(Materials.Aluminium), Character.valueOf('R'),
-            // OrePrefixes.plate.get(Materials.Rubber)});
-            GregTech_API.registerCover(
-                    GregtechItemList.Conveyor_Module_LuV.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
-                    new GT_Cover_Conveyor(400));
-            GregTech_API.registerCover(
-                    GregtechItemList.Conveyor_Module_ZPM.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[2][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
-                    new GT_Cover_Conveyor(100));
-            GregTech_API.registerCover(
-                    GregtechItemList.Conveyor_Module_UV.get(1L),
-                    new GT_MultiTexture(
-                            new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[3][0],
-                                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }),
-                    new GT_Cover_Conveyor(20));
-            GregTech_API.registerCover(
-                    GregtechItemList.Conveyor_Module_MAX.get(1L),
-                    new GT_MultiText