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>

5 files changed, 17 insertions, 40 deletions

diff --git a/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java
index 403198d6df..01e5a087c1 100644
--- a/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java
+++ b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java
@@ -4,11 +4,9 @@ import static gregtech.api.enums.Mods.GTPlusPlusEverglades;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
 
 import net.minecraft.block.Block;
 import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.config.Configuration;
 
 import bwcrossmod.galacticgreg.MTEVoidMinerBase;
 import cpw.mods.fml.common.Mod;
@@ -31,8 +29,6 @@ import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base;
 import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer;
 import gtPlusPlus.everglades.gen.gt.WorldGen_Ores;
 import gtPlusPlus.preloader.PreloaderCore;
-import gtPlusPlus.xmod.gregtech.HandlerGT;
-import gtPlusPlus.xmod.gregtech.api.util.GTPPConfig;
 
 @Mod(
     modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES,
@@ -64,11 +60,6 @@ public class GTPPEverglades implements ActionListener {
         getEvergladesBiome().instance = instance;
         Everglades_Dimension.instance = instance;
         getEvergladesBiome().preInit(event);
-
-        // Load/Set Custom Ore Gen
-        HandlerGT.sCustomWorldgenFile = new GTPPConfig(
-            new Configuration(
-                new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
     }
 
     @EventHandler
@@ -132,11 +123,6 @@ public class GTPPEverglades implements ActionListener {
     }
 
     protected synchronized void setVars(FMLPreInitializationEvent event) {
-        // Init WorldGen config.
-        HandlerGT.sCustomWorldgenFile = new GTPPConfig(
-            new Configuration(
-                new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg")));
-
         if (DimensionManager.isDimensionRegistered(DimensionEverglades.DIMID)) {
             DimensionEverglades.DIMID = DimensionManager.getNextFreeDimId();
         }
@@ -164,7 +150,8 @@ public class GTPPEverglades implements ActionListener {
     }
 
     public void addVMDrop(Block block, int meta, float weight) {
-        MTEVoidMinerBase.addBlockToDimensionList(GTPPCore.EVERGLADES_ID, block, meta, weight);
+        MTEVoidMinerBase
+            .addBlockToDimensionList(gtPlusPlus.core.config.Configuration.worldgen.EVERGLADES_ID, block, meta, weight);
     }
 
     @EventHandler
diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java
index 8394bd8385..74fb6c8d54 100644
--- a/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java
+++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java
@@ -12,9 +12,9 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.config.Configuration;
 import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
-import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.everglades.dimension.DimensionEverglades;
 
 public class BiomeEverglades {
@@ -38,11 +38,9 @@ public class BiomeEverglades {
 
         @SuppressWarnings("unchecked")
         public BiomeGenEverglades() {
-            super(GTPPCore.EVERGLADESBIOME_ID);
-            // this.setBiomeID();
+            super(Configuration.worldgen.EVERGLADESBIOME_ID);
             this.theBiomeDecorator = new CustomBiomeGenerator();
             this.theBiomeDecorator.treesPerChunk = 10;
-            // Logger.INFO("Dark World Temperature Category: "+getTempCategory());
             this.setBiomeName("Toxic Everglades");
             this.topBlock = DimensionEverglades.blockTopLayer;
             this.fillerBlock = DimensionEverglades.blockSecondLayer;
diff --git a/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java b/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java
index 702a3210a2..bcdeabde03 100644
--- a/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java
+++ b/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java
@@ -4,7 +4,7 @@ import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraftforge.common.DimensionManager;
 
-import gtPlusPlus.core.lib.GTPPCore;
+import gtPlusPlus.core.config.Configuration;
 import gtPlusPlus.everglades.block.BlockEvergladesPortal;
 import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger;
 import gtPlusPlus.everglades.world.WorldProviderMod;
@@ -12,7 +12,7 @@ import gtPlusPlus.everglades.world.WorldProviderMod;
 public class DimensionEverglades {
 
     public Object instance;
-    public static int DIMID = GTPPCore.EVERGLADES_ID;
+    public static int DIMID = Configuration.worldgen.EVERGLADES_ID;
     public static BlockEvergladesPortal portalBlock;
     public static ItemEvergladesPortalTrigger portalItem;
     public static Block blockTopLayer;
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
index 9ce91e3e4d..670b6b889a 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java
@@ -8,8 +8,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import gtPlusPlus.xmod.gregtech.HandlerGT;
-
 public abstract class WorldGen_GT {
 
     public final String mWorldGenName;
@@ -18,7 +16,7 @@ public abstract class WorldGen_GT {
 
     public WorldGen_GT(String aName, List aList, boolean aDefault) {
         this.mWorldGenName = aName;
-        this.mEnabled = HandlerGT.sCustomWorldgenFile.get("worldgen", this.mWorldGenName, aDefault);
+        this.mEnabled = aDefault;
         if (this.mEnabled) {
             aList.add(this);
         }
@@ -36,11 +34,10 @@ public abstract class WorldGen_GT {
 
     public boolean isGenerationAllowed(World aWorld, int aDimensionType, int aAllowedDimensionType) {
         String aDimName = aWorld.provider.getDimensionName();
-        Boolean tAllowed = (Boolean) this.mDimensionMap.get(aDimName);
+        Boolean tAllowed = this.mDimensionMap.get(aDimName);
         if (tAllowed == null) {
-            boolean tValue = HandlerGT.sCustomWorldgenFile
-                .get("worldgen.dimensions." + this.mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType);
-            this.mDimensionMap.put(aDimName, Boolean.valueOf(tValue));
+            boolean tValue = (aDimensionType == aAllowedDimensionType);
+            this.mDimensionMap.put(aDimName, tValue);
             return tValue;
         } else {
             return tAllowed;
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
index 74aad2d996..46fef6b58c 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
@@ -22,7 +22,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.everglades.dimension.DimensionEverglades;
-import gtPlusPlus.xmod.gregtech.HandlerGT;
 
 public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
 
@@ -83,18 +82,14 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
         boolean GC_UNUSED3, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) {
         super(aName, sList, aDefault);
         Logger.WORLD("Creating Ore Layer Object");
-        this.mOverworld = HandlerGT.sCustomWorldgenFile
-            .get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld);
-        this.mNether = HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether);
-        this.mEnd = HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd);
+        this.mOverworld = aOverworld;
+        this.mNether = aNether;
+        this.mEnd = aEnd;
         this.mMinY = 5;
-        this.mMaxY = (short) 14;
-        this.mWeight = ((short) HandlerGT.sCustomWorldgenFile
-            .get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight));
-        this.mDensity = ((short) HandlerGT.sCustomWorldgenFile
-            .get(aTextWorldgen + this.mWorldGenName, "Density", aDensity));
-        this.mSize = ((short) Math
-            .max(1, HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize)));
+        this.mMaxY = 14;
+        this.mWeight = (short) aWeight;
+        this.mDensity = (short) aDensity;
+        this.mSize = (short) Math.max(1, aSize);
         this.mPrimary = aPrimary;
         this.mSecondary = aSecondary;
         this.mBetween = aBetween;