diff --git a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java index e0d27efe6d..84651596cc 100644 --- a/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/ForgeHooksClient.java @@ -149,5 +149,19 @@ public class ForgeHooksClient { .getTextureFile())); } } + + public static void renderCustomItem(ICustomItemRenderer customRenderer, RenderBlocks renderBlocks,int itemID, int meta, float f) { + Tessellator tessellator = Tessellator.instance; + if (renderBlocks.useInventoryTint) { + int j = 0xffffff;//block.getRenderColor(i); + float f1 = (float) (j >> 16 & 0xff) / 255F; + float f3 = (float) (j >> 8 & 0xff) / 255F; + float f5 = (float) (j & 0xff) / 255F; + GL11.glColor4f(f1 * f, f3 * f, f5 * f, 1.0F); + } + +// ModLoader.RenderInvBlock(this, block, i, k); + customRenderer.renderInventory(renderBlocks, itemID, meta); + } } diff --git a/forge/forge_client/src/net/minecraft/src/forge/ICustomItemRenderer.java b/forge/forge_client/src/net/minecraft/src/forge/ICustomItemRenderer.java new file mode 100755 index 0000000000..030678b1da --- /dev/null +++ b/forge/forge_client/src/net/minecraft/src/forge/ICustomItemRenderer.java @@ -0,0 +1,7 @@ +package net.minecraft.src.forge; + +import net.minecraft.src.RenderBlocks; + +public interface ICustomItemRenderer { + public void renderInventory (RenderBlocks renderblocks, int itemID, int meta); +} diff --git a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java index 3256dfc95d..4163783968 100755 --- a/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java +++ b/forge/forge_client/src/net/minecraft/src/forge/MinecraftForgeClient.java @@ -6,10 +6,9 @@ package net.minecraft.src.forge; import net.minecraft.src.Block; +import net.minecraft.src.Item; import net.minecraft.src.ModLoader; import net.minecraft.src.RenderBlocks; -import net.minecraft.src.Tessellator; -import org.lwjgl.opengl.GL11; public class MinecraftForgeClient { /** @@ -64,4 +63,14 @@ public class MinecraftForgeClient { public static int getRenderPass() { return ForgeHooksClient.renderPass; } + + private static ICustomItemRenderer [] customItemRenderers = new ICustomItemRenderer [Item.itemsList.length]; + + public static void registerCustomItemRenderer (int itemID, ICustomItemRenderer renderer) { + customItemRenderers [itemID] = renderer; + } + + public static ICustomItemRenderer getCustomItemRenderer (int itemID) { + return customItemRenderers [itemID]; + } } diff --git a/forge/minecraft.patch b/forge/minecraft.patch index d2e1a6b7ed..2414210872 100644 --- a/forge/minecraft.patch +++ b/forge/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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 2011-08-30 03:13:19.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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 2011-08-30 03:13:19.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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 2011-08-30 03:13:19.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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 2011-08-30 03:44:31.000000000 -0400 +--- ../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 @@ -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-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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 2011-09-01 04:00:04.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -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-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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -6,6 +6,8 @@ import java.util.Random; @@ -1166,37 +1183,32 @@ 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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 2011-08-30 03:13:19.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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 2011-08-30 03:13:19.000000000 -0400 -@@ -5,6 +5,8 @@ +--- ../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 +@@ -5,6 +5,10 @@ package net.minecraft.src; import net.minecraft.client.Minecraft; +import net.minecraft.src.forge.ForgeHooksClient; ++import net.minecraft.src.forge.ICustomItemRenderer; ++import net.minecraft.src.forge.MinecraftForgeClient; + import org.lwjgl.opengl.GL11; // Referenced classes of package net.minecraft.src: -@@ -34,15 +36,18 @@ - if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) +@@ -31,18 +35,27 @@ + public void renderItem(EntityLiving entityliving, ItemStack itemstack) + { + GL11.glPushMatrix(); +- if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) ++ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); ++ ++ if (customRenderer != null) { ++ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); ++ ForgeHooksClient.overrideTexture (itemstack.getItem()); ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F)); ++ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png")); + ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]); @@ -1215,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -1252,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MetadataChunkBlock.java 2011-08-30 04:13:17.000000000 -0400 +--- ../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 @@ -95,7 +95,7 @@ } else if(blockEnum == EnumSkyBlock.Block) @@ -1264,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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -1275,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1320,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -63,7 +63,7 @@ { Block.blocksList[i1].onBlockClicked(mc.theWorld, i, j, k, mc.thePlayer); @@ -1341,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -37,7 +37,7 @@ int j1 = mc.theWorld.getBlockMetadata(i, j, k); boolean flag = super.sendBlockRemoved(i, j, k, l); @@ -1371,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -2171,7 +2171,7 @@ colorBlueTopRight *= f27; int i1 = block.getBlockTexture(blockAccess, i, j, k, 2); @@ -1446,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -126,6 +126,9 @@ } try @@ -1459,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -1558,8 +1558,8 @@ } @@ -1484,19 +1496,51 @@ 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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 2011-08-30 03:13:19.000000000 -0400 -@@ -5,6 +5,9 @@ +--- ../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 +@@ -5,6 +5,11 @@ package net.minecraft.src; import java.util.Random; + +import net.minecraft.src.forge.ForgeHooksClient; ++import net.minecraft.src.forge.ICustomItemRenderer; ++import net.minecraft.src.forge.MinecraftForgeClient; + import org.lwjgl.opengl.GL11; // Referenced classes of package net.minecraft.src: -@@ -51,6 +54,7 @@ +@@ -47,10 +52,36 @@ + } + GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2); + GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/); +- if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) ++ ++ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID); ++ ++ if (customRenderer != null) { ++ GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); ++ loadTexture("/terrain.png"); ++ ForgeHooksClient.overrideTexture(itemstack.getItem()); ++ float f4 = 0.25F; ++ f4 = 0.5F; ++ GL11.glScalef(f4, f4, f4); ++ for(int j = 0; j < byte0; j++) ++ { ++ GL11.glPushMatrix(); ++ if(j > 0) ++ { ++ float f5 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; ++ float f7 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; ++ float f9 = ((random.nextFloat() * 2.0F - 1.0F) * 0.2F) / f4; ++ GL11.glTranslatef(f5, f7, f9); ++ } ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocks, ++ itemstack.itemID, itemstack.getItemDamage(), ++ entityitem.getEntityBrightness(f1)); ++ GL11.glPopMatrix(); ++ } ++ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType())) { GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F); loadTexture("/terrain.png"); @@ -1504,7 +1548,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte float f4 = 0.25F; if(!Block.blocksList[itemstack.itemID].renderAsNormalBlock() && itemstack.itemID != Block.stairSingle.blockID && Block.blocksList[itemstack.itemID].getRenderType() != 16) { -@@ -78,10 +82,12 @@ +@@ -78,10 +109,12 @@ if(itemstack.itemID < 256) { loadTexture("/terrain.png"); @@ -1518,7 +1562,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte Tessellator tessellator = Tessellator.instance; float f6 = (float)((i % 16) * 16 + 0) / 256F; float f8 = (float)((i % 16) * 16 + 16) / 256F; -@@ -92,6 +98,7 @@ +@@ -92,6 +125,7 @@ float f14 = 0.25F; if(field_27004_a) { @@ -1526,7 +1570,38 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte int k = Item.itemsList[itemstack.itemID].getColorFromDamage(itemstack.getItemDamage()); float f15 = (float)(k >> 16 & 0xff) / 255F; float f17 = (float)(k >> 8 & 0xff) / 255F; -@@ -131,6 +138,7 @@ +@@ -127,10 +161,37 @@ + + public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1) + { +- if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType())) ++ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(i); ++ if (customRenderer != null) { ++ int j1 = i; ++ renderengine.bindTexture(renderengine.getTexture("/terrain.png")); ++ Item item = Item.itemsList[i]; ++ ForgeHooksClient.overrideTexture (Item.itemsList [i]); ++ GL11.glPushMatrix(); ++ GL11.glTranslatef(l - 2, i1 + 3, -3F); ++ GL11.glScalef(10F, 10F, 10F); ++ GL11.glTranslatef(1.0F, 0.5F, 1.0F); ++ GL11.glScalef(1.0F, 1.0F, -1F); ++ GL11.glRotatef(210F, 1.0F, 0.0F, 0.0F); ++ GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); ++ int l1 = Item.itemsList[i].getColorFromDamage(j); ++ float f2 = (float)(l1 >> 16 & 0xff) / 255F; ++ float f4 = (float)(l1 >> 8 & 0xff) / 255F; ++ float f5 = (float)(l1 & 0xff) / 255F; ++ if(field_27004_a) ++ { ++ GL11.glColor4f(f2, f4, f5, 1.0F); ++ } ++ GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); ++ renderBlocks.useInventoryTint = field_27004_a; ++ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocks, i, j, 1.0F); ++ renderBlocks.useInventoryTint = true; ++ GL11.glPopMatrix(); ++ } else if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType())) { int j1 = i; renderengine.bindTexture(renderengine.getTexture("/terrain.png")); @@ -1534,7 +1609,15 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/RenderIte Block block = Block.blocksList[j1]; GL11.glPushMatrix(); GL11.glTranslatef(l - 2, i1 + 3, -3F); -@@ -159,9 +167,11 @@ +@@ -152,16 +213,17 @@ + renderBlocks.renderBlockOnInventory(block, j, 1.0F); + renderBlocks.useInventoryTint = true; + GL11.glPopMatrix(); +- } else +- if(k >= 0) ++ } else if(k >= 0) + { + GL11.glDisable(2896 /*GL_LIGHTING*/); if(i < 256) { renderengine.bindTexture(renderengine.getTexture("/terrain.png")); @@ -1547,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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1574,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -1593,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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -6,6 +6,7 @@ import java.io.PrintStream; @@ -1779,8 +1862,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -4,6 +4,7 @@ package net.minecraft.src; @@ -1806,8 +1889,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-08-30 03:13:17.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/World.java 2011-08-30 04:12:35.000000000 -0400 +--- ../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 @@ -313,7 +313,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -1890,8 +1973,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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -5,6 +5,9 @@ package net.minecraft.src; @@ -1973,182 +2056,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 2011-08-30 03:13:19.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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 2011-08-30 03:13:19.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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 2011-08-30 03:13:19.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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 2011-08-30 03:35:23.000000000 -0400 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2268,9 +2178,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-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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } @@ -2354,8 +2437,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) @@ -2475,8 +2558,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -46,7 +46,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2496,8 +2579,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { @@ -2552,8 +2635,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) @@ -2573,8 +2656,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2604,8 +2687,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -36,24 +36,24 @@ private boolean func_31028_g(World world, int i, int j, int k) @@ -2709,8 +2792,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 2011-09-01 04:00:11.000000000 -0400 +--- ../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 @@ -130,7 +130,7 @@ { j1--; @@ -2746,8 +2829,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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2785,8 +2868,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -532,7 +532,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); @@ -2799,8 +2882,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -6,6 +6,10 @@ import java.util.*; @@ -2894,8 +2977,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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -2922,9 +3005,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-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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -6,6 +6,8 @@ import java.util.Random; @@ -2949,8 +3049,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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3029,26 +3129,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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 2011-08-30 03:13:19.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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -4,6 +4,8 @@ package net.minecraft.src; @@ -3084,20 +3167,21 @@ 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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MetadataChunkBlock.java 2011-08-30 04:13:11.000000000 -0400 +--- ../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 @@ -95,7 +95,7 @@ } else - if(field_957_a == EnumSkyBlock.Block) + if(blockEnum == EnumSkyBlock.Block) { - l3 = Block.lightValue[j3]; + l3 = (j3==0)?0:Block.blocksList[j3].getLightValue(world,k1,k2,l1); } 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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; @@ -3107,8 +3191,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -169,12 +169,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) @@ -3126,8 +3210,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-08-30 03:13:19.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 2011-08-30 03:13:19.000000000 -0400 +--- ../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 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode @@ -3145,8 +3229,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-08-30 03:13:18.000000000 -0400 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 2011-08-30 04:12:48.000000000 -0400 +--- ../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 @@ -166,7 +166,11 @@ public boolean isAirBlock(int i, int j, int k) @@ -3210,7 +3294,7 @@ diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Wo + return block.isBlockSolidOnSide(this,i,j,k,side); } - public boolean func_6156_d() + public boolean updatingLighting() @@ -2178,6 +2191,7 @@ { block = null; @@ -3228,3 +3312,4 @@ 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~ diff --git a/forge/release.bat b/forge/release.bat index 99f6233321..21ccc13758 100755 --- a/forge/release.bat +++ b/forge/release.bat @@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH% cd forge -sh package.sh 1.0.6-beta2 +sh package.sh 1.0.6 pause