diff --git a/src/minecraft/net/minecraft/src/Chunk.java b/src/minecraft/net/minecraft/src/Chunk.java index a622094..b81b28e 100644 --- a/src/minecraft/net/minecraft/src/Chunk.java +++ b/src/minecraft/net/minecraft/src/Chunk.java @@ -124,7 +124,7 @@ public class Chunk { for (int var8 = 0; var8 < var5; ++var8) { - byte var9 = par2ArrayOfByte[var6 << 11 | var7 << 7 | var8]; + byte var9 = par2ArrayOfByte[var6 << 12 | var7 << 8 | var8]; if (var9 != 0) { diff --git a/src/minecraft/net/minecraft/src/ChunkProviderEnd.java b/src/minecraft/net/minecraft/src/ChunkProviderEnd.java index d9eeeed..b820a54 100644 --- a/src/minecraft/net/minecraft/src/ChunkProviderEnd.java +++ b/src/minecraft/net/minecraft/src/ChunkProviderEnd.java @@ -69,8 +69,8 @@ public class ChunkProviderEnd implements IChunkProvider for (int var41 = 0; var41 < 8; ++var41) { - int var42 = var41 + var9 * 8 << 11 | 0 + var10 * 8 << 7 | var11 * 4 + var30; - short var43 = 128; + int var42 = var41 + var9 * 8 << 12 | 0 + var10 * 8 << 8 | var11 * 4 + var30; + short var43 = 256; double var44 = 0.125D; double var46 = var33; double var48 = (var35 - var33) * var44; @@ -116,7 +116,7 @@ public class ChunkProviderEnd implements IChunkProvider for (int var11 = 127; var11 >= 0; --var11) { - int var12 = (var6 * 16 + var5) * 128 + var11; + int var12 = (var6 * 16 + var5) * 256 + var11; byte var13 = par3ArrayOfByte[var12]; if (var13 == 0) @@ -170,7 +170,7 @@ public class ChunkProviderEnd implements IChunkProvider public Chunk provideChunk(BigInteger par1, BigInteger par2) { this.endRNG.setSeed((long)par1.intValue() * 341873128712L + (long)par2.intValue() * 132897987541L); - byte[] var3 = new byte[32768]; + byte[] var3 = new byte[65536]; this.biomesForGeneration = this.endWorld.getWorldChunkManager().loadBlockGeneratorData(this.biomesForGeneration, par1.shiftLeft(4), par2.shiftLeft(4), 16, 16); this.generateTerrain(par1, par2, var3, this.biomesForGeneration); this.replaceBlocksForBiome(par1, par2, var3, this.biomesForGeneration); diff --git a/src/minecraft/net/minecraft/src/ChunkProviderFlat.java b/src/minecraft/net/minecraft/src/ChunkProviderFlat.java index 4e7d337..3851c84 100644 --- a/src/minecraft/net/minecraft/src/ChunkProviderFlat.java +++ b/src/minecraft/net/minecraft/src/ChunkProviderFlat.java @@ -43,7 +43,7 @@ public class ChunkProviderFlat implements IChunkProvider var6 = Block.grass.blockID; } - par1ArrayOfByte[var3 << 11 | var4 << 7 | var5] = (byte)var6; + par1ArrayOfByte[var3 << 12 | var4 << 8 | var5] = (byte)var6; } } } @@ -63,7 +63,7 @@ public class ChunkProviderFlat implements IChunkProvider */ public Chunk provideChunk(BigInteger par1, BigInteger par2) { - byte[] var3 = new byte[32768]; + byte[] var3 = new byte[65536]; this.generate(var3); Chunk var4 = new Chunk(this.worldObj, var3, par1, par2); diff --git a/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java b/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java index 20373fc..d814050 100644 --- a/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java +++ b/src/minecraft/net/minecraft/src/ChunkProviderGenerate.java @@ -99,13 +99,13 @@ public class ChunkProviderGenerate implements IChunkProvider public void generateTerrain(BigInteger par1, BigInteger par2, byte[] par3ArrayOfByte) { byte var4 = 4; - byte var5 = 16; + byte var5 = 32; byte var6 = 63; int var7 = var4 + 1; - byte var8 = 17; + byte var8 = 33; int var9 = var4 + 1; this.biomesForGeneration = this.worldObj.getWorldChunkManager().getBiomesForGeneration(this.biomesForGeneration, par1.multiply(BigInteger.valueOf(4)).subtract(BigInteger.valueOf(2)), par2.multiply(BigInteger.valueOf(4)).subtract(BigInteger.valueOf(2)), var7 + 5, var9 + 5); - this.noiseArray = this.initializeNoiseField(this.noiseArray, par1.multiply(BigInteger.valueOf(var4)), 0, par2.multiply(BigInteger.valueOf(var4)), var7, var8, var9); + this.noiseArray = this.initializeNoiseField(this.noiseArray, par1.multiply(BigInteger.valueOf(var4)), 0, par2.multiply(BigInteger.valueOf(var4)), var7, var8, var9, 17); for (int var10 = 0; var10 < var4; ++var10) { @@ -133,8 +133,8 @@ public class ChunkProviderGenerate implements IChunkProvider for (int var42 = 0; var42 < 4; ++var42) { - int var43 = var42 + var10 * 4 << 11 | 0 + var11 * 4 << 7 | var12 * 8 + var31; - short var44 = 128; + int var43 = var42 + var10 * 4 << 12 | 0 + var11 * 4 << 8 | var12 * 8 + var31; + short var44 = 256; var43 -= var44; double var45 = 0.25D; double var49 = (var36 - var34) * var45; @@ -199,9 +199,9 @@ public class ChunkProviderGenerate implements IChunkProvider byte var14 = var10.topBlock; byte var15 = var10.fillerBlock; - for (int var16 = 127; var16 >= 0; --var16) + for (int var16 = 255; var16 >= 0; --var16) { - int var17 = (var9 * 16 + var8) * 128 + var16; + int var17 = (var9 * 16 + var8) * 256 + var16; if (var16 <= 0 + this.rand.nextInt(5)) { @@ -286,7 +286,7 @@ public class ChunkProviderGenerate implements IChunkProvider public Chunk provideChunk(BigInteger par1, BigInteger par2) { this.rand.setSeed((long)par1.longValue() * 341873128712L + (long)par2.longValue() * 132897987541L); - byte[] var3 = new byte[32768]; + byte[] var3 = new byte[65536]; this.generateTerrain(par1, par2, var3); this.biomesForGeneration = this.worldObj.getWorldChunkManager().loadBlockGeneratorData(this.biomesForGeneration, par1.shiftLeft(4), par2.shiftLeft(4), 16, 16); this.replaceBlocksForBiome(par1, par2, var3, this.biomesForGeneration); @@ -317,7 +317,7 @@ public class ChunkProviderGenerate implements IChunkProvider * generates a subset of the level's terrain data. Takes 7 arguments: the [empty] noise array, the position, and the * size. */ - private double[] initializeNoiseField(double[] par1ArrayOfDouble, BigInteger par2, int par3, BigInteger par4, int par5, int par6, int par7) + private double[] initializeNoiseField(double[] par1ArrayOfDouble, BigInteger par2, int par3, BigInteger par4, int par5, int par6, int par7, int par8) { if (par1ArrayOfDouble == null) { @@ -418,8 +418,8 @@ public class ChunkProviderGenerate implements IChunkProvider double var48 = (double)var17; double var26 = (double)var16; var48 += var46 * 0.2D; - var48 = var48 * (double)par6 / 16.0D; - double var28 = (double)par6 / 2.0D + var48 * 4.0D - par3; + var48 = var48 * (double)par8 / 16.0D; + double var28 = (double)par8 / 2.0D + var48 * 4.0D - par3; double var30 = 0.0D; for (int var47 = 0; var47 < par6; ++var47) @@ -456,7 +456,7 @@ public class ChunkProviderGenerate implements IChunkProvider var30 = var30 * (1.0D - var40) + -10.0D * var40; } - par1ArrayOfDouble[var12] = var30 - par3; + par1ArrayOfDouble[var12] = var30; ++var12; } } @@ -474,7 +474,7 @@ public class ChunkProviderGenerate implements IChunkProvider int var9 = var4 + 1; byte[] par3ArrayOfByte = new byte[1 << 12]; this.biomesForGeneration = this.worldObj.getWorldChunkManager().getBiomesForGeneration(this.biomesForGeneration, x.multiply(BigInteger.valueOf(4)).subtract(BigInteger.valueOf(2)), z.multiply(BigInteger.valueOf(4)).subtract(BigInteger.valueOf(2)), var7 + 5, var9 + 5); - double[] noiseArray = initializeNoiseField(null, x.multiply(BigInteger.valueOf(var4)), y * var4, z.multiply(BigInteger.valueOf(var4)), var7, var8, var9); + double[] noiseArray = initializeNoiseField(null, x.multiply(BigInteger.valueOf(var4)), y * var5, z.multiply(BigInteger.valueOf(var4)), var7, var8, var9, 3); for (int var10 = 0; var10 < var4; ++var10) { for (int var11 = 0; var11 < var4; ++var11) diff --git a/src/minecraft/net/minecraft/src/ChunkProviderHell.java b/src/minecraft/net/minecraft/src/ChunkProviderHell.java index 13b4c07..f89b2a8 100644 --- a/src/minecraft/net/minecraft/src/ChunkProviderHell.java +++ b/src/minecraft/net/minecraft/src/ChunkProviderHell.java @@ -96,8 +96,8 @@ public class ChunkProviderHell implements IChunkProvider for (int var41 = 0; var41 < 4; ++var41) { - int var42 = var41 + var9 * 4 << 11 | 0 + var10 * 4 << 7 | var11 * 8 + var30; - short var43 = 128; + int var42 = var41 + var9 * 4 << 12 | 0 + var10 * 4 << 8 | var11 * 8 + var30; + short var43 = 256; double var44 = 0.25D; double var46 = var33; double var48 = (var35 - var33) * var44; @@ -160,7 +160,7 @@ public class ChunkProviderHell implements IChunkProvider for (int var15 = 127; var15 >= 0; --var15) { - int var16 = (var8 * 16 + var7) * 128 + var15; + int var16 = (var8 * 16 + var7) * 256 + var15; if (var15 < 127 - this.hellRNG.nextInt(5) && var15 > 0 + this.hellRNG.nextInt(5)) { @@ -252,7 +252,7 @@ public class ChunkProviderHell implements IChunkProvider public Chunk provideChunk(BigInteger par1, BigInteger par2) { this.hellRNG.setSeed((long)par1.longValue() * 341873128712L + (long)par2.longValue()* 132897987541L); - byte[] var3 = new byte[32768]; + byte[] var3 = new byte[65536]; this.generateNetherTerrain(par1, par2, var3); this.replaceBlocksForBiome(par1, par2, var3); this.netherCaveGenerator.generate(this, this.worldObj, par1, par2, var3);