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, 44 insertions, 52 deletions

diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index e105ae82f6..c2d1bb58b6 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.plugin.agrichem;
 
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -424,9 +422,9 @@ public class BioRecipes {
     private static void recipeCatalystCarrier() {
         // Assembly Recipe
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { getBioChip(20), ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", GTNH ? 8 : 4),
-                        ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", GTNH ? 4 : 2),
-                        ItemUtils.getItemStackOfAmountFromOreDict("screwTin", GTNH ? 6 : 3) },
+                new ItemStack[] { getBioChip(20), ItemUtils.getItemStackOfAmountFromOreDict("plateSteel", 8),
+                        ItemUtils.getItemStackOfAmountFromOreDict("wireFineCopper", 4),
+                        ItemUtils.getItemStackOfAmountFromOreDict("screwTin", 6) },
                 GT_Values.NF,
                 CI.getEmptyCatalyst(1),
                 300 * 20,
diff --git a/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java b/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
index 782aac0b0a..96f6d82e09 100644
--- a/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
+++ b/src/main/java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
@@ -214,32 +214,29 @@ public class Core_SulfuricChemistry implements IPlugin {
         }
 
         // Multi Block Recipes
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            recipe: for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
-                for (ItemStack i : r.mOutputs) {
-                    i.stackSize = 1;
-                    if (ItemStack.areItemStacksEqual(
-                            i,
-                            ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
-                        mRemovedRecipes1.put(r);
-                        r.mEnabled = false;
-                        r.mHidden = true;
-                        mDisabled++;
-                        continue recipe;
-                    }
-                    continue;
+        recipe: for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
+            for (ItemStack i : r.mOutputs) {
+                i.stackSize = 1;
+                if (ItemStack
+                        .areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
+                    mRemovedRecipes1.put(r);
+                    r.mEnabled = false;
+                    r.mHidden = true;
+                    mDisabled++;
+                    continue recipe;
                 }
-                for (FluidStack f : r.mFluidOutputs) {
-                    f.amount = 1;
-                    if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
-                        mRemovedRecipes1.put(r);
-                        r.mEnabled = false;
-                        r.mHidden = true;
-                        mDisabled++;
-                        continue recipe;
-                    }
-                    continue;
+                continue;
+            }
+            for (FluidStack f : r.mFluidOutputs) {
+                f.amount = 1;
+                if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
+                    mRemovedRecipes1.put(r);
+                    r.mEnabled = false;
+                    r.mHidden = true;
+                    mDisabled++;
+                    continue recipe;
                 }
+                continue;
             }
         }
 
@@ -277,31 +274,28 @@ public class Core_SulfuricChemistry implements IPlugin {
         }
 
         // Multi Block Recipes
-        if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
-            recipe: for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
-                for (ItemStack i : r.mOutputs) {
-                    i.stackSize = 1;
-                    if (ItemStack
-                            .areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 1))) {
-                        mRemovedRecipes2.put(r);
-                        r.mEnabled = false;
-                        r.mHidden = true;
-                        mDisabled++;
-                        continue recipe;
-                    }
-                    continue;
+        recipe: for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
+            for (ItemStack i : r.mOutputs) {
+                i.stackSize = 1;
+                if (ItemStack.areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 1))) {
+                    mRemovedRecipes2.put(r);
+                    r.mEnabled = false;
+                    r.mHidden = true;
+                    mDisabled++;
+                    continue recipe;
                 }
-                for (FluidStack f : r.mFluidOutputs) {
-                    f.amount = 1;
-                    if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
-                        mRemovedRecipes2.put(r);
-                        r.mEnabled = false;
-                        r.mHidden = true;
-                        mDisabled++;
-                        continue recipe;
-                    }
-                    continue;
+                continue;
+            }
+            for (FluidStack f : r.mFluidOutputs) {
+                f.amount = 1;
+                if (FluidStack.areFluidStackTagsEqual(f, mStack)) {
+                    mRemovedRecipes2.put(r);
+                    r.mEnabled = false;
+                    r.mHidden = true;
+                    mDisabled++;
+                    continue recipe;
                 }
+                continue;
             }
         }