Revert "Add fringelands."

This reverts commit acc69336a3.

readme.md

@@ -1,3 +1,5 @@
-# Minecraft 1.3.2 128bit mod
+![Image](./Image.png)
 
-Incompleted yet.
+Please made it you self :)
+
+# End of support

src/minecraft/net/minecraft/src/AnvilChunkLoader.java

@@ -223,7 +223,7 @@ public class AnvilChunkLoader implements IThreadedFileIO, IChunkLoader
             if (var9 != null)
             {
                 var10 = new NBTTagCompound();
-                var10.setByte("Y", (byte)(var9.getYLocation() & 255));
+                var10.setByte("Y", (byte)(var9.getYLocation() >> 4 & 255));
                 var10.setByteArray("Blocks", var9.getBlockLSBArray());
 
                 if (var9.getBlockMSBArray() != null)
@@ -313,11 +313,11 @@ public class AnvilChunkLoader implements IThreadedFileIO, IChunkLoader
         byte var7 = 16;
         ExtendedBlockStorage[] var8 = new ExtendedBlockStorage[var7];
 
-        for (int var9 = 0; var9 < var6.tagCount() && var9 < var8.length; ++var9)
+        for (int var9 = 0; var9 < var6.tagCount(); ++var9)
         {
             NBTTagCompound var10 = (NBTTagCompound)var6.tagAt(var9);
             byte var11 = var10.getByte("Y");
-            ExtendedBlockStorage var12 = new ExtendedBlockStorage(var11);
+            ExtendedBlockStorage var12 = new ExtendedBlockStorage(var11 << 4);
             var12.setBlockLSBArray(var10.getByteArray("Blocks"));
 
             if (var10.hasKey("Add"))

src/minecraft/net/minecraft/src/Chunk.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -23,8 +22,6 @@ public class Chunk
      */
     private ExtendedBlockStorage[] storageArrays;
 
-    private LinkedList<ExtendedBlockStorage>[] extraStorageArray = new LinkedList[256];
-
     /**
      * Contains a 16x16 mapping on the X/Z plane of the biome ID to which each colum belongs.
      */
@@ -130,7 +127,12 @@ public class Chunk
                     {
                         int var10 = var8 >> 4;
 
-                    	getBlockStorage(var10).setExtBlockID(var6, var8 & 15, var7, var9);
+                        if (this.storageArrays[var10] == null)
+                        {
+                            this.storageArrays[var10] = new ExtendedBlockStorage(var10 << 4);
+                        }
+
+                        this.storageArrays[var10].setExtBlockID(var6, var8 & 15, var7, var9);
                     }
                 }
             }
@@ -177,21 +179,6 @@ public class Chunk
         return this.storageArrays;
     }
 
-    public ExtendedBlockStorage getBlockStorage(int yBase) {
-    	if(yBase < 0 || yBase >= storageArrays.length) {
-    		LinkedList<ExtendedBlockStorage> list = extraStorageArray[yBase & 0xFF];
-    		if(list == null) list = extraStorageArray[yBase & 0xFF] = new LinkedList<>();
-    		for(ExtendedBlockStorage blockStorage : list) if(blockStorage.yBase == yBase) return blockStorage;
-    		ExtendedBlockStorage blockStorage = new ExtendedBlockStorage(yBase);
-    		list.add(blockStorage);
-    		worldObj.addExtraChunk(xPosition, yBase, zPosition, blockStorage);
-    		return blockStorage;
-    	} else {
-    		ExtendedBlockStorage blockStorage;
-    		return (blockStorage = storageArrays[yBase]) == null ? storageArrays[yBase] = new ExtendedBlockStorage(yBase) : blockStorage;
-    	}
-    }
-    
     /**
      * Generates the height map for a chunk from scratch
      */
@@ -523,18 +510,32 @@ public class Chunk
      */
     public int getBlockID(int par1, int par2, int par3)
     {
-    	ExtendedBlockStorage var4 = this.getBlockStorage(par2 >> 4);
+        if (par2 >> 4 >= this.storageArrays.length)
+        {
+            return 0;
+        }
+        else
+        {
+            ExtendedBlockStorage var4 = this.storageArrays[par2 >> 4];
             return var4 != null ? var4.getExtBlockID(par1, par2 & 15, par3) : 0;
         }
+    }
 
     /**
      * Return the metadata corresponding to the given coordinates inside a chunk.
      */
     public int getBlockMetadata(int par1, int par2, int par3)
     {
-    	ExtendedBlockStorage var4 = this.getBlockStorage(par2 >> 4);
+        if (par2 >> 4 >= this.storageArrays.length)
+        {
+            return 0;
+        }
+        else
+        {
+            ExtendedBlockStorage var4 = this.storageArrays[par2 >> 4];
             return var4 != null ? var4.getExtBlockMetadata(par1, par2 & 15, par3) : 0;
         }
+    }
 
     /**
      * Sets a blockID for a position in the chunk. Args: x, y, z, blockID
@@ -566,7 +567,7 @@ public class Chunk
         }
         else
         {
-            ExtendedBlockStorage var10 = this.getBlockStorage(par2 >> 4);
+            ExtendedBlockStorage var10 = this.storageArrays[par2 >> 4];
             boolean var11 = false;
 
             if (var10 == null)
@@ -677,7 +678,7 @@ public class Chunk
      */
     public boolean setBlockMetadata(int par1, int par2, int par3, int par4)
     {
-        ExtendedBlockStorage var5 = this.getBlockStorage(par2 >> 4);
+        ExtendedBlockStorage var5 = this.storageArrays[par2 >> 4];
 
         if (var5 == null)
         {
@@ -718,7 +719,7 @@ public class Chunk
      */
     public int getSavedLightValue(EnumSkyBlock par1EnumSkyBlock, int par2, int par3, int par4)
     {
-        ExtendedBlockStorage var5 = this.getBlockStorage(par3 >> 4);
+        ExtendedBlockStorage var5 = this.storageArrays[par3 >> 4];
         return var5 == null ? (this.canBlockSeeTheSky(par2, par3, par4) ? par1EnumSkyBlock.defaultLightValue : 0) : (par1EnumSkyBlock == EnumSkyBlock.Sky ? var5.getExtSkylightValue(par2, par3 & 15, par4) : (par1EnumSkyBlock == EnumSkyBlock.Block ? var5.getExtBlocklightValue(par2, par3 & 15, par4) : par1EnumSkyBlock.defaultLightValue));
     }
 
@@ -728,7 +729,7 @@ public class Chunk
      */
     public void setLightValue(EnumSkyBlock par1EnumSkyBlock, int par2, int par3, int par4, int par5)
     {
-        ExtendedBlockStorage var6 = this.getBlockStorage(par3 >> 4);
+        ExtendedBlockStorage var6 = this.storageArrays[par3 >> 4];
 
         if (var6 == null)
         {
@@ -756,7 +757,7 @@ public class Chunk
      */
     public int getBlockLightValue(int par1, int par2, int par3, int par4)
     {
-        ExtendedBlockStorage var5 = this.getBlockStorage(par2 >> 4);
+        ExtendedBlockStorage var5 = this.storageArrays[par2 >> 4];
 
         if (var5 == null)
         {
@@ -1196,9 +1197,19 @@ public class Chunk
      */
     public boolean getAreLevelsEmpty(int par1, int par2)
     {
+        if (par1 < 0)
+        {
+            par1 = 0;
+        }
+
+        if (par2 >= 256)
+        {
+            par2 = 255;
+        }
+
         for (int var3 = par1; var3 <= par2; var3 += 16)
         {
-            ExtendedBlockStorage var4 = this.getBlockStorage(var3 >> 4);
+            ExtendedBlockStorage var4 = this.storageArrays[var3 >> 4];
 
             if (var4 != null && !var4.isEmpty())
             {
@@ -1430,8 +1441,4 @@ public class Chunk
 //            }
 //        }
     }
-
-	public LinkedList<ExtendedBlockStorage>[] getExtraStorageArray() {
-		return extraStorageArray;
-	}
 }

src/minecraft/net/minecraft/src/ChunkCache.java

@@ -56,6 +56,16 @@ public class ChunkCache implements IBlockAccess
      * Returns the block ID at coords x,y,z
      */
     public int getBlockId(BigInteger par1, int par2, BigInteger par3)
+    {
+        if (par2 < 0)
+        {
+            return 0;
+        }
+        else if (par2 >= 256)
+        {
+            return 0;
+        }
+        else
         {
             int var4 = (par1.shiftRight(4)).subtract(chunkX).intValueExact();
             int var5 = (par3.shiftRight(4)).subtract(chunkZ).intValueExact();
@@ -70,6 +80,7 @@ public class ChunkCache implements IBlockAccess
                 return 0;
             }
         }
+    }
 
     /**
      * Returns the TileEntity associated with a given block in X,Y,Z coordinates, or null if no TileEntity exists
@@ -197,11 +208,22 @@ public class ChunkCache implements IBlockAccess
      * Returns the block metadata at coords x,y,z
      */
     public int getBlockMetadata(BigInteger par1, int par2, BigInteger par3)
+    {
+        if (par2 < 0)
+        {
+            return 0;
+        }
+        else if (par2 >= 256)
+        {
+            return 0;
+        }
+        else
         {
         	int var4 = (par1.shiftRight(4)).subtract(chunkX).intValueExact();
             int var5 = (par3.shiftRight(4)).subtract(chunkZ).intValueExact();
             return this.chunkArray[var4][var5].getBlockMetadata(par1.intValue() & 15, par2, par3.intValue() & 15);
         }
+    }
 
     /**
      * Returns the block's material.

src/minecraft/net/minecraft/src/ChunkProviderGenerate.java

@@ -4,8 +4,6 @@ import org.mcmodule.math.BigInteger;
 import java.util.List;
 import java.util.Random;
 
-import static net.minecraft.src.Constants.*;
-
 public class ChunkProviderGenerate implements IChunkProvider
 {
     /** RNG. */
@@ -142,12 +140,7 @@ public class ChunkProviderGenerate implements IChunkProvider
 
                             for (int var51 = 0; var51 < 4; ++var51)
                             {
-                            	if(!ENABLE_FRINGE_LAND) {
+                                if ((var47 += var49) > 0.0D)
-                            		var47 += var49;
-                            	} else {
-                            		if(var51 == 0) var47 = var34;
-                            	}
-                                if (var47 > 0.0D)
                                 {
                                     par3ArrayOfByte[var43 += var44] = (byte)Block.stone.blockID;
                                 }
@@ -159,9 +152,6 @@ public class ChunkProviderGenerate implements IChunkProvider
                                 {
                                     par3ArrayOfByte[var43 += var44] = 0;
                                 }
-                                if(ENABLE_FRINGE_LAND) {
-                            		var47 += var49;
-                            	}
                             }
 
                             var34 += var38;
@@ -205,7 +195,7 @@ public class ChunkProviderGenerate implements IChunkProvider
 
                     if (var16 <= 0 + this.rand.nextInt(5))
                     {
-//                        par3ArrayOfByte[var17] = (byte)Block.bedrock.blockID;
+                        par3ArrayOfByte[var17] = (byte)Block.bedrock.blockID;
                     }
                     else
                     {
@@ -455,7 +445,7 @@ public class ChunkProviderGenerate implements IChunkProvider
                         var30 = var30 * (1.0D - var40) + -10.0D * var40;
                     }
 
-                    par1ArrayOfDouble[var12] = var30 - par3;
+                    par1ArrayOfDouble[var12] = var30;
                     ++var12;
                 }
             }
@@ -464,92 +454,6 @@ public class ChunkProviderGenerate implements IChunkProvider
         return par1ArrayOfDouble;
     }
 
-    // FIXME
-    public void generateExtraBlockStorage(BigInteger x, int y, BigInteger z, ExtendedBlockStorage storage) {
-    	byte var4 = 4;
-        byte var5 = 2;
-        int var7 = var4 + 1;
-        byte var8 = 3;
-        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);
-    	 for (int var10 = 0; var10 < var4; ++var10)
-         {
-             for (int var11 = 0; var11 < var4; ++var11)
-             {
-                 for (int var12 = 0; var12 < var5; ++var12)
-                 {
-                     double var13 = 0.125D;
-                     double var15 = noiseArray[((var10 + 0) * var9 + var11 + 0) * var8 + var12 + 0];
-                     double var17 = noiseArray[((var10 + 0) * var9 + var11 + 1) * var8 + var12 + 0];
-                     double var19 = noiseArray[((var10 + 1) * var9 + var11 + 0) * var8 + var12 + 0];
-                     double var21 = noiseArray[((var10 + 1) * var9 + var11 + 1) * var8 + var12 + 0];
-                     double var23 = (noiseArray[((var10 + 0) * var9 + var11 + 0) * var8 + var12 + 1] - var15) * var13;
-                     double var25 = (noiseArray[((var10 + 0) * var9 + var11 + 1) * var8 + var12 + 1] - var17) * var13;
-                     double var27 = (noiseArray[((var10 + 1) * var9 + var11 + 0) * var8 + var12 + 1] - var19) * var13;
-                     double var29 = (noiseArray[((var10 + 1) * var9 + var11 + 1) * var8 + var12 + 1] - var21) * var13;
-
-                     var15 += var23 * Math.floorDiv(y, 16);
-                     var17 += var25 * Math.floorDiv(y, 16);
-                     var19 += var27 * Math.floorDiv(y, 16);
-                     var21 += var29 * Math.floorDiv(y, 16);
-                     
-                     for (int var31 = 0; var31 < 8; ++var31)
-                     {
-                         double var32 = 0.25D;
-                         double var34 = var15;
-                         double var36 = var17;
-                         double var38 = (var19 - var15) * var32;
-                         double var40 = (var21 - var17) * var32;
-
-                         for (int var42 = 0; var42 < 4; ++var42)
-                         {
-                             int var43 = var42 + var10 * 4 << 8 | 0 + var11 * 4 << 4 | var12 * 8 + var31;
-                             short var44 = 16;
-                             var43 -= var44;
-                             double var45 = 0.25D;
-                             double var49 = (var36 - var34) * var45;
-                             double var47 = var34 - var49;
-
-                             for (int var51 = 0; var51 < 4; ++var51)
-                             {
-                             	if(!ENABLE_FRINGE_LAND) {
-                             		var47 += var49;
-                             	} else {
-                             		if(var51 == 0) var47 = var34;
-                             	}
-                                 if (var47 > 0.0D)
-                                 {
-                                     par3ArrayOfByte[var43 += var44] = (byte)Block.stone.blockID;
-                                 }
-                                 else
-                                 {
-                                     par3ArrayOfByte[var43 += var44] = 0;
-                                 }
-                                 if(ENABLE_FRINGE_LAND) {
-                             		var47 += var49;
-                             	}
-                             }
-
-                             var34 += var38;
-                             var36 += var40;
-                         }
-
-                         var15 += var23;
-                         var17 += var25;
-                         var19 += var27;
-                         var21 += var29;
-                     }
-                 }
-             }
-         }
-    	 for(int i = 0; i < 16; i++) for(int j = 0; j < 16; j++) for(int k = 0; k < 16; k++) {
-    		 int blockId = par3ArrayOfByte[i << 8 | k << 4 | j] & 0xFF;
-    		 if(blockId != 0) storage.setExtBlockID(i, j, k, blockId);
-    	 }
-    }
-
     /**
      * Checks to see if a chunk exists at x, y
      */

src/minecraft/net/minecraft/src/ChunkProviderServer.java

@@ -333,8 +333,4 @@ public class ChunkProviderServer implements IChunkProvider
     {
         return this.loadedChunkHashMap.size();
     }
-    
-    public void generateExtraBlockStorage(BigInteger x, int y, BigInteger z, ExtendedBlockStorage storage) {
-    	this.currentChunkProvider.generateExtraBlockStorage(x, y, z, storage);
-    }
 }

src/minecraft/net/minecraft/src/CommandServerTp.java

@@ -63,7 +63,7 @@ public class CommandServerTp extends CommandBase
                 int var5 = par2ArrayOfStr.length - 3;
                 int var6 = 30000000;
                 BigDecimal var7 = parseBigDecimal(par1ICommandSender, par2ArrayOfStr[var5++]);
-                int var8 = parseInt(par1ICommandSender, par2ArrayOfStr[var5++]);
+                int var8 = parseIntBounded(par1ICommandSender, par2ArrayOfStr[var5++], 0, 256);
                 BigDecimal var9 = parseBigDecimal(par1ICommandSender, par2ArrayOfStr[var5++]);
                 var4.serverForThisPlayer.setPlayerLocation(var7.add(BigDecimal.valueOf(0.5)), (double)var8, var9.add(BigDecimal.valueOf(0.5)), var4.rotationYaw, var4.rotationPitch);
                 notifyAdmins(par1ICommandSender, "commands.tp.coordinates", new Object[] {var4.getEntityName(), var7.toString(), Integer.valueOf(var8), var9.toString()});

src/minecraft/net/minecraft/src/Constants.java

@@ -1,7 +1,6 @@
 package net.minecraft.src;
 
 import java.lang.reflect.Field;
-import sun.misc.Unsafe;
 
 public class Constants {
 	public static       boolean DISABLE_MODULO = false,
@@ -13,18 +12,9 @@ public class Constants {
 	public static boolean USE_64BIT_PERLIN_GENERATOR = false;
 	
 	static {
-		Unsafe unsafe;
-		try {
-			Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
-			unsafeField.setAccessible(true);
-			unsafe = (Unsafe) unsafeField.get(null);
-		} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
-			throw new RuntimeException(e);
-		}
 		Class<Constants> cls = Constants.class;
 		try {
 			for(Field f : cls.getDeclaredFields()) {
-//				unsafe.putBoolean(cls, unsafe.fieldOffset(f), Boolean.getBoolean(cls.getName() + "." + f.getName()));
 				f.setBoolean(null, Boolean.getBoolean(cls.getName() + "." + f.getName()));
 			}
 		} catch(Throwable t) {

src/minecraft/net/minecraft/src/Entity.java

@@ -467,10 +467,10 @@ public abstract class Entity
             this.fallDistance *= 0.5F;
         }
 
-//        if (this.posY < -64.0D)
+        if (this.posY < -64.0D)
-//        {
+        {
-//            this.kill();
+            this.kill();
-//        }
+        }
 
         if (!this.worldObj.isRemote)
         {

src/minecraft/net/minecraft/src/EntityPlayerMP.java

@@ -173,7 +173,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting
 
         if (!this.chunksToLoad.isEmpty())
         {
-            ArrayList<Chunk> var6 = new ArrayList<>();
+            ArrayList var6 = new ArrayList();
             Iterator var7 = this.chunksToLoad.iterator();
             ArrayList var3 = new ArrayList();
 
@@ -192,16 +192,6 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting
             if (!var6.isEmpty())
             {
                 this.serverForThisPlayer.sendPacketToPlayer(new Packet56MapChunks(var6));
-                for(Chunk chunk : var6) {
-                	LinkedList<ExtendedBlockStorage>[] list = chunk.getExtraStorageArray();
-                    for (int i = 0; i < list.length; i++) {
-        				LinkedList<ExtendedBlockStorage> linkedList = list[i];
-        				if(linkedList == null) continue;
-        				for(ExtendedBlockStorage blockStorage : linkedList) {
-        	            	this.serverForThisPlayer.sendPacketToPlayer(new Packet57ExtraChunk(chunk.xPosition, blockStorage.yBase, chunk.zPosition, blockStorage));
-        	            }
-        			}
-                }
                 Iterator var10 = var3.iterator();
 
                 while (var10.hasNext())

src/minecraft/net/minecraft/src/EntityRenderer.java

@@ -994,9 +994,7 @@ public class EntityRenderer
             this.mc.mcProfiler.endStartSection("culling");
             Frustrum var14 = new Frustrum();
             var14.setPosition(var7, var9, var11);
-//            long time = System.currentTimeMillis();
             this.mc.renderGlobal.clipRenderersByFrustum(var14, par1);
-//            System.out.println(System.currentTimeMillis() - time);
 
             if (var13 == 0)
             {

src/minecraft/net/minecraft/src/ExtendedBlockStorage.java

@@ -5,7 +5,7 @@ public class ExtendedBlockStorage
     /**
      * Contains the bottom-most Y block represented by this ExtendedBlockStorage. Typically a multiple of 16.
      */
-    int yBase;
+    private int yBase;
 
     /**
      * A total count of the number of non-air blocks in this block storage's Chunk.
@@ -46,7 +46,6 @@ public class ExtendedBlockStorage
         this.blockMetadataArray = new NibbleArray(this.blockLSBArray.length, 4);
         this.skylightArray = new NibbleArray(this.blockLSBArray.length, 4);
         this.blocklightArray = new NibbleArray(this.blockLSBArray.length, 4);
-        this.blockMSBArray = new NibbleArray(this.blockLSBArray.length, 4);
     }
 
     /**
@@ -317,12 +316,4 @@ public class ExtendedBlockStorage
         this.blockMSBArray = new NibbleArray(this.blockLSBArray.length, 4);
         return this.blockMSBArray;
     }
-
-	public int getBlockRefCnt() {
-		return this.blockRefCount;
-	}
-
-	public void setBlockRefCnt(int blockRefCnt) {
-		this.blockRefCount = blockRefCnt;
-	}
 }

src/minecraft/net/minecraft/src/IChunkProvider.java

@@ -59,6 +59,4 @@ public interface IChunkProvider
     ChunkPosition findClosestStructure(World var1, String var2, BigInteger var3, int var4, BigInteger var5);
 
     int getLoadedChunkCount();
-    
-    default void generateExtraBlockStorage(BigInteger x, int y, BigInteger z, ExtendedBlockStorage storage) {}
 }

src/minecraft/net/minecraft/src/ItemBlock.java

@@ -72,10 +72,10 @@ public class ItemBlock extends Item
         {
             return false;
         }
-        /*else if (par5 == 255 && Block.blocksList[this.blockID].blockMaterial.isSolid())
+        else if (par5 == 255 && Block.blocksList[this.blockID].blockMaterial.isSolid())
         {
             return false;
-        }*/
+        }
         else if (par3World.canPlaceEntityOnSide(this.blockID, par4, par5, par6, false, par7, par2EntityPlayer))
         {
             Block var12 = Block.blocksList[this.blockID];

src/minecraft/net/minecraft/src/NetClientHandler.java

@@ -582,19 +582,6 @@ public class NetClientHandler extends NetHandler
         this.worldClient.setBlockAndMetadataAndInvalidate(par1Packet53BlockChange.xPosition, par1Packet53BlockChange.yPosition, par1Packet53BlockChange.zPosition, par1Packet53BlockChange.type, par1Packet53BlockChange.metadata);
     }
 
-    public void handleAddExtraChunk(Packet57ExtraChunk packet) {
-    	Chunk chunk = this.worldClient.getChunkFromChunkCoords(packet.getX(), packet.getZ());
-    	if(chunk instanceof EmptyChunk) throw new RuntimeException("Attempt send extra chunk data on empty chunk!");
-    	ExtendedBlockStorage storage = chunk.getBlockStorage(packet.getY());
-    	System.arraycopy(packet.getBlockLSB()  , 0, storage.getBlockLSBArray()       , 0, storage.getBlockLSBArray()       .length);
-    	System.arraycopy(packet.getBlockMSB()  , 0, storage.getBlockMSBArray()  .data, 0, storage.getBlockMSBArray()  .data.length);
-    	System.arraycopy(packet.getMetadata()  , 0, storage.getMetadataArray()  .data, 0, storage.getMetadataArray()  .data.length);
-    	System.arraycopy(packet.getSkyLight()  , 0, storage.getSkylightArray()  .data, 0, storage.getSkylightArray()  .data.length);
-    	System.arraycopy(packet.getBlockLight(), 0, storage.getBlocklightArray().data, 0, storage.getBlocklightArray().data.length);
-    	storage.setBlockRefCnt(packet.getBlockRefCnt());
-    	this.worldClient.markBlocksDirty(packet.getX().shiftLeft(4), packet.getY() << 4, packet.getZ().shiftLeft(4), (packet.getX().shiftLeft(4)).add(BigInteger.valueOf(16)), (packet.getY() << 4) + 16, (packet.getZ().shiftLeft(4)).add(BigInteger.valueOf(16)));
-    }
-
     public void handleKickDisconnect(Packet255KickDisconnect par1Packet255KickDisconnect)
     {
         this.netManager.networkShutdown("disconnect.kicked", new Object[0]);

src/minecraft/net/minecraft/src/NetHandler.java

@@ -410,10 +410,6 @@ public abstract class NetHandler
         this.registerPacket(par1Packet56MapChunks);
     }
 
-    public void handleAddExtraChunk(Packet57ExtraChunk packet57ExtraChunks) {
-		registerPacket(packet57ExtraChunks);
-	}
-
     /**
      * packet.processPacket is only called if this returns true
      */
@@ -421,5 +417,4 @@ public abstract class NetHandler
     {
         return false;
     }
-
 }

src/minecraft/net/minecraft/src/NetServerHandler.java

@@ -399,10 +399,10 @@ public class NetServerHandler extends NetHandler
                     return;
                 }
 
-//                if (var6 >= this.mcServer.getBuildLimit())
+                if (var6 >= this.mcServer.getBuildLimit())
-//                {
+                {
-//                    return;
+                    return;
-//                }
+                }
             }
 
             ChunkCoordinates var19 = var2.getSpawnPoint();
@@ -480,11 +480,11 @@ public class NetServerHandler extends NetHandler
 
             this.playerEntity.theItemInWorldManager.tryUseItem(this.playerEntity, var2, var3);
         }
-        /*else if (par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit() - 1 && (par1Packet15Place.getDirection() == 1 || par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit()))
+        else if (par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit() - 1 && (par1Packet15Place.getDirection() == 1 || par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit()))
         {
             this.playerEntity.serverForThisPlayer.sendPacketToPlayer(new Packet3Chat("\u00a77Height limit for building is " + this.mcServer.getBuildLimit()));
             var4 = true;
-        }*/
+        }
         else
         {
             ChunkCoordinates var10 = var2.getSpawnPoint();

src/minecraft/net/minecraft/src/NoiseGeneratorOctaves.java

@@ -33,7 +33,7 @@ public class NoiseGeneratorOctaves extends NoiseGenerator
      */
     public double[] generateNoiseOctaves(double[] par1ArrayOfDouble, BigInteger par2, BigInteger par3, BigInteger par4, int par5, int par6, int par7, double par8, double par10, double par12)
     {
-        if (par1ArrayOfDouble == null || par1ArrayOfDouble.length < par5 * par6 * par7)
+        if (par1ArrayOfDouble == null)
         {
             par1ArrayOfDouble = new double[par5 * par6 * par7];
         }

src/minecraft/net/minecraft/src/NoiseGeneratorPerlin.java

@@ -2,8 +2,6 @@ package net.minecraft.src;
 
 import java.util.Random;
 
-import static net.minecraft.src.Constants.*;
-
 public class NoiseGeneratorPerlin extends NoiseGenerator
 {
     private int[] permutations;
@@ -124,7 +122,7 @@ public class NoiseGeneratorPerlin extends NoiseGenerator
                     var73 = this.lerp(var35, this.grad3d(this.permutations[var66 + 1], var31, 0.0D, var38 - 1.0D), this.grad3d(this.permutations[var22 + 1], var31 - 1.0D, 0.0D, var38 - 1.0D));
                     double var79 = this.lerp(var42, var70, var73);
                     var10001 = var75++;
-                    par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var79 * var77) : var79 * var77;
+                    par1ArrayOfDouble[var10001] += (var79 * var77);
                 }
             }
         }
@@ -205,7 +203,7 @@ public class NoiseGeneratorPerlin extends NoiseGenerator
                         double var60 = this.lerp(var56, var33, var35);
                         double var62 = this.lerp(var49, var58, var60);
                         var10001 = var19++;
-                        par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var62 * var20) : var62 * var20;
+                        par1ArrayOfDouble[var10001] += (var62 * var20);
                     }
                 }
             }

src/minecraft/net/minecraft/src/NoiseGeneratorPerlin64.java

@@ -2,8 +2,6 @@ package net.minecraft.src;
 
 import java.util.Random;
 
-import static net.minecraft.src.Constants.*;
-
 public class NoiseGeneratorPerlin64 extends NoiseGenerator
 {
     private int[] permutations;
@@ -124,7 +122,7 @@ public class NoiseGeneratorPerlin64 extends NoiseGenerator
                     var73 = this.lerp(var35, this.grad3d(this.permutations[var66 + 1], var31, 0.0D, var38 - 1.0D), this.grad3d(this.permutations[var22 + 1], var31 - 1.0D, 0.0D, var38 - 1.0D));
                     double var79 = this.lerp(var42, var70, var73);
                     var10001 = var75++;
-                    par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var79 * var77) : var79 * var77;
+                    par1ArrayOfDouble[var10001] += (var79 * var77);
                 }
             }
         }
@@ -205,7 +203,7 @@ public class NoiseGeneratorPerlin64 extends NoiseGenerator
                         double var60 = this.lerp(var56, var33, var35);
                         double var62 = this.lerp(var49, var58, var60);
                         var10001 = var19++;
-                        par1ArrayOfDouble[var10001] += FLOAT_PERLIN_GENERATOR ? (float) (var62 * var20) : var62 * var20;
+                        par1ArrayOfDouble[var10001] += (var62 * var20);
                     }
                 }
             }

src/minecraft/net/minecraft/src/Packet.java

@@ -432,7 +432,6 @@ public abstract class Packet
         addIdClassMapping(54, true, false, Packet54PlayNoteBlock.class);
         addIdClassMapping(55, true, false, Packet55BlockDestroy.class);
         addIdClassMapping(56, true, false, Packet56MapChunks.class);
-        addIdClassMapping(57, true, false, Packet57ExtraChunk.class);
         addIdClassMapping(60, true, false, Packet60Explosion.class);
         addIdClassMapping(61, true, false, Packet61DoorChange.class);
         addIdClassMapping(62, true, false, Packet62LevelSound.class);

src/minecraft/net/minecraft/src/Packet57ExtraChunk.java

@@ -1,101 +0,0 @@
-package net.minecraft.src;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.mcmodule.math.BigInteger;
-
-public class Packet57ExtraChunk extends Packet {
-
-	private byte[] blockLSB, blockMSB, metadata, skyLight, blockLight;
-	private BigInteger x, z;
-	private int y, blockRefCnt;
-
-	public Packet57ExtraChunk() {}
-	
-	public Packet57ExtraChunk(BigInteger x, int y, BigInteger z, ExtendedBlockStorage storage) {
-		this.x = x;
-		this.y = y;
-		this.z = z;
-		this.blockLSB    = storage.getBlockLSBArray();
-		this.blockMSB    = storage.getBlockMSBArray().data;
-		this.metadata    = storage.getMetadataArray().data;
-		this.skyLight    = storage.getSkylightArray().data;
-		this.blockLight  = storage.getBlocklightArray().data;
-		this.blockRefCnt = storage.getBlockRefCnt();
-	}
-	
-	@Override
-	public void readPacketData(DataInputStream var1) throws IOException {
-		this.x = readBigInteger(var1);
-		this.y = var1.readInt();
-		this.z = readBigInteger(var1);
-		this.blockLSB    = readBytesFromStream(var1);
-		this.blockMSB    = readBytesFromStream(var1);
-		this.metadata    = readBytesFromStream(var1);
-		this.skyLight    = readBytesFromStream(var1);
-		this.blockLight  = readBytesFromStream(var1);
-		this.blockRefCnt = var1.readInt();
-	}
-
-	@Override
-	public void writePacketData(DataOutputStream var1) throws IOException {
-		writeBigInteger(var1, this.x);
-		var1.writeInt(this.y);
-		writeBigInteger(var1, this.z);
-		writeByteArray(var1, this.blockLSB);
-		writeByteArray(var1, this.blockMSB);
-		writeByteArray(var1, this.metadata);
-		writeByteArray(var1, this.skyLight);
-		writeByteArray(var1, this.blockLight);
-		var1.writeInt(blockRefCnt);
-	}
-
-	@Override
-	public void processPacket(NetHandler var1) {
-		var1.handleAddExtraChunk(this);
-	}
-
-	@Override
-	public int getPacketSize() {
-		return 0;
-	}
-	
-	public byte[] getBlockLSB() {
-		return blockLSB;
-	}
-
-	public byte[] getBlockMSB() {
-		return blockMSB;
-	}
-
-	public byte[] getMetadata() {
-		return metadata;
-	}
-
-	public byte[] getSkyLight() {
-		return skyLight;
-	}
-
-	public byte[] getBlockLight() {
-		return blockLight;
-	}
-
-	public BigInteger getX() {
-		return x;
-	}
-
-	public BigInteger getZ() {
-		return z;
-	}
-
-	public int getY() {
-		return y;
-	}
-	
-	public int getBlockRefCnt() {
-		return blockRefCnt;
-	}
-
-}

src/minecraft/net/minecraft/src/PlayerInstance.java

@@ -3,7 +3,6 @@ package net.minecraft.src;
 import org.mcmodule.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 
 class PlayerInstance
@@ -49,8 +48,7 @@ class PlayerInstance
     {
         if (this.playersInChunk.contains(par1EntityPlayerMP))
         {
-        	Chunk chunk = PlayerManager.getWorldServer(this.myManager).getChunkFromChunkCoords(this.chunkLocation.chunkXPos, this.chunkLocation.chunkZPos);
+            par1EntityPlayerMP.serverForThisPlayer.sendPacketToPlayer(new Packet51MapChunk(PlayerManager.getWorldServer(this.myManager).getChunkFromChunkCoords(this.chunkLocation.chunkXPos, this.chunkLocation.chunkZPos), true, 0));
-            par1EntityPlayerMP.serverForThisPlayer.sendPacketToPlayer(new Packet51MapChunk(chunk, true, 0));
             this.playersInChunk.remove(par1EntityPlayerMP);
             par1EntityPlayerMP.chunksToLoad.remove(this.chunkLocation);
 
@@ -65,7 +63,6 @@ class PlayerInstance
 
                 this.myManager.getWorldServer().theChunkProviderServer.unloadChunksIfNotNearSpawn(this.chunkLocation.chunkXPos, this.chunkLocation.chunkZPos);
             }
-
         }
 //        else System.out.println(this + " B");
     }

src/minecraft/net/minecraft/src/PlayerManager.java

@@ -65,7 +65,7 @@ public class PlayerManager
         }
     }
 
-    public PlayerInstance getOrCreateChunkWatcher(BigInteger par1, BigInteger par2, boolean par3)
+    private PlayerInstance getOrCreateChunkWatcher(BigInteger par1, BigInteger par2, boolean par3)
     {
     	ChunkCoordIntPair pos = new ChunkCoordIntPair(par1, par2);
         PlayerInstance var6 = (PlayerInstance)this.allChunkWathers.get(pos);
@@ -211,7 +211,6 @@ public class PlayerManager
     	BigInteger var3 = MathHelper.toBigInteger(par1EntityPlayerMP.posZBig).shiftRight(4);
 //        int var2 = (int)par1EntityPlayerMP.posX >> 4;
 //        int var3 = (int)par1EntityPlayerMP.posZ >> 4;
-    	int y = (int)par1EntityPlayerMP.posY >> 4;
         double var4 = par1EntityPlayerMP.field_71131_d.subtract(par1EntityPlayerMP.posXBig).doubleValue();
         double var6 = par1EntityPlayerMP.field_71132_e.subtract(par1EntityPlayerMP.posZBig).doubleValue();
         double var8 = var4 * var4 + var6 * var6;
@@ -235,10 +234,6 @@ public class PlayerManager
                         if (!this.func_72684_a(var15, var16, var10, var11, var12))
                         {
                             this.getOrCreateChunkWatcher(var15, var16, true).addPlayerToChunkWatchingList(par1EntityPlayerMP);
-                            Chunk chunk = theWorldServer.getChunkFromChunkCoords(var15, var16);
-                            for(int var17 = y - this.playerViewDistance; var17 <= y + this.playerViewDistance; var17++) {
-                            	chunk.getBlockStorage(var17);
-                            }
                         }
 
                         if (!this.func_72684_a(var15.subtract(var13), var16.subtract(var14), var2, var3, var12))

src/minecraft/net/minecraft/src/RenderGlobal.java

@@ -551,17 +551,9 @@ public class RenderGlobal implements IWorldAccess
 //                    this.maxBlockZ = var10;
 //                }
 
-                int sdfvhsdbvfhsdhkbdkjsakjdb = this.renderChunksTall * 16;
-                int kshdjiajdfjosjofjsdhvfssd = sdfvhsdbvfhsdhkbdkjsakjdb / 2;
                 for (int var12 = 0; var12 < this.renderChunksTall; ++var12)
                 {
                     int var13 = var12 * 16;
-                    int var1000000000000000000000000 = var13 + kshdjiajdfjosjofjsdhvfssd - par2;
-                    if (var1000000000000000000000000 < 0) {
-                    	var1000000000000000000000000 -= sdfvhsdbvfhsdhkbdkjsakjdb - 1;
-                    }
-                    var1000000000000000000000000 /= sdfvhsdbvfhsdhkbdkjsakjdb;
-                    int y = var13 - var1000000000000000000000000 * sdfvhsdbvfhsdhkbdkjsakjdb;
 
 //                    if (var13 < this.minBlockY)
 //                    {
@@ -575,7 +567,7 @@ public class RenderGlobal implements IWorldAccess
 
                     WorldRenderer var14 = this.worldRenderers[(var9 * this.renderChunksTall + var12) * this.renderChunksWide + var6];
                     boolean var15 = var14.needsUpdate;
-                    var14.setPosition(x, y, z);
+                    var14.setPosition(x, var13, z);
 
                     if (!var15 && var14.needsUpdate)
                     { // WTF this is a unreachable code.
@@ -869,11 +861,7 @@ public class RenderGlobal implements IWorldAccess
 
             if (var17 < 0)
             {
-                if (var14 + 1 < 4) { 
                 var17 = var14++;
-                } else {
-                    var17 = 0;
-                }
                 this.allRenderLists[var17].func_78422_a(var22.posXMinus, var22.posYMinus, var22.posZMinus, var20, var10, var12);
             }
         }

src/minecraft/net/minecraft/src/RenderList.java

@@ -59,7 +59,7 @@ public class RenderList
             {
                 GL11.glPushMatrix();
                 if(profiler != null) profiler.startSection("translate");
-                GL11.glTranslated((float)(MathHelper.toBigDecimal(this.field_78429_a).subtract(this.field_78425_d).floatValue()), (this.field_78427_b - this.field_78426_e), (float)(MathHelper.toBigDecimal(this.field_78428_c).subtract(this.field_78423_f).floatValue()));
+                GL11.glTranslatef((float)(MathHelper.toBigDecimal(this.field_78429_a).subtract(this.field_78425_d).floatValue()), (float)((double)this.field_78427_b - this.field_78426_e), (float)(MathHelper.toBigDecimal(this.field_78428_c).subtract(this.field_78423_f).floatValue()));
                 if(profiler != null) profiler.endStartSection("opengl");
                 GL11.glCallLists(this.field_78424_g);
                 if(profiler != null) profiler.endSection();

src/minecraft/net/minecraft/src/ServerConfigurationManager.java

@@ -145,10 +145,10 @@ public abstract class ServerConfigurationManager
         this.playerEntityList.add(par1EntityPlayerMP);
         WorldServer var2 = this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension);
 
-//        while (!var2.getCollidingBoundingBoxes(par1EntityPlayerMP, ((Entity)par1EntityPlayerMP).boundingBox).isEmpty())
+        while (!var2.getCollidingBoundingBoxes(par1EntityPlayerMP, ((Entity)par1EntityPlayerMP).boundingBox).isEmpty())
-//        {
+        {
-//            par1EntityPlayerMP.setPosition(par1EntityPlayerMP.posX, par1EntityPlayerMP.posY + 1.0D, par1EntityPlayerMP.posZ);
+            par1EntityPlayerMP.setPosition(par1EntityPlayerMP.posX, par1EntityPlayerMP.posY + 1.0D, par1EntityPlayerMP.posZ);
-//        }
+        }
 
         var2.spawnEntityInWorld(par1EntityPlayerMP);
         this.func_72375_a(par1EntityPlayerMP, (WorldServer)null);

src/minecraft/net/minecraft/src/World.java

@@ -256,6 +256,7 @@ public abstract class World implements IBlockAccess
      */
     public int getBlockId(BigInteger par1, int par2, BigInteger par3)
     {
+    	if(par2 > 256 || par2 < 0) return 0;
         return this.getChunkFromChunkCoords(par1.shiftRight(4), par3.shiftRight(4)).getBlockID(par1.intValue() & 0xF, par2, par3.intValue() & 0xF);
     }
 
@@ -343,6 +344,16 @@ public abstract class World implements IBlockAccess
      * metadata, needsUpdate
      */
     public boolean setBlockAndMetadataWithUpdate(BigInteger par1, int par2, BigInteger par3, int par4, int par5, boolean par6)
+    {
+    	if (par2 < 0)
+        {
+            return false;
+        }
+        else if (par2 >= 256)
+        {
+            return false;
+        }
+        else
         {
             Chunk var7 = this.getChunkFromChunkCoords(par1.shiftRight(4), par3.shiftRight(4));
             boolean var8 = var7.setBlockIDWithMetadata(par1.intValue() & 0xF, par2, par3.intValue() & 0xF, par4, par5);
@@ -357,11 +368,22 @@ public abstract class World implements IBlockAccess
 
             return var8;
         }
+    }
 
     /**
      * Sets the block to the specified blockID at the block coordinates Args x, y, z, blockID
      */
     public boolean setBlock(BigInteger par1, int par2, BigInteger par3, int par4)
+    {
+    	if (par2 < 0)
+        {
+            return false;
+        }
+        else if (par2 >= 256)
+        {
+            return false;
+        }
+        else
         {
             Chunk var5 = this.getChunkFromChunkCoords(par1.shiftRight(4), par3.shiftRight(4));
             boolean var6 = var5.setBlockID(par1.intValue() & 0xF, par2, par3.intValue() & 0xF, par4);
@@ -376,6 +398,7 @@ public abstract class World implements IBlockAccess
 
             return var6;
         }
+    }
 
     /**
      * Returns the block's material.
@@ -390,10 +413,21 @@ public abstract class World implements IBlockAccess
      * Returns the block metadata at coords x,y,z
      */
     public int getBlockMetadata(BigInteger par1, int par2, BigInteger par3)
+    {
+    	if (par2 < 0)
+        {
+            return 0;
+        }
+        else if (par2 >= 256)
+        {
+            return 0;
+        }
+        else
         {
             Chunk var4 = this.getChunkFromChunkCoords(par1.shiftRight(4), par3.shiftRight(4));
             return var4.getBlockMetadata(par1.intValue() & 0xF, par2, par3.intValue() & 0xF);
         }
+    }
 
     /**
      * Sets the blocks metadata and if set will then notify blocks that this block changed. Args: x, y, z, metadata
@@ -410,6 +444,16 @@ public abstract class World implements IBlockAccess
      * Set the metadata of a block in global coordinates
      */
     public boolean setBlockMetadata(BigInteger par1, int par2, BigInteger par3, int par4)
+    {
+    	if (par2 < 0)
+        {
+            return false;
+        }
+        else if (par2 >= 256)
+        {
+            return false;
+        }
+        else
         {
             Chunk var5 = this.getChunkFromChunkCoords(par1.shiftRight(4), par3.shiftRight(4));
             int var6 = par1.intValue() & 0xF;
@@ -423,6 +467,7 @@ public abstract class World implements IBlockAccess
 
             return var8;
         }
+    }
 
     /**
      * Sets a block and notifies relevant systems with the block change  Args: x, y, z, blockID
@@ -3833,8 +3878,4 @@ public abstract class World implements IBlockAccess
             var7.destroyBlockPartially(par1, par2, par3, par4, par5);
         }
     }
-
-	public void addExtraChunk(BigInteger x, int y, BigInteger z, ExtendedBlockStorage blockStorage) {
-		chunkProvider.generateExtraBlockStorage(x, y, z, blockStorage);
-	}
 }

src/minecraft/net/minecraft/src/WorldRenderer.java

@@ -107,7 +107,7 @@ public class WorldRenderer
             this.posYPlus = par2 + 8;
             this.posZPlus = par3.add(BigInteger.valueOf(8));
             this.posXClip = par1.intValue() & 1023;
-            this.posYClip = par2 & 1023;
+            this.posYClip = par2;
             this.posZClip = par3.intValue() & 1023;
             this.posXMinus = par1.subtract(BigInteger.valueOf(posXClip));
             this.posYMinus = par2 - this.posYClip;
@@ -317,9 +317,7 @@ public class WorldRenderer
 
     public void updateInFrustum(ICamera par1ICamera)
     {
-//    	long time = System.currentTimeMillis();
         this.isInFrustum = par1ICamera.isBoundingBoxInFrustum(this.rendererBoundingBox);
-//        System.out.println("> " + (System.currentTimeMillis() - time));
     }
 
     /**

src/minecraft/net/minecraft/src/WorldServer.java

@@ -554,17 +554,6 @@ public class WorldServer extends World
         return this.theChunkProviderServer;
     }
 
-    public void addExtraChunk(BigInteger x, int y, BigInteger z, ExtendedBlockStorage blockStorage) {
-//    	long time = System.currentTimeMillis();
-    	super.addExtraChunk(x, y, z, blockStorage);
-//    	System.out.println(System.currentTimeMillis() - time);
-    	if(thePlayerManager == null || blockStorage.isEmpty()) return;
-    	PlayerInstance instance = thePlayerManager.getOrCreateChunkWatcher(x, z, false);
-    	if(instance != null) {
-    		instance.sendToAllPlayersWatchingChunk(new Packet57ExtraChunk(x, y, z, blockStorage));
-    	}
-    }
-
     /**
      * pars: min x,y,z , max x,y,z
      */