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

34 files changed, 2392 insertions, 4427 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index c8c0f4ca08..140773f4ea 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -18,7 +18,6 @@ import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.interfaces.ITexturedBlock;
 import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer;
 import gtPlusPlus.core.item.base.itemblock.ItemBlockOre;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -106,26 +105,20 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
             GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(
                     blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
                     this.blockMaterial.getRGBA());
-            if (aIconSet != null) {
-                return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
-            }
+            return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
         }
 
         if (hiddenTextureArray == null) {
-            if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-                hiddenTextureArray = Textures.BlockIcons.GRANITES;
-            } else {
-                try {
-                    Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES");
-                    if (o != null) {
-                        hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class);
-                    }
-                    if (hiddenTextureArray == null) {
-                        hiddenTextureArray = new IIconContainer[6];
-                    }
-                } catch (IllegalArgumentException | IllegalAccessException e) {
+            try {
+                Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES");
+                if (o != null) {
+                    hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class);
+                }
+                if (hiddenTextureArray == null) {
                     hiddenTextureArray = new IIconContainer[6];
                 }
+            } catch (IllegalArgumentException | IllegalAccessException e) {
+                hiddenTextureArray = new IIconContainer[6];
             }
         }
         return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
@@ -200,26 +193,20 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
                 GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(
                         blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
                         this.blockMaterial.getRGBA());
-                if (aIconSet != null) {
-                    return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
-                }
+                return new ITexture[] { new GTPP_CopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
             }
 
             if (hiddenTextureArray == null) {
-                if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-                    hiddenTextureArray = Textures.BlockIcons.GRANITES;
-                } else {
-                    try {
-                        Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES");
-                        if (o != null) {
-                            hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class);
-                        }
-                        if (hiddenTextureArray == null) {
-                            hiddenTextureArray = new IIconContainer[6];
-                        }
-                    } catch (IllegalArgumentException | IllegalAccessException e) {
+                try {
+                    Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES");
+                    if (o != null) {
+                        hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class);
+                    }
+                    if (hiddenTextureArray == null) {
                         hiddenTextureArray = new IIconContainer[6];
                     }
+                } catch (IllegalArgumentException | IllegalAccessException e) {
+                    hiddenTextureArray = new IIconContainer[6];
                 }
             }
             return new ITexture[] { new GTPP_RenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index 26bf349b93..19cf2d8356 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -50,11 +50,6 @@ public class CommonProxy {
     public CommonProxy() {
         // Should Register Gregtech Materials I've Made
         Utils.registerEvent(this);
-        if (!CORE.GTNH) {
-            Logger.INFO("We're using Gregtech " + Utils.getGregtechVersionAsString());
-        } else {
-            Logger.INFO("We're using GTNH's Gregtech " + Utils.getGregtechVersionAsString());
-        }
     }
 
     public void preInit(final FMLPreInitializationEvent e) {
diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
index 666c0177ee..357647c83e 100644
--- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
+++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -5,7 +5,6 @@ import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
 import net.minecraft.item.ItemStack;
 
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
@@ -50,22 +49,20 @@ public class COMPAT_IC2 {
 
         if (ConfigSwitches.disableIC2Recipes) {
 
-            if (LoadedMods.Gregtech) {
-                // Fuck these right off.
-                RemoveRecipeQueue.add("IC2:itemCable");
-                RemoveRecipeQueue.add("IC2:itemCable:1");
-                RemoveRecipeQueue.add("IC2:itemCable:2");
-                RemoveRecipeQueue.add("IC2:itemCable:3");
-                RemoveRecipeQueue.add("IC2:itemCable:5");
-                RemoveRecipeQueue.add("IC2:itemCable:6");
-                RemoveRecipeQueue.add("IC2:itemCable:10");
-                RemoveRecipeQueue.add("IC2:itemCable:13");
-                // RemoveRecipeQueue.add(itemCropnalyzer);
-                // RemoveRecipeQueue.add(itemSolarHelmet);
+            // Fuck these right off.
+            RemoveRecipeQueue.add("IC2:itemCable");
+            RemoveRecipeQueue.add("IC2:itemCable:1");
+            RemoveRecipeQueue.add("IC2:itemCable:2");
+            RemoveRecipeQueue.add("IC2:itemCable:3");
+            RemoveRecipeQueue.add("IC2:itemCable:5");
+            RemoveRecipeQueue.add("IC2:itemCable:6");
+            RemoveRecipeQueue.add("IC2:itemCable:10");
+            RemoveRecipeQueue.add("IC2:itemCable:13");
+            // RemoveRecipeQueue.add(itemCropnalyzer);
+            // RemoveRecipeQueue.add(itemSolarHelmet);
 
-                // AddRecipeQueue.add(Cropnalyzer);
-                // AddRecipeQueue.add(SolarHelmet);
-            }
+            // AddRecipeQueue.add(Cropnalyzer);
+            // AddRecipeQueue.add(SolarHelmet);
         }
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 27816d2a42..5e78c2ed2d 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.core.handler;
 
-import static gtPlusPlus.core.lib.LoadedMods.Gregtech;
-
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.Set;
@@ -35,7 +33,6 @@ import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
-import gtPlusPlus.core.recipe.RECIPES_Extruder;
 import gtPlusPlus.core.recipe.RECIPES_GREGTECH;
 import gtPlusPlus.core.recipe.RECIPES_LaserEngraver;
 import gtPlusPlus.core.recipe.ShapedRecipeObject;
@@ -73,98 +70,90 @@ public class COMPAT_HANDLER {
     }
 
     public static void registerGregtechMachines() {
-        if (Gregtech) {
-
-            // Debug
-            GregtechItemList.Garbage_Collector_Debug_Machine.set(
-                    new GregtechMetaGarbageCollector(
-                            "garbagecollector.01.tier.single",
-                            "JVM Garbage Collector",
-                            "Useful for debugging or smoother performance on local servers").getStackForm(1L));
-
-            // Free IDs
-            /*
-             * --- 859 to 868 --- 911 to 940
-             */
+        // Debug
+        GregtechItemList.Garbage_Collector_Debug_Machine.set(
+                new GregtechMetaGarbageCollector(
+                        "garbagecollector.01.tier.single",
+                        "JVM Garbage Collector",
+                        "Useful for debugging or smoother performance on local servers").getStackForm(1L));
 
-            new RECIPES_LaserEngraver();
-            new RECIPES_Extruder();
-            GregtechGeneratorsULV.run();
-            GregtechEnergyBuffer.run();
-            GregtechLFTR.run();
-            GregtechSteamCondenser.run();
-            GregtechSafeBlock.run();
-            // GregtechSuperConductionPoint.run();
-            GregtechIronBlastFurnace.run();
-            GregtechIndustrialCentrifuge.run();
-            GregtechIndustrialCokeOven.run();
-            GregtechIndustrialPlatePress.run();
-            GregtechRocketFuelGenerator.run();
-            GregtechIndustrialElectrolyzer.run();
-            GregtechIndustrialMacerator.run();
-            GregtechIndustrialWiremill.run();
-            GregtechIndustrialMassFabricator.run();
-            GregtechIndustrialBlastSmelter.run();
-            GregtechQuantumForceTransformer.run();
-            GregtechSolarGenerators.run();
-            GregtechPowerSubStation.run();
-            GregtechDehydrator.run();
-            GregtechAdvancedBoilers.run();
-            GregtechPollutionDevices.run();
-            GregtechTieredFluidTanks.run();
-            // GregtechIndustrialMultiTank.run();
-            GregtechGeothermalThermalGenerator.run();
-            Gregtech4Content.run();
-            GregtechIndustrialFuelRefinery.run();
-            GregtechTreeFarmerTE.run();
-            GregtechIndustrialTreeFarm.run();
-            GregtechIndustrialSifter.run();
-            GregtechSimpleWasher.run();
-            GregtechRTG.run();
-            GregtechCyclotron.run();
-            GregtechHiAmpTransformer.run();
-            GregtechIndustrialThermalCentrifuge.run();
-            GregtechIndustrialWashPlant.run();
-            GregtechSemiFluidgenerators.run();
-            GregtechWirelessChargers.run();
-            GregtechIndustrialGeneratorArray.run();
-            GregtechIndustrialCuttingFactory.run();
-            // GregtechMiniRaFusion.run();
-            GregtechComponentAssembler.run();
-            GregtechTeslaTower.run();
-            GregtechSuperChests.run();
-            GregtechIndustrialFishPond.run();
-            GregtechTieredChunkloaders.run();
-            GregtechIndustrialExtruder.run();
-            GregtechIndustrialMultiMachine.run();
-            // GregtechBedrockPlatforms.run();
-            GregtechBufferDynamos.run();
-            GregtechAmazonWarehouse.run();
-            GregtechFactoryGradeReplacementMultis.run();
-            GregtechThaumcraftDevices.run();
-            GregtechThreadedBuffers.run();
-            GregtechIndustrialMixer.run();
-            GregtechCustomHatches.run();
-            // GregtechNaqReactor.run();
-            GregtechIndustrialArcFurnace.run();
-            GregtechSolarTower.run();
-            GregtechLargeTurbinesAndHeatExchanger.run();
-            GregtechPowerBreakers.run();
-            GregtechFluidReactor.run();
-            GregtechAlgaeContent.run();
-            GregtechIndustrialAlloySmelter.run();
-            GregtechIsaMill.run();
-            GregtechSteamMultis.run();
-            GregtechIndustrialForgeHammer.run();
-            GregtechMolecularTransformer.run();
-            GregtechIndustrialElementDuplicator.run();
-            GregtechIndustrialRockBreaker.run();
-            GregtechIndustrialChisel.run();
-            GregtechIndustrialFluidHeater.run();
+        // Free IDs
+        /*
+         * --- 859 to 868 --- 911 to 940
+         */
 
-            // New Horizons Content
-            NewHorizonsAccelerator.run();
-        }
+        new RECIPES_LaserEngraver();
+        GregtechGeneratorsULV.run();
+        GregtechEnergyBuffer.run();
+        GregtechLFTR.run();
+        GregtechSteamCondenser.run();
+        GregtechSafeBlock.run();
+        GregtechIronBlastFurnace.run();
+        GregtechIndustrialCentrifuge.run();
+        GregtechIndustrialCokeOven.run();
+        GregtechIndustrialPlatePress.run();
+        GregtechRocketFuelGenerator.run();
+        GregtechIndustrialElectrolyzer.run();
+        GregtechIndustrialMacerator.run();
+        GregtechIndustrialWiremill.run();
+        GregtechIndustrialMassFabricator.run();
+        GregtechIndustrialBlastSmelter.run();
+        GregtechQuantumForceTransformer.run();
+        GregtechSolarGenerators.run();
+        GregtechPowerSubStation.run();
+        GregtechDehydrator.run();
+        GregtechAdvancedBoilers.run();
+        GregtechPollutionDevices.run();
+        GregtechTieredFluidTanks.run();
+        // GregtechIndustrialMultiTank.run();
+        GregtechGeothermalThermalGenerator.run();
+        Gregtech4Content.run();
+        GregtechIndustrialFuelRefinery.run();
+        GregtechTreeFarmerTE.run();
+        GregtechIndustrialTreeFarm.run();
+        GregtechIndustrialSifter.run();
+        GregtechSimpleWasher.run();
+        GregtechRTG.run();
+        GregtechCyclotron.run();
+        GregtechHiAmpTransformer.run();
+        GregtechIndustrialThermalCentrifuge.run();
+        GregtechIndustrialWashPlant.run();
+        GregtechSemiFluidgenerators.run();
+        GregtechWirelessChargers.run();
+        GregtechIndustrialGeneratorArray.run();
+        GregtechIndustrialCuttingFactory.run();
+        // GregtechMiniRaFusion.run();
+        GregtechComponentAssembler.run();
+        GregtechTeslaTower.run();
+        GregtechSuperChests.run();
+        GregtechIndustrialFishPond.run();
+        GregtechTieredChunkloaders.run();
+        GregtechIndustrialExtruder.run();
+        GregtechIndustrialMultiMachine.run();
+        // GregtechBedrockPlatforms.run();
+        GregtechBufferDynamos.run();
+        GregtechAmazonWarehouse.run();
+        GregtechFactoryGradeReplacementMultis.run();
+        GregtechThaumcraftDevices.run();
+        GregtechThreadedBuffers.run();
+        GregtechIndustrialMixer.run();
+        GregtechCustomHatches.run();
+        // GregtechNaqReactor.run();
+        GregtechIndustrialArcFurnace.run();
+        GregtechSolarTower.run();
+        GregtechLargeTurbinesAndHeatExchanger.run();
+        GregtechPowerBreakers.run();
+        GregtechFluidReactor.run();
+        GregtechAlgaeContent.run();
+        GregtechIndustrialAlloySmelter.run();
+        GregtechIsaMill.run();
+        GregtechSteamMultis.run();
+        GregtechIndustrialForgeHammer.run();
+        GregtechMolecularTransformer.run();
+        GregtechIndustrialElementDuplicator.run();
+        GregtechIndustrialRockBreaker.run();
+        GregtechIndustrialChisel.run();
+        GregtechIndustrialFluidHeater.run();
     }
 
     // InterMod
@@ -203,9 +192,7 @@ public class COMPAT_HANDLER {
         if (LoadedMods.CompactWindmills) {
             COMPAT_CompactWindmills.OreDict();
         }
-        if (LoadedMods.IndustrialCraft2) {
-            COMPAT_IC2.OreDict();
-        }
+        COMPAT_IC2.OreDict();
         if (LoadedMods.PamsHarvestcraft) {
             COMPAT_HarvestCraft.OreDict();
         }
diff --git a/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java b/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java
index c22cb3bc56..746b2bb814 100644
--- a/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java
@@ -1,19 +1,12 @@
 package gtPlusPlus.core.handler;
 
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.ic2.CustomInternalName;
 
 public class EnumHelperHandler {
 
     public static void init() {
-
-        if (LoadedMods.IndustrialCraft2) {
-            CustomInternalName.init();
-        }
-
-        if (LoadedMods.Gregtech) {
-            HANDLER_GT.addNewOrePrefixes();
-        }
+        CustomInternalName.init();
+        HANDLER_GT.addNewOrePrefixes();
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java b/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java
deleted file mode 100644
index 4881479be3..0000000000
--- a/src/main/java/gtPlusPlus/core/handler/OldCircuitHandler.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package gtPlusPlus.core.handler;
-
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableOldGTcircuits;
-
-import java.lang.reflect.Field;
-import java.util.HashSet;
-
-import org.apache.commons.lang3.reflect.FieldUtils;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.util.EmptyRecipeMap;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.recipe.RECIPES_Old_Circuits;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
-
-public class OldCircuitHandler {
-
-    public static void preInit() {
-        if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
-            removeCircuitRecipeMap(); // Bye shitty recipes.
-        }
-    }
-
-    public static void init() {}
-
-    public static void postInit() {
-        if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
-            RECIPES_Old_Circuits.handleCircuits();
-            new RECIPES_Old_Circuits();
-        }
-    }
-
-    public static boolean addCircuitItems() {
-        if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
-            return MetaGeneratedGregtechItems.INSTANCE.registerOldCircuits();
-        }
-        return false;
-    }
-
-    private static boolean removeCircuitRecipeMap() {
-        if (enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH) {
-            try {
-                Logger.INFO(
-                        "[Old Feature - Circuits] Trying to override the Circuit Assembler Recipe map, so that no recipes for new circuits get added.");
-                ReflectionUtils.setFinalStatic(
-                        GT_Recipe_Map.class.getDeclaredField("sCircuitAssemblerRecipes"),
-                        new EmptyRecipeMap(
-                                new HashSet<GT_Recipe>(0),
-                                "gt.recipe.removed",
-                                "Removed",
-                                null,
-                                GT_Values.RES_PATH_GUI + "basicmachines/Default",
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                GT_Values.E,
-                                0,
-                                GT_Values.E,
-                                true,
-                                false));
-                Field jaffar = GT_Recipe_Map.class.getDeclaredField("sCircuitAssemblerRecipes");
-                FieldUtils.removeFinalModifier(jaffar, true);
-                jaffar.set(
-                        null,
-                        new EmptyRecipeMap(
-                                new HashSet<GT_Recipe>(0),
-                                "gt.recipe.removed",
-                                "Removed",
-                                null,
-                                GT_Values.RES_PATH_GUI + "basicmachines/Default",
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                GT_Values.E,
-                                0,
-                                GT_Values.E,
-                                true,
-                                false));
-                Logger.INFO(
-                        "[Old Feature - Circuits] Successfully replaced circuit assembler recipe map with one that cannot hold recipes.");
-            } catch (Exception e) {
-                Logger.INFO("[Old Feature - Circuits] Failed removing circuit assembler recipe map.");
-                return false;
-            }
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
index f240656dd7..cd4ff542dc 100644
--- a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java
@@ -17,7 +17,6 @@ public class RegistrationHandler {
         RECIPES_Tools.loadRecipes();
         RECIPES_General.loadRecipes();
         RECIPES_Machines.loadRecipes();
-        RECIPES_Shapeless.loadRecipes();
         RECIPES_MachineComponents.loadRecipes();
         RECIPE_Batteries.loadRecipes();
         Logger.INFO("Loaded: " + recipesSuccess + " Failed: " + recipesFailed);
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index e9bb6e1bf6..04f22931c6 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -94,8 +94,6 @@ public final class ModItems {
     public static Item itemPlateBlutonium;
     public static Item itemPlateCyanite;
     public static Item itemPlateLudicrite;
-    // Thaumcraft
-    public static Item itemPlateVoidMetal;
     // Pneumaticraft
     public static Item itemPlateCompressedIron;
     // SimplyJetpacks
@@ -534,8 +532,7 @@ public final class ModItems {
             // in radioisotope thermoelectric generators (RTGs)
             // and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power.
             MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM238, false);
-            if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null
-                    || Utils.getGregtechVersionAsInt() < 50931) {
+            if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null) {
                 MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().PLUTONIUM239, false);
             }
 
@@ -544,10 +541,6 @@ public final class ModItems {
             MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().POLONIUM210, false);
             MaterialGenerator.generateNuclearMaterial(ELEMENT.getInstance().AMERICIUM241, false);
 
-            if (!CORE.GTNH) {
-                MaterialGenerator.generateOreMaterialWithAllExcessComponents(ELEMENT.getInstance().TRINIUM);
-            }
-
             // Custom Materials that will have standalone refinery processes
             MaterialGenerator.generate(ELEMENT.STANDALONE.ADVANCED_NITINOL, false);
             MaterialGenerator.generate(ELEMENT.STANDALONE.ASTRAL_TITANIUM);
@@ -565,10 +558,6 @@ public final class ModItems {
 
             MISC_MATERIALS.run();
 
-            // Carbides - Tungsten Carbide exists in .09 so don't generate it. - Should still come before alloys though
-            if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-                MaterialGenerator.generate(ALLOY.TUNGSTEN_CARBIDE);
-            }
             MaterialGenerator.generate(ALLOY.SILICON_CARBIDE);
             MaterialGenerator.generate(ALLOY.ZIRCONIUM_CARBIDE);
             MaterialGenerator.generate(ALLOY.TANTALUM_CARBIDE);
@@ -656,10 +645,6 @@ public final class ModItems {
             MaterialGenerator.generate(ALLOY.HG1223, false, false);
 
             // Generate Fictional Materials
-            if (!CORE.GTNH) {
-                MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false);
-                MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false);
-            }
             MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM);
             MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false);
             MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON);
@@ -900,12 +885,9 @@ public final class ModItems {
             dustFertUN32 = ItemUtils
                     .generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0];
 
-            ItemStack temp1 = null;
+            ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1);
             ItemStack temp2 = null;
 
-            if (LoadedMods.IndustrialCraft2) {
-                temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1);
-            }
             if (LoadedMods.Forestry) {
                 temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1);
             }
@@ -1264,20 +1246,6 @@ public final class ModItems {
             Logger.WARNING("BigReactors not Found - Skipping Resources.");
         }
 
-        // Thaumcraft
-        if ((LoadedMods.Thaumcraft || LOAD_ALL_CONTENT) && !CORE.GTNH) {
-            Logger.INFO("Thaumcraft Found - Loading Resources.");
-            // Item Init
-            try {
-