diff --git a/forge_client/.classpath b/forge_client/.classpath
index fae6017a3b..34ef34d1b6 100755
--- a/forge_client/.classpath
+++ b/forge_client/.classpath
@@ -7,6 +7,6 @@
-
+
diff --git a/minecraft.patch b/minecraft.patch
index 34cbd93cae..6cdb963b4f 100644
--- a/minecraft.patch
+++ b/minecraft.patch
@@ -1,179 +1,6 @@
-diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButton.java ../src_work/minecraft/net/minecraft/src/BlockButton.java
---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-07 10:43:34.000000000 -0400
-@@ -41,36 +41,36 @@
-
- public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
- {
-- if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
-+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
- {
- return true;
- }
-- if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
-+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
- {
- return true;
- }
-- if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
-+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
- {
- return true;
- }
-- return l == 5 && world.isBlockNormalCube(i - 1, j, k);
-+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5);
- }
-
- public boolean canPlaceBlockAt(World world, int i, int j, int k)
- {
-- if(world.isBlockNormalCube(i - 1, j, k))
-+ if(world.isBlockSolidOnSide(i - 1, j, k,5))
- {
- return true;
- }
-- if(world.isBlockNormalCube(i + 1, j, k))
-+ if(world.isBlockSolidOnSide(i + 1, j, k,4))
- {
- return true;
- }
-- if(world.isBlockNormalCube(i, j, k - 1))
-+ if(world.isBlockSolidOnSide(i, j, k - 1,3))
- {
- return true;
- }
-- return world.isBlockNormalCube(i, j, k + 1);
-+ return world.isBlockSolidOnSide(i, j, k + 1,2);
- }
-
- public void onBlockPlaced(World world, int i, int j, int k, int l)
-@@ -78,19 +78,19 @@
- int i1 = world.getBlockMetadata(i, j, k);
- int j1 = i1 & 8;
- i1 &= 7;
-- if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
-+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
- {
- i1 = 4;
- } else
-- if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
-+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
- {
- i1 = 3;
- } else
-- if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
-+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
- {
- i1 = 2;
- } else
-- if(l == 5 && world.isBlockNormalCube(i - 1, j, k))
-+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
- {
- i1 = 1;
- } else
-@@ -102,19 +102,19 @@
-
- private int getOrientation(World world, int i, int j, int k)
- {
-- if(world.isBlockNormalCube(i - 1, j, k))
-+ if(world.isBlockSolidOnSide(i - 1, j, k,5))
- {
- return 1;
- }
-- if(world.isBlockNormalCube(i + 1, j, k))
-+ if(world.isBlockSolidOnSide(i + 1, j, k,4))
- {
- return 2;
- }
-- if(world.isBlockNormalCube(i, j, k - 1))
-+ if(world.isBlockSolidOnSide(i, j, k - 1,3))
- {
- return 3;
- }
-- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4;
-+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4;
- }
-
- public void onNeighborBlockChange(World world, int i, int j, int k, int l)
-@@ -123,19 +123,19 @@
- {
- int i1 = world.getBlockMetadata(i, j, k) & 7;
- boolean flag = false;
-- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
-+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1)
- {
- flag = true;
- }
-- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
-+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2)
- {
- flag = true;
- }
-- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
-+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3)
- {
- flag = true;
- }
-- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
-+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4)
- {
- flag = true;
- }
-diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChest.java ../src_work/minecraft/net/minecraft/src/BlockChest.java
---- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-07 10:43:34.000000000 -0400
-@@ -230,23 +230,23 @@
- public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer)
- {
- Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k);
-- if(world.isBlockNormalCube(i, j + 1, k))
-+ if(world.isBlockSolidOnSide(i, j + 1, k,0))
- {
- return true;
- }
-- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k))
-+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0))
- {
- return true;
- }
-- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k))
-+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0))
- {
- return true;
- }
-- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1))
-+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0))
- {
- return true;
- }
-- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1))
-+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0))
- {
- return true;
- }
-diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor.java ../src_work/minecraft/net/minecraft/src/BlockDoor.java
---- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-07 10:43:34.000000000 -0400
-@@ -178,7 +178,7 @@
- world.setBlockWithNotify(i, j, k, 0);
- flag = true;
- }
-- if(!world.isBlockNormalCube(i, j - 1, k))
-+ if(!world.isBlockSolidOnSide(i, j - 1, k,1))
- {
- world.setBlockWithNotify(i, j, k, 0);
- flag = true;
-@@ -241,7 +241,7 @@
- return false;
- } else
- {
-- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
-+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
- }
- }
-
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.java ../src_work/minecraft/net/minecraft/src/Block.java
---- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-07 10:43:32.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/Block.java 2011-09-07 21:52:10.331793000 +0200
++++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-07 21:53:05.657957800 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -303,9 +130,182 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.jav
static Class _mthclass$(String s)
{
try
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockButton.java ../src_work/minecraft/net/minecraft/src/BlockButton.java
+--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 2011-09-07 21:52:10.345794000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-07 21:53:05.647957200 +0200
+@@ -41,36 +41,36 @@
+
+ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
+ {
+- if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
+ {
+ return true;
+ }
+- if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
+ {
+ return true;
+ }
+- if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
+ {
+ return true;
+ }
+- return l == 5 && world.isBlockNormalCube(i - 1, j, k);
++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5);
+ }
+
+ public boolean canPlaceBlockAt(World world, int i, int j, int k)
+ {
+- if(world.isBlockNormalCube(i - 1, j, k))
++ if(world.isBlockSolidOnSide(i - 1, j, k,5))
+ {
+ return true;
+ }
+- if(world.isBlockNormalCube(i + 1, j, k))
++ if(world.isBlockSolidOnSide(i + 1, j, k,4))
+ {
+ return true;
+ }
+- if(world.isBlockNormalCube(i, j, k - 1))
++ if(world.isBlockSolidOnSide(i, j, k - 1,3))
+ {
+ return true;
+ }
+- return world.isBlockNormalCube(i, j, k + 1);
++ return world.isBlockSolidOnSide(i, j, k + 1,2);
+ }
+
+ public void onBlockPlaced(World world, int i, int j, int k, int l)
+@@ -78,19 +78,19 @@
+ int i1 = world.getBlockMetadata(i, j, k);
+ int j1 = i1 & 8;
+ i1 &= 7;
+- if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
+ {
+ i1 = 4;
+ } else
+- if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
+ {
+ i1 = 3;
+ } else
+- if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
+ {
+ i1 = 2;
+ } else
+- if(l == 5 && world.isBlockNormalCube(i - 1, j, k))
++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
+ {
+ i1 = 1;
+ } else
+@@ -102,19 +102,19 @@
+
+ private int getOrientation(World world, int i, int j, int k)
+ {
+- if(world.isBlockNormalCube(i - 1, j, k))
++ if(world.isBlockSolidOnSide(i - 1, j, k,5))
+ {
+ return 1;
+ }
+- if(world.isBlockNormalCube(i + 1, j, k))
++ if(world.isBlockSolidOnSide(i + 1, j, k,4))
+ {
+ return 2;
+ }
+- if(world.isBlockNormalCube(i, j, k - 1))
++ if(world.isBlockSolidOnSide(i, j, k - 1,3))
+ {
+ return 3;
+ }
+- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4;
++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4;
+ }
+
+ public void onNeighborBlockChange(World world, int i, int j, int k, int l)
+@@ -123,19 +123,19 @@
+ {
+ int i1 = world.getBlockMetadata(i, j, k) & 7;
+ boolean flag = false;
+- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1)
+ {
+ flag = true;
+ }
+- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2)
+ {
+ flag = true;
+ }
+- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3)
+ {
+ flag = true;
+ }
+- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4)
+ {
+ flag = true;
+ }
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockChest.java ../src_work/minecraft/net/minecraft/src/BlockChest.java
+--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 2011-09-07 21:52:10.356794000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-07 21:53:05.650957400 +0200
+@@ -230,23 +230,23 @@
+ public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer)
+ {
+ Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k);
+- if(world.isBlockNormalCube(i, j + 1, k))
++ if(world.isBlockSolidOnSide(i, j + 1, k,0))
+ {
+ return true;
+ }
+- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k))
++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0))
+ {
+ return true;
+ }
+- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k))
++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0))
+ {
+ return true;
+ }
+- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1))
++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0))
+ {
+ return true;
+ }
+- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1))
++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0))
+ {
+ return true;
+ }
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockDoor.java ../src_work/minecraft/net/minecraft/src/BlockDoor.java
+--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 2011-09-07 21:52:10.383796000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-07 21:53:05.653957600 +0200
+@@ -178,7 +178,7 @@
+ world.setBlockWithNotify(i, j, k, 0);
+ flag = true;
+ }
+- if(!world.isBlockNormalCube(i, j - 1, k))
++ if(!world.isBlockSolidOnSide(i, j - 1, k,1))
+ {
+ world.setBlockWithNotify(i, j, k, 0);
+ flag = true;
+@@ -241,7 +241,7 @@
+ return false;
+ } else
+ {
+- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
+ }
+ }
+
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadder.java ../src_work/minecraft/net/minecraft/src/BlockLadder.java
---- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 2011-09-07 21:52:10.429798000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-07 21:53:05.660958000 +0200
@@ -63,6 +63,11 @@
return super.getSelectedBoundingBoxFromPool(world, i, j, k);
}
@@ -389,8 +389,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLadd
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLever.java ../src_work/minecraft/net/minecraft/src/BlockLever.java
---- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 2011-09-07 21:52:10.439799000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-07 21:53:05.663958100 +0200
@@ -40,44 +40,44 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@@ -510,8 +510,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockLeve
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java
---- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:52:10.485802000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:53:05.666958300 +0200
@@ -46,7 +46,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@@ -531,8 +531,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockPres
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail.java ../src_work/minecraft/net/minecraft/src/BlockRail.java
---- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 2011-09-07 21:52:10.492802000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-07 21:53:05.669958500 +0200
@@ -16,12 +16,12 @@
public static final boolean isRailBlockAt(World world, int i, int j, int k)
{
@@ -587,8 +587,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRail
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java
---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:52:10.498802000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:53:05.672958700 +0200
@@ -27,7 +27,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@@ -608,8 +608,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds
return false;
} else
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java
---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:52:10.508803000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:53:05.675958800 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -639,8 +639,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockReds
{
return true;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorch.java ../src_work/minecraft/net/minecraft/src/BlockTorch.java
---- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 2011-09-07 21:52:10.556806000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-07 21:53:05.678959000 +0200
@@ -41,24 +41,24 @@
private boolean func_31032_h(World world, int i, int j, int k)
@@ -744,8 +744,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTorc
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java
---- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:32.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:52:10.559806000 +0200
++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:53:05.681959200 +0200
@@ -147,7 +147,7 @@
{
j1--;
@@ -781,8 +781,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/BlockTrap
+ public static boolean disableValidation=false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.java ../src_work/minecraft/net/minecraft/src/Chunk.java
---- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-07 10:43:32.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/Chunk.java 2011-09-07 21:52:10.593808000 +0200
++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-07 21:53:05.684959300 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -820,8 +820,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Chunk.jav
if(j1 != 0)
{
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRenderer.java ../src_work/minecraft/net/minecraft/src/EffectRenderer.java
---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 21:52:10.730816200 +0200
++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-07 21:53:05.688959600 +0200
@@ -7,6 +7,9 @@
import java.util.*;
import org.lwjgl.opengl.GL11;
@@ -965,8 +965,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRen
private Random rand;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiving.java ../src_work/minecraft/net/minecraft/src/EntityLiving.java
---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 21:52:10.892825000 +0200
++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-07 21:53:05.691959700 +0200
@@ -555,7 +555,9 @@
int i = MathHelper.floor_double(posX);
int j = MathHelper.floor_double(boundingBox.minY);
@@ -979,8 +979,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityLiv
public void writeEntityToNBT(NBTTagCompound nbttagcompound)
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPlayer.java ../src_work/minecraft/net/minecraft/src/EntityPlayer.java
---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 21:52:10.951828000 +0200
++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-07 21:53:05.701960300 +0200
@@ -6,6 +6,10 @@
import java.util.*;
@@ -1074,8 +1074,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPla
{
if(isPlayerSleeping() || !isEntityAlive())
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRenderer.java ../src_work/minecraft/net/minecraft/src/EntityRenderer.java
---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 21:52:11.003831800 +0200
++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-07 21:53:05.704960500 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -1111,8 +1111,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityRen
}
renderRainSnow(f);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion.java ../src_work/minecraft/net/minecraft/src/Explosion.java
---- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-07 10:43:32.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/Explosion.java 2011-09-07 21:52:11.106837000 +0200
++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-07 21:53:05.707960700 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -1140,9 +1140,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion
}
if(f1 > 0.0F)
{
+diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java ../src_work/minecraft/net/minecraft/src/Item.java
+--- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-07 21:52:11.394854000 +0200
++++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-07 21:53:05.713961000 +0200
+@@ -75,6 +75,13 @@
+ return 1.0F;
+ }
+
++ /* FORGE: Metadata-sensitive version of getStrVsBlock
++ */
++ public float getStrVsBlock(ItemStack itemstack, Block block, int md)
++ {
++ return getStrVsBlock(itemstack,block);
++ }
++
+ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
+ {
+ return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucket.java ../src_work/minecraft/net/minecraft/src/ItemBucket.java
---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 2011-09-07 21:52:11.418855000 +0200
++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-07 21:53:05.710960800 +0200
@@ -6,6 +6,8 @@
import java.util.Random;
@@ -1166,26 +1183,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemBucke
if(world.getBlockMaterial(i, j, k) == Material.water && world.getBlockMetadata(i, j, k) == 0)
{
world.setBlockWithNotify(i, j, k, 0);
-diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Item.java ../src_work/minecraft/net/minecraft/src/Item.java
---- ../src_base/minecraft/net/minecraft/src/Item.java 2011-09-07 10:43:32.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-07 10:43:34.000000000 -0400
-@@ -75,6 +75,13 @@
- return 1.0F;
- }
-
-+ /* FORGE: Metadata-sensitive version of getStrVsBlock
-+ */
-+ public float getStrVsBlock(ItemStack itemstack, Block block, int md)
-+ {
-+ return getStrVsBlock(itemstack,block);
-+ }
-+
- public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
- {
- return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRenderer.java ../src_work/minecraft/net/minecraft/src/ItemRenderer.java
---- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-07 21:52:11.494859900 +0200
++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-07 21:53:05.716961200 +0200
@@ -5,6 +5,10 @@
package net.minecraft.src;
@@ -1227,8 +1227,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemRende
Tessellator tessellator = Tessellator.instance;
int i = entityliving.getItemIcon(itemstack);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.java ../src_work/minecraft/net/minecraft/src/ItemTool.java
---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 10:43:32.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 21:52:11.528861000 +0200
++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-07 21:53:05.719961400 +0200
@@ -4,6 +4,8 @@
package net.minecraft.src;
@@ -1264,8 +1264,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/ItemTool.
protected EnumToolMaterial toolMaterial;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java
---- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:52:11.738873000 +0200
++++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:53:05.722961500 +0200
@@ -95,7 +95,7 @@
} else
if(blockEnum == EnumSkyBlock.Block)
@@ -1276,8 +1276,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MetadataC
if(k3 >= 15 && l3 == 0)
{
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java
---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-07 21:52:11.858880000 +0200
++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-07 21:53:05.725961700 +0200
@@ -35,4 +35,7 @@
public int sideHit;
public Vec3D hitVec;
@@ -1287,8 +1287,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/MovingObj
+ public int subHit=-1;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerController.java ../src_work/minecraft/net/minecraft/src/PlayerController.java
---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 21:52:12.966944000 +0200
++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-07 21:53:05.728961900 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -1332,8 +1332,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java
---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 21:52:12.970944000 +0200
++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-07 21:53:05.731962000 +0200
@@ -63,7 +63,7 @@
{
Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer);
@@ -1353,8 +1353,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
{
mc.sndManager.playSound(block.stepSound.func_1145_d(), (float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, (block.stepSound.getVolume() + 1.0F) / 8F, block.stepSound.getPitch() * 0.5F);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java
---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-07 21:52:12.974944000 +0200
++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-07 21:53:05.733962200 +0200
@@ -37,7 +37,7 @@
int j1 = mc.theWorld.getBlockMetadata(i, j, k);
boolean flag = super.sendBlockRemoved(i, j, k, l);
@@ -1383,8 +1383,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/PlayerCon
{
mc.sndManager.playSound(block.stepSound.func_1145_d(), (float)i + 0.5F, (float)j + 0.5F, (float)k + 0.5F, (block.stepSound.getVolume() + 1.0F) / 8F, block.stepSound.getPitch() * 0.5F);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlocks.java ../src_work/minecraft/net/minecraft/src/RenderBlocks.java
---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-07 10:43:32.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-07 21:52:13.275961700 +0200
++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-07 21:53:05.739962500 +0200
@@ -2171,7 +2171,7 @@
colorBlueTopRight *= f27;
int i1 = block.getBlockTexture(blockAccess, i, j, k, 2);
@@ -1458,8 +1458,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderBlo
tessellator.setColorOpaque_F(f12 * f25 * f, f15 * f25 * f1, f18 * f25 * f2);
renderSouthFace(block, i, j, k, 38);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEngine.java ../src_work/minecraft/net/minecraft/src/RenderEngine.java
---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 21:52:13.298963000 +0200
++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-07 21:53:05.743962700 +0200
@@ -126,6 +126,9 @@
}
try
@@ -1471,8 +1471,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderEng
GLAllocation.generateTextureNames(singleIntBuffer);
int i = singleIntBuffer.get(0);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlobal.java ../src_work/minecraft/net/minecraft/src/RenderGlobal.java
---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 21:52:13.380967700 +0200
++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-07 21:53:05.747963000 +0200
@@ -1558,8 +1558,8 @@
}
@@ -1496,8 +1496,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderGlo
private boolean occlusionEnabled;
private int cloudOffsetX;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderItem.java ../src_work/minecraft/net/minecraft/src/RenderItem.java
---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 21:52:13.389968200 +0200
++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-07 21:53:05.750963100 +0200
@@ -5,6 +5,11 @@
package net.minecraft.src;
@@ -1630,8 +1630,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte
int k1 = Item.itemsList[i].getColorFromDamage(j);
float f = (float)(k1 >> 16 & 0xff) / 255F;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPlayer.java ../src_work/minecraft/net/minecraft/src/RenderPlayer.java
---- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-07 21:52:13.427970400 +0200
++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-07 21:53:05.753963300 +0200
@@ -4,6 +4,7 @@
package net.minecraft.src;
@@ -1657,8 +1657,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderPla
modelbiped.bipedHead.showModel = i == 0;
modelbiped.bipedHeadwear.showModel = i == 0;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCrafting.java ../src_work/minecraft/net/minecraft/src/SlotCrafting.java
---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 21:52:13.498974000 +0200
++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-07 21:53:05.756963500 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -1676,8 +1676,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/SlotCraft
{
ItemStack itemstack1 = craftMatrix.getStackInSlot(i);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellator.java ../src_work/minecraft/net/minecraft/src/Tessellator.java
---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 11:12:23.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 21:52:13.588979600 +0200
++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-07 21:53:05.760963700 +0200
@@ -6,6 +6,7 @@
import java.io.PrintStream;
@@ -1863,8 +1863,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java
---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 10:43:32.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 21:52:13.700986000 +0200
++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-07 21:53:05.763963900 +0200
@@ -4,6 +4,7 @@
package net.minecraft.src;
@@ -1890,8 +1890,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/TileEntit
}
}
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.java ../src_work/minecraft/net/minecraft/src/World.java
---- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-07 10:43:32.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/World.java 2011-09-07 21:52:13.815992000 +0200
++++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-07 21:54:44.038584900 +0200
@@ -313,7 +313,11 @@
public boolean isAirBlock(int i, int j, int k)
@@ -1930,7 +1930,34 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav
}
}
-@@ -1895,13 +1903,18 @@
+@@ -1847,7 +1855,25 @@
+ tileentity.xCoord = i;
+ tileentity.yCoord = j;
+ tileentity.zCoord = k;
+- addedTileEntityList.add(tileentity);
++
++ // FORGE: This loop fixes a problem where, when scanning, the
++ // same entity is added several times, making the client lag
++ // crazyly when tile are requested during the scanning
++ // process.
++ boolean found = false;
++
++ for (Object o : addedTileEntityList) {
++ TileEntity e = (TileEntity) o;
++
++ if (e.xCoord == i && e.yCoord == j && e.zCoord == k) {
++ found = true;
++ break;
++ }
++ }
++
++ if (!found) {
++ addedTileEntityList.add(tileentity);
++ }
+ } else
+ {
+ loadedTileEntityList.add(tileentity);
+@@ -1895,13 +1921,18 @@
public boolean isBlockNormalCube(int i, int j, int k)
{
Block block = Block.blocksList[getBlockId(i, j, k)];
@@ -1956,7 +1983,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav
}
public void saveWorldIndirectly(IProgressUpdate iprogressupdate)
-@@ -2425,6 +2438,7 @@
+@@ -2425,6 +2456,7 @@
{
block = null;
}
@@ -1964,7 +1991,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav
return i > 0 && block == null && block1.canPlaceBlockOnSide(this, j, k, l, i1);
}
-@@ -2913,7 +2927,7 @@
+@@ -2913,7 +2945,7 @@
public int field_27172_i;
public boolean editingBlocks;
private long lockTimestamp;
@@ -1974,8 +2001,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/World.jav
public Random rand;
public boolean isNewWorld;
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRenderer.java ../src_work/minecraft/net/minecraft/src/WorldRenderer.java
---- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-07 21:52:13.915998300 +0200
++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-07 21:53:05.771964300 +0200
@@ -5,6 +5,9 @@
package net.minecraft.src;
@@ -2057,182 +2084,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/WorldRend
- tessellator = Tessellator.instance;
- }
}
-diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockButton.java ../src_work/minecraft_server/net/minecraft/src/BlockButton.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-07 10:43:34.000000000 -0400
-@@ -41,36 +41,36 @@
-
- public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
- {
-- if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
-+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
- {
- return true;
- }
-- if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
-+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
- {
- return true;
- }
-- if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
-+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
- {
- return true;
- }
-- return l == 5 && world.isBlockNormalCube(i - 1, j, k);
-+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5);
- }
-
- public boolean canPlaceBlockAt(World world, int i, int j, int k)
- {
-- if(world.isBlockNormalCube(i - 1, j, k))
-+ if(world.isBlockSolidOnSide(i - 1, j, k,5))
- {
- return true;
- }
-- if(world.isBlockNormalCube(i + 1, j, k))
-+ if(world.isBlockSolidOnSide(i + 1, j, k,4))
- {
- return true;
- }
-- if(world.isBlockNormalCube(i, j, k - 1))
-+ if(world.isBlockSolidOnSide(i, j, k - 1,3))
- {
- return true;
- }
-- return world.isBlockNormalCube(i, j, k + 1);
-+ return world.isBlockSolidOnSide(i, j, k + 1,2);
- }
-
- public void onBlockPlaced(World world, int i, int j, int k, int l)
-@@ -78,19 +78,19 @@
- int i1 = world.getBlockMetadata(i, j, k);
- int j1 = i1 & 8;
- i1 &= 7;
-- if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
-+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
- {
- i1 = 4;
- } else
-- if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
-+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
- {
- i1 = 3;
- } else
-- if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
-+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
- {
- i1 = 2;
- } else
-- if(l == 5 && world.isBlockNormalCube(i - 1, j, k))
-+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
- {
- i1 = 1;
- } else
-@@ -102,19 +102,19 @@
-
- private int getOrientation(World world, int i, int j, int k)
- {
-- if(world.isBlockNormalCube(i - 1, j, k))
-+ if(world.isBlockSolidOnSide(i - 1, j, k,5))
- {
- return 1;
- }
-- if(world.isBlockNormalCube(i + 1, j, k))
-+ if(world.isBlockSolidOnSide(i + 1, j, k,4))
- {
- return 2;
- }
-- if(world.isBlockNormalCube(i, j, k - 1))
-+ if(world.isBlockSolidOnSide(i, j, k - 1,3))
- {
- return 3;
- }
-- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4;
-+ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4;
- }
-
- public void onNeighborBlockChange(World world, int i, int j, int k, int l)
-@@ -123,19 +123,19 @@
- {
- int i1 = world.getBlockMetadata(i, j, k) & 7;
- boolean flag = false;
-- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
-+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1)
- {
- flag = true;
- }
-- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
-+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2)
- {
- flag = true;
- }
-- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
-+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3)
- {
- flag = true;
- }
-- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
-+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4)
- {
- flag = true;
- }
-diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockChest.java ../src_work/minecraft_server/net/minecraft/src/BlockChest.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 10:43:34.000000000 -0400
-@@ -140,23 +140,23 @@
- public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer)
- {
- Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k);
-- if(world.isBlockNormalCube(i, j + 1, k))
-+ if(world.isBlockSolidOnSide(i, j + 1, k,0))
- {
- return true;
- }
-- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k))
-+ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0))
- {
- return true;
- }
-- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k))
-+ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0))
- {
- return true;
- }
-- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1))
-+ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0))
- {
- return true;
- }
-- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1))
-+ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0))
- {
- return true;
- }
-diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 10:43:34.000000000 -0400
-@@ -167,7 +167,7 @@
- world.setBlockWithNotify(i, j, k, 0);
- flag = true;
- }
-- if(!world.isBlockNormalCube(i, j - 1, k))
-+ if(!world.isBlockSolidOnSide(i, j - 1, k,1))
- {
- world.setBlockWithNotify(i, j, k, 0);
- flag = true;
-@@ -230,7 +230,7 @@
- return false;
- } else
- {
-- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
-+ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
- }
- }
-
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Block.java ../src_work/minecraft_server/net/minecraft/src/Block.java
---- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/Block.java 2011-09-07 21:52:24.970630000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-07 21:53:05.784965100 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -2352,9 +2206,182 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
static Class _mthclass$(String s)
{
try
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockButton.java ../src_work/minecraft_server/net/minecraft/src/BlockButton.java
+--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-07 21:52:24.984631000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-07 21:53:05.774964500 +0200
+@@ -41,36 +41,36 @@
+
+ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
+ {
+- if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
+ {
+ return true;
+ }
+- if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
+ {
+ return true;
+ }
+- if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
+ {
+ return true;
+ }
+- return l == 5 && world.isBlockNormalCube(i - 1, j, k);
++ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5);
+ }
+
+ public boolean canPlaceBlockAt(World world, int i, int j, int k)
+ {
+- if(world.isBlockNormalCube(i - 1, j, k))
++ if(world.isBlockSolidOnSide(i - 1, j, k,5))
+ {
+ return true;
+ }
+- if(world.isBlockNormalCube(i + 1, j, k))
++ if(world.isBlockSolidOnSide(i + 1, j, k,4))
+ {
+ return true;
+ }
+- if(world.isBlockNormalCube(i, j, k - 1))
++ if(world.isBlockSolidOnSide(i, j, k - 1,3))
+ {
+ return true;
+ }
+- return world.isBlockNormalCube(i, j, k + 1);
++ return world.isBlockSolidOnSide(i, j, k + 1,2);
+ }
+
+ public void onBlockPlaced(World world, int i, int j, int k, int l)
+@@ -78,19 +78,19 @@
+ int i1 = world.getBlockMetadata(i, j, k);
+ int j1 = i1 & 8;
+ i1 &= 7;
+- if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
++ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
+ {
+ i1 = 4;
+ } else
+- if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
++ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
+ {
+ i1 = 3;
+ } else
+- if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
++ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
+ {
+ i1 = 2;
+ } else
+- if(l == 5 && world.isBlockNormalCube(i - 1, j, k))
++ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
+ {
+ i1 = 1;
+ } else
+@@ -102,19 +102,19 @@
+
+ private int getOrientation(World world, int i, int j, int k)
+ {
+- if(world.isBlockNormalCube(i - 1, j, k))
++ if(world.isBlockSolidOnSide(i - 1, j, k,5))
+ {
+ return 1;
+ }
+- if(world.isBlockNormalCube(i + 1, j, k))
++ if(world.isBlockSolidOnSide(i + 1, j, k,4))
+ {
+ return 2;
+ }
+- if(world.isBlockNormalCube(i, j, k - 1))
++ if(world.isBlockSolidOnSide(i, j, k - 1,3))
+ {
+ return 3;
+ }
+- return !world.isBlockNormalCube(i, j, k + 1) ? 1 : 4;
++ return !world.isBlockSolidOnSide(i, j, k + 1,2) ? 1 : 4;
+ }
+
+ public void onNeighborBlockChange(World world, int i, int j, int k, int l)
+@@ -123,19 +123,19 @@
+ {
+ int i1 = world.getBlockMetadata(i, j, k) & 7;
+ boolean flag = false;
+- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
++ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1)
+ {
+ flag = true;
+ }
+- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
++ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2)
+ {
+ flag = true;
+ }
+- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
++ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3)
+ {
+ flag = true;
+ }
+- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
++ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4)
+ {
+ flag = true;
+ }
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockChest.java ../src_work/minecraft_server/net/minecraft/src/BlockChest.java
+--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 21:52:24.994632000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-07 21:53:05.777964700 +0200
+@@ -140,23 +140,23 @@
+ public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer)
+ {
+ Object obj = (TileEntityChest)world.getBlockTileEntity(i, j, k);
+- if(world.isBlockNormalCube(i, j + 1, k))
++ if(world.isBlockSolidOnSide(i, j + 1, k,0))
+ {
+ return true;
+ }
+- if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockNormalCube(i - 1, j + 1, k))
++ if(world.getBlockId(i - 1, j, k) == blockID && world.isBlockSolidOnSide(i - 1, j + 1, k,0))
+ {
+ return true;
+ }
+- if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockNormalCube(i + 1, j + 1, k))
++ if(world.getBlockId(i + 1, j, k) == blockID && world.isBlockSolidOnSide(i + 1, j + 1, k,0))
+ {
+ return true;
+ }
+- if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockNormalCube(i, j + 1, k - 1))
++ if(world.getBlockId(i, j, k - 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k - 1,0))
+ {
+ return true;
+ }
+- if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockNormalCube(i, j + 1, k + 1))
++ if(world.getBlockId(i, j, k + 1) == blockID && world.isBlockSolidOnSide(i, j + 1, k + 1,0))
+ {
+ return true;
+ }
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java
+--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 21:52:25.022633000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-07 21:53:05.780964800 +0200
+@@ -167,7 +167,7 @@
+ world.setBlockWithNotify(i, j, k, 0);
+ flag = true;
+ }
+- if(!world.isBlockNormalCube(i, j - 1, k))
++ if(!world.isBlockSolidOnSide(i, j - 1, k,1))
+ {
+ world.setBlockWithNotify(i, j, k, 0);
+ flag = true;
+@@ -230,7 +230,7 @@
+ return false;
+ } else
+ {
+- return world.isBlockNormalCube(i, j - 1, k) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
++ return world.isBlockSolidOnSide(i, j - 1, k,1) && super.canPlaceBlockAt(world, i, j, k) && super.canPlaceBlockAt(world, i, j + 1, k);
+ }
+ }
+
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-07 21:52:25.067636000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-07 21:53:05.787965200 +0200
@@ -40,6 +40,11 @@
return super.getCollisionBoundingBoxFromPool(world, i, j, k);
}
@@ -2438,8 +2465,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockLever.java ../src_work/minecraft_server/net/minecraft/src/BlockLever.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 21:52:25.077636000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-07 21:53:05.790965400 +0200
@@ -35,44 +35,44 @@
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
@@ -2559,8 +2586,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:52:25.121639000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-07 21:53:05.793965600 +0200
@@ -46,7 +46,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@@ -2580,8 +2607,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRail.java ../src_work/minecraft_server/net/minecraft/src/BlockRail.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 21:52:25.128639000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-07 21:53:05.796965800 +0200
@@ -16,12 +16,12 @@
public static final boolean isRailBlockAt(World world, int i, int j, int k)
{
@@ -2636,8 +2663,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:52:25.134639000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-07 21:53:05.799965900 +0200
@@ -27,7 +27,7 @@
public boolean canPlaceBlockAt(World world, int i, int j, int k)
@@ -2657,8 +2684,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
return false;
} else
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:52:25.143640000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-07 21:53:05.802966100 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -2688,8 +2715,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
{
return true;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 21:52:25.191643000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-07 21:53:05.805966300 +0200
@@ -36,24 +36,24 @@
private boolean func_31028_g(World world, int i, int j, int k)
@@ -2793,8 +2820,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
flag = true;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java
---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:52:25.194643000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-07 21:53:05.808966400 +0200
@@ -130,7 +130,7 @@
{
j1--;
@@ -2830,8 +2857,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Bl
+ public static boolean disableValidation=false;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Chunk.java ../src_work/minecraft_server/net/minecraft/src/Chunk.java
---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 21:52:25.210644000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-07 21:53:05.811966600 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -2869,8 +2896,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ch
if(j1 != 0)
{
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java
---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 21:52:25.444657000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-07 21:53:05.814966800 +0200
@@ -532,7 +532,9 @@
int i = MathHelper.floor_double(posX);
int j = MathHelper.floor_double(boundingBox.minY);
@@ -2883,8 +2910,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En
public void writeEntityToNBT(NBTTagCompound nbttagcompound)
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java
---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 21:52:25.489660000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-07 21:53:05.818967000 +0200
@@ -6,6 +6,10 @@
import java.util.*;
@@ -2978,8 +3005,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/En
{
if(isPlayerSleeping() || !isEntityAlive())
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Explosion.java ../src_work/minecraft_server/net/minecraft/src/Explosion.java
---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 21:52:25.578665000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-07 21:53:05.820967100 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -3006,9 +3033,26 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Ex
}
if(f1 > 0.0F)
{
+diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Item.java ../src_work/minecraft_server/net/minecraft/src/Item.java
+--- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-07 21:52:25.654669000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-07 21:53:05.830967700 +0200
+@@ -65,6 +65,13 @@
+ return 1.0F;
+ }
+
++ /* FORGE: Metadata-sensitive version of getStrVsBlock
++ */
++ public float getStrVsBlock(ItemStack itemstack, Block block, int md)
++ {
++ return getStrVsBlock(itemstack,block);
++ }
++
+ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
+ {
+ return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java
---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-07 21:52:25.675670000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-07 21:53:05.823967300 +0200
@@ -6,6 +6,8 @@
import java.util.Random;
@@ -3033,8 +3077,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
{
world.setBlockWithNotify(i, j, k, 0);
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java
---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 21:52:25.706672000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-07 21:53:05.827967500 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -3113,26 +3157,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
}
}
-diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Item.java ../src_work/minecraft_server/net/minecraft/src/Item.java
---- ../src_base/minecraft_server/net/minecraft/src/Item.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-07 10:43:34.000000000 -0400
-@@ -65,6 +65,13 @@
- return 1.0F;
- }
-
-+ /* FORGE: Metadata-sensitive version of getStrVsBlock
-+ */
-+ public float getStrVsBlock(ItemStack itemstack, Block block, int md)
-+ {
-+ return getStrVsBlock(itemstack,block);
-+ }
-+
- public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer entityplayer)
- {
- return itemstack;
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemTool.java ../src_work/minecraft_server/net/minecraft/src/ItemTool.java
---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 21:52:25.772676000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-07 21:53:05.832967800 +0200
@@ -4,6 +4,8 @@
package net.minecraft.src;
@@ -3168,8 +3195,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/It
protected EnumToolMaterial toolMaterial;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java
---- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:52:25.835680000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-07 21:53:05.835968000 +0200
@@ -95,7 +95,7 @@
} else
if(blockEnum == EnumSkyBlock.Block)
@@ -3180,8 +3207,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Me
if(k3 >= 15 && l3 == 0)
{
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java
---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-07 21:52:25.857681000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-07 21:53:05.838968200 +0200
@@ -35,4 +35,7 @@
public int sideHit;
public Vec3D hitVec;
@@ -3191,8 +3218,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Mo
+ public int subHit=-1;
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java
---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 21:52:26.166698000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-07 21:53:05.840968300 +0200
@@ -169,12 +169,11 @@
sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver));
for(int k = 0; k < numBlocksToUpdate; k++)
@@ -3210,8 +3237,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Pl
}
}
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java
---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:34.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 21:52:26.268704000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-07 21:53:05.843968400 +0200
@@ -3,6 +3,7 @@
// Decompiler options: packimports(3) braces deadcode
@@ -3229,8 +3256,8 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Sl
{
ItemStack itemstack1 = craftMatrix.getStackInSlot(i);
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/World.java ../src_work/minecraft_server/net/minecraft/src/World.java
---- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-07 10:43:33.000000000 -0400
-+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-07 10:43:34.000000000 -0400
+--- ../src_base/minecraft_server/net/minecraft/src/World.java 2011-09-07 21:52:26.443714000 +0200
++++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-07 21:53:05.847968700 +0200
@@ -166,7 +166,11 @@
public boolean isAirBlock(int i, int j, int k)
diff --git a/release.bat b/release.bat
index 21ccc13758..8f7c89964e 100755
--- a/release.bat
+++ b/release.bat
@@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH%
cd forge
-sh package.sh 1.0.6
+sh package.sh 1.0.7
pause