Config/gregtech.cfg (#2939)

* first pass on config migration

* second pass on config migration

* removing bad configs

* rename config classes and register them

* move debug options to its own debug category

* migrate pollution

* finish migrating general config

* removing useless config

* finish GregTech.cfg port to GTNHLib

* don't accidentally force panic mode in dev env

* typo

* defaults are now handled by the confg handler

* remove dead config

* force config save after defaults are being written

* stop messing with the GregTech.cfg externally

* removing comments

* new underground fluid builder and porting default underground fluids to code

* move config handlers of gregtech.cfg in their own package

* process MachineStats.cfg

* yeeted MaterialProperties.cfg

* remove unused compat in GTNH

* process OverpoweredStuff.cfg

* process Other.cfg

* ungregify some config variables

* remove unused variables

* fix Ids.cfg not being populated

* delete duplicate printing of MTE IDs in GT5U clients

* bump hodgepodge version to get mod phase timers

* process Client.cfg

* fix bad category naming

* registering all the config handlers in gui

* bump GTNHLib version

* actually only registering client configs

* use proper double arrays now

* move GT ore mixes to patternbuilders

* dead code

* fix multifiles config not being handled properly

* import class from NHCore

* removing reflection

* use enums for registration

* yeet config for Asteroid dimensions

* remove unused since 2015 enum entry

* todo

* rework oremix enums

* imported dimension data in enums

* convert old dirty predicate into proper one

* hook gagreg onto the OreMixes enum

* finally nuke worldgen.ore.mix config category!

* hook gagreg small ores onto the SmallOres enum

* imported dim values in enum

* fix dirty work around in vm predicate

* yeet unused classes

* hook GT stones to GTStones enum

* yeet all the remaining booleans in the worldgen category

* port endasteroids category

* port general category

* deprecated

* yeet unused bw compat

* finish worldgen config migration

* hardcode config into code

* remove not generated config entry

* remove Unification.cfg

* fix build

* migrate oreveins away from config

* migrate small ores away from config

* delete config parser

* forgotten

* fix EoH recipe crash in dev

* fix GT NEI Ore Plugin config and csv paths

* shade opencsv

* rewrite csv generator

* spotless apply

1 files changed, 24 insertions, 213 deletions

diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index b6eb9ec3ad..85978e4c20 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -18,17 +18,16 @@ import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GalacticraftCore;
 import static gregtech.api.enums.Mods.GalaxySpace;
-import static gregtech.api.enums.Mods.GanysSurface;
 import static gregtech.api.enums.Mods.GraviSuite;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.IguanaTweaksTinkerConstruct;
-import static gregtech.api.enums.Mods.MagicalCrops;
 import static gregtech.api.enums.Mods.Names;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.enums.Mods.TaintedMagic;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Mods.ThaumicBoots;
 import static gregtech.api.enums.Mods.ThaumicTinkerer;
+import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.enums.Mods.TwilightForest;
 import static gregtech.api.enums.Mods.WitchingGadgets;
 import static gregtech.api.recipe.RecipeMaps.crackingRecipes;
@@ -120,11 +119,11 @@ import cpw.mods.fml.common.network.FMLNetworkEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.FluidState;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
+import gregtech.api.enums.ManualOreDictTweaks;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OreDictNames;
 import gregtech.api.enums.OrePrefixes;
@@ -166,6 +165,7 @@ import gregtech.api.util.GT_Shaped_Recipe;
 import gregtech.api.util.GT_Shapeless_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.WorldSpawnedEventBuilder;
+import gregtech.common.config.opstuff.ConfigGeneral;
 import gregtech.common.items.GT_MetaGenerated_Item_98;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gregtech.common.items.ID_MetaTool_01;
@@ -543,7 +543,6 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public final GT_BlockMap<Boolean> mCTMBlockCache = new GT_BlockMap<>();
     public boolean mDisableVanillaOres = true;
     public boolean mAllowSmallBoilerAutomation = false;
-    public boolean mSortToTheEnd = true;
     public boolean mCraftingUnification = true;
     public boolean mInventoryUnification = true;
     public boolean mIncreaseDungeonLoot = true;
@@ -551,7 +550,6 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public boolean mSurvivalIntoAdventure = false;
     public boolean mNerfedWoodPlank = true;
     public boolean mNerfedVanillaTools = true;
-    public boolean mHardRock = false;
     public boolean mHungerEffect = true;
     public boolean mIgnoreTcon = true;
     public boolean mAchievements = true;
@@ -563,8 +561,6 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public boolean mHideUnusedOres = true;
     public boolean mPollution = true;
     public boolean mExplosionItemDrop = false;
-    public boolean mUseGreatlyShrukenReplacementList = true;
-    public int mSkeletonsShootGTArrows = 16;
     public int mMaxEqualEntitiesAtOneSpot = 3;
     public int mFlintChance = 30;
     public int mItemDespawnTime = 6000;
@@ -572,7 +568,6 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public int[] mHarvestLevel = new int[1000];
     public int mGraniteHavestLevel = 3;
     public int mMaxHarvestLevel = 7;
-    public int mWireHeatingTicks = 4;
     public double replicatorExponent = 1.2D;
     public int mPollutionSmogLimit = 550000;
     public int mPollutionPoisonLimit = 750000;
@@ -608,11 +603,9 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public boolean mEnableAllMaterials = false;
     public boolean mEnableCleanroom = true;
     public boolean mLowGravProcessing = false;
-    public boolean mAprilFool = false;
     public boolean mCropNeedBlock = true;
     public boolean mAMHInteraction = true;
     public boolean mForceFreeFace = true;
-    public boolean mBrickedBlastFurnace = true;
     public boolean mMixedOreOnlyYieldsTwoThirdsOfPureOre = false;
     public boolean mRichOreYieldMultiplier = true;
     public boolean mNetherOreYieldMultiplier = true;
@@ -735,10 +728,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public boolean mWailaTransformerVoltageTier = true;
 
     /**
-     * What is the order of the circuits when they are selected?
+     * This enables showing the cpu load in nanoseconds via waila.
      */
-    public Map<String, Integer> mCircuitsOrder = new HashMap<>();
-
     public boolean wailaAverageNS = false;
 
     public static final int GUI_ID_COVER_SIDE_BASE = 10; // Takes GUI ID 10 - 15
@@ -834,9 +825,8 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         GT_Log.ore.println("GT_Mod: Preload-Phase started!");
 
         GregTech_API.sPreloadStarted = true;
-        this.mIgnoreTcon = GregTech_API.sOPStuff.get(ConfigCategories.general, "ignoreTConstruct", true);
-        this.mWireHeatingTicks = GregTech_API.sOPStuff.get(ConfigCategories.general, "WireHeatingTicks", 4);
-        this.replicatorExponent = GregTech_API.sOPStuff.get("Replicator", "Nerf Exponent", 1.2D);
+        this.mIgnoreTcon = ConfigGeneral.ignoreTinkerConstruct;
+        this.replicatorExponent = ConfigGeneral.replicatorExponent;
         for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry
             .getRegisteredFluidContainerData()) {
             if ((tData.filledContainer.getItem() == Items.potionitem) && (tData.filledContainer.getItemDamage() == 0)) {
@@ -1070,19 +1060,6 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     public void onLoad() {
         GT_Log.out.println("GT_Mod: Beginning Load-Phase.");
         GT_Log.ore.println("GT_Mod: Beginning Load-Phase.");
-        if (MagicalCrops.isModLoaded()) {
-            GT_OreDictUnificator.registerOre(
-                "cropChilipepper",
-                GT_ModHandler.getModItem(MagicalCrops.ID, "magicalcrops_CropProduce", 1L, 2));
-            GT_OreDictUnificator.registerOre(
-                "cropTomato",
-                GT_ModHandler.getModItem(MagicalCrops.ID, "magicalcrops_CropProduce", 1L, 8));
-            GT_OreDictUnificator
-                .registerOre("cropGrape", GT_ModHandler.getModItem(MagicalCrops.ID, "magicalcrops_CropProduce", 1L, 4));
-        }
-        if (GanysSurface.isModLoaded()) {
-            GT_OreDictUnificator.registerOre("cropTea", GT_ModHandler.getModItem(GanysSurface.ID, "teaLeaves", 1L, 0));
-        }
 
         // Clay buckets, which don't get registered until Iguana Tweaks pre-init
         if (IguanaTweaksTinkerConstruct.isModLoaded()) {
@@ -1283,7 +1260,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
             for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
                 for (; i < GregTech_API.METATILEENTITIES.length; i++) {
                     if (GregTech_API.METATILEENTITIES[i] != null) {
-                        GregTech_API.METATILEENTITIES[i].onConfigLoad(GregTech_API.sMachineFile);
+                        GregTech_API.METATILEENTITIES[i].onConfigLoad();
                     }
                 }
             }
@@ -1719,17 +1696,10 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
         }
         try {
             aEvent.Ore.stackSize = 1;
-            if (this.mIgnoreTcon || aEvent.Ore.getUnlocalizedName()
-                .startsWith("item.oreberry")) {
-                if ((aOriginalMod.toLowerCase(Locale.ENGLISH)
-                    .contains("xycraft"))
-                    || (aOriginalMod.toLowerCase(Locale.ENGLISH)
-                        .contains("tconstruct"))) {
-                    if (GT_Values.D1) {
-                        GT_Log.ore.println(aMod + " -> " + aEvent.Name + " is getting ignored, because of racism. :P");
-                    }
-                    return;
-                }
+
+            // skipping TinkerConstruct ore registration
+            if (this.mIgnoreTcon && aOriginalMod.equals(TinkerConstruct.ID)) {
+                return;
             }
             String tModToName = aMod + " -> " + aEvent.Name;
             if (this.mOreDictActivated || GregTech_API.sPostloadStarted || GregTech_API.sLoadFinished) {
@@ -2743,8 +2713,6 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
     }
 
     public void registerUnificationEntries() {
-        GregTech_API.sUnification.mConfig.save();
-        GregTech_API.sUnification.mConfig.load();
         GT_OreDictUnificator.resetUnificationEntries();
         for (OreDictEventContainer tOre : this.mEvents) {
             if ((!(tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null)
@@ -2753,166 +2721,17 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                 boolean checkModID = tOre.mModID != null;
 
                 if (checkModID) {
-                    switch (tOre.mModID) {
-                        case Names.ENDER_I_O -> {
-                            if (tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.DarkSteel) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            }
-                        }
-                        case Names.THERMAL_FONDATION -> {
-                            if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Blizz) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            } else if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Pyrotheum) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            }
-                        }
-                        case Names.ARS_MAGICA2 -> {
-                            if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Vinteum) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.BlueTopaz) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Chimerite) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Moonstone) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            } else if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Sunstone) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            }
-                        }
-                        case Names.ROTARY_CRAFT -> {
-                            if (tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.HSLA) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            }
-                        }
-                        case Names.APPLIED_ENERGISTICS2 -> {
-                            if (tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.CertusQuartz) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            } else if (tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.CertusQuartz) {
-                                GT_OreDictUnificator
-                                    .addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
-                                GT_OreDictUnificator.set(
-                                    tOre.mPrefix,
-                                    tOre.mMaterial,
-                                    tOre.mEvent.Ore,
-                                    (GregTech_API.sUnification.get(
-                                        ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                                        tOre.mEvent.Name,
-                                        true)),
-                                    true);
-                                continue;
-                            }
+                    if (tOre.mModID.equals(Names.ENDER_I_O)) {
+                        if (tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.DarkSteel) {
+                            GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+                            GT_OreDictUnificator.set(
+                                tOre.mPrefix,
+                                tOre.mMaterial,
+                                tOre.mEvent.Ore,
+                                ManualOreDictTweaks.shouldOredictBeOverwritten(tOre.mModID, tOre.mEvent.Name),
+                                true);
+                            continue;
                         }
-                        default -> {}
                     }
                 }
                 if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {
@@ -2923,10 +2742,7 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                         tOre.mPrefix,
                         tOre.mMaterial,
                         tOre.mEvent.Ore,
-                        (checkModID) && (GregTech_API.sUnification.get(
-                            ConfigCategories.specialunificationtargets + "." + tOre.mModID,
-                            tOre.mEvent.Name,
-                            false)),
+                        checkModID && ManualOreDictTweaks.shouldOredictBeOverwritten(tOre.mModID, tOre.mEvent.Name),
                         true);
                 }
             }
@@ -2944,18 +2760,13 @@ public abstract class GT_Proxy implements IGT_Mod, IFuelHandler {
                         tOre.mPrefix,
                         tOre.mMaterial,
                         tOre.mEvent.Ore,
-                        (tOre.mModID != null) && (GregTech_API.sUnification.get(
-                            new StringBuilder().append(ConfigCategories.specialunificationtargets)
-                                .append(".")
-                                .append(tOre.mModID),
-                            tOre.mEvent.Name,
-                            false)),
+                        (tOre.mModID != null)
+                            && ManualOreDictTweaks.shouldOredictBeOverwritten(tOre.mModID, tOre.mEvent.Name),
                         true);
                 }
             }
         }
         GregTech_API.sUnificationEntriesRegistered = true;
-        GregTech_API.sUnification.mConfig.save();
         GT_Recipe.reInit();
     }