                  {
                      ((EntityPlayerMP)p_187250_1_).sendContainerToPlayer(p_187250_1_.inventoryContainer);
                  }
+@@ -446,7 +446,7 @@ public class PlayerInteractionManager
+             {
+                 return EnumActionResult.PASS;
+             }
+-            else if (p_187251_1_.func_184811_cZ().hasCooldown(p_187251_3_.getItem()))
++            else if (p_187251_1_.getCooldownTracker().hasCooldown(p_187251_3_.getItem()))
+             {
+                 return EnumActionResult.PASS;
+             }
 diff --git a/src/net/minecraft/tileentity/TileEntitySign.java b/src/net/minecraft/tileentity/TileEntitySign.java
 index f5cab9e..d422622 100644
 --- a/src/net/minecraft/tileentity/TileEntitySign.java

 .../minecraft/entity/EntityAreaEffectCloud.java    |   6 +-
 src/net/minecraft/entity/EntityLivingBase.java     |  90 ++++++-----
 .../entity/ai/EntityAIAttackRangedBow.java         |   4 +-
 src/net/minecraft/entity/monster/EntityMob.java    |   2 +-
 src/net/minecraft/entity/monster/EntitySpider.java |   2 +-
 src/net/minecraft/entity/monster/EntityZombie.java |   2 +-
 src/net/minecraft/entity/player/EntityPlayer.java  |  23 ++-
 .../minecraft/entity/player/EntityPlayerMP.java    |   4 +-
 .../minecraft/entity/projectile/EntityPotion.java  |   4 +-
 .../entity/projectile/EntityTippedArrow.java       |   2 +-
 src/net/minecraft/item/ItemBow.java                |   2 +-
 src/net/minecraft/item/ItemShield.java             |   2 +-
 src/net/minecraft/network/NetworkManager.java      |  26 ++++
 .../network/play/server/SPacketEntityEffect.java   |   2 +-

 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            |  80 +++++++---
 .../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        |  33 ++++-
 src/net/minecraft/client/gui/GuiIngameMenu.java    |  50 ++++++-
 .../client/gui/GuiListWorldSelectionEntry.java     |   2 +-
 src/net/minecraft/client/gui/GuiMainMenu.java      |  20 ++-
