diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index b0233712d8..405f22a4b5 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch index cc54d7ee6b..8539149b11 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockButton.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch index 8c69a81af3..9ea9ec81aa 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockChest.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 @@ -423,23 +423,23 @@ { return true; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch index 1871f24c98..5fd9a0785c 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 @@ -26,7 +26,7 @@ public void onBlockAdded(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch index 2706d14e6d..17b0d339a4 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockCrops.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch index e6ba89fe80..a46e540beb 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -178,7 +178,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch index 78010cb2ad..18e256f762 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockLadder.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 @@ -63,6 +63,11 @@ return super.getSelectedBoundingBoxFromPool(world, i, j, k); } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch index f2937b1c37..d8b0a56be6 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockLever.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 @@ -40,44 +40,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch index 16abd9ba82..4c27c2a174 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockPressurePlate.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch index 2e26b4bb34..1b7425a710 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch index 488e9ef02c..275b62bc8d 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch index f0c5c3468a..f2a839931b 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRedstoneWire.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch index d4750f5201..92c83744ad 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTallGrass.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 @@ -4,7 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch index c3f031031c..21067a5cee 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTorch.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 @@ -41,24 +41,24 @@ private boolean func_31032_h(World world, int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch index e3106e78e0..a602844b2c 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockTrapDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -147,7 +147,7 @@ { j1--; diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index 20285d71da..1f18cad900 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch index d02350e5e8..8023965caa 100644 --- a/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EffectRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -7,6 +7,9 @@ import java.util.*; import org.lwjgl.opengl.GL11; diff --git a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch index 6e09fb3851..244b0cead7 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 @@ -624,7 +624,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index f10cc7362e..5bf97786ee 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,10 @@ package net.minecraft.src; @@ -53,7 +53,33 @@ public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -720,7 +752,9 @@ +@@ -667,6 +699,25 @@ + + protected void damageEntity(DamageSource damagesource, int i) + { ++ boolean doRegularComputation = true; ++ int initialDamage = i; ++ ++ for (ItemStack stack : inventory.armorInventory) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ ++ ArmorProperties props = armor.getProperties(this, initialDamage, i); ++ i = i - props.damageRemove; ++ doRegularComputation = doRegularComputation ++ && props.allowRegularComputation; ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(damagesource, i); ++ return; ++ } ++ + if(!damagesource.unblockable() && func_35162_ad()) + { + i = 1 + i >> 1; +@@ -720,7 +771,9 @@ public void destroyCurrentEquippedItem() { @@ -63,7 +89,7 @@ } public double getYOffset() -@@ -815,6 +849,10 @@ +@@ -815,6 +868,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch index 852e814076..3ff87b7132 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/EntityRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch index bb54fe9488..9ad5cc4359 100644 --- a/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Explosion.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch index b8a98fc45e..c789d9be7a 100644 --- a/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/FurnaceRecipes.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,7 @@ import java.util.HashMap; diff --git a/forge/patches/minecraft/net/minecraft/src/Item.java.patch b/forge/patches/minecraft/net/minecraft/src/Item.java.patch index 664d382446..c1f8a55679 100644 --- a/forge/patches/minecraft/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Item.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 @@ -76,6 +76,13 @@ return 1.0F; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch index f9cf25b4da..46bdb88286 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemBlock.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 @@ -62,7 +62,7 @@ { return false; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch index 251d86ec24..c567eba5a7 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemBucket.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,8 @@ import java.util.Random; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch index 66e7f77eee..7b9aae403b 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemDye.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch index 41c66ac63a..12bc6d21f2 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemFlintAndSteel.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,7 @@ { i++; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch index a82f7de402..4dc2c74be4 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemHoe.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch index d22e6a1b48..1c4116d095 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRedstone.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 @@ -50,7 +50,7 @@ return false; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch index 15778ccf7d..155c33a5a9 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemReed.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 @@ -52,7 +52,7 @@ i++; } diff --git a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch index 3bcb926ab0..1c4e3562ed 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch index 9e754e8583..5b1daeead2 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemSeeds.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 @@ -24,7 +24,7 @@ { return false; diff --git a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch index ba4765bcb3..b7046218c8 100644 --- a/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ItemTool.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch index 49a2ac24df..ca6044464d 100644 --- a/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/MovingObjectPosition.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch index 7509b615f1..1210a4b09c 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerController.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/PlayerController.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch index c78999f827..a01dcac600 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerMP.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerMP.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,9 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch index 2bbbf8121e..e9ac50b3fc 100644 --- a/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/PlayerControllerSP.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/PlayerControllerSP.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,8 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch index f7f78623c3..f1b01e65e3 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -00 @@ -2980,7 +2980,7 @@ colorBlueTopRight *= f27; int j2 = block.getBlockTexture(blockAccess, i, j, k, 2); diff --git a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch index eb2044e7c0..07bb39a10a 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderEngine.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderEngine.java 0000-00-00 00:00:00.000000000 -00 @@ -128,6 +128,9 @@ } try diff --git a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch index dfade4d45a..edb7724238 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderGlobal.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderGlobal.java 0000-00-00 00:00:00.000000000 -00 @@ -1635,8 +1635,8 @@ } diff --git a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch index f0d2249f2b..c0b6593049 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderItem.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderItem.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch index 50669f71cc..179174fe66 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch index fabc12a24f..cfebc3c0e2 100644 --- a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch index 6d52526c8e..123700a2e7 100644 --- a/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Tessellator.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch index b63e70a654..d771b66e34 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 @@ -61,6 +61,13 @@ { } diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch index 89dfe957d7..9b9b224481 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch index e3f6b6cc92..bc984e3984 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityRendererPiston.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/TileEntityRendererPiston.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch index 204a25f5c2..5213abff55 100644 --- a/forge/patches/minecraft/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 @@ -336,7 +336,10 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch index cbf615ac7a..927c0f4c67 100644 --- a/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/WorldRenderer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft/net/minecraft/src/WorldRenderer.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index eb70c99a17..3d21e84c74 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Block.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch index 4b1fb3e7fb..fb25e5b274 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockButton.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockButton.java 0000-00-00 00:00:00.000000000 -00 @@ -41,36 +41,36 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch index 5e0acf20ad..be9f6ab3a3 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockChest.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockChest.java 0000-00-00 00:00:00.000000000 -00 @@ -328,23 +328,23 @@ { return true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch index 24433f82fd..cd35cd72a9 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockContainer.java 0000-00-00 00:00:00.000000000 -00 @@ -26,7 +26,7 @@ public void onBlockAdded(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch index 09c53056b2..df52f41f8e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockCrops.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockCrops.java 0000-00-00 00:00:00.000000000 -00 @@ -5,6 +5,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch index c1ea96b1fe..7913f44b22 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -167,7 +167,7 @@ world.setBlockWithNotify(i, j, k, 0); flag = true; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch index 7cf02273c6..9f1dab7871 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLadder.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -00 @@ -40,6 +40,11 @@ return super.getCollisionBoundingBoxFromPool(world, i, j, k); } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch index 09b539626e..4a7993dc23 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockLever.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -00 @@ -35,44 +35,44 @@ public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch index eff38e4bb4..c1cbc7e1b5 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockPressurePlate.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockPressurePlate.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,8 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch index 7034891beb..5eb9f1a1e9 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRail.java 0000-00-00 00:00:00.000000000 -00 @@ -16,12 +16,12 @@ public static final boolean isRailBlockAt(World world, int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch index 66372a4a8a..5953cd8b02 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneRepeater.java 0000-00-00 00:00:00.000000000 -00 @@ -27,7 +27,7 @@ public boolean canPlaceBlockAt(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch index ec300c0949..846b9a21f2 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRedstoneWire.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockRedstoneWire.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch index 31118139a4..8e67bc098a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTallGrass.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTallGrass.java 0000-00-00 00:00:00.000000000 -00 @@ -4,7 +4,10 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch index 6a8d951fa5..12316c0fa4 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTorch.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -00 @@ -36,24 +36,24 @@ private boolean canPlaceTorchOn(World world, int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch index 6e2fcc1cd9..531e403415 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockTrapDoor.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/BlockTrapDoor.java 0000-00-00 00:00:00.000000000 -00 @@ -130,7 +130,7 @@ { j1--; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch index 1b328d5e10..369cf0788f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Chunk.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch index 607f48d7dd..eb01f279f6 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityLiving.java 0000-00-00 00:00:00.000000000 -00 @@ -600,7 +600,9 @@ int i = MathHelper.floor_double(posX); int j = MathHelper.floor_double(boundingBox.minY); diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index b8f5e13ba4..92bc123b87 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/EntityPlayer.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,10 @@ import java.util.*; @@ -53,7 +53,33 @@ public boolean canHarvestBlock(Block block) { return inventory.canHarvestBlock(block); -@@ -668,7 +700,9 @@ +@@ -615,6 +647,25 @@ + + protected void damageEntity(DamageSource damagesource, int i) + { ++ boolean doRegularComputation = true; ++ int initialDamage = i; ++ ++ for (ItemStack stack : inventory.armorInventory) { ++ if (stack != null && stack.getItem() instanceof ISpecialArmor) { ++ ISpecialArmor armor = (ISpecialArmor) stack.getItem(); ++ ++ ArmorProperties props = armor.getProperties(this, initialDamage, i); ++ i = i - props.damageRemove; ++ doRegularComputation = doRegularComputation ++ && props.allowRegularComputation; ++ } ++ } ++ ++ if (!doRegularComputation) { ++ super.damageEntity(damagesource, i); ++ return; ++ } ++ + if(!damagesource.func_35083_b() && func_35180_G()) + { + i = 1 + i >> 1; +@@ -668,7 +719,9 @@ public void destroyCurrentEquippedItem() { @@ -63,7 +89,7 @@ } public double getYOffset() -@@ -757,6 +791,10 @@ +@@ -757,6 +810,10 @@ public EnumStatus sleepInBedAt(int i, int j, int k) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch index 7ee22e874c..beeee5f0d7 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Explosion.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch index 70d851bf1c..89069f4f40 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/FurnaceRecipes.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/FurnaceRecipes.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,7 @@ import java.util.HashMap; diff --git a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch index 545acffb2b..5982ee09c7 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Item.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/Item.java 0000-00-00 00:00:00.000000000 -00 @@ -66,6 +66,13 @@ return 1.0F; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch index 794422dc09..71dce34deb 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBlock.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBlock.java 0000-00-00 00:00:00.000000000 -00 @@ -62,7 +62,7 @@ { return false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch index ad858eb819..bca00196fa 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemBucket.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java 0000-00-00 00:00:00.000000000 -00 @@ -6,6 +6,8 @@ import java.util.Random; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch index 30e1b2bb64..9540178fbc 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemDye.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemDye.java 0000-00-00 00:00:00.000000000 -00 @@ -3,6 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch index 167cde2315..a0e0cdc1da 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemFlintAndSteel.java 0000-00-00 00:00:00.000000000 -00 @@ -46,7 +46,7 @@ { i++; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch index 4596ad1a1f..9b1da5455a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemHoe.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemHoe.java 0000-00-00 00:00:00.000000000 -00 @@ -21,7 +21,7 @@ public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch index fd72220c42..3c1bda8ce8 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemInWorldManager.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemInWorldManager.java 0000-00-00 00:00:00.000000000 -00 @@ -3,7 +3,8 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch index c7e7bd08e1..33ded38c47 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemRedstone.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemRedstone.java 0000-00-00 00:00:00.000000000 -00 @@ -50,7 +50,7 @@ return false; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch index ad19a4c590..4e4cc75f57 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemReed.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemReed.java 0000-00-00 00:00:00.000000000 -00 @@ -52,7 +52,7 @@ i++; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch index e5170c75a5..69dca2ba27 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemSeeds.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemSeeds.java 0000-00-00 00:00:00.000000000 -00 @@ -24,7 +24,7 @@ { return false; diff --git a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch index 4bc57d9f23..b17018c381 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/ItemTool.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/ItemTool.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,8 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch index 38011b3cf0..0dcfa2389c 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/MovingObjectPosition.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/MovingObjectPosition.java 0000-00-00 00:00:00.000000000 -00 @@ -35,4 +35,7 @@ public int sideHit; public Vec3D hitVec; diff --git a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch index bf56c4732d..c6027ee04d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/PlayerInstance.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/PlayerInstance.java 0000-00-00 00:00:00.000000000 -00 @@ -168,12 +168,11 @@ sendPacketToPlayersInInstance(new Packet52MultiBlockChange(chunkX, chunkZ, blocksToUpdate, numBlocksToUpdate, worldserver)); for(int k = 0; k < numBlocksToUpdate; k++) diff --git a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch index 39b6ed4f9e..8f4d8c418a 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -00 @@ -3,7 +3,7 @@ // Decompiler options: packimports(3) braces deadcode diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch index ef84f71cb6..8d4d81e1f8 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -00 @@ -61,6 +61,13 @@ { } diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch index 5511bd75c0..30c940ff4d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -00 @@ -4,6 +4,7 @@ package net.minecraft.src; diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch index 0b57d2df1d..266ac2dbd3 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/World.java 0000-00-00 00:00:00.000000000 -00 @@ -183,7 +183,11 @@ public boolean isAirBlock(int i, int j, int k) diff --git a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch index cdcb542ed0..9fb2a0a260 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/WorldServer.java.patch @@ -1,5 +1,5 @@ ---- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -0000 +--- ../src_base/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -00 ++++ ../src_work/minecraft_server/net/minecraft/src/WorldServer.java 0000-00-00 00:00:00.000000000 -00 @@ -54,15 +54,20 @@ public List getTileEntityList(int i, int j, int k, int l, int i1, int j1) { diff --git a/forge/release.bat b/forge/release.bat index 8f7c89964e..9b359e1431 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.7 +sh package.sh 1.1.1 pause