  src/net/minecraft/potion/PotionType.java           |   2 +-
  src/net/minecraft/potion/PotionUtils.java          |   4 +-
  src/net/minecraft/realms/Realms.java               |   4 +-
- .../management/PlayerInteractionManager.java       |   2 +-
+ .../management/PlayerInteractionManager.java       |   6 +-
  src/net/minecraft/tileentity/TileEntitySign.java   |   2 +-
- 68 files changed, 1114 insertions(+), 267 deletions(-)
+ 73 files changed, 1142 insertions(+), 295 deletions(-)
 
 diff --git a/src/net/minecraft/block/Block.java b/src/net/minecraft/block/Block.java
 index b386ea0..44bfcdc 100644

 src/net/minecraft/block/BlockSoulSand.java         |   5 +
 .../minecraft/block/state/BlockStateContainer.java |   3 +-
 src/net/minecraft/block/state/IBlockState.java     |   2 +-
 src/net/minecraft/client/Minecraft.java            |  78 +++++++---
 .../client/audio/PositionedSoundRecord.java        |   2 +-
 .../client/entity/AbstractClientPlayer.java        |   4 +-
 .../minecraft/client/entity/EntityPlayerSP.java    | 164 ++++++++++++++++-----
 src/net/minecraft/client/gui/GuiButton.java        |  16 +-
 src/net/minecraft/client/gui/GuiDisconnected.java  |  87 +++++++++++
 src/net/minecraft/client/gui/GuiGameOver.java      |  13 +-
 src/net/minecraft/client/gui/GuiIngame.java        |  25 +++-
 src/net/minecraft/client/gui/GuiIngameMenu.java    |  50 ++++++-
 .../client/gui/GuiListWorldSelectionEntry.java     |   2 +-
 src/net/minecraft/client/gui/GuiMainMenu.java      |  20 ++-

         }
 
         if (!this.field_184561_h.isEmpty())
diff --git a/src/net/minecraft/item/Item.java b/src/net/minecraft/item/Item.java
index 6c7c6a6..0611f1f 100644
--- a/src/net/minecraft/item/Item.java
+++ b/src/net/minecraft/item/Item.java
@@ -83,7 +83,7 @@ public class Item
     {
         public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn)
         {
-            return entityIn instanceof EntityPlayer ? ((EntityPlayer)entityIn).func_184811_cZ().getCooldown(stack.getItem(), 0.0F) : 0.0F;
+            return entityIn instanceof EntityPlayer ? ((EntityPlayer)entityIn).getCooldownTracker().getCooldown(stack.getItem(), 0.0F) : 0.0F;
         }
     };
     private final IRegistry<ResourceLocation, IItemPropertyGetter> properties = new RegistrySimple();
diff --git a/src/net/minecraft/item/ItemBow.java b/src/net/minecraft/item/ItemBow.java
index 59ad015..025f525 100644
--- a/src/net/minecraft/item/ItemBow.java
