migrate GT++ config to GTNHLib (#3193)

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

6 files changed, 70 insertions, 74 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java
index bdf93c22be..67ff8034dc 100644
--- a/src/main/java/gtPlusPlus/core/item/ModItems.java
+++ b/src/main/java/gtPlusPlus/core/item/ModItems.java
@@ -66,7 +66,6 @@ import gtPlusPlus.core.item.init.ItemsFoods;
 import gtPlusPlus.core.item.materials.DustDecayable;
 import gtPlusPlus.core.item.tool.misc.ItemGregtechPump;
 import gtPlusPlus.core.item.wearable.WearableLoader;
-import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialMisc;
@@ -607,9 +606,7 @@ public final class ModItems {
             false,
             null);
 
-        if (GTPPCore.ConfigSwitches.enableMachine_Pollution) {
-            itemBasicTurbine = new ItemBasicScrubberTurbine();
-        }
+        itemBasicTurbine = new ItemBasicScrubberTurbine();
 
         // Zirconium
         // Cinter Pellet.
@@ -643,55 +640,53 @@ public final class ModItems {
         // //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
 
         // Load Tree Farmer
-        if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { // https://en.wikipedia.org/wiki/UAN
-            dustFertUN18 = ItemUtils
-                .generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0];
-            dustFertUN32 = ItemUtils
-                .generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0];
-
-            if (Forestry.isModLoaded()) {
-                ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1);
-                ItemStack temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1);
-                if (temp1 != null && temp2 != null) {
-                    fluidFertBasic = FluidUtils.generateFluidNonMolten(
-                        "Fertiliser",
-                        "Fertiliser",
-                        32,
-                        new short[] { 45, 170, 45, 100 },
-                        temp1,
-                        null,
-                        true);
-                    GTValues.RA.stdBuilder()
-                        .itemInputs(temp2)
-                        .fluidOutputs(new FluidStack(fluidFertBasic, 36))
-                        .duration(5 * TICKS)
-                        .eut(16)
-                        .addTo(fluidExtractionRecipes);
-                }
+        // https://en.wikipedia.org/wiki/UAN
+        dustFertUN18 = ItemUtils
+            .generateSpecialUseDusts("UN18Fertiliser", "UN-18 Fertiliser", Utils.rgbtoHexValue(60, 155, 60))[0];
+        dustFertUN32 = ItemUtils
+            .generateSpecialUseDusts("UN32Fertiliser", "UN-32 Fertiliser", Utils.rgbtoHexValue(55, 190, 55))[0];
+
+        if (Forestry.isModLoaded()) {
+            ItemStack temp1 = ItemUtils.getCorrectStacktype("IC2:itemFertilizer", 1);
+            ItemStack temp2 = ItemUtils.getCorrectStacktype("Forestry:fertilizerCompound", 1);
+            if (temp1 != null && temp2 != null) {
+                fluidFertBasic = FluidUtils.generateFluidNonMolten(
+                    "Fertiliser",
+                    "Fertiliser",
+                    32,
+                    new short[] { 45, 170, 45, 100 },
+                    temp1,
+                    null,
+                    true);
+                GTValues.RA.stdBuilder()
+                    .itemInputs(temp2)
+                    .fluidOutputs(new FluidStack(fluidFertBasic, 36))
+                    .duration(5 * TICKS)
+                    .eut(16)
+                    .addTo(fluidExtractionRecipes);
             }
-            fluidFertUN32 = FluidUtils.generateFluidNonMolten(
-                "UN32Fertiliser",
-                "UN-32 Fertiliser",
-                24,
-                new short[] { 55, 190, 55, 100 },
-                null,
-                null,
-                true);
-            fluidFertUN18 = FluidUtils.generateFluidNonMolten(
-                "UN18Fertiliser",
-                "UN-18 Fertiliser",
-                22,
-                new short[] { 60, 155, 60, 100 },
-                null,
-                null,
-                true);
-
-            /*
-             * GT_Values.RA.addMixerRecipe( arg0, //Item In arg1, arg2, arg3, arg4, //Fluid in arg5, //Fluid Out arg6,
-             * //Item out arg7, //Eu arg8); //Time
-             */
-
         }
+        fluidFertUN32 = FluidUtils.generateFluidNonMolten(
+            "UN32Fertiliser",
+            "UN-32 Fertiliser",
+            24,
+            new short[] { 55, 190, 55, 100 },
+            null,
+            null,
+            true);
+        fluidFertUN18 = FluidUtils.generateFluidNonMolten(
+            "UN18Fertiliser",
+            "UN-18 Fertiliser",
+            22,
+            new short[] { 60, 155, 60, 100 },
+            null,
+            null,
+            true);
+
+        /*
+         * GT_Values.RA.addMixerRecipe( arg0, //Item In arg1, arg2, arg3, arg4, //Fluid in arg5, //Fluid Out arg6,
+         * //Item out arg7, //Eu arg8); //Time
+         */
 
         // Juice
         FluidUtils.generateFluidNonMolten(
@@ -984,12 +979,10 @@ public final class ModItems {
         }
 
         // A plate of Europium.
-        if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null)
-            && GTPPCore.ConfigSwitches.enableCustom_Pipes) {
+        if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateEuropium", 1) == null) {
             itemPlateEuropium = new BaseItemPlate(MaterialsElements.getInstance().EUROPIUM);
         }
-        if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null)
-            && GTPPCore.ConfigSwitches.enableCustom_Pipes) {
+        if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) {
             itemDoublePlateEuropium = new BaseItemPlateDouble(MaterialsElements.getInstance().EUROPIUM);
         }
 
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 50b59ea42a..07744c5c2e 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -27,6 +27,7 @@ import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.util.GTLanguageManager;
 import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.config.Configuration;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
@@ -169,7 +170,7 @@ public class BaseItemComponent extends Item {
     }
 
     public String getCorrectTextures() {
-        if (!GTPPCore.ConfigSwitches.useGregtechTextures) {
+        if (!Configuration.visual.useGregtechTextures) {
             return GTPlusPlus.ID + ":" + "item" + this.componentType.COMPONENT_NAME;
         }
         String metType = "9j4852jyo3rjmh3owlhw9oe";
@@ -324,7 +325,7 @@ public class BaseItemComponent extends Item {
     @Override
     @SideOnly(Side.CLIENT)
     public boolean requiresMultipleRenderPasses() {
-        return (GTPPCore.ConfigSwitches.useGregtechTextures ? true : false);
+        return (Configuration.visual.useGregtechTextures ? true : false);
     }
 
     @SuppressWarnings("unchecked")
@@ -332,10 +333,10 @@ public class BaseItemComponent extends Item {
     public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
 
         if (this.componentType == ComponentTypes.CELL || this.componentType == ComponentTypes.PLASMACELL) {
-            if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) {
+            if (renderPass == 0 && !Configuration.visual.useGregtechTextures) {
                 return Utils.rgbtoHexValue(255, 255, 255);
             }
-            if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) {
+            if (renderPass == 1 && Configuration.visual.useGregtechTextures) {
                 return Utils.rgbtoHexValue(255, 255, 255);
             }
         }
@@ -380,7 +381,7 @@ public class BaseItemComponent extends Item {
 
     @Override
     public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
-        if (GTPPCore.ConfigSwitches.useGregtechTextures) {
+        if (Configuration.visual.useGregtechTextures) {
             if (pass == 0) {
                 return this.base;
             }
@@ -392,7 +393,7 @@ public class BaseItemComponent extends Item {
     @Override
     public void registerIcons(final IIconRegister i) {
 
-        if (GTPPCore.ConfigSwitches.useGregtechTextures) {
+        if (Configuration.visual.useGregtechTextures) {
             this.base = i.registerIcon(getCorrectTextures());
             this.overlay = i.registerIcon(getCorrectTextures() + "_OVERLAY");
         } else {
diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
index 228c1803eb..451a5b1290 100644
--- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
+++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java
@@ -9,8 +9,8 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
+import gtPlusPlus.core.config.Configuration;
 import gtPlusPlus.core.item.base.BaseItemComponent;
-import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -47,7 +47,7 @@ public class BaseItemCell extends BaseItemComponent {
     @Override
     public void registerIcons(final IIconRegister i) {
 
-        if (GTPPCore.ConfigSwitches.useGregtechTextures) {
+        if (Configuration.visual.useGregtechTextures) {
             this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell");
             this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "cell_OVERLAY");
         } else {
@@ -62,10 +62,10 @@ public class BaseItemCell extends BaseItemComponent {
 
     @Override
     public int getColorFromItemStack(final ItemStack stack, final int renderPass) {
-        if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) {
+        if (renderPass == 0 && !Configuration.visual.useGregtechTextures) {
             return Utils.rgbtoHexValue(230, 230, 230);
         }
-        if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) {
+        if (renderPass == 1 && Configuration.visual.useGregtechTextures) {
             return Utils.rgbtoHexValue(230, 230, 230);
         }
         return this.componentColour;
diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index a451bfc77b..bcb56795bc 100644
--- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -17,6 +17,7 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GTLanguageManager;
 import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.config.Configuration;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.data.StringUtils;
@@ -120,7 +121,7 @@ public class BaseItemDustUnique extends Item {
     }
 
     private String getCorrectTexture(final String pileSize) {
-        if (!GTPPCore.ConfigSwitches.useGregtechTextures) {
+        if (!Configuration.visual.useGregtechTextures) {
             if ((pileSize.equals("dust")) || (pileSize.equals("Dust"))) {
                 this.setTextureName(GTPlusPlus.ID + ":" + "dust");
             } else {
diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index 82020229f0..cb227a9423 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -16,8 +16,8 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.GTValues;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.config.Configuration;
 import gtPlusPlus.core.item.base.BaseItemComponent;
-import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
@@ -78,7 +78,7 @@ public class BaseItemIngotHot extends BaseItemIngot {
     @Override
     @SideOnly(Side.CLIENT)
     public boolean requiresMultipleRenderPasses() {
-        if (GTPPCore.ConfigSwitches.useGregtechTextures) {
+        if (Configuration.visual.useGregtechTextures) {
             return true;
         } else {
             return false;
@@ -88,7 +88,7 @@ public class BaseItemIngotHot extends BaseItemIngot {
     @Override
     public void registerIcons(final IIconRegister i) {
 
-        if (GTPPCore.ConfigSwitches.useGregtechTextures) {
+        if (Configuration.visual.useGregtechTextures) {
             this.base = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot");
             this.overlay = i.registerIcon(GregTech.ID + ":" + "materialicons/METALLIC/" + "ingotHot_OVERLAY");
         } else {
@@ -100,9 +100,9 @@ public class BaseItemIngotHot extends BaseItemIngot {
 
     @Override
     public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
-        if (pass == 0 && GTPPCore.ConfigSwitches.useGregtechTextures) {
+        if (pass == 0 && Configuration.visual.useGregtechTextures) {
             return this.base;
-        } else if (pass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) {
+        } else if (pass == 1 && Configuration.visual.useGregtechTextures) {
             return this.overlay;
         } else {
             return this.overlay;
diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index dd4ad12df8..45ba089f15 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -21,6 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.config.Configuration;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.material.Material;
@@ -180,7 +181,7 @@ public class BaseOreComponent extends Item {
                 this.overlay = par1IconRegister
                     .registerIcon(GTPlusPlus.ID + ":" + "processing/MilledOre/milled_OVERLAY");
             }
-        } else if (GTPPCore.ConfigSwitches.useGregtechTextures) {
+        } else if (Configuration.visual.useGregtechTextures) {
             // Logger.MATERIALS(this.componentType.getPrefix()+this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME+"
             // is using `"+GregTech.ID + ":" + "materialicons/METALLIC/" + this.componentType.COMPONENT_NAME+"' as the
             // layer 0 texture path.");
@@ -210,10 +211,10 @@ public class BaseOreComponent extends Item {
             }
             return this.componentColour;
         } else {
-            if (renderPass == 0 && !GTPPCore.ConfigSwitches.useGregtechTextures) {
+            if (renderPass == 0 && !Configuration.visual.useGregtechTextures) {
                 return this.componentColour;
             }
-            if (renderPass == 1 && GTPPCore.ConfigSwitches.useGregtechTextures) {
+            if (renderPass == 1 && Configuration.visual.useGregtechTextures) {
                 return Utils.rgbtoHexValue(230, 230, 230);
             }
             return this.componentColour;