diff options
| author | boubou19 <miisterunknown@gmail.com> | 2024-09-19 23:05:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-19 21:05:17 +0000 |
| commit | c74367258e8a2a60392234d2a1a13e0a19433795 (patch) | |
| tree | 9c7d9d7173a91e7362f92250126a4a65f0920b04 /src/main/java/gtPlusPlus/everglades/gen | |
| parent | 0a5c7ecc004444a089edbed28f4ecb136bc21f1f (diff) | |
| download | GT5-Unofficial-c74367258e8a2a60392234d2a1a13e0a19433795.tar.gz GT5-Unofficial-c74367258e8a2a60392234d2a1a13e0a19433795.tar.bz2 GT5-Unofficial-c74367258e8a2a60392234d2a1a13e0a19433795.zip | |
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>
Diffstat (limited to 'src/main/java/gtPlusPlus/everglades/gen')
| -rw-r--r-- | src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java | 11 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java | 19 |
2 files changed, 11 insertions, 19 deletions
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; |
