Merge branch 'master' of https://github.com/ted80/BiomesOPlenty

src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java

@@ -511,6 +511,8 @@ public class BiomeDecoratorBOP extends BiomeDecorator
     /**
      * The method that does the work of actually decorating chunks
      */
+    
+    @Override
     protected void decorate()
     {
 		MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Pre(currentWorld, randomGenerator, chunk_X, chunk_Z));
@@ -1180,7 +1182,7 @@ public class BiomeDecoratorBOP extends BiomeDecorator
             var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
             this.desertCactusGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5);
         }
-
+        
         if (this.generateLakes)
         {
             for (var2 = 0; var2 < 50 + pondsPerChunk; ++var2)

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandCrystals.java

@@ -37,7 +37,7 @@ public class BiomeGenPromisedLandCrystals extends BiomeGenBase
         this.customBiomeDecorator.glowFlowersPerChunk = 10;
 		this.customBiomeDecorator.blueMilksPerChunk = 5;
 		this.customBiomeDecorator.generateLakes = false;
-		//this.customBiomeDecorator.pondsPerChunk = -999;
+		this.customBiomeDecorator.pondsPerChunk = -100;
 		this.customBiomeDecorator.waterLakesPerChunk = 5;
 		this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();
@@ -64,19 +64,6 @@ public class BiomeGenPromisedLandCrystals extends BiomeGenBase
         int var7;
         int var8;
 
-        for (var6 = 0; var6 < var5; ++var6)
-        {
-            var7 = par3 + par2Random.nextInt(16);
-            var8 = par2Random.nextInt(30) + 30;
-            int var9 = par4 + par2Random.nextInt(16);
-            int var10 = par1World.getBlockId(var7, var8, var9);
-
-            if (var10 == Block.stone.blockID)
-            {
-                par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 0, 2);
-            }
-        }
-
         for (var5 = 0; var5 < 5; ++var5)
         {
             var6 = par3 + par2Random.nextInt(16);

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandDesert.java

@@ -35,7 +35,7 @@ public class BiomeGenPromisedLandDesert extends BiomeGenBase
 		this.customBiomeDecorator.tinyCactiPerChunk = 10;
 		this.customBiomeDecorator.aloePerChunk = 2;
 		this.customBiomeDecorator.generateLakes = false;
-		this.customBiomeDecorator.pondsPerChunk = -999;
+		this.customBiomeDecorator.pondsPerChunk = -100;
 		this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();
 		this.spawnableMonsterList.clear();
@@ -69,19 +69,6 @@ public class BiomeGenPromisedLandDesert extends BiomeGenBase
         int var7;
         int var8;
 
-        for (var6 = 0; var6 < var5; ++var6)
-        {
-            var7 = par3 + par2Random.nextInt(16);
-            var8 = par2Random.nextInt(30) + 30;
-            int var9 = par4 + par2Random.nextInt(16);
-            int var10 = par1World.getBlockId(var7, var8, var9);
-
-            if (var10 == Block.stone.blockID)
-            {
-                par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 0, 2);
-            }
-        }
-
         for (var5 = 0; var5 < 5; ++var5)
         {
             var6 = par3 + par2Random.nextInt(16);

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java

@@ -37,7 +37,7 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
         this.customBiomeDecorator.glowFlowersPerChunk = 3;
 		this.customBiomeDecorator.blueMilksPerChunk = 5;
 		this.customBiomeDecorator.generateLakes = false;
-		//this.customBiomeDecorator.pondsPerChunk = -999;
+		this.customBiomeDecorator.pondsPerChunk = -100;
 		this.customBiomeDecorator.waterLakesPerChunk = 5;
 		this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();
@@ -72,19 +72,6 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase
         int var7;
         int var8;
 
-        for (var6 = 0; var6 < var5; ++var6)
-        {
-            var7 = par3 + par2Random.nextInt(16);
-            var8 = par2Random.nextInt(30) + 30;
-            int var9 = par4 + par2Random.nextInt(16);
-            int var10 = par1World.getBlockId(var7, var8, var9);
-
-            if (var10 == Block.stone.blockID)
-            {
-                par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 0, 2);
-            }
-        }
-
         for (var5 = 0; var5 < 5; ++var5)
         {
             var6 = par3 + par2Random.nextInt(16);

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java

@@ -35,7 +35,7 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
 		this.customBiomeDecorator.promisedWillowPerChunk = 20;
 		this.customBiomeDecorator.blueMilksPerChunk = 1;
 		this.customBiomeDecorator.generateLakes = false;
-		//this.customBiomeDecorator.pondsPerChunk = -999;
+		this.customBiomeDecorator.pondsPerChunk = -100;
 		this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();
 		this.spawnableMonsterList.clear();
@@ -61,19 +61,6 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase
         int var7;
         int var8;
 
-        for (var6 = 0; var6 < var5; ++var6)
-        {
-            var7 = par3 + par2Random.nextInt(16);
-            var8 = par2Random.nextInt(30) + 30;
-            int var9 = par4 + par2Random.nextInt(16);
-            int var10 = par1World.getBlockId(var7, var8, var9);
-
-            if (var10 == Block.stone.blockID)
-            {
-                par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 0, 2);
-            }
-        }
-
         for (var5 = 0; var5 < 5; ++var5)
         {
             var6 = par3 + par2Random.nextInt(16);

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java

@@ -35,7 +35,7 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
         this.customBiomeDecorator.glowFlowersPerChunk = 3;
 		this.customBiomeDecorator.blueMilksPerChunk = 15;
 		this.customBiomeDecorator.generateLakes = false;
-		//this.customBiomeDecorator.pondsPerChunk = -999;
+		this.customBiomeDecorator.pondsPerChunk = -100;
 		this.customBiomeDecorator.waterLakesPerChunk = 10;
 		this.spawnableCreatureList.clear();
         this.spawnableWaterCreatureList.clear();
@@ -70,19 +70,6 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase
         int var7;
         int var8;
 
-        for (var6 = 0; var6 < var5; ++var6)
-        {
-            var7 = par3 + par2Random.nextInt(16);
-            var8 = par2Random.nextInt(30) + 30;
-            int var9 = par4 + par2Random.nextInt(16);
-            int var10 = par1World.getBlockId(var7, var8, var9);
-
-            if (var10 == Block.stone.blockID)
-            {
-                par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 0, 2);
-            }
-        }
-
         for (var5 = 0; var5 < 10; ++var5)
         {
             var6 = par3 + par2Random.nextInt(16);

src/minecraft/biomesoplenty/world/ChunkProviderPromised.java

@@ -113,7 +113,7 @@ public class ChunkProviderPromised implements IChunkProvider
 
                                 if (var46 > 0.0D)
                                 {
-                                    var51 = Block.stone.blockID;
+                                    var51 = Blocks.holyStone.get().blockID;
                                 }
 
                                 par3ArrayOfByte[var42] = (byte)var51;
@@ -162,7 +162,7 @@ public class ChunkProviderPromised implements IChunkProvider
                     {
                         var8 = -1;
                     }
-                    else if (var13 == Block.stone.blockID)
+                    else if (var13 == (byte)Blocks.holyStone.get().blockID)
                     {
                         if (var8 == -1)
                         {
@@ -502,6 +502,20 @@ public class ChunkProviderPromised implements IChunkProvider
         int var4 = par2 * 16;
         int var5 = par3 * 16;
         BiomeGenBase var6 = this.endWorld.getBiomeGenForCoords(var4 + 16, var5 + 16);
+        
+        for (int a = 0; a < 100; ++a)
+        {
+            int x = var4 + endWorld.rand.nextInt(16);
+            int y = endWorld.rand.nextInt(30) + 30;
+            int z = var5 + endWorld.rand.nextInt(16);
+            int b = endWorld.getBlockId(x, y, z);
+
+            if (b == Blocks.holyStone.get().blockID)
+            {
+            	endWorld.setBlock(x, y, z, Blocks.amethystOre.get().blockID, 0, 2);
+            }
+        }
+        
         var6.decorate(this.endWorld, this.endWorld.rand, var4, var5);
 
         MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(par1IChunkProvider, endWorld, endWorld.rand, par2, par3, false));

src/minecraft/biomesoplenty/world/layer/BiomeLayer.java

@@ -17,7 +17,7 @@ public abstract class BiomeLayer
     	BiomeLayer obj = new BiomeLayerCreate(1L);
     	obj = new BiomeLayerFuzzyZoom(2000L, (BiomeLayer)(obj));
     	
-    	for(int i = 0; i < 3; i++)
+    	for(int i = 1; i < 4; i++)
     	{
     		obj = new BiomeLayerZoom(2000L + i, (BiomeLayer)(obj));
     	}
@@ -26,6 +26,11 @@ public abstract class BiomeLayer
     	obj = new BiomeLayerBiomes(200L, ((BiomeLayer)(obj)), worldtype);
     	obj = BiomeLayerZoom.func_75915_a(1000L, ((BiomeLayer)(obj)), 2);
     	
+    	for(int j = 0; j < 4; j++)
+    	{
+    		obj = new BiomeLayerZoom(1000L + j, (BiomeLayer)(obj));
+    	}
+    	
     	BiomeLayerVoronoiZoom genlayervoronoizoom = new BiomeLayerVoronoiZoom(10L, ((BiomeLayer)(obj)));
 		((BiomeLayer)(obj)).initWorldGenSeed(seed);
 		genlayervoronoizoom.initWorldGenSeed(seed);