^ Version bump to 1.7.0pre2

% Toned down Staballoy Construct explosion.
% Changed ore Density during generation in Toxic Everglades.
% Updated en_US.lang.

2 files changed, 4 insertions, 17 deletions

diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
index 65184b6f35..36efed40ef 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
@@ -63,7 +63,6 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 	// private static boolean gcAsteroids = true;
 
 	public WorldGen_GT_Base() {
-		GameRegistry.registerWorldGenerator(this, 7735);
 		if (debugWorldGen) {
 			GT_Log.out.println("GTPP_Worldgenerator created");
 		}
@@ -101,18 +100,6 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 		}
 	}
 
-	private void generateEnd(World world, Random random, int x, int z) {
-		// ...
-	}
-
-	private void generateSurface(World world, Random random, int x, int z) {
-		// ...
-	}
-
-	private void generateNether(World world, Random random, int x, int z) {
-		// ...
-	}
-
 	private synchronized void generateDarkWorld(Random aRandom, int aX, int aZ, World aWorld,
 			IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
 		Logger.WORLD("Trying to Generate Dimension.");
@@ -396,7 +383,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
 										// 32, instead of 64
 			}
 			else {
-				oreveinMaxSize = 24;
+				oreveinMaxSize = 48;
 			}
 
 			int wXbox = this.mX - (oreveinMaxSize / 16);
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java
index 03606b28e8..1252d4bc89 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java
@@ -75,8 +75,8 @@ extends WorldGen_GT {
 		//this.mMoon = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Moon", aMoon);
 		//this.mMars = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Mars", aMars);
 		//this.mAsteroid = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Asteroid", aAsteroid);
-		this.mMinY = ((short) HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY));
-		short mMaxY = ((short) HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY));
+		this.mMinY = 5;
+		short mMaxY = 14;
 		if (mMaxY < (this.mMinY + 7))    {
 			GT_Log.out.println(
 					"Oremix " + this.mWorldGenName +
@@ -186,7 +186,7 @@ extends WorldGen_GT {
 			return NO_OVERLAP;
 		}
 		// Adjust the density down the more chunks we are away from the oreseed.  The 5 chunks surrounding the seed should always be max density due to truncation of Math.sqrt().
-		int localDensity = Math.max(1, this.mDensity / ((int)Math.sqrt(2 + Math.pow(aChunkX/16 - aSeedX/16, 2) + Math.pow(aChunkZ/16 - aSeedZ/16, 2))) );
+		int localDensity = (Math.max(1, this.mDensity / ((int)Math.sqrt(2 + Math.pow(aChunkX/16 - aSeedX/16, 2) + Math.pow(aChunkZ/16 - aSeedZ/16, 2))))/2);
 
 		// To allow for early exit due to no ore placed in the bottom layer (probably because we are in the sky), unroll 1 pass through the loop
 		// Now we do bottom-level-first oregen, and work our way upwards.