diff --git a/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index 84651596cc..7cfe0b9d35 100644 --- a/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -46,6 +46,7 @@ public class ForgeHooksClient { static boolean inWorld=false; static HashSet renderTextureTest=new HashSet(); static ArrayList renderTextureList=new ArrayList(); + static Tessellator defaultTessellator=null; protected static void bindTessellator(int tex, int sub) { List key=Arrays.asList(tex,sub); @@ -60,9 +61,9 @@ public class ForgeHooksClient { renderTextureTest.add(key); renderTextureList.add(key); t.startDrawingQuads(); - t.setTranslationD(Tessellator.firstInstance.xOffset, - Tessellator.firstInstance.yOffset, - Tessellator.firstInstance.zOffset); + t.setTranslationD(defaultTessellator.xOffset, + defaultTessellator.yOffset, + defaultTessellator.zOffset); } Tessellator.instance=t; } @@ -77,7 +78,6 @@ public class ForgeHooksClient { n=(Integer)textures.get(name); } if(!inWorld) { - Tessellator.instance=Tessellator.firstInstance; GL11.glBindTexture(3553 /* GL_TEXTURE_2D */,n); return; } @@ -85,8 +85,9 @@ public class ForgeHooksClient { } protected static void unbindTexture() { - Tessellator.instance=Tessellator.firstInstance; - if(!inWorld) { + if(inWorld) { + Tessellator.instance=defaultTessellator; + } else { GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader .getMinecraftInstance().renderEngine .getTexture("/terrain.png")); @@ -97,7 +98,7 @@ public class ForgeHooksClient { static int renderPass=-1; public static void beforeRenderPass(int pass) { renderPass=pass; - Tessellator.instance=Tessellator.firstInstance; + defaultTessellator=Tessellator.instance; Tessellator.renderingWorldRenderer=true; GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader .getMinecraftInstance().renderEngine @@ -120,7 +121,6 @@ public class ForgeHooksClient { GL11.glBindTexture(3553 /* GL_TEXTURE_2D */, ModLoader .getMinecraftInstance().renderEngine .getTexture("/terrain.png")); - Tessellator.instance=Tessellator.firstInstance; Tessellator.renderingWorldRenderer=false; } diff --git a/minecraft.patch b/minecraft.patch index 2414210872..1c8dcc0eb7 100644 --- a/minecraft.patch +++ b/minecraft.patch @@ -1,6 +1,179 @@ +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-03 12:18:32.126541000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-09-03 12:19:32.548997700 +0200 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -130,182 +303,9 @@ 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-03 12:18:32.143542000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-09-03 12:19:32.537997100 +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-03 12:18:32.156543000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-09-03 12:19:32.540997200 +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-03 12:18:32.191545000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-09-03 12:19:32.544997500 +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-03 12:18:32.257549000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-09-03 12:19:32.552997900 +0200 +--- ../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 @@ -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-03 12:18:32.271549000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-09-03 12:19:32.555998100 +0200 +--- ../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 @@ -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-03 12:18:32.332553000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-09-03 12:19:32.560998400 +0200 +--- ../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 @@ -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-03 12:18:32.340553000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-09-03 12:19:32.563998500 +0200 +--- ../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 @@ -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-03 12:18:32.351554000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-03 12:19:32.566998700 +0200 +--- ../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 @@ -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-03 12:18:32.364555000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-09-03 12:19:32.570998900 +0200 +--- ../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 @@ -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-03 12:18:32.433559000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-09-03 12:19:32.574999200 +0200 +--- ../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 @@ -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-03 12:18:32.437559000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-03 12:19:32.577999300 +0200 +--- ../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 @@ -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-03 12:18:32.476561000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-09-03 12:19:32.581999600 +0200 +--- ../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 @@ -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-03 12:18:32.624570200 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-09-03 12:19:32.586999900 +0200 +--- ../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 @@ -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-03 12:18:32.813580000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-09-03 12:19:32.590000000 +0200 +--- ../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 @@ -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-03 12:18:32.888585000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-09-03 12:19:32.594000300 +0200 +--- ../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 @@ -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-03 12:18:32.948588700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-09-03 12:19:32.599000600 +0200 +--- ../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 @@ -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-03 12:18:33.076596000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-09-03 12:19:32.602000700 +0200 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1140,26 +1140,9 @@ 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-03 12:18:33.419615000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-09-03 12:19:32.609001100 +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-03 12:18:33.448617000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-09-03 12:19:32.605000900 +0200 +--- ../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 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1183,9 +1166,26 @@ 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-03 12:18:33.541622700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-09-03 13:41:51.273476600 +0200 +--- ../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 @@ -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-03 12:18:33.588625000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-09-03 12:19:32.617001600 +0200 +--- ../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 @@ -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-03 12:18:33.857640000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-09-03 12:19:32.621001800 +0200 +--- ../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 @@ -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-03 12:18:34.108655000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-09-03 12:19:32.624002000 +0200 +--- ../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 @@ -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-03 12:18:34.468675000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-09-03 12:19:32.628002200 +0200 +--- ../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 @@ -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-03 12:18:34.473675000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-09-03 12:19:32.631002400 +0200 +--- ../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 @@ -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-03 12:18:34.478676000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-09-03 12:19:32.635002600 +0200 +--- ../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 @@ -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-03 12:18:34.797694500 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-09-03 12:19:32.641003000 +0200 +--- ../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 @@ -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-03 12:18:34.822695900 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-09-03 12:19:32.646003200 +0200 +--- ../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 @@ -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-03 12:18:34.911701000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-09-03 12:19:32.651003500 +0200 +--- ../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 @@ -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-03 12:18:34.923701700 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-09-03 13:45:05.006557500 +0200 +--- ../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 @@ -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-03 12:18:34.964704100 +0200 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-09-03 12:19:32.658003900 +0200 +--- ../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 @@ -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-03 12:18:35.048708000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-09-03 12:19:32.662004200 +0200 +--- ../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 @@ -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-03 12:18:35.156715000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-09-03 12:19:32.666004400 +0200 +--- ../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 10:57:28.000000000 -0400 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -1809,7 +1809,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat private int rawBuffer[]; private int vertexCount; private double textureU; -@@ -350,16 +353,43 @@ +@@ -350,16 +353,41 @@ private int addedVertices; private boolean isColorDisabled; private int drawMode; @@ -1839,12 +1839,10 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellat + private static IntBuffer intBuffer; + private static FloatBuffer floatBuffer; + public static Tessellator instance; -+ public static Tessellator firstInstance; + + static { + instance=new Tessellator(); -+ firstInstance=instance; -+ firstInstance.defaultTexture=true; ++ instance.defaultTexture=true; + + nativeBufferSize = 0x200000; + trivertsInBuffer = (nativeBufferSize/48)*6; @@ -1862,8 +1860,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-03 12:18:35.289722600 +0200 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-09-03 12:19:32.669004600 +0200 +--- ../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 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1889,8 +1887,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-03 12:18:35.412729000 +0200 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-09-03 12:19:32.675004900 +0200 +--- ../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 @@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -1973,8 +1971,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-03 12:18:35.529736400 +0200 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-09-03 12:19:32.679005100 +0200 +--- ../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 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -2056,9 +2054,182 @@ 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-03 12:18:49.774551000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-09-03 12:19:32.695006000 +0200 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2178,182 +2349,9 @@ 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-03 12:18:49.789551000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-09-03 12:19:32.683005400 +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-03 12:18:49.800552000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-09-03 12:19:32.687005600 +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-03 12:18:49.831554000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-09-03 12:19:32.690005800 +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-03 12:18:49.880557000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-09-03 12:19:32.699006300 +0200 +--- ../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 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2437,8 +2435,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-03 12:18:49.891557000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-09-03 12:19:32.703006500 +0200 +--- ../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 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2558,8 +2556,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-03 12:18:49.942560000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-09-03 12:19:32.706006700 +0200 +--- ../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 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2579,8 +2577,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-03 12:18:49.950561000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-09-03 12:19:32.710006900 +0200 +--- ../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 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -2635,8 +2633,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-03 12:18:49.958561000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-09-03 12:19:32.713007100 +0200 +--- ../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 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2656,8 +2654,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-03 12:18:49.967562000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-09-03 12:19:32.717007300 +0200 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2687,8 +2685,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-03 12:18:50.020565000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-09-03 12:19:32.721007500 +0200 +--- ../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 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2792,8 +2790,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-03 12:18:50.024565000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-03 12:19:32.725007800 +0200 +--- ../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 @@ -130,7 +130,7 @@ { j1--; @@ -2829,8 +2827,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-03 12:18:50.043566000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-09-03 12:19:32.729008000 +0200 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2868,8 +2866,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-03 12:18:50.299581000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-09-03 12:19:32.734008300 +0200 +--- ../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 @@ -532,7 +532,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -2882,8 +2880,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-03 12:18:50.351584000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-09-03 12:19:32.738008500 +0200 +--- ../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 @@ -6,6 +6,10 @@ import java.util.*; @@ -2977,8 +2975,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-03 12:18:50.455590000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-09-03 12:19:32.742008700 +0200 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3005,26 +3003,9 @@ 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-03 12:18:50.545595000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-09-03 12:19:32.761009800 +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-03 12:18:50.570596000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-09-03 12:19:32.750009200 +0200 +--- ../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 @@ -6,6 +6,8 @@ import java.util.Random; @@ -3049,8 +3030,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-03 12:18:50.609598000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-09-03 12:19:32.756009500 +0200 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3129,9 +3110,26 @@ 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-03 12:18:50.690603000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-09-03 12:19:32.765010000 +0200 +--- ../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 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3167,8 +3165,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-03 12:18:50.764607000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-09-03 12:19:32.769010300 +0200 +--- ../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 @@ -95,7 +95,7 @@ } else if(blockEnum == EnumSkyBlock.Block) @@ -3178,10 +3176,9 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Me } if(k3 >= 15 && l3 == 0) { -Seulement dans ../src_work/minecraft_server/net/minecraft/src: MetadataChunk~ 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-03 12:18:50.790609000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-09-03 12:19:32.775010600 +0200 +--- ../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 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3191,8 +3188,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-03 12:18:51.186631000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-09-03 12:19:32.778010800 +0200 +--- ../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 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3210,8 +3207,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-03 12:18:51.308638000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-09-03 12:19:32.782011000 +0200 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3229,8 +3226,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-03 12:18:51.499649000 +0200 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-09-03 12:19:32.788011400 +0200 +--- ../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 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -3312,4 +3309,3 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo public int difficultySetting; public Random rand; public boolean isNewWorld; -Seulement dans ../src_work/minecraft_server/net/minecraft/src: World.java~