Code cleanup (#2309)

* guard clause technique on GT_ItemIterator

* removing oredict for ars magica 2 items

* removing oredict for mystcraft items

* convert big if ladder into a swtich statement

* enhanced switch

* clean non GTNH compat and identify other compats

* spotlessApply (#2310)

Co-authored-by: GitHub GTNH Actions <>

* more guard clauses

* reordering condition

* removing dead code

* removing optional block

* deprecating mIC2Classic

* spotless apply

* deprecate modloaded variables

* spotlessApply

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

4 files changed, 68 insertions, 86 deletions

diff --git a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java
index f4c5112d8f..4ae56e9511 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java
@@ -341,6 +341,22 @@ public class DistilleryRecipes implements Runnable {
             .eut(24)
             .addTo(sDistilleryRecipes);
 
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.getIntegratedCircuit(1))
+            .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 20))
+            .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 32))
+            .duration(2 * SECONDS)
+            .eut(16)
+            .addTo(sDistilleryRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_Utility.getIntegratedCircuit(2))
+            .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4))
+            .fluidOutputs(Materials.Water.getFluid(2))
+            .duration(4 * SECONDS)
+            .eut(30)
+            .addTo(sDistilleryRecipes);
+
         if (TinkerConstruct.isModLoaded()) {
 
             GT_Values.RA.stdBuilder()
@@ -360,26 +376,6 @@ public class DistilleryRecipes implements Runnable {
                 .addTo(sDistilleryRecipes);
 
         }
-
-        if (!GregTech_API.mIC2Classic) {
-
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(1))
-                .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 20))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 32))
-                .duration(2 * SECONDS)
-                .eut(16)
-                .addTo(sDistilleryRecipes);
-
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_Utility.getIntegratedCircuit(2))
-                .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 4))
-                .fluidOutputs(Materials.Water.getFluid(2))
-                .duration(4 * SECONDS)
-                .eut(30)
-                .addTo(sDistilleryRecipes);
-
-        }
     }
 
     public void distillationTowerRecipes() {
@@ -603,23 +599,18 @@ public class DistilleryRecipes implements Runnable {
             .addTo(sDistillationRecipes);
 
         GT_Values.RA.stdBuilder()
+            .itemOutputs(ItemList.IC2_Fertilizer.get(1))
+            .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 3000))
+            .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000), Materials.Water.getFluid(125L))
+            .duration(12 * SECONDS + 10 * TICKS)
+            .eut(TierEU.RECIPE_HV)
+            .addTo(sDistillationRecipes);
+        GT_Values.RA.stdBuilder()
             .fluidInputs(new FluidStack(ItemList.sOilExtraHeavy, 1000))
             .fluidOutputs(Materials.OilHeavy.getFluid(1500))
             .duration(16 * TICKS)
             .eut(2400)
             .addTo(sDistillationRecipes);
-
-        if (!GregTech_API.mIC2Classic) {
-
-            GT_Values.RA.stdBuilder()
-                .itemOutputs(ItemList.IC2_Fertilizer.get(1))
-                .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 3000))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biogas"), 8000), Materials.Water.getFluid(125L))
-                .duration(12 * SECONDS + 10 * TICKS)
-                .eut(TierEU.RECIPE_HV)
-                .addTo(sDistillationRecipes);
-
-        }
     }
 
     public void universalDistillationTowerRecipes() {
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java
index 43098ec86c..d3e3b0d339 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java
@@ -11,7 +11,6 @@ import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_RecipeConstants;
@@ -21,16 +20,13 @@ public class FuelRecipes implements Runnable {
     // todo: add an enum for the fuel type, int values are mysterious
     @Override
     public void run() {
-        if (!GregTech_API.mIC2Classic) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_ModHandler.getIC2Item("biogasCell", 1L))
-                .metadata(FUEL_VALUE, 40)
-                .metadata(FUEL_TYPE, 1)
-                .duration(0)
-                .eut(0)
-                .addTo(GT_RecipeConstants.Fuel);
-
-        }
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_ModHandler.getIC2Item("biogasCell", 1L))
+            .metadata(FUEL_VALUE, 40)
+            .metadata(FUEL_TYPE, 1)
+            .duration(0)
+            .eut(0)
+            .addTo(GT_RecipeConstants.Fuel);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.golden_apple, 1, 1))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java
index 38365e9638..d465f0f33c 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java
@@ -10,7 +10,6 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -68,16 +67,6 @@ public class PyrolyseRecipes implements Runnable {
                 .addTo(sPyrolyseRecipes);
         }
 
-        if (!GregTech_API.mIC2Classic) {
-            GT_Values.RA.stdBuilder()
-                .itemInputs(GT_ModHandler.getIC2Item("biochaff", 4), GT_Utility.getIntegratedCircuit(1))
-                .fluidInputs(Materials.Water.getFluid(4000))
-                .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5000))
-                .duration(45 * SECONDS)
-                .eut(10)
-                .addTo(sPyrolyseRecipes);
-        }
-
         if (Forestry.isModLoaded()) {
             GT_Values.RA.stdBuilder()
                 .itemInputs(getModItem(Forestry.ID, "fertilizerBio", 4), GT_Utility.getIntegratedCircuit(1))
@@ -97,6 +86,14 @@ public class PyrolyseRecipes implements Runnable {
         }
 
         GT_Values.RA.stdBuilder()
+            .itemInputs(GT_ModHandler.getIC2Item("biochaff", 4), GT_Utility.getIntegratedCircuit(1))
+            .fluidInputs(Materials.Water.getFluid(4000))
+            .fluidOutputs(new FluidStack(FluidRegistry.getFluid("ic2biomass"), 5000))
+            .duration(45 * SECONDS)
+            .eut(10)
+            .addTo(sPyrolyseRecipes);
+
+        GT_Values.RA.stdBuilder()
             .itemInputs(GT_ModHandler.getIC2Item("biochaff", 1), GT_Utility.getIntegratedCircuit(2))
             .fluidInputs(Materials.Water.getFluid(1500))
             .fluidOutputs(Materials.FermentedBiomass.getFluid(1500))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java
index 8dd51d8272..10132ece09 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java
@@ -11,7 +11,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -115,43 +114,42 @@ public class RecipeRemover implements Runnable {
             GT_ModHandler.getExtractorRecipeList(),
             null);
 
-        if (!GregTech_API.mIC2Classic) {
-            try {
-                Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = Recipes.liquidCooldownManager
-                    .getHeatExchangeProperties();
-                Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = tLiqExchange
-                    .entrySet()
-                    .iterator();
-                while (tIterator.hasNext()) {
-                    Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tEntry = tIterator.next();
-                    if (tEntry.getKey()
-                        .equals("ic2hotcoolant")) {
-                        tIterator.remove();
-                        Recipes.liquidCooldownManager.addFluid("ic2hotcoolant", "ic2coolant", 100);
-                    }
+        try {
+            Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = Recipes.liquidCooldownManager
+                .getHeatExchangeProperties();
+            Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = tLiqExchange
+                .entrySet()
+                .iterator();
+            while (tIterator.hasNext()) {
+                Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tEntry = tIterator.next();
+                if (tEntry.getKey()
+                    .equals("ic2hotcoolant")) {
+                    tIterator.remove();
+                    Recipes.liquidCooldownManager.addFluid("ic2hotcoolant", "ic2coolant", 100);
                 }
-            } catch (Throwable e) {
-                /* Do nothing */
             }
+        } catch (Throwable e) {
+            /* Do nothing */
+        }
 
-            try {
-                Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = Recipes.liquidHeatupManager
-                    .getHeatExchangeProperties();
-                Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = tLiqExchange
-                    .entrySet()
-                    .iterator();
-                while (tIterator.hasNext()) {
-                    Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tEntry = tIterator.next();
-                    if (tEntry.getKey()
-                        .equals("ic2coolant")) {
-                        tIterator.remove();
-                        Recipes.liquidHeatupManager.addFluid("ic2coolant", "ic2hotcoolant", 100);
-                    }
+        try {
+            Map<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tLiqExchange = Recipes.liquidHeatupManager
+                .getHeatExchangeProperties();
+            Iterator<Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty>> tIterator = tLiqExchange
+                .entrySet()
+                .iterator();
+            while (tIterator.hasNext()) {
+                Map.Entry<String, ILiquidHeatExchangerManager.HeatExchangeProperty> tEntry = tIterator.next();
+                if (tEntry.getKey()
+                    .equals("ic2coolant")) {
+                    tIterator.remove();
+                    Recipes.liquidHeatupManager.addFluid("ic2coolant", "ic2hotcoolant", 100);
                 }
-            } catch (Throwable e) {
-                /* Do nothing */
             }
+        } catch (Throwable e) {
+            /* Do nothing */
         }
+
     }
 
     public void removeSmelting() {