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

2 files changed, 12 insertions, 53 deletions

diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 870ccf733f..dc6e8cc7a3 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -10,13 +10,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
-import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.util.FakePlayerFactory;
 
 import com.mojang.authlib.GameProfile;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-import gregtech.api.GregTech_API;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.api.objects.random.XSTR;
@@ -24,26 +22,17 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
-import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator;
 import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal;
 
 public class CORE {
 
-    // import cpw.mods.fml.common.Optional;
-
-    // Analytics handler
-    // public static SegmentAnalytics mHelper;
-
     public static Map PlayerCache;
 
     // Math Related
     public static final float PI = (float) Math.PI;
     public static volatile Random RANDOM = new XSTR();
 
-    // Env. Variables
-    public static Configuration Config;
-
     public static boolean DEVENV = false;
     // Only can be set in Dev, no config or setting elsewhere.
     public static final boolean LOAD_ALL_CONTENT = false;;
@@ -58,10 +47,6 @@ public class CORE {
     public static int EVERGLADES_ID = 227;
     public static int EVERGLADESBIOME_ID = 238;
 
-    // GT Vars;
-    public static final int GREG_FIRST_ID = 760;
-    public static final boolean MAIN_GREGTECH_5U_EXPERIMENTAL_FORK = Meta_GT_Proxy.areWeUsingGregtech5uExperimental();
-    public static final int GREGTECH_API_VERSION = GregTech_API.VERSION;
     public static int turbineCutoffBase = 75000;
 
     // GT++ Fake Player Profile
@@ -77,8 +62,6 @@ public class CORE {
             .translateToLocal("GTPP.core.GT_Tooltip_Radioactive");
     public static final String noItem = "";
 
-    // Because I want to be lazy Gregtech New Horizons Var.
-    public static boolean GTNH = false;
     // Because I want to be lazy. Beyond Reality Classic Var.
     public static boolean BRC = false;
 
@@ -101,9 +84,6 @@ public class CORE {
     /**
      * Some Gregtech Material and Recipe Variables
      */
-    @Deprecated
-    public static IGregtech_RecipeAdder sRecipeAdder;
-
     public static IGregtech_RecipeAdder RA;
 
     public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000];
@@ -324,8 +304,4 @@ public class CORE {
         }
         FMLCommonHandler.instance().exitJava(0, true);
     }
-
-    public static final void gc() {
-        System.gc();
-    }
 }
diff --git a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
index da24c8bbc1..498b69860e 100644
--- a/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/main/java/gtPlusPlus/core/lib/LoadedMods.java
@@ -7,19 +7,16 @@ import java.util.HashMap;
 import cpw.mods.fml.common.Loader;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechTextures;
 import gtPlusPlus.xmod.gregtech.recipes.GregtechRecipeAdder;
 
 public class LoadedMods {
 
     // Initialize Variables
-    public static boolean Gregtech = false;
     public static boolean PlayerAPI = false;
     public static boolean BuildCraft = false;
     public static boolean EnderIO = false;
     public static boolean Big_Reactors = false;
-    public static boolean IndustrialCraft2 = false;
     public static boolean IndustrialCraft2Classic = false;
     public static boolean Simply_Jetpacks = false;
     public static boolean RFTools = false;
@@ -39,7 +36,6 @@ public class LoadedMods {
     public static boolean MagicBees = false;
     public static boolean ExtraBees = false;
     public static boolean Psychedelicraft = false;
-    public static boolean MiscUtils = true; // Dummy For MetaData Lookups in MT Wrapper
     public static boolean ThermalFoundation = false;
     public static boolean IHL = false;
     public static boolean AdvancedSolarPanel = false;
@@ -72,29 +68,21 @@ public class LoadedMods {
     @SuppressWarnings("deprecation")
     public static void checkLoaded() {
         Logger.INFO("Looking for optional mod prereqs.");
-        if (isModLoaded("gregtech")) {
-            Gregtech = true;
-            Logger.INFO("Components enabled for: Gregtech");
-            if (Gregtech) {
-                try {
-                    CORE.sRecipeAdder = CORE.RA = new GregtechRecipeAdder();
-                    Logger.INFO("Created Gregtech recipe handler.");
-                    GregtechTextures.BlockIcons.VOID.name();
-                    GregtechTextures.ItemIcons.VOID.name();
-                    Logger.INFO("Created Gregtech texture handler.");
-                } catch (final NullPointerException e) {
-                    Logger.INFO("Could NOT create a Gregtech recipe handler.");
-                }
-            }
-
-            totalMods++;
+        Logger.INFO("Components enabled for: Gregtech");
+        try {
+            CORE.RA = new GregtechRecipeAdder();
+            Logger.INFO("Created Gregtech recipe handler.");
+            GregtechTextures.BlockIcons.VOID.name();
+            GregtechTextures.ItemIcons.VOID.name();
+            Logger.INFO("Created Gregtech texture handler.");
+        } catch (final NullPointerException e) {
+            Logger.INFO("Could NOT create a Gregtech recipe handler.");
         }
-        if (isModLoaded("dreamcraft")
-                || ReflectionUtils.doesClassExist("gregtech.api.util.GT_Multiblock_Tooltip_Builder")) {
+
+        totalMods++;
+        if (isModLoaded("dreamcraft")) {
             DreamCraft = true;
-            GTNH = true;
             Logger.INFO("Components enabled for: DreamCraft");
-            Logger.INFO("Components enabled for: GT: New Horizons");
             totalMods++;
         }
         if (isModLoaded("beyondrealitycore")) {
@@ -153,11 +141,6 @@ public class LoadedMods {
             Logger.INFO("Components enabled for: Big Reactors");
             totalMods++;
         }
-        if (isModLoaded("IC2")) {
-            IndustrialCraft2 = true;
-            Logger.INFO("Components enabled for: IndustrialCraft2");
-            totalMods++;
-        }
         if (isModLoaded("IC2-Classic-Spmod")) {
             IndustrialCraft2Classic = true;
             Logger.INFO("Components enabled for: IndustrialCraft2-Classic");