diff --git a/src/tconstruct/TConstruct.java b/src/tconstruct/TConstruct.java index 4b630547..b359cd05 100644 --- a/src/tconstruct/TConstruct.java +++ b/src/tconstruct/TConstruct.java @@ -139,6 +139,9 @@ public class TConstruct } content.intermodCommunication(); + Tforest.initProps(PHConstruct.cfglocation); + BOP.initProps(PHConstruct.cfglocation); + dimblacklist.getbaddimensions(); GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0)); } @@ -151,10 +154,7 @@ public class TConstruct TContent.modRecipes(); content.createEntities(); content.modRecipes(); - Tforest.initProps(PHConstruct.cfglocation); - BOP.initProps(PHConstruct.cfglocation); - dimblacklist.getbaddimensions(); - } + } public static LiquidCasting getTableCasting() { diff --git a/src/tconstruct/compat/BOP.java b/src/tconstruct/compat/BOP.java index 79bae810..3c316054 100644 --- a/src/tconstruct/compat/BOP.java +++ b/src/tconstruct/compat/BOP.java @@ -25,7 +25,8 @@ public class BOP { /* Load the configuration file */ config.load(); - pldimid = config.get("dimension settings", "Promised Land Dimension ID", true).getInt(); + pldimid = config.get("dimension settings", "Promised Land Dimension ID", -200).getInt(); + System.out.println("[TConstruct]PL Dim ID: " + pldimid); } else { pldimid = -100; diff --git a/src/tconstruct/compat/Tforest.java b/src/tconstruct/compat/Tforest.java index b5b901eb..fb7d6d75 100644 --- a/src/tconstruct/compat/Tforest.java +++ b/src/tconstruct/compat/Tforest.java @@ -25,7 +25,8 @@ public class Tforest { /* Load the configuration file */ config.load(); - tfdimid = config.get("Dimension", "DimensionID", true).getInt(); + tfdimid = config.get("dimension", "dimensionID", -100).getInt(); + System.out.println("[TConstruct]TF Dim ID: " + tfdimid); } else { tfdimid = -100; diff --git a/src/tconstruct/compat/dimensions/dimblacklist.java b/src/tconstruct/compat/dimensions/dimblacklist.java index 3f5df943..617081c5 100644 --- a/src/tconstruct/compat/dimensions/dimblacklist.java +++ b/src/tconstruct/compat/dimensions/dimblacklist.java @@ -32,16 +32,18 @@ public static boolean isDimInBlacklist(int dim){ for (int len = 0;len< blacklist.size(); len++){ if (blacklist.get(len) == dim) return false; + //System.out.println("[TConstruct]diminblist +" + blacklist.get(len)); } return true; } -public static boolean isDimPoolOnly(int dim){ +public static boolean isDimNoPool(int dim){ for (int len = 0;len< nopool.size(); len++){ if (nopool.get(len) == dim) - return false; + //System.out.println("[TConstruct]DimNoPool "+ nopool.get(len)); + return true; } - return true; + return false; } } diff --git a/src/tconstruct/worldgen/SlimeIslandGen.java b/src/tconstruct/worldgen/SlimeIslandGen.java index 1be86620..63dc1839 100644 --- a/src/tconstruct/worldgen/SlimeIslandGen.java +++ b/src/tconstruct/worldgen/SlimeIslandGen.java @@ -133,8 +133,9 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator } //Decorate + if(!dimblacklist.isDimNoPool(world.provider.dimensionId)){ generateSlimePool(world, rand, xChunk + xRange / 2, yCenter + initialHeight, zChunk + zRange / 2); - + } PlantGen tallGrass = new PlantGen(TContent.slimeTallGrass.blockID, 0, 128, xRange, 1, zRange, false); tallGrass.generate(world, rand, xChunk, yCenter + initialHeight + 1, zChunk); for (int i = 0; i < 3; i++) @@ -145,9 +146,8 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator public void generateSlimePool (World world, Random rand, int x, int y, int z) { - if(dimblacklist.isDimPoolOnly(world.provider.dimensionId)){ this.generate(world, rand, x, y, z); - } + } public boolean generate (World world, Random rand, int x, int y, int z) //WorldGenerator version