fixed some bugs to prep for PR

SlimeKnights · Sep 13, 2013 · afe2d86 · afe2d86
1 parent 8e41fb6
commit afe2d86
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/src/tconstruct/TConstruct.java b/src/tconstruct/TConstruct.java
@@ -139,6 +139,9 @@ public void init(FMLInitializationEvent event)
         }
 
         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 void postInit(FMLPostInitializationEvent evt)
         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
@@ -25,7 +25,8 @@ public static void initProps (File location)
         /* 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
@@ -25,7 +25,8 @@ public static void initProps (File location)
         /* 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
@@ -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
@@ -133,8 +133,9 @@ public void generateIsland (World world, Random rand, int xChunk, int zChunk)
         }
 
         //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 void generateIsland (World world, Random rand, int xChunk, int zChunk)
 
     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