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

13 files changed, 90 insertions, 208 deletions

diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
index 4c7eb3ce38..b10b44228d 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
@@ -1,7 +1,5 @@
 package gregtech.common.tileentities.boilers;
 
-import static gregtech.api.GregTech_API.sMachineFile;
-import static gregtech.api.enums.ConfigCategories.machineconfig;
 import static mcp.mobius.waila.api.SpecialChars.GOLD;
 import static mcp.mobius.waila.api.SpecialChars.RESET;
 
@@ -28,6 +26,7 @@ import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.config.machinestats.ConfigBronzeSolarBoiler;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 
@@ -39,37 +38,28 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
         "Steam Power by the Sun%n" + "Produces %sL of Steam per second%n"
             + "Calcifies over time, reducing Steam output to %sL/s%n"
             + "Break and replace to descale");
-    protected final Config mConfig;
+    protected int calcificationTicks = ConfigBronzeSolarBoiler.calcificationTicks;
+    protected int cooldownTicks = ConfigBronzeSolarBoiler.cooldownTicks;
+    protected int maxOutputPerSecond = ConfigBronzeSolarBoiler.maxOutputPerSecond;
+    protected int minOutputPerSecond = ConfigBronzeSolarBoiler.minOutputPerSecond;
+
     protected final int basicTemperatureMod = 5; // Base Celsius gain or loss
     private int mRunTimeTicks = 0;
 
     public GT_MetaTileEntity_Boiler_Solar(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, new String[0]);
-        mConfig = createConfig();
     }
 
     public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
-        mConfig = createConfig();
     }
 
     public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
-        mConfig = createConfig();
-    }
-
-    protected GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
-        Config aConfig) {
-        super(aName, aTier, aDescription, aTextures);
-        mConfig = aConfig;
-    }
-
-    protected Config createConfig() {
-        return new Config(machineconfig + ".boiler.solar.bronze", 1080000, 40, 120, 45);
     }
 
     public int getMaxOutputPerSecond() {
-        return mConfig.getMaxOutputPerSecond();
+        return maxOutputPerSecond;
     }
 
     @Override
@@ -83,7 +73,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
     }
 
     public int getMinOutputPerSecond() {
-        return mConfig.getMinOutputPerSecond();
+        return minOutputPerSecond;
     }
 
     @Override
@@ -159,21 +149,34 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
         if (mTemperature < 100) {
             return 0;
         }
-        if (mRunTimeTicks > mConfig.getMaxRuntimeTicks()) {
-            return mConfig.getMinOutputPerSecond();
-        } else if (mRunTimeTicks > mConfig.getCalcificationTicks()) {
+        if (mRunTimeTicks > getMaxRuntimeTicks()) {
+            return getMinOutputPerSecond();
+        } else if (mRunTimeTicks > getCalcificationTicks()) {
             /*
              * When reaching calcification ticks; discount the proportion of run-time spent on calcification from the
              * maximum output per second, and return this or the minimum output per second
              */
-            return mConfig.getMaxOutputPerSecond()
-                - mConfig.getMaxOutputPerSecond() * (mRunTimeTicks - mConfig.getCalcificationTicks())
-                    / mConfig.getCalcificationTicks();
+            return getMaxOutputPerSecond()
+                - getMaxOutputPerSecond() * (mRunTimeTicks - getCalcificationTicks()) / getCalcificationTicks();
         } else {
-            return mConfig.getMaxOutputPerSecond();
+            return getMaxOutputPerSecond();
         }
     }
 
+    protected int getCalcificationTicks() {
+        return calcificationTicks;
+    }
+
+    protected int getCooldownTicks() {
+        return cooldownTicks;
+    }
+
+    protected int getMaxRuntimeTicks() {
+        // After which min output is reached.
+        return (getMaxOutputPerSecond() - getMinOutputPerSecond()) * getCalcificationTicks() / getMaxOutputPerSecond()
+            + getCalcificationTicks();
+    }
+
     @Override
     protected int getMaxTemperature() {
         return 500;
@@ -186,7 +189,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
 
     @Override
     protected int getCooldownInterval() {
-        return mConfig.getCoolDownTicks() / basicTemperatureMod;
+        return getCooldownTicks() / basicTemperatureMod;
     }
 
     @Override
@@ -272,7 +275,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Solar(mName, mTier, mDescriptionArray, mTextures, mConfig);
+        return new GT_MetaTileEntity_Boiler_Solar(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
@@ -305,64 +308,4 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
         tag.setInteger("calcificationOutput", (getProductionPerSecond()));
         tag.setInteger("maxCalcificationOutput", (getMaxOutputPerSecond()));
     }
-
-    protected static class Config {
-
-        private final int calcificationTicks;
-        private final int minOutputPerSecond;
-        private final int maxOutputPerSecond;
-        private final int coolDownTicks;
-        private final int maxRuntimeTicks;
-
-        public Config(String aCategory, int aDefaultCalcificationTicks, int aDefaultMinOutputPerSecond,
-            int aDefaultMaxOutputPerSecond, int aDefaultCoolDownTicks) {
-            calcificationTicks = get(
-                aCategory,
-                "CalcificationTicks",
-                aDefaultCalcificationTicks,
-                "Number of run-time ticks before boiler starts calcification.",
-                "100% calcification and minimal output will be reached at 2 times this.");
-            minOutputPerSecond = get(aCategory, "MinOutputPerSecond", aDefaultMinOutputPerSecond);
-            maxOutputPerSecond = get(aCategory, "MaxOutputPerSecond", aDefaultMaxOutputPerSecond);
-            coolDownTicks = get(
-                aCategory,
-                "CoolDownTicks",
-                aDefaultCoolDownTicks,
-                "Number of ticks it takes to lose 1°C.");
-            // After which min output is reached.
-            maxRuntimeTicks = (getMaxOutputPerSecond() - getMinOutputPerSecond()) * getCalcificationTicks()
-                / getMaxOutputPerSecond() + getCalcificationTicks();
-        }
-
-        protected int get(final String aCategory, final String aKey, final int aDefaultValue,
-            final String... aComments) {
-            final StringBuilder tCommentBuilder = new StringBuilder();
-            for (String tComment : aComments) tCommentBuilder.append(tComment)
-                .append('\n');
-            tCommentBuilder.append("Default: ")
-                .append(aDefaultValue);
-            return sMachineFile.mConfig.get(aCategory, aKey, aDefaultValue, tCommentBuilder.toString())
-                .getInt();
-        }
-
-        public int getCalcificationTicks() {
-            return calcificationTicks;
-        }
-
-        public int getMinOutputPerSecond() {
-            return minOutputPerSecond;
-        }
-
-        public int getMaxOutputPerSecond() {
-            return maxOutputPerSecond;
-        }
-
-        public int getCoolDownTicks() {
-            return coolDownTicks;
-        }
-
-        public int getMaxRuntimeTicks() {
-            return maxRuntimeTicks;
-        }
-    }
 }
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java
index c20ea4018a..c537e388d1 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java
@@ -1,7 +1,5 @@
 package gregtech.common.tileentities.boilers;
 
-import static gregtech.api.enums.ConfigCategories.machineconfig;
-
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.SteamVariant;
 import gregtech.api.enums.Textures.BlockIcons;
@@ -9,31 +7,32 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.render.TextureFactory;
+import gregtech.common.config.machinestats.ConfigSteelSolarBoiler;
 
 public class GT_MetaTileEntity_Boiler_Solar_Steel extends GT_MetaTileEntity_Boiler_Solar {
 
     public GT_MetaTileEntity_Boiler_Solar_Steel(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
+        initBoilerStats();
     }
 
     public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
+        initBoilerStats();
     }
 
     public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
+        initBoilerStats();
     }
 
-    public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String[] aDescription,
-        ITexture[][][] aTextures, Config aConfig) {
-        super(aName, aTier, aDescription, aTextures, aConfig);
-    }
-
-    @Override
-    protected Config createConfig() {
-        return new Config(machineconfig + ".boiler.solar.steel", 1080000, 120, 360, 75);
+    protected void initBoilerStats() {
+        calcificationTicks = ConfigSteelSolarBoiler.calcificationTicks;
+        cooldownTicks = ConfigSteelSolarBoiler.cooldownTicks;
+        maxOutputPerSecond = ConfigSteelSolarBoiler.maxOutputPerSecond;
+        minOutputPerSecond = ConfigSteelSolarBoiler.minOutputPerSecond;
     }
 
     @Override
@@ -67,11 +66,6 @@ public class GT_MetaTileEntity_Boiler_Solar_Steel extends GT_MetaTileEntity_Boil
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Solar_Steel(
-            this.mName,
-            this.mTier,
-            this.mDescriptionArray,
-            this.mTextures,
-            this.mConfig);
+        return new GT_MetaTileEntity_Boiler_Solar_Steel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
index 5047cb7624..10138bdfc2 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
@@ -31,8 +31,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.ParticleFX;
 import gregtech.api.interfaces.ITexture;
@@ -95,10 +93,7 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicGe
     }
 
     public void onConfigLoad() {
-        this.mEfficiency = GregTech_API.sMachineFile.get(
-            ConfigCategories.machineconfig,
-            "DieselGenerator.efficiency.tier." + this.mTier,
-            (100 - this.mTier * 5));
+        this.mEfficiency = (100 - this.mTier * 5);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
index e18bc00b51..ca0a5d6958 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
@@ -25,8 +25,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -51,14 +49,12 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat
                         * GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier[aTier])
                     + " Pollution per second" });
         this.mEfficiency = mEfficiency;
-        onConfigLoad();
     }
 
     public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures,
         int mEfficiency) {
         super(aName, aTier, aDescription, aTextures);
         this.mEfficiency = mEfficiency;
-        onConfigLoad();
     }
 
     @Override
@@ -86,11 +82,6 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicGenerat
         return 16000;
     }
 
-    public void onConfigLoad() {
-        this.mEfficiency = GregTech_API.sMachineFile
-            .get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, this.mEfficiency);
-    }
-
     @Override
     public int getEfficiency() {
         return this.mEfficiency;
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java
index 7317180b5d..647aa504e5 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicEnergyConverter.java
@@ -12,8 +12,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -68,10 +66,7 @@ public class GT_MetaTileEntity_MagicEnergyConverter extends GT_MetaTileEntity_Ba
     }
 
     public void onConfigLoad() {
-        this.mEfficiency = GregTech_API.sMachineFile.get(
-            ConfigCategories.machineconfig,
-            "MagicEnergyConverter.efficiency.tier." + this.mTier,
-            100 - this.mTier * 5);
+        this.mEfficiency = 100 - this.mTier * 5;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
index 8dc3417a84..3245607ac2 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
@@ -1,6 +1,5 @@
 package gregtech.common.tileentities.generators;
 
-import static gregtech.api.enums.ConfigCategories.machineconfig;
 import static gregtech.api.enums.GT_Values.V;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_DRAGONEGG;
@@ -52,7 +51,6 @@ import com.google.common.base.Enums;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.ParticleFX;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.interfaces.ITexture;
@@ -62,11 +60,11 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenera
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder;
+import gregtech.common.config.machinestats.ConfigMachines;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.aspects.AspectSourceHelper;
@@ -81,10 +79,9 @@ interface MagicalEnergyBBListener {
 public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_BasicGenerator
     implements MagicalEnergyBBListener {
 
-    private static final boolean THAUMCRAFT_LOADED = Thaumcraft.isModLoaded();
     private static final ConcurrentHashMap<UUID, GT_MetaTileEntity_MagicalEnergyAbsorber> sSubscribedCrystals = new ConcurrentHashMap<>(
         4);
-    private static final List<Aspect> sPrimalAspects = (THAUMCRAFT_LOADED) ? Aspect.getPrimalAspects()
+    private static final List<Aspect> sPrimalAspects = (Thaumcraft.isModLoaded()) ? Aspect.getPrimalAspects()
         : new ArrayList<>();
     private static final Map<Aspect, Integer> sAspectsEnergy = new HashMap<>();
     private static boolean sAllowMultipleEggs = false;
@@ -103,28 +100,21 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
 
     public GT_MetaTileEntity_MagicalEnergyAbsorber(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "Feasts on magic close to it:");
-        onConfigLoad(GregTech_API.sMachineFile);
+        onConfigLoad();
     }
 
     private GT_MetaTileEntity_MagicalEnergyAbsorber(String aName, int aTier, String[] aDescription,
         ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
-        onConfigLoad(GregTech_API.sMachineFile);
+        onConfigLoad();
     }
 
     /**
      * Populates static variables dependant on config settings
-     *
-     * @param aConfig GT_Config
      */
-    private static void sharedConfigLoad(GT_Config aConfig) {
-        sAllowMultipleEggs = aConfig.get(machineconfig, "MagicEnergyAbsorber.AllowMultipleEggs", false);
-        sDragonEggEnergyPerTick = aConfig.get(machineconfig, "MagicEnergyAbsorber.EnergyPerTick.DragonEgg", 2048);
-        sCreeperEggEnergyPerTick = aConfig.get(machineconfig, "MagicEnergyAbsorber.EnergyPerTick.CreeperEgg", 512);
-        sEnergyPerEndercrystal = aConfig.get(machineconfig, "MagicEnergyAbsorber.EnergyPerTick.EnderCrystal", 512);
-        if (THAUMCRAFT_LOADED) {
-            sEnergyFromVis = aConfig.get(machineconfig, "MagicEnergyAbsorber.EnergyPerVis", 20);
-            sEnergyPerEssentia = aConfig.get(machineconfig, "MagicEnergyAbsorber.EnergyPerEssentia", 320);
+    private static void sharedConfigLoad() {
+        sAllowMultipleEggs = ConfigMachines.allowMultipleEggs;
+        if (Thaumcraft.isModLoaded()) {
             for (Aspect tAspect : Aspect.aspects.values()) {
                 // noinspection UnstableApiUsage
                 sAspectsEnergy.put(
@@ -142,13 +132,11 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
         sActiveSiphon = aSiphon;
     }
 
-    @Override
-    public void onConfigLoad(GT_Config aConfig) {
-        sharedConfigLoad(aConfig);
-        mEfficiency = aConfig.get(machineconfig, "MagicEnergyAbsorber.efficiency.tier." + mTier, 100 - mTier * 10);
-        mMaxVisPerDrain = (int) Math.round(
-            Math.sqrt((double) (V[mTier] * 10000) / (sEnergyFromVis * (getEfficiency() != 0 ? getEfficiency() : 100))));
-        if (Math.pow(mMaxVisPerDrain, 2) * sEnergyFromVis * (getEfficiency() != 0 ? getEfficiency() : 100) < V[mTier]) {
+    public void onConfigLoad() {
+        sharedConfigLoad();
+        mEfficiency = 100 - mTier * 10;
+        mMaxVisPerDrain = (int) Math.round(Math.sqrt((double) (V[mTier] * 10000) / (sEnergyFromVis * getEfficiency())));
+        if (Math.pow(mMaxVisPerDrain, 2) * sEnergyFromVis * getEfficiency() < V[mTier]) {
             mMaxVisPerDrain += 1;
         }
     }
@@ -229,7 +217,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
         if (sEnergyPerEndercrystal > 0) {
             description.add(LI + sEnergyPerEndercrystal + EU_PER + LIGHT_PURPLE + "Ender Crystal" + GRAY + " in range");
         }
-        if (THAUMCRAFT_LOADED) {
+        if (Thaumcraft.isModLoaded()) {
             description.add(LI + mMaxVisPerDrain + "%%%CV/t from an " + LIGHT_PURPLE + "Energised Node" + GRAY);
             description.add(
                 LI + (sEnergyPerEssentia * getEfficiency()) / 100
@@ -561,7 +549,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
     }
 
     private long absorbFromVisNet() {
-        if (!THAUMCRAFT_LOADED) return 0;
+        if (!Thaumcraft.isModLoaded()) return 0;
 
         long tEU;
         IGregTechTileEntity tBaseMetaTileEntity = getBaseMetaTileEntity();
@@ -584,7 +572,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
     }
 
     private long absorbFromEssentiaContainers() {
-        if (!THAUMCRAFT_LOADED) return 0;
+        if (!Thaumcraft.isModLoaded()) return 0;
 
         long tEU = 0;
 
@@ -666,7 +654,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
             mMaxTier = Math.max(Math.max(aMaxTier, 0), Math.max(aDefaultTier, 0));
             mDefaultTier = Math.min(aDefaultTier, mMaxTier);
             mTier = mDefaultTier;
-            if (THAUMCRAFT_LOADED) mAvailableAspects = new ArrayList<>(Aspect.aspects.size());
+            if (Thaumcraft.isModLoaded()) mAvailableAspects = new ArrayList<>(Aspect.aspects.size());
         }
 
         int getTier() {
@@ -734,7 +722,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
         }
 
         private void scanAvailableAspects() {
-            if (!THAUMCRAFT_LOADED) return;
+            if (!Thaumcraft.isModLoaded()) return;
             IGregTechTileEntity tBaseMetaTileEntity = mAbsorber.getBaseMetaTileEntity();
             if (tBaseMetaTileEntity.isInvalidTileEntity()) return;
             int tRange = getRange();
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
index ba5aaf4c64..1dd378e746 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java
@@ -23,8 +23,6 @@ import static gregtech.api.enums.Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -43,7 +41,7 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe
         if (aTier > 8 || aTier < 4) {
             new Exception("Tier without Recipe Map!").printStackTrace();
         }
-        onConfigLoad();
+        mEfficiency = getBaseEff();
     }
 
     public GT_MetaTileEntity_NaquadahReactor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
@@ -51,7 +49,7 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe
         if (aTier > 8 || aTier < 4) {
             new Exception("Tier without Recipe Map!").printStackTrace();
         }
-        onConfigLoad();
+        mEfficiency = getBaseEff();
     }
 
     @Override
@@ -89,18 +87,13 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe
 
     @Override
     public int getEfficiency() {
-        return mEfficiency == 0 ? onConfigLoad() : mEfficiency;
+        return mEfficiency;
     }
 
     private int getBaseEff() {
         return mTier == 4 ? 80 : 100 + (50 * (mTier - 5));
     }
 
-    public int onConfigLoad() {
-        return mEfficiency = GregTech_API.sMachineFile
-            .get(ConfigCategories.machineconfig, "SolidNaquadah.efficiency.tier." + mTier, getBaseEff());
-    }
-
     @Override
     public ITexture[] getFront(byte aColor) {
         return new ITexture[] { super.getFront(aColor)[0],
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_PlasmaGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_PlasmaGenerator.java
index 603c1439ba..fa980ce480 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_PlasmaGenerator.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_PlasmaGenerator.java
@@ -7,8 +7,6 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT;
 
 import net.minecraftforge.common.util.ForgeDirection;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -23,17 +21,17 @@ public class GT_MetaTileEntity_PlasmaGenerator extends GT_MetaTileEntity_BasicGe
 
     public GT_MetaTileEntity_PlasmaGenerator(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "Plasma into energy");
-        onConfigLoad();
+        setEfficiency();
     }
 
     public GT_MetaTileEntity_PlasmaGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
-        onConfigLoad();
+        setEfficiency();
     }
 
     public GT_MetaTileEntity_PlasmaGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
-        onConfigLoad();
+        setEfficiency();
     }
 
     @Override
@@ -133,11 +131,8 @@ public class GT_MetaTileEntity_PlasmaGenerator extends GT_MetaTileEntity_BasicGe
         return new GT_MetaTileEntity_PlasmaGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
-    public void onConfigLoad() {
-        this.mEfficiency = GregTech_API.sMachineFile.get(
-            ConfigCategories.machineconfig,
-            "PlasmaGenerator.efficiency.tier." + this.mTier,
-            Math.max(10, 10 + Math.min(90, this.mTier * 10)));
+    public void setEfficiency() {
+        this.mEfficiency = Math.max(10, 10 + Math.min(90, this.mTier * 10));
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
index 3c9a89815a..9c1b8db562 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
@@ -25,8 +25,6 @@ import static gregtech.api.enums.Textures.BlockIcons.STEAM_TURBINE_TOP_GLOW;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -46,17 +44,17 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
             aNameRegional,
             aTier,
             new String[] { "Converts Steam into EU", "Base rate: 2L of Steam -> 1 EU" });
-        onConfigLoad();
+        this.mEfficiency = 6 + this.mTier;
     }
 
     public GT_MetaTileEntity_SteamTurbine(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
-        onConfigLoad();
+        this.mEfficiency = 6 + this.mTier;
     }
 
     public GT_MetaTileEntity_SteamTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
-        onConfigLoad();
+        this.mEfficiency = 6 + this.mTier;
     }
 
     @Override
@@ -90,11 +88,6 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
         return 24000 * this.mTier;
     }
 
-    public void onConfigLoad() {
-        this.mEfficiency = GregTech_API.sMachineFile
-            .get(ConfigCategories.machineconfig, "SteamTurbine.efficiency.tier." + this.mTier, 6 + this.mTier);
-    }
-
     @Override
     public int getEfficiency() {
         return this.mEfficiency;
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
index ef0914f6a4..7eaa8122c1 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -26,7 +26,6 @@ import net.minecraftforge.fluids.FluidStack;
 
 import com.google.common.primitives.Ints;
 
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.MachineType;
 import gregtech.api.enums.Materials;
@@ -39,11 +38,11 @@ import gregtech.api.objects.overclockdescriber.OverclockDescriber;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_OverclockCalculator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.MethodsReturnNonnullByDefault;
+import gregtech.common.config.machinestats.ConfigMassFabricator;
 
 public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMachine {
 
@@ -135,13 +134,12 @@ public class GT_MetaTileEntity_Massfabricator extends GT_MetaTileEntity_BasicMac
     }
 
     @Override
-    public void onConfigLoad(GT_Config aConfig) {
-        super.onConfigLoad(aConfig);
-        sDurationMultiplier = aConfig
-            .get(ConfigCategories.machineconfig, "Massfabricator.UUM_Duration_Multiplier", sDurationMultiplier);
-        sUUAperUUM = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_per_UUM", sUUAperUUM);
-        sUUASpeedBonus = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Speed_Bonus", sUUASpeedBonus);
-        sRequiresUUA = aConfig.get(ConfigCategories.machineconfig, "Massfabricator.UUA_Requirement", sRequiresUUA);
+    public void onConfigLoad() {
+        super.onConfigLoad();
+        sDurationMultiplier = ConfigMassFabricator.durationMultiplier;
+        sUUAperUUM = ConfigMassFabricator.UUAPerUUM;
+        sUUASpeedBonus = ConfigMassFabricator.UUASpeedBonus;
+        sRequiresUUA = ConfigMassFabricator.requiresUUA;
         Materials.UUAmplifier.mChemicalFormula = ("Mass Fabricator Eff/Speed Bonus: x" + sUUASpeedBonus);
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
index aa8616e03d..575e98c5c6 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
@@ -28,7 +28,6 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Materials;
 import gregtech.api.gui.modularui.GT_UIInfos;
 import gregtech.api.gui.modularui.GT_UITextures;
@@ -42,8 +41,9 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.config.machinestats.ConfigMicrowaveEnergyTransmitter;
+import gregtech.common.config.machinestats.ConfigTeleporter;
 
 public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEntity_BasicTank
     implements IAddGregtechLogo, IAddUIWidgets {
@@ -154,12 +154,11 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
     }
 
     @Override
-    public void onConfigLoad(GT_Config aConfig) {
-        sInterDimensionalTeleportAllowed = aConfig
-            .get(ConfigCategories.machineconfig, "Teleporter.Interdimensional", true);
-        mMaxLoss = Math.max(aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.MaxLoss", 50), 11);
-        mMaxLossDistance = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.MaxLossDistance", 10000);
-        mPassiveEnergyUse = aConfig.get(ConfigCategories.machineconfig, "MicrowaveTransmitter.PassiveEnergy", true);
+    public void onConfigLoad() {
+        sInterDimensionalTeleportAllowed = ConfigTeleporter.interDimensionalTPAllowed;
+        mMaxLoss = Math.max(ConfigMicrowaveEnergyTransmitter.maxLoss, 11);
+        mMaxLossDistance = ConfigMicrowaveEnergyTransmitter.maxLossDistance;
+        mPassiveEnergyUse = ConfigMicrowaveEnergyTransmitter.passiveEnergyUse;
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
index 1c95ee563d..9de00b4a0e 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
@@ -50,7 +50,6 @@ import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.enums.ConfigCategories;
 import gregtech.api.gui.modularui.GT_UIInfos;
 import gregtech.api.gui.modularui.GT_UITextures;
 import gregtech.api.gui.modularui.GUITextureSet;
@@ -61,8 +60,8 @@ import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_Utility;
+import gregtech.common.config.machinestats.ConfigTeleporter;
 
 public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
     implements IAddGregtechLogo, IAddUIWidgets {
@@ -246,12 +245,10 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank
     }
 
     @Override
-    public void onConfigLoad(GT_Config aConfig) {
-        sInterDimensionalTeleportAllowed = aConfig
-            .get(ConfigCategories.machineconfig, "Teleporter.Interdimensional", true);
-        sPassiveEnergyDrain = aConfig
-            .get(ConfigCategories.machineconfig, "Teleporter.PassiveDrain", sPassiveEnergyDrain);
-        sPowerMultiplyer = aConfig.get(ConfigCategories.machineconfig, "Teleporter.PowerMultipler", sPowerMultiplyer);
+    public void onConfigLoad() {
+        sInterDimensionalTeleportAllowed = ConfigTeleporter.interDimensionalTPAllowed;
+        sPassiveEnergyDrain = ConfigTeleporter.passiveEnergyDrain;
+        sPowerMultiplyer = ConfigTeleporter.powerMultiplier;
         sFPowerMultiplyer = sPowerMultiplyer / 100.0;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
index cd31b9cc1e..b0b9cdd078 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
@@ -470,6 +470,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB
         cfg.get("cleanroom_allowed_blocks.warded_glass", "Name", "tile.blockCosmeticOpaque");
         cfg.get("cleanroom_allowed_blocks.warded_glass", "Meta", 2);
         cfg.get("cleanroom_allowed_blocks.warded_glass", "Percentage", 50);
+        cfg.save();
     }
 
     public static void loadConfig(Configuration cfg) {