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

7 files changed, 193 insertions, 326 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
index 980efc1bdb..3d66558c4f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/GT_Material_Loader.java
@@ -8,7 +8,6 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -39,7 +38,7 @@ public class GT_Material_Loader {
 
             // Try Reflectively add ourselves to the GT loader.
             Class mInterface = ReflectionUtils.getClass("gregtech.api.interfaces.IMaterialHandler");
-            if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && mInterface != null) {
+            if (mInterface != null) {
 
                 // Make this class Dynamically implement IMaterialHandler
                 if (mProxyObject == null) {
@@ -114,10 +113,6 @@ public class GT_Material_Loader {
      */
 
     private static synchronized boolean tryEnableMaterial(Materials mMaterial) {
-        if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            return false;
-        }
-
         boolean value = ReflectionUtils.setField(mMaterial, "mHasParentMod", true);
         if (value) {
             Logger.DEBUG_MATERIALS("Set mHasParentMod true for " + mMaterial.mDefaultLocalName);
@@ -128,9 +123,6 @@ public class GT_Material_Loader {
     }
 
     private static synchronized boolean tryEnableMaterialPart(OrePrefixes prefix, Materials mMaterial) {
-        if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            return false;
-        }
         try {
             Method enableComponent = ReflectionUtils.getClass("gregtech.api.enums.OrePrefixes")
                     .getDeclaredMethod("enableComponent", Materials.class);
@@ -157,9 +149,6 @@ public class GT_Material_Loader {
     }
 
     private static synchronized boolean tryEnableAllComponentsForMaterial(Materials material) {
-        if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            return false;
-        }
         try {
             tryEnableMaterial(material);
             int mValid = 0;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
index 97807f3053..c0f1ba3b77 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_Ex.java
@@ -26,13 +26,10 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
     @Override
     public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
             ItemStack aStack) {
-
-        boolean keepHighTempRecipes = !CORE.GTNH;
-
         switch (aPrefix) {
             case dust:
                 ItemStack tDustStack;
-                if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
+                if (aMaterial.mBlastFurnaceTemp <= 3600) {
                     if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)))
                             && (!aMaterial.contains(SubTag.NO_SMELTING))) {
                         if (aMaterial.mBlastFurnaceRequired) {
@@ -58,7 +55,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
                     }
                 }
             case ingot:
-                if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
+                if (aMaterial.mBlastFurnaceTemp <= 3600) {
                     if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L)))
                             && (!aMaterial.contains(SubTag.NO_SMELTING))) {
                         if (aMaterial.mBlastFurnaceRequired) {
@@ -80,7 +77,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
                 }
                 break;
             case dustSmall:
-                if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
+                if (aMaterial.mBlastFurnaceTemp <= 3600) {
                     if (aMaterial.mBlastFurnaceRequired) {
                         addBlastRecipe(
                                 GT_Utility.copyAmount(4L, new Object[] { aStack }),
@@ -102,7 +99,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
                 }
                 break;
             case dustTiny:
-                if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
+                if (aMaterial.mBlastFurnaceTemp <= 3600) {
                     if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) {
                         if (aMaterial.mBlastFurnaceRequired) {
                             addBlastRecipe(
@@ -127,7 +124,7 @@ public class RecipeGen_BlastSmelterGT_Ex implements IOreRecipeRegistrator {
                 }
                 break;
             default:
-                if (keepHighTempRecipes || aMaterial.mBlastFurnaceTemp <= 3600) {
+                if (aMaterial.mBlastFurnaceTemp <= 3600) {
                     if (!aMaterial.contains(SubTag.NO_SMELTING)) {
                         if ((aMaterial.mBlastFurnaceRequired) || (aMaterial.mDirectSmelting.mBlastFurnaceRequired)) {
                             addBlastRecipe(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
index bfd5fdc2cb..4a82c5e92f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java
@@ -77,10 +77,7 @@ public class RecipeGen_BlastSmelterGT_GTNH {
                 if (x.mInputs[0] != null) {
                     for (int tag : OreDictionary.getOreIDs(x.mInputs[0])) {
                         String oreName = OreDictionary.getOreName(tag).toLowerCase();
-                        String mType = "dust";
-                        if (CORE.GTNH) {
-                            mType = "ingot";
-                        }
+                        String mType = "ingot";
                         if (oreName.startsWith(mType) && !oreName.contains("double")
                                 && !oreName.contains("triple")
                                 && !oreName.contains("quad")
@@ -154,8 +151,8 @@ public class RecipeGen_BlastSmelterGT_GTNH {
                 enabled = x.mEnabled;
                 special = x.mSpecialValue;
 
-                // Check for GTNH, if it's found, continue to next recipe if the Temp is too high.
-                if (CORE.GTNH && special > 3600) {
+                // continue to next recipe if the Temp is too high.
+                if (special > 3600) {
                     Logger.MACHINE_INFO("[ABS] Skipping ABS addition for GTNH due to temp.");
                     continue;
                 } else {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index 9f12a591ff..35d1a987e2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -7,7 +7,6 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -118,144 +117,141 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
                         (144 * 9) + "l fluid molder from 1 block Recipe: " + material.getLocalizedName() + " - Failed");
             }
 
-            if (CORE.GTNH) {
+            // GTNH
 
-                // GTNH
+            // Shape_Mold_Rod
+            // Shape_Mold_Rod_Long
+            // Shape_Mold_Bolt,
+            // Shape_Mold_Screw,
+            // Shape_Mold_Ring,
 
-                // Shape_Mold_Rod
-                // Shape_Mold_Rod_Long
-                // Shape_Mold_Bolt,
-                // Shape_Mold_Screw,
-                // Shape_Mold_Ring,
+            ItemList mold_Rod = ItemUtils.getValueOfItemList("Shape_Mold_Rod", null);
+            ItemList mold_Rod_Long = ItemUtils.getValueOfItemList("Shape_Mold_Rod_Long", null);
+            ItemList mold_Bolt = ItemUtils.getValueOfItemList("Shape_Mold_Bolt", null);
+            ItemList mold_Screw = ItemUtils.getValueOfItemList("Shape_Mold_Screw", null);
+            ItemList mold_Ring = ItemUtils.getValueOfItemList("Shape_Mold_Ring", null);
+            ItemList mold_Rotor = ItemUtils.getValueOfItemList("Shape_Mold_Rotor", null);
 
-                ItemList mold_Rod = ItemUtils.getValueOfItemList("Shape_Mold_Rod", null);
-                ItemList mold_Rod_Long = ItemUtils.getValueOfItemList("Shape_Mold_Rod_Long", null);
-                ItemList mold_Bolt = ItemUtils.getValueOfItemList("Shape_Mold_Bolt", null);
-                ItemList mold_Screw = ItemUtils.getValueOfItemList("Shape_Mold_Screw", null);
-                ItemList mold_Ring = ItemUtils.getValueOfItemList("Shape_Mold_Ring", null);
-                ItemList mold_Rotor = ItemUtils.getValueOfItemList("Shape_Mold_Rotor", null);
+            // Rod
+            if (ItemUtils.checkForInvalidItems(material.getRod(1)))
+                if (mold_Rod != null && GT_Values.RA.addFluidSolidifierRecipe(
+                        mold_Rod.get(0), // Item Shape
+                        material.getFluidStack(72), // Fluid Input
+                        material.getRod(1), // output
+                        150, // Duration
+                        material.vVoltageMultiplier // Eu Tick
+                )) {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 rod Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Success");
+                } else {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 rod Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Failed");
+                }
 
-                // Rod
-                if (ItemUtils.checkForInvalidItems(material.getRod(1)))
-                    if (mold_Rod != null && GT_Values.RA.addFluidSolidifierRecipe(
-                            mold_Rod.get(0), // Item Shape
-                            material.getFluidStack(72), // Fluid Input
-                            material.getRod(1), // output
-                            150, // Duration
-                            material.vVoltageMultiplier // Eu Tick
-                    )) {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 rod Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Success");
-                    } else {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 rod Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Failed");
-                    }
+            // Rod Long
+            if (ItemUtils.checkForInvalidItems(material.getLongRod(1)))
+                if (mold_Rod_Long != null && GT_Values.RA.addFluidSolidifierRecipe(
+                        mold_Rod_Long.get(0), // Item
+                        // Shape
+                        material.getFluidStack(144), // Fluid Input
+                        material.getLongRod(1), // output
+                        300, // Duration
+                        material.vVoltageMultiplier // Eu Tick
+                )) {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 rod long Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Success");
+                } else {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 rod long Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Failed");
+                }
 
-                // Rod Long
-                if (ItemUtils.checkForInvalidItems(material.getLongRod(1)))
-                    if (mold_Rod_Long != null && GT_Values.RA.addFluidSolidifierRecipe(
-                            mold_Rod_Long.get(0), // Item
-                            // Shape
-                            material.getFluidStack(144), // Fluid Input
-                            material.getLongRod(1), // output
-                            300, // Duration
-                            material.vVoltageMultiplier // Eu Tick
-                    )) {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 rod long Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Success");
-                    } else {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 rod long Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Failed");
-                    }
+            // Bolt
+            if (ItemUtils.checkForInvalidItems(material.getBolt(1)))
+                if (mold_Bolt != null && GT_Values.RA.addFluidSolidifierRecipe(
+                        mold_Bolt.get(0), // Item Shape
+                        material.getFluidStack(18), // Fluid Input
+                        material.getBolt(1), // output
+                        50, // Duration
+                        material.vVoltageMultiplier // Eu Tick
+                )) {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 bolt Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Success");
+                } else {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 bolt Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Failed");
+                }
 
-                // Bolt
-                if (ItemUtils.checkForInvalidItems(material.getBolt(1)))
-                    if (mold_Bolt != null && GT_Values.RA.addFluidSolidifierRecipe(
-                            mold_Bolt.get(0), // Item Shape
-                            material.getFluidStack(18), // Fluid Input
-                            material.getBolt(1), // output
-                            50, // Duration
-                            material.vVoltageMultiplier // Eu Tick
-                    )) {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 bolt Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Success");
-                    } else {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 bolt Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Failed");
-                    }
+            // Screw
+            if (ItemUtils.checkForInvalidItems(material.getScrew(1)))
+                if (mold_Screw != null && GT_Values.RA.addFluidSolidifierRecipe(
+                        mold_Screw.get(0), // Item Shape
+                        material.getFluidStack(18), // Fluid Input
+                        material.getScrew(1), // output
+                        50, // Duration
+                        material.vVoltageMultiplier // Eu Tick
+                )) {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 screw Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Success");
+                } else {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 screw Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Failed");
+                }
 
-                // Screw
-                if (ItemUtils.checkForInvalidItems(material.getScrew(1)))
-                    if (mold_Screw != null && GT_Values.RA.addFluidSolidifierRecipe(
-                            mold_Screw.get(0), // Item Shape
-                            material.getFluidStack(18), // Fluid Input
-                            material.getScrew(1), // output
-                            50, // Duration
-                            material.vVoltageMultiplier // Eu Tick
-                    )) {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 screw Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Success");
-                    } else {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 screw Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Failed");
-                    }
+            // Ring
+            if (ItemUtils.checkForInvalidItems(material.getRing(1)))
+                if (mold_Ring != null && GT_Values.RA.addFluidSolidifierRecipe(
+                        mold_Ring.get(0), // Item Shape
+                        material.getFluidStack(36), // Fluid Input
+                        material.getRing(1), // output
+                        100, // Duration
+                        material.vVoltageMultiplier // Eu Tick
+                )) {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 ring Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Success");
+                } else {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 ring Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Failed");
+                }
 
-                // Ring
-                if (ItemUtils.checkForInvalidItems(material.getRing(1)))
-                    if (mold_Ring != null && GT_Values.RA.addFluidSolidifierRecipe(
-                            mold_Ring.get(0), // Item Shape
-                            material.getFluidStack(36), // Fluid Input
-                            material.getRing(1), // output
-                            100, // Duration
-                            material.vVoltageMultiplier // Eu Tick
-                    )) {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 ring Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Success");
-                    } else {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 ring Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Failed");
-                    }
-
-                // Rotor
-                if (ItemUtils.checkForInvalidItems(material.getRotor(1)))
-                    if (mold_Rotor != null && GT_Values.RA.addFluidSolidifierRecipe(
-                            mold_Rotor.get(0), // Item Shape
-                            material.getFluidStack(612), // Fluid Input
-                            material.getRotor(1), // output
-                            100, // Duration
-                            material.vVoltageMultiplier // Eu Tick
-                    )) {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 rotor Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Success");
-                    } else {
-                        Logger.WARNING(
-                                (144 * 9) + "l fluid molder from 1 rotor Recipe: "
-                                        + material.getLocalizedName()
-                                        + " - Failed");
-                    }
-            }
+            // Rotor
+            if (ItemUtils.checkForInvalidItems(material.getRotor(1)))
+                if (mold_Rotor != null && GT_Values.RA.addFluidSolidifierRecipe(
+                        mold_Rotor.get(0), // Item Shape
+                        material.getFluidStack(612), // Fluid Input
+                        material.getRotor(1), // output
+                        100, // Duration
+                        material.vVoltageMultiplier // Eu Tick
+                )) {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 rotor Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Success");
+                } else {
+                    Logger.WARNING(
+                            (144 * 9) + "l fluid molder from 1 rotor Recipe: "
+                                    + material.getLocalizedName()
+                                    + " - Failed");
+                }
         }
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
index 1c938e0da4..d821751c7b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -383,14 +383,6 @@ public class RecipeGen_Recycling implements Runnable {
             return ItemUtils.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();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index 8bc90b6ba0..e414d8c511 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -6,11 +6,9 @@ import java.util.Set;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.RecipeUtils;
 
 public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
 
@@ -33,19 +31,6 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
     private void generateRecipes(final Material material) {
         Logger.WARNING("Generating Shaped Crafting recipes for " + material.getLocalizedName()); // TODO
 
-        if (!CORE.GTNH) {
-            // Nuggets
-            if (ItemUtils.checkForInvalidItems(material.getNugget(1))
-                    && ItemUtils.checkForInvalidItems(material.getIngot(1)))
-                GT_ModHandler.addShapelessCraftingRecipe(
-                        material.getIngot(1),
-                        new Object[] { material.getNugget(1), material.getNugget(1), material.getNugget(1),
-                                material.getNugget(1), material.getNugget(1), material.getNugget(1),
-                                material.getNugget(1), material.getNugget(1), material.getNugget(1) });
-        }
-
-        // Plates
-
         // Single Plate Shaped/Shapeless
         if (ItemUtils.checkForInvalidItems(material.getPlate(1))
                 && ItemUtils.checkForInvalidItems(material.getIngot(1)))
@@ -83,32 +68,13 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
         // Ring Recipe
         if (!material.isRadioactive && ItemUtils.checkForInvalidItems(material.getRing(1))
                 && ItemUtils.checkForInvalidItems(material.getRod(1))) {
-            if (CORE.GTNH) {
-                if (GT_ModHandler.addCraftingRecipe(
-                        material.getRing(1),
-                        gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS
-                                | gregtech.api.util.GT_ModHandler.RecipeBits.BUFFERED,
-                        new Object[] { "h ", "fR", 'R', material.getRod(1) })) {
-                    Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Success");
-                } else {
-                    Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Failed");
-                }
+            if (GT_ModHandler.addCraftingRecipe(
+                    material.getRing(1),
+                    GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                    new Object[] { "h ", "fR", 'R', material.getRod(1) })) {
+                Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Success");
             } else {
-                if (RecipeUtils.addShapedRecipe(
-                        "craftingToolHardHammer",
-                        null,
-                        null,
-                        null,
-                        material.getRod(1),
-                        null,
-                        null,
-                        null,
-                        null,
-                        material.getRing(1))) {
-                    Logger.WARNING("Ring Recipe: " + material.getLocalizedName() + " - Success");
-                } else {
-                    Logger.WARNING("Ring Recipe: " + material.getLocalizedName() + " - Failed");
-                }
+                Logger.WARNING("GT:NH Ring Recipe: " + material.getLocalizedName() + " - Failed");
             }
         }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index 2a6715c1ac..7595fc7af7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.xmod.gregtech.loaders.recipe;
 
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -20,7 +18,6 @@ import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 
@@ -208,119 +205,55 @@ public class RecipeLoader_Nuclear {
                 300 * 20);
 
         // LFTR Fuel Related Compounds
-        if (GTNH) {
-            // Hydroxide
-            GT_Values.RA.addChemicalRecipe(
-                    ItemUtils.getGregtechCircuit(3),
-                    ELEMENT.getInstance().OXYGEN.getCell(1),
-                    ELEMENT.getInstance().HYDROGEN.getFluidStack(1000),
-                    MISC_MATERIALS.HYDROXIDE.getFluidStack(2000),
-                    CI.emptyCells(1),
-                    GT_Values.NI,
-                    8 * 20,
-                    30);
-            // Beryllium Hydroxide
-            GT_Values.RA.addChemicalRecipe(
-                    ItemUtils.getGregtechCircuit(3),
-                    ELEMENT.getInstance().BERYLLIUM.getDust(7),
-                    MISC_MATERIALS.HYDROXIDE.getFluidStack(1000),
-                    FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000),
-                    GT_Values.NI,
-                    8 * 20,
-                    30);
+        // Hydroxide
+        GT_Values.RA.addChemicalRecipe(
+                ItemUtils.getGregtechCircuit(3),
+                ELEMENT.getInstance().OXYGEN.getCell(1),
+                ELEMENT.getInstance().HYDROGEN.getFluidStack(1000),
+                MISC_MATERIALS.HYDROXIDE.getFluidStack(2000),
+                CI.emptyCells(1),
+                GT_Values.NI,
+                8 * 20,
+                30);
+        // Beryllium Hydroxide
+        GT_Values.RA.addChemicalRecipe(
+                ItemUtils.getGregtechCircuit(3),
+                ELEMENT.getInstance().BERYLLIUM.getDust(7),
+                MISC_MATERIALS.HYDROXIDE.getFluidStack(1000),
+                FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000),
+                GT_Values.NI,
+                8 * 20,
+                30);
+        // Ammonium Bifluoride
+        GT_Values.RA.addChemicalRecipe(
+                ItemUtils.getGregtechCircuit(3),
+                ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1),
+                MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
+                FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000),
+                CI.emptyCells(1),
+                20 * 20,
+                30);
+        if (aGtHydrofluoricAcid != null) {
             // Ammonium Bifluoride
             GT_Values.RA.addChemicalRecipe(
                     ItemUtils.getGregtechCircuit(3),
-                    ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1),
+                    aGtHydrofluoricAcid,
                     MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
                     FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000),
-                    CI.emptyCells(1),
-                    20 * 20,
-                    30);
-            if (aGtHydrofluoricAcid != null) {
-                // Ammonium Bifluoride
-                GT_Values.RA.addChemicalRecipe(
-                        ItemUtils.getGregtechCircuit(3),
-                        aGtHydrofluoricAcid,
-                        MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
-                        FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000),
-                        CI.emptyCells(2),
-                        40 * 20,
-                        30);
-            }
-            // Ammonium
-            GT_Values.RA.addChemicalRecipe(
-                    ItemUtils.getGregtechCircuit(3),
-                    ELEMENT.getInstance().HYDROGEN.getCell(1),
-                    MISC_MATERIALS.AMMONIA.getFluidStack(1000),
-                    MISC_MATERIALS.AMMONIUM.getFluidStack(2000),
-                    CI.emptyCells(1),
-                    GT_Values.NI,
-                    20 * 20,
-                    30);
-        }
-
-        if (!GTNH) {
-            // Hydroxide
-            GT_Values.RA.addChemicalRecipe(
-                    ItemUtils.getGregtechCircuit(3),
-                    ELEMENT.getInstance().OXYGEN.getCell(1),
-                    ELEMENT.getInstance().HYDROGEN.getFluidStack(1000),
-                    MISC_MATERIALS.HYDROXIDE.getFluidStack(2000),
-                    CI.emptyCells(1),
-                    GT_Values.NI,
-                    8 * 20,
-                    30);
-            // Beryllium Hydroxide
-            GT_Values.RA.addChemicalRecipe(
-                    ItemUtils.getGregtechCircuit(3),
-                    ELEMENT.getInstance().BERYLLIUM.getDust(7),
-                    MISC_MATERIALS.HYDROXIDE.getFluidStack(1000),
-                    FLUORIDES.BERYLLIUM_HYDROXIDE.getFluidStack(2000),
-                    GT_Values.NI,
-                    8 * 20,
-                    30);
-            // Ammonium Bifluoride
-            GT_Values.RA.addChemicalRecipe(
-                    ItemUtils.getGregtechCircuit(3),
-                    ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 1),
-                    MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
-                    FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(3000),
-                    CI.emptyCells(1),
-                    20 * 20,
-                    30);
-
-            if (aGtHydrofluoricAcid != null) {
-                // Ammonium Bifluoride
-                GT_Values.RA.addChemicalRecipe(
-                        ItemUtils.getGregtechCircuit(3),
-                        aGtHydrofluoricAcid,
-                        MISC_MATERIALS.AMMONIUM.getFluidStack(1000),
-                        FLUORIDES.AMMONIUM_BIFLUORIDE.getFluidStack(2000),
-                        CI.emptyCells(2),
-                        40 * 20,
-                        30);
-            }
-
-            // Ammonium
-            GT_Values.RA.addChemicalRecipe(
-                    ItemUtils.getGregtechCircuit(3),
-                    ELEMENT.getInstance().HYDROGEN.getCell(1),
-                    MISC_MATERIALS.AMMONIA.getFluidStack(1000),
-                    MISC_MATERIALS.AMMONIUM.getFluidStack(2000),
-                    CI.emptyCells(1),
-                    GT_Values.NI,
-                    20 * 20,
+                    CI.emptyCells(2),
+                    40 * 20,
                     30);
-            // Ammonia
-            GT_Values.RA.addChemicalRecipe(
-                    ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 3),
-                    ItemUtils.getItemStackOfAmountFromOreDict("dustMagnetite", 0),
-                    FluidUtils.getFluidStack("nitrogen", 1000),
-                    FluidUtils.getFluidStack("ammonia", 1000),
-                    CI.emptyCells(3),
-                    14 * 20);
         }
+        // Ammonium
+        GT_Values.RA.addChemicalRecipe(
+                ItemUtils.getGregtechCircuit(3),
+                ELEMENT.getInstance().HYDROGEN.getCell(1),
+                MISC_MATERIALS.AMMONIA.getFluidStack(1000),
+                MISC_MATERIALS.AMMONIUM.getFluidStack(2000),
+                CI.emptyCells(1),
+                GT_Values.NI,
+                20 * 20,
+                30);
 
         // Technetium
         GT_Values.RA.addChemicalRecipe(
@@ -445,18 +378,15 @@ public class RecipeLoader_Nuclear {
                 500); // EU
 
         // Zirconium Chloride -> TetraFluoride
-        FluidStack aGregtechHydro = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1);
-        if (aGregtechHydro != null || Utils.getGregtechVersionAsInt() >= 50929) {
-            CORE.RA.addDehydratorRecipe(
-                    new ItemStack[] { CI.getNumberedAdvancedCircuit(10),
-                            ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9) },
-                    FluidUtils.getFluidStack("hydrofluoricacid_