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

5 files changed, 57 insertions, 173 deletions

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;
         }
     }
 
@@ -58,23 +56,18 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
     }
 
     public String[] getDescription() {
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            String[] mDescArray = StaticFields59.getDescriptionArray(this);
-            String[] desc = new String[mDescArray.length + 7];
-            System.arraycopy(mDescArray, 0, desc, 0, mDescArray.length);
-            desc[mDescArray.length] = "DO NOT OBSTRUCT THE OUTPUT!";
-            desc[mDescArray.length + 1] = "Requires 3 Air on the exhaust face";
-            desc[mDescArray.length + 2] = "Requires Air Filters";
-            desc[mDescArray.length + 3] = "Mufflers require T2 Filters from IV-" + GT_Values.VN[9];
-            desc[mDescArray.length + 4] = "Reduces Pollution to " + this.calculatePollutionReductionForTooltip(100)
-                    + "%";
-            desc[mDescArray.length + 5] = "Recovers " + (105 - this.calculatePollutionReductionForTooltip(100))
-                    + "% of CO2/CO/SO2";
-            desc[mDescArray.length + 6] = CORE.GT_Tooltip.get();
-            return desc;
-        } else {
-            return new String[] {};
-        }
+        String[] mDescArray = StaticFields59.getDescriptionArray(this);
+        String[] desc = new String[mDescArray.length + 7];
+        System.arraycopy(mDescArray, 0, desc, 0, mDescArray.length);
+        desc[mDescArray.length] = "DO NOT OBSTRUCT THE OUTPUT!";
+        desc[mDescArray.length + 1] = "Requires 3 Air on the exhaust face";
+        desc[mDescArray.length + 2] = "Requires Air Filters";
+        desc[mDescArray.length + 3] = "Mufflers require T2 Filters from IV-" + GT_Values.VN[9];
+        desc[mDescArray.length + 4] = "Reduces Pollution to " + this.calculatePollutionReductionForTooltip(100) + "%";
+        desc[mDescArray.length + 5] = "Recovers " + (105 - this.calculatePollutionReductionForTooltip(100))
+                + "% of CO2/CO/SO2";
+        desc[mDescArray.length + 6] = CORE.GT_Tooltip.get();
+        return desc;
     }
 
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index 1605448cfb..edb9a357a7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
 import gregtech.api.enums.*;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -16,13 +14,11 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
     private static Textures.BlockIcons INSULATION_MEDIUM_PLUS;
 
     static {
-        if (GTNH) {
-            try {
-                INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GT_Utility
-                        .getField(Textures.BlockIcons.class, "INSULATION_MEDIUM_PLUS").get(null);
-            } catch (IllegalAccessException | NullPointerException e) {
-                throw new Error(e);
-            }
+        try {
+            INSULATION_MEDIUM_PLUS = (Textures.BlockIcons) GT_Utility
+                    .getField(Textures.BlockIcons.class, "INSULATION_MEDIUM_PLUS").get(null);
+        } catch (IllegalAccessException | NullPointerException e) {
+            throw new Error(e);
         }
     }
 
@@ -92,8 +88,7 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
     @Override
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections,
             byte aColorIndex, boolean aConnected, boolean aRedstone) {
-        return GTNH ? getTextureGTNH(aBaseMetaTileEntity, aSide, aConnections, aColorIndex, aConnected, aRedstone)
-                : getTexturePure(aBaseMetaTileEntity, aSide, aConnections, aColorIndex, aConnected, aRedstone);
+        return getTextureGTNH(aBaseMetaTileEntity, aSide, aConnections, aColorIndex, aConnected, aRedstone);
     }
 
     private ITexture[] getTextureGTNH(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections,
@@ -152,70 +147,4 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
                 Textures.BlockIcons.INSULATION_FULL,
                 Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
     }
-
-    private ITexture[] getTexturePure(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections,
-            byte aColorIndex, boolean aConnected, boolean aRedstone) {
-
-        // if (this.vRGB == null || this.vRGB.length < 3 || this.vRGB.length > 4){
-        // this.vRGB = new short[]{200, 0, 200, 0};
-        // }
-        // if (this.vRGB.length != 4){
-        // short[] tempRGB = this.vRGB;
-        // this.vRGB = new short[]{tempRGB[0], tempRGB[1], tempRGB[2], 0};
-        // }
-        //
-        // Materials wireMaterial = this.mMaterial;
-        //
-        // if (wireMaterial == null){
-        // wireMaterial = Materials.Iron;
-        // }
-
-        // With the code in constructors it should work
-        Materials wireMaterial = mMaterial;
-        if (wireMaterial == null) {
-            wireMaterial = Materials.Iron;
-        }
-
-        if (!(this.mInsulated)) return new ITexture[] { new GT_RenderedTexture(
-                wireMaterial.mIconSet.mTextures[69],
-                Dyes.getModulation(aColorIndex, this.vRGB)) };
-        if (aConnected) {
-            float tThickNess = getThickNess();
-            if (tThickNess < 0.124F) return new ITexture[] { new GT_RenderedTexture(
-                    Textures.BlockIcons.INSULATION_FULL,
-                    Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
-            if (tThickNess < 0.374F)
-                return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                        new GT_RenderedTexture(
-                                Textures.BlockIcons.INSULATION_TINY,
-                                Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
-            if (tThickNess < 0.499F)
-                return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                        new GT_RenderedTexture(
-                                Textures.BlockIcons.INSULATION_SMALL,
-                                Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
-            if (tThickNess < 0.624F)
-                return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                        new GT_RenderedTexture(
-                                Textures.BlockIcons.INSULATION_MEDIUM,
-                                Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
-            if (tThickNess < 0.749F)
-                return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                        new GT_RenderedTexture(
-                                Textures.BlockIcons.INSULATION_LARGE,
-                                Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
-            if (tThickNess < 0.874F)
-                return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                        new GT_RenderedTexture(
-                                Textures.BlockIcons.INSULATION_HUGE,
-                                Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
-            return new ITexture[] { new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                    new GT_RenderedTexture(
-                            Textures.BlockIcons.INSULATION_FULL,
-                            Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
-        }
-        return new ITexture[] { new GT_RenderedTexture(
-                Textures.BlockIcons.INSULATION_FULL,
-                Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa)) };
-    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
index 6a5fb9d4d2..0a06c89549 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
@@ -35,7 +35,6 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_Proxy;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import ic2.api.energy.tile.IEnergySink;
 
@@ -83,22 +82,20 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
         final String lookingForValue = "mWireHeatingTicks";
         int temp = 4;
         Field field;
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            try {
-                field = clazz.getClass().getField(lookingForValue);
-                final Class<?> clazzType = field.getType();
-                if (clazzType.toString().equals("int")) {
-                    temp = (field.getInt(clazz));
-                } else {
-                    temp = 4;
-                }
-            } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
-                // Utils.LOG_INFO("FATAL ERROR - REFLECTION FAILED FOR GT CABLES
-                // - PLEASE REPORT THIS.");
-                Logger.WARNING("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
-                Logger.ERROR("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
+        try {
+            field = clazz.getClass().getField(lookingForValue);
+            final Class<?> clazzType = field.getType();
+            if (clazzType.toString().equals("int")) {
+                temp = (field.getInt(clazz));
+            } else {
                 temp = 4;
             }
+        } catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+            // Utils.LOG_INFO("FATAL ERROR - REFLECTION FAILED FOR GT CABLES
+            // - PLEASE REPORT THIS.");
+            Logger.WARNING("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
+            Logger.ERROR("FATAL ERROR - REFLECTION FAILED FOR GT CABLES - PLEASE REPORT THIS.");
+            temp = 4;
         }
         return temp;
     }
@@ -365,20 +362,12 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
         this.mTransferredAmperageLast20 = Math.max(this.mTransferredAmperageLast20, this.mTransferredAmperage);
 
         if ((aVoltage > this.mVoltage) || (this.mTransferredAmperage > this.mAmperage)) {
-            // GT 5.09
-            if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-                if (this.mOverheat > (this.mWireHeatingTicks * 100)) {
-                    this.getBaseMetaTileEntity().setToFire();
-                } else {
-                    this.mOverheat += 100;
-                }
-                return aAmperage;
-            }
-            // GT 5.08
-            else {
+            if (this.mOverheat > (this.mWireHeatingTicks * 100)) {
                 this.getBaseMetaTileEntity().setToFire();
-                return aAmperage;
+            } else {
+                this.mOverheat += 100;
             }
+            return aAmperage;
         }
 
         return rUsedAmperes;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 75bb0ce94f..88215b7f44 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -68,7 +68,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.*;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.api.objects.minecraft.multi.SpecialMultiBehaviour;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -1886,37 +1885,20 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
                     "Invalid recipe, Fallback lookup. " + this.getRecipeMap().mRecipeList.size()
                             + " | "
                             + this.getRecipeMap().mNEIName);
-            if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-                try {
-                    return (GT_Recipe) findRecipe08.invoke(
-                            getRecipeMap(),
-                            aTileEntity,
-                            aRecipe,
-                            aNotUnificated,
-                            aVoltage,
-                            aFluids,
-                            aSpecialSlot,
-                            aInputs);
-                } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-                    e.printStackTrace();
-                    return null;
-                }
-            } else {
-                try {
-                    return (GT_Recipe) findRecipe09.invoke(
-                            getRecipeMap(),
-                            aTileEntity,
-                            aRecipe,
-                            aNotUnificated,
-                            aDontCheckStackSizes,
-                            aVoltage,
-                            aFluids,
-                            aSpecialSlot,
-                            aInputs);
-                } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-                    e.printStackTrace();
-                    return null;
-                }
+            try {
+                return (GT_Recipe) findRecipe09.invoke(
+                        getRecipeMap(),
+                        aTileEntity,
+                        aRecipe,
+                        aNotUnificated,
+                        aDontCheckStackSizes,
+                        aVoltage,
+                        aFluids,
+                        aSpecialSlot,
+                        aInputs);
+            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+                e.printStackTrace();
+                return null;
             }
         } else {
             return mRecipeResult;