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

86 files changed, 1206 insertions, 2972 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index 96b17f0685..51f5697cc4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -37,7 +37,6 @@ import gtPlusPlus.api.objects.minecraft.multi.NoEUBonusMultiBehaviour;
 import gtPlusPlus.api.objects.minecraft.multi.NoOutputBonusMultiBehaviour;
 import gtPlusPlus.api.objects.minecraft.multi.NoSpeedBonusMultiBehaviour;
 import gtPlusPlus.core.handler.COMPAT_HANDLER;
-import gtPlusPlus.core.handler.OldCircuitHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
@@ -88,10 +87,6 @@ public class HANDLER_GT {
             GT_Materials.init(mMaterialProperties);
         }
 
-        if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH) {
-            OldCircuitHandler.preInit();
-        }
-
         GregtechFluidHandler.run();
     }
 
@@ -111,10 +106,6 @@ public class HANDLER_GT {
             sMetaGeneratedToolInstance = MetaGeneratedGregtechTools.getInstance();
         }
 
-        if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH) {
-            OldCircuitHandler.init();
-        }
-
         // Generates recipes for all gregtech smelting and alloy smelting combinations.
         // RecipeGen_BlastSmelterGT.generateRecipes();
         // new RecipeGen_BlastSmelterGT_Ex();
@@ -136,10 +127,6 @@ public class HANDLER_GT {
             GregtechNitroDieselFix.run();
         }
 
-        if (ConfigSwitches.enableOldGTcircuits && !CORE.GTNH) {
-            OldCircuitHandler.postInit();
-        }
-
         // Register custom singles to the PA
         AddCustomMachineToPA.register();
 
@@ -508,7 +495,7 @@ public class HANDLER_GT {
         Item aU;
         Collection<GT_Recipe> aAssRecipes = GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.mRecipeList;
         // 170, 172, 174, 176
-        if (aAssRecipes.size() > 0 && (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH)) {
+        if (aAssRecipes.size() > 0) {
             recipe: for (GT_Recipe aG : aAssRecipes) {
                 if (aG.mOutputs != null && aG.mOutputs.length > 0) {
                     outputs: for (ItemStack aI : aG.mOutputs) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
index 160ca2ceae..8b7f2bf685 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
@@ -6,7 +6,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatch_Dynamo {
@@ -56,18 +55,10 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc
     @Override
     public String[] getDescription() {
         String[] g;
-        if (CORE.GTNH || (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && Utils.getGregtechVersionAsInt() >= 50932)) {
-            g = new String[] { "Dynamo with internal storage and additional Amp capacity",
-                    "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
-                    CORE.GT_Tooltip.get() };
+        g = new String[] { "Dynamo with internal storage and additional Amp capacity",
+                "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
+                CORE.GT_Tooltip.get() };
 
-        } else {
-            g = new String[] { "Dynamo with internal storage and additional Amp capacity",
-                    "Stores " + maxEUStore() + "EU", "Amperage In: 4", "Amperage Out: 4",
-                    "Does not accept more than " + (this.maxEUOutput() * this.maxAmperesIn()) + "EU/t as input",
-                    "Large Turbines only supply 1A to this, other Multiblocks can inject more amps",
-                    CORE.GT_Tooltip.get() };
-        }
         return g;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
index 96bbde32b5..7897dda8bc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
@@ -34,15 +34,13 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
     @Override
     public void onConfigLoad(GT_Config aConfig) {
         super.onConfigLoad(aConfig);
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) {
-            try {
-                Integer a1 = (int) StaticFields59.getFieldFromGregtechProxy("mPollutionSmogLimit");
-                if (a1 != null && a1 > 0) {
-                    mPollutionSmogLimit = a1;
-                }
-            } catch (Throwable t) {
-                mPollutionSmogLimit = 500000;
+        try {
+            Integer a1 = (int) StaticFields59.getFieldFromGregtechProxy("mPollutionSmogLimit");
+            if (a1 != null && a1 > 0) {
+                mPollutionSmogLimit = a1;
             }
+        } catch (Throwable t) {
+            mPollutionSmogLimit = 500000;
         }
     }