Port BW config to GTNHLib (#3169)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

4 files changed, 15 insertions, 16 deletions

diff --git a/src/main/java/bwcrossmod/galacticraft/GalacticraftProxy.java b/src/main/java/bwcrossmod/galacticraft/GalacticraftProxy.java
index d6ee41c48b..9ad58820d0 100644
--- a/src/main/java/bwcrossmod/galacticraft/GalacticraftProxy.java
+++ b/src/main/java/bwcrossmod/galacticraft/GalacticraftProxy.java
@@ -16,7 +16,7 @@ package bwcrossmod.galacticraft;
 import net.minecraftforge.common.MinecraftForge;
 
 import bartworks.API.SideReference;
-import bartworks.common.configs.ConfigHandler;
+import bartworks.common.configs.Configuration;
 import bartworks.system.oregen.BWWorldGenRoss128b;
 import bartworks.system.oregen.BWWorldGenRoss128ba;
 import bwcrossmod.galacticraft.atmosphere.BWAtmosphereManager;
@@ -71,7 +71,7 @@ public class GalacticraftProxy {
     private static void clientInit(FMLInitializationEvent e) {}
 
     private static void commonInit(FMLInitializationEvent e) {
-        if (ConfigHandler.Ross128Enabled) Ross128SolarSystem.init();
+        if (Configuration.crossModInteractions.Ross128Enabled) Ross128SolarSystem.init();
     }
 
     private static void serverPostInit(FMLPostInitializationEvent e) {}
diff --git a/src/main/java/bwcrossmod/galacticraft/PlanetsHelperClass.java b/src/main/java/bwcrossmod/galacticraft/PlanetsHelperClass.java
index eecd5bd8fe..e5b43ef886 100644
--- a/src/main/java/bwcrossmod/galacticraft/PlanetsHelperClass.java
+++ b/src/main/java/bwcrossmod/galacticraft/PlanetsHelperClass.java
@@ -15,7 +15,7 @@ package bwcrossmod.galacticraft;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 
-import bartworks.common.configs.ConfigHandler;
+import bartworks.common.configs.Configuration;
 import micdoodle8.mods.galacticraft.core.entities.EntityLander;
 import micdoodle8.mods.galacticraft.core.entities.EntityLanderBase;
 import micdoodle8.mods.galacticraft.planets.asteroids.entities.EntityEntryPod;
@@ -24,9 +24,9 @@ import micdoodle8.mods.galacticraft.planets.mars.entities.EntityLandingBalloons;
 public class PlanetsHelperClass {
 
     public static EntityLanderBase getLanderType(EntityPlayerMP player) {
-        return switch (ConfigHandler.landerType) {
-            case 1 -> new EntityLander(player);
-            case 2 -> new EntityLandingBalloons(player);
+        return switch (Configuration.crossModInteractions.landerType) {
+            case MoonLander -> new EntityLander(player);
+            case LandingBalloons -> new EntityLandingBalloons(player);
             default -> new EntityEntryPod(player);
         };
     }
diff --git a/src/main/java/bwcrossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java b/src/main/java/bwcrossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java
index 7682e61d09..ba9414250c 100644
--- a/src/main/java/bwcrossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java
+++ b/src/main/java/bwcrossmod/galacticraft/planets/ross128b/ChunkProviderRoss128b.java
@@ -37,7 +37,7 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.terraingen.PopulateChunkEvent;
 import net.minecraftforge.event.terraingen.TerrainGen;
 
-import bartworks.common.configs.ConfigHandler;
+import bartworks.common.configs.Configuration;
 import bartworks.system.oregen.BWWordGenerator;
 import bartworks.system.worldgen.MapGenRuins;
 import bwcrossmod.thaumcraft.util.ThaumcraftHandler;
@@ -82,7 +82,7 @@ public class ChunkProviderRoss128b extends ChunkProviderGenerate {
             if (Thaumcraft.isModLoaded()) {
                 if (ThaumcraftHandler.isTaintBiome(biomeGenBase.biomeID))
                     this.biomesForGeneration[i] = BiomeGenBase.taiga;
-                else if (ConfigHandler.disableMagicalForest
+                else if (Configuration.crossModInteractions.disableMagicalForest
                     && ThaumcraftHandler.isMagicalForestBiome(biomeGenBase.biomeID))
                     this.biomesForGeneration[i] = BiomeGenBase.birchForest;
             }
@@ -134,7 +134,7 @@ public class ChunkProviderRoss128b extends ChunkProviderGenerate {
             && biomegenbase != BiomeGenBase.river
             && biomegenbase != BiomeGenBase.frozenOcean
             && biomegenbase != BiomeGenBase.frozenRiver
-            && this.rand.nextInt(ConfigHandler.ross128bRuinChance) == 0) {
+            && this.rand.nextInt(Configuration.crossModInteractions.ross128bRuinChance) == 0) {
             x1 = k + this.rand.nextInt(16) + 3;
             y1 = this.rand.nextInt(256);
             z1 = l + this.rand.nextInt(16) + 3;
diff --git a/src/main/java/bwcrossmod/galacticraft/solarsystems/Ross128SolarSystem.java b/src/main/java/bwcrossmod/galacticraft/solarsystems/Ross128SolarSystem.java
index 050c26b087..7113e091f8 100644
--- a/src/main/java/bwcrossmod/galacticraft/solarsystems/Ross128SolarSystem.java
+++ b/src/main/java/bwcrossmod/galacticraft/solarsystems/Ross128SolarSystem.java
@@ -13,13 +13,11 @@
 
 package bwcrossmod.galacticraft.solarsystems;
 
-import static gregtech.api.enums.Mods.GalaxySpace;
-
 import java.util.Arrays;
 
 import net.minecraft.util.ResourceLocation;
 
-import bartworks.common.configs.ConfigHandler;
+import bartworks.common.configs.Configuration;
 import bwcrossmod.BartWorksCrossmod;
 import bwcrossmod.galacticraft.UniversalTeleportType;
 import bwcrossmod.galacticraft.planets.ross128b.WorldProviderRoss128b;
@@ -64,17 +62,18 @@ public class Ross128SolarSystem {
         Ross128SolarSystem.Ross128b.setRelativeOrbitTime(0.65F);
         Ross128SolarSystem.Ross128b.atmosphere
             .addAll(Arrays.asList(IAtmosphericGas.OXYGEN, IAtmosphericGas.NITROGEN, IAtmosphericGas.ARGON));
-        Ross128SolarSystem.Ross128b.setDimensionInfo(ConfigHandler.ross128BID, WorldProviderRoss128b.class);
-        Ross128SolarSystem.Ross128b.setTierRequired(ConfigHandler.ross128btier);
+        Ross128SolarSystem.Ross128b
+            .setDimensionInfo(Configuration.crossModInteractions.ross128BID, WorldProviderRoss128b.class);
+        Ross128SolarSystem.Ross128b.setTierRequired(Configuration.CrossModInteractions.ross128btier);
 
         Ross128SolarSystem.Ross128ba = new Moon("Ross128ba").setParentPlanet(Ross128SolarSystem.Ross128b);
         Ross128SolarSystem.Ross128ba.setRelativeDistanceFromCenter(new CelestialBody.ScalableDistance(10f, 15f))
             .setRelativeOrbitTime(1 / 0.01F);
         Ross128SolarSystem.Ross128ba.setBodyIcon(
             new ResourceLocation(BartWorksCrossmod.MOD_ID + ":galacticraft/Ross128b/MapObjs/Ross128ba.png"));
-        Ross128SolarSystem.Ross128ba.setDimensionInfo(ConfigHandler.ross128BAID, WorldProviderRoss128ba.class);
         Ross128SolarSystem.Ross128ba
-            .setTierRequired(GalaxySpace.isModLoaded() ? Math.min(ConfigHandler.ross128btier + 2, 8) : 3);
+            .setDimensionInfo(Configuration.crossModInteractions.ross128BAID, WorldProviderRoss128ba.class);
+        Ross128SolarSystem.Ross128ba.setTierRequired(Configuration.CrossModInteractions.ross128batier);
 
         GalaxyRegistry.registerSolarSystem(Ross128SolarSystem.Ross128System);
         GalaxyRegistry.registerPlanet(Ross128SolarSystem.Ross128b);