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

6 files changed, 79 insertions, 183 deletions

diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java
index b95574fc60..2155535acc 100644
--- a/src/main/java/gtPlusPlus/core/util/Utils.java
+++ b/src/main/java/gtPlusPlus/core/util/Utils.java
@@ -7,7 +7,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -46,7 +45,6 @@ import org.apache.commons.lang3.EnumUtils;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.registry.EntityRegistry;
 import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
-import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
@@ -58,16 +56,13 @@ import gregtech.api.util.GT_Utility;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.core.util.sys.SystemUtils;
 import gtPlusPlus.plugin.villagers.tile.TileEntityGenericSpawner;
 import ic2.core.Ic2Items;
@@ -807,63 +802,6 @@ public class Utils {
         return GT_Utility.copy(new Object[] { rStack });
     }
 
-    @SuppressWarnings({ "unused", "unchecked" })
-    public static Pair<Integer, Integer> getGregtechVersion() {
-        Pair<Integer, Integer> version;
-        if (GT_Mod.VERSION == 509) {
-            Class<GT_Mod> clazz;
-            try {
-
-                if (LoadedMods.BeyondRealityCore) {
-                    // Safely assume it's Beyond Reality running .28-pre (If it's not, tough shit really?)
-                    return new Pair<Integer, Integer>(9, 28);
-                }
-
-                clazz = (Class<GT_Mod>) ReflectionUtils.getClass("gregtech.GT_Mod");
-                Field mSubversion = ReflectionUtils.getField(clazz, "SUBVERSION");
-                if (mSubversion != null) {
-                    int mSub = 0;
-                    mSub = mSubversion.getInt(clazz);
-                    if (mSub != 0) {
-                        version = new Pair<Integer, Integer>(9, mSub);
-                        return version;
-                    }
-                }
-            } catch (Throwable t) {
-
-            }
-        }
-        // 5.08.33
-        else if (GT_Mod.VERSION == 508) {
-            version = new Pair<Integer, Integer>(8, 33);
-            return version;
-
-        }
-        // 5.07.07
-        else if (GT_Mod.VERSION == 507) {
-            version = new Pair<Integer, Integer>(7, 7);
-            return version;
-        }
-        // Returb Bad Value
-        version = new Pair<Integer, Integer>(0, 0);
-        return version;
-    }
-
-    public static int getGregtechVersionAsInt() {
-        Pair<Integer, Integer> ver = getGregtechVersion();
-        return 50000 + (ver.getKey() * 100) + (ver.getValue());
-    }
-
-    public static String getGregtechVersionAsString() {
-        Pair<Integer, Integer> ver = getGregtechVersion();
-        return "5." + ver.getKey() + "." + ver.getValue();
-    }
-
-    public static int getGregtechSubVersion() {
-        Pair<Integer, Integer> ver = getGregtechVersion();
-        return ver.getValue();
-    }
-
     public static SecureRandom generateSecureRandom() {
         SecureRandom secRan;
         String secRanType;
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
index 80536189ce..b4e6a8fceb 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java
@@ -56,21 +56,19 @@ public class HazmatUtils {
         // Make Nano a hazmat suit
         // Make Quantum a hazmat suit
 
-        if (LoadedMods.IndustrialCraft2 || LoadedMods.IndustrialCraft2Classic) {
-            AutoMap<ItemStack> aVanillaIC2Armour = new AutoMap<ItemStack>();
-            aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoHelmet, 1));
-            aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoBodyarmor, 1));
-            aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoLeggings, 1));
-            aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoBoots, 1));
-            aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumHelmet, 1));
-            aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumBodyarmor, 1));
-            aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumLeggings, 1));
-            aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumBoots, 1));
-            for (ItemStack aItem : aVanillaIC2Armour) {
-                addProtection(aItem);
-            }
-            Logger.INFO("[Hazmat] Registered IC2 Items as hazmat gear.");
+        AutoMap<ItemStack> aVanillaIC2Armour = new AutoMap<ItemStack>();
+        aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoHelmet, 1));
+        aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoBodyarmor, 1));
+        aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoLeggings, 1));
+        aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.nanoBoots, 1));
+        aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumHelmet, 1));
+        aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumBodyarmor, 1));
+        aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumLeggings, 1));
+        aVanillaIC2Armour.add(ItemUtils.getSimpleStack(Ic2Items.quantumBoots, 1));
+        for (ItemStack aItem : aVanillaIC2Armour) {
+            addProtection(aItem);
         }
+        Logger.INFO("[Hazmat] Registered IC2 Items as hazmat gear.");
 
         if (LoadedMods.isModLoaded("EMT")) {
             AutoMap<Field> aItemFields = new AutoMap<Field>();
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 1722d22c13..6806e06315 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -46,7 +46,6 @@ import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.item.tool.staballoy.MultiPickaxeBase;
 import gtPlusPlus.core.item.tool.staballoy.MultiSpadeBase;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
@@ -269,7 +268,7 @@ public class ItemUtils {
         } else {
             temp2 = fqrnSplit[2];
         }
-        temp = ItemUtils.getItemStackWithMeta(LoadedMods.MiscUtils, fqrn, temp1, Integer.parseInt(temp2), stackSize);
+        temp = ItemUtils.getItemStackWithMeta(true, fqrn, temp1, Integer.parseInt(temp2), stackSize);
         return temp;
     }
 
@@ -350,14 +349,6 @@ public class ItemUtils {
             return getSimpleStack(Items.clay_ball, amount);
         }
 
-        if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            if (oredictName.toLowerCase().contains("rutile")) {
-                mTemp = oredictName.replace("Rutile", "Titanium");
-            }
-            if (oredictName.toLowerCase().contains("vanadiumsteel")) {
-                mTemp = oredictName.replace("VanadiumSteel", "StainlessSteel");
-            }
-        }
         final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(mTemp);
         if (!oreDictList.isEmpty()) {
             final ItemStack returnValue = oreDictList.get(0).copy();
@@ -873,12 +864,7 @@ public class ItemUtils {
     }
 
     public static ItemStack getGregtechCircuit(final int Meta) {
-        return ItemUtils.getItemStackWithMeta(
-                LoadedMods.Gregtech,
-                "gregtech:gt.integrated_circuit",
-                "Gregtech Circuit",
-                Meta,
-                0);
+        return ItemUtils.getItemStackWithMeta(true, "gregtech:gt.integrated_circuit", "Gregtech Circuit", Meta, 0);
     }
 
     public static ItemStack[] getBlockDrops(final ArrayList<ItemStack> blockDrops) {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index daabb97b69..8c2b98b712 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -267,17 +267,12 @@ public class MaterialUtils {
     }
 
     private static Materials getMaterialByName(String materialName) {
-
-        if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false);
-        } else {
-            for (Materials m : Materials.values()) {
-                if (MaterialUtils.getMaterialName(m).toLowerCase().equals(materialName.toLowerCase())) {
-                    return m;
-                }
+        for (Materials m : Materials.values()) {
+            if (MaterialUtils.getMaterialName(m).toLowerCase().equals(materialName.toLowerCase())) {
+                return m;
             }
-            return null;
         }
+        return null;
     }
 
     @SuppressWarnings("deprecation")
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
index 639cd37f76..7441f0b4cf 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.core.util.minecraft.gregtech;
 
-import static gtPlusPlus.core.lib.CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fluids.FluidStack;
@@ -16,7 +14,6 @@ import gregtech.common.GT_Pollution;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.item.base.cell.BaseItemCell;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -24,28 +21,14 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class PollutionUtils {
 
-    private static boolean mIsPollutionEnabled = true;
-
     public static AutoMap<FluidStack> mPollutionFluidStacks = new AutoMap<FluidStack>();
 
-    static {
-        if (MAIN_GREGTECH_5U_EXPERIMENTAL_FORK || CORE.GTNH) {
-            mIsPollutionEnabled = mPollution();
-        } else {
-            mIsPollutionEnabled = false;
-        }
-    }
-
     public static boolean isPollutionEnabled() {
-        return mIsPollutionEnabled;
-    }
-
-    private static boolean mPollution() {
         return GT_Mod.gregtechproxy.mPollution;
     }
 
     public static boolean addPollution(IGregTechTileEntity te, int pollutionValue) {
-        if (mIsPollutionEnabled) {
+        if (GT_Mod.gregtechproxy.mPollution) {
             GT_Pollution.addPollution(te, pollutionValue);
             return true;
         }
@@ -53,7 +36,7 @@ public class PollutionUtils {
     }
 
     public static boolean addPollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) {
-        if (mIsPollutionEnabled) {
+        if (GT_Mod.gregtechproxy.mPollution) {
             IHasWorldObjectAndCoords j = (IHasWorldObjectAndCoords) aTileOfSomeSort;
             Chunk c = j.getWorld().getChunkFromBlockCoords(j.getXCoord(), j.getZCoord());
             return addPollution(c, pollutionValue);
@@ -62,7 +45,7 @@ public class PollutionUtils {
     }
 
     public static boolean addPollution(Chunk aChunk, int pollutionValue) {
-        if (mIsPollutionEnabled) {
+        if (GT_Mod.gregtechproxy.mPollution) {
             GT_Pollution.addPollution(aChunk, pollutionValue);
             return true;
         }
@@ -98,7 +81,7 @@ public class PollutionUtils {
     }
 
     public static boolean nullifyPollution(Chunk aChunk) {
-        if (mIsPollutionEnabled) {
+        if (GT_Mod.gregtechproxy.mPollution) {
             if (aChunk == null) {
                 return false;
             }
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
index 11217e1e47..3bd507fb38 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/AddGregtechRecipe.java
@@ -132,49 +132,47 @@ public final class AddGregtechRecipe {
 
     public static boolean addCircuitAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput,
             int aDuration, int aEUt) {
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            try {
-                IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
-                if (IGT_RecipeAdder != null) {
-                    Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
-                    Method addRecipe = classRA.getMethod(
-                            "addCircuitAssemblerRecipe",
-                            ItemStack.class,
-                            FluidStack.class,
-                            ItemStack.class,
-                            int.class,
-                            int.class);
-                    if (addRecipe != null) {
-                        if (aFluidInput.isFluidEqual(FluidUtils.getFluidStack("molten.tin", 1))) {
-                            boolean[] didAdd = new boolean[3];
-                            FluidStack moltenMetal = FluidUtils.getFluidStack("molten.tin", 144);
-                            // Tin
-                            didAdd[0] = (boolean) addRecipe
-                                    .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
-                            moltenMetal = FluidUtils.getFluidStack("molten.lead", 144);
-                            // Lead
-                            didAdd[1] = (boolean) addRecipe
-                                    .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
-                            moltenMetal = FluidUtils.getFluidStack("molten.solderingalloy", 144 / 2);
-                            // Soldering Alloy
-                            didAdd[2] = (boolean) addRecipe
-                                    .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
-
-                            if (didAdd[0] && didAdd[1] && didAdd[2]) {
-                                return true;
-                            } else {
-                                return false;
-                            }
+        try {
+            IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
+            if (IGT_RecipeAdder != null) {
+                Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
+                Method addRecipe = classRA.getMethod(
+                        "addCircuitAssemblerRecipe",
+                        ItemStack.class,
+                        FluidStack.class,
+                        ItemStack.class,
+                        int.class,
+                        int.class);
+                if (addRecipe != null) {
+                    if (aFluidInput.isFluidEqual(FluidUtils.getFluidStack("molten.tin", 1))) {
+                        boolean[] didAdd = new boolean[3];
+                        FluidStack moltenMetal = FluidUtils.getFluidStack("molten.tin", 144);
+                        // Tin
+                        didAdd[0] = (boolean) addRecipe
+                                .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
+                        moltenMetal = FluidUtils.getFluidStack("molten.lead", 144);
+                        // Lead
+                        didAdd[1] = (boolean) addRecipe
+                                .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
+                        moltenMetal = FluidUtils.getFluidStack("molten.solderingalloy", 144 / 2);
+                        // Soldering Alloy
+                        didAdd[2] = (boolean) addRecipe
+                                .invoke(IGT_RecipeAdder, aInputs, moltenMetal, aOutput, aDuration, aEUt);
+
+                        if (didAdd[0] && didAdd[1] && didAdd[2]) {
+                            return true;
                         } else {
-                            return (boolean) addRecipe
-                                    .invoke(IGT_RecipeAdder, aInputs, aFluidInput, aOutput, aDuration, aEUt);
+                            return false;
                         }
+                    } else {
+                        return (boolean) addRecipe
+                                .invoke(IGT_RecipeAdder, aInputs, aFluidInput, aOutput, aDuration, aEUt);
                     }
                 }
-            } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
-                    | InvocationTargetException e) {
-                return false;
             }
+        } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
+                | InvocationTargetException e) {
+            return false;
         }
         return false;
     }
@@ -183,31 +181,29 @@ public final class AddGregtechRecipe {
             final FluidStack p2, final FluidStack p3, final ItemStack p4, final ItemStack p5, final int p6,
             final int p7) {
 
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            try {
-                IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
-                if (IGT_RecipeAdder != null) {
-                    Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
-                    // final ItemStack p0, final ItemStack p1, final FluidStack p2, final FluidStack p3, final ItemStack
-                    // p4, final ItemStack p5, final int p6, final int p7
-                    Method addRecipe = classRA.getMethod(
-                            "addChemicalRecipeForBasicMachineOnly",
-                            ItemStack.class,
-                            ItemStack.class,
-                            FluidStack.class,
-                            FluidStack.class,
-                            ItemStack.class,
-                            ItemStack.class,
-                            int.class,
-                            int.class);
-                    if (addRecipe != null) {
-                        return (boolean) addRecipe.invoke(IGT_RecipeAdder, p0, p1, p2, p3, p4, p5, p6, p7);
-                    }
+        try {
+            IGT_RecipeAdder IGT_RecipeAdder = GT_Values.RA;
+            if (IGT_RecipeAdder != null) {
+                Class<? extends IGT_RecipeAdder> classRA = IGT_RecipeAdder.getClass();
+                // final ItemStack p0, final ItemStack p1, final FluidStack p2, final FluidStack p3, final ItemStack
+                // p4, final ItemStack p5, final int p6, final int p7
+                Method addRecipe = classRA.getMethod(
+                        "addChemicalRecipeForBasicMachineOnly",
+                        ItemStack.class,
+                        ItemStack.class,
+                        FluidStack.class,
+                        FluidStack.class,
+                        ItemStack.class,
+                        ItemStack.class,
+                        int.class,
+                        int.class);
+                if (addRecipe != null) {
+                    return (boolean) addRecipe.invoke(IGT_RecipeAdder, p0, p1, p2, p3, p4, p5, p6, p7);
                 }
-            } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
-                    | InvocationTargetException e) {
-
             }
+        } catch (SecurityException | NoSuchMethodException | IllegalAccessException | IllegalArgumentException
+                | InvocationTargetException e) {
+
         }
 
         return GT_Values.RA.addChemicalRecipe(p0, p1, p2, p3, p4, p6);