Update to new MCP bugfix version, Fixes: Missing Armor/Item rendering, and Boss health mapping issues.

fml/commands.patch

@@ -9,7 +9,7 @@
  
  class Commands(object):
      """Contains the commands and initialisation for a full mcp run"""
-@@ -943,6 +945,8 @@
+@@ -949,6 +951,8 @@
          binlk = {CLIENT: self.binclient, SERVER: self.binserver}
          testlk = {CLIENT: self.testclient, SERVER: self.testserver}
  
@@ -18,7 +18,7 @@
          if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
              return False
          return True
-@@ -1274,6 +1278,9 @@
+@@ -1280,6 +1284,9 @@
          pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
          pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
          pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
@@ -28,25 +28,16 @@
  
          if not os.path.exists(pathbinlk[side]):
              os.makedirs(pathbinlk[side])
-@@ -1331,7 +1338,7 @@
+@@ -1337,7 +1344,7 @@
              raise
  
-     def startserver(self):
+     def startserver(self, mainclass, extraargs):
 -        classpath = [self.binserver] + self.cpathserver
 +        classpath = [self.binclient, self.srcclient] + self.cpathserver
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          os.chdir(self.dirjars)
-@@ -1339,7 +1346,7 @@
+@@ -1702,7 +1709,7 @@
-         self.runmc(forkcmd)
- 
-     def startclient(self):
--        classpath = [self.binclient] + self.cpathclient
-+        classpath = [self.binclient, self.srcclient] + self.cpathclient
-         classpath = [os.path.join('..', p) for p in classpath]
-         classpath = os.pathsep.join(classpath)
-         natives = os.path.join('..', self.dirnatives)
-@@ -1696,7 +1703,7 @@
          self.runcmd(forkcmd)
          return True
  
@@ -55,7 +46,7 @@
          if not reobf:
              md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
          else:
-@@ -1711,6 +1718,9 @@
+@@ -1717,6 +1724,9 @@
                      class_path = ''
                  else:
                      class_path += '/'
@@ -65,7 +56,7 @@
                  for class_file in fnmatch.filter(filelist, '*.class'):
                      class_name = class_path + os.path.splitext(class_file)[0]
                      bin_file = os.path.normpath(os.path.join(path, class_file))
-@@ -1883,6 +1893,9 @@
+@@ -1889,6 +1899,9 @@
                  sys.exit(1)
  
          for entry in newfiles:
@@ -75,7 +66,7 @@
              if entry[3] == 'U':
                  self.logger.info('Retrieving file from server : %s', entry[0])
                  cur_file = os.path.normpath(entry[0])
-@@ -1903,6 +1916,9 @@
+@@ -1909,6 +1922,9 @@
          md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
          outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
          src = {CLIENT: self.srcclient, SERVER: self.srcserver}

fml/conf/joined.exc

@@ -1,5 +1,5 @@
-#max index = 2341
+#max index = 2351
-max_constructor_index=2341
+max_constructor_index=2351
 net/minecraft/client/ClientBrandRetriever.<init>()V=|
 net/minecraft/client/main/Main.<init>()V=|
 net/minecraft/client/main/Main.func_110121_a(Ljava/lang/String;)Z=|p_110121_0_
@@ -7,7 +7,6 @@ net/minecraft/client/main/Main.main([Ljava/lang/String;)V=|p_main_0_
 net/minecraft/server/MinecraftServer.<init>(Ljava/io/File;)V=|p_i1498_1_
 net/minecraft/server/MinecraftServer.func_104055_i(Z)V=|p_104055_1_
 net/minecraft/server/MinecraftServer.func_104056_am()Z=|
-net/minecraft/server/MinecraftServer.func_110122_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_110122_1_
 net/minecraft/server/MinecraftServer.func_110454_ao()Ljava/net/Proxy;=|
 net/minecraft/server/MinecraftServer.func_110455_j()I=|
 net/minecraft/server/MinecraftServer.func_130014_f_()Lnet/minecraft/src/World;=|
@@ -16,6 +15,7 @@ net/minecraft/server/MinecraftServer.func_70001_b(Lnet/minecraft/src/PlayerUsage
 net/minecraft/server/MinecraftServer.func_70002_Q()Z=|
 net/minecraft/server/MinecraftServer.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
 net/minecraft/server/MinecraftServer.func_70005_c_()Ljava/lang/String;=|
+net/minecraft/server/MinecraftServer.func_70006_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_70006_1_
 net/minecraft/server/MinecraftServer.func_71187_D()Lnet/minecraft/src/ICommandManager;=|
 net/minecraft/server/MinecraftServer.func_71188_g(Z)V=|p_71188_1_
 net/minecraft/server/MinecraftServer.func_71189_e(Ljava/lang/String;)V=|p_71189_1_
@@ -2382,10 +2382,10 @@ net/minecraft/src/CombatEntry.func_94561_i()F=|
 net/minecraft/src/CombatEntry.func_94562_g()Ljava/lang/String;=|
 net/minecraft/src/CombatEntry.func_94563_c()F=|
 net/minecraft/src/CombatTracker.<init>(Lnet/minecraft/src/EntityLivingBase;)V=|p_i1565_1_
-net/minecraft/src/CombatTracker.func_111182_b()Lnet/minecraft/src/ChatMessageComponent;=|
 net/minecraft/src/CombatTracker.func_94542_g()V=|
 net/minecraft/src/CombatTracker.func_94544_f()Lnet/minecraft/src/CombatEntry;=|
 net/minecraft/src/CombatTracker.func_94545_a()V=|
+net/minecraft/src/CombatTracker.func_94546_b()Lnet/minecraft/src/ChatMessageComponent;=|
 net/minecraft/src/CombatTracker.func_94547_a(Lnet/minecraft/src/DamageSource;FF)V=|p_94547_1_,p_94547_2_,p_94547_3_
 net/minecraft/src/CombatTracker.func_94548_b(Lnet/minecraft/src/CombatEntry;)Ljava/lang/String;=|p_94548_1_
 net/minecraft/src/CombatTracker.func_94549_h()V=|
@@ -3015,8 +3015,6 @@ net/minecraft/src/ContainerPlayer.func_75145_c(Lnet/minecraft/src/EntityPlayer;)
 net/minecraft/src/ContainerPlayer.func_82846_b(Lnet/minecraft/src/EntityPlayer;I)Lnet/minecraft/src/ItemStack;=|p_82846_1_,p_82846_2_
 net/minecraft/src/ContainerPlayer.func_94530_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/Slot;)Z=|p_94530_1_,p_94530_2_
 net/minecraft/src/ContainerRepair.<init>(Lnet/minecraft/src/InventoryPlayer;Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)V=|p_i1800_1_,p_i1800_2_,p_i1800_3_,p_i1800_4_,p_i1800_5_,p_i1800_6_
-net/minecraft/src/ContainerRepair.func_135072_b(Lnet/minecraft/src/ContainerRepair;)I=|p_135072_0_
-net/minecraft/src/ContainerRepair.func_135073_a(Lnet/minecraft/src/ContainerRepair;)Lnet/minecraft/src/IInventory;=|p_135073_0_
 net/minecraft/src/ContainerRepair.func_75130_a(Lnet/minecraft/src/IInventory;)V=|p_75130_1_
 net/minecraft/src/ContainerRepair.func_75132_a(Lnet/minecraft/src/ICrafting;)V=|p_75132_1_
 net/minecraft/src/ContainerRepair.func_75134_a(Lnet/minecraft/src/EntityPlayer;)V=|p_75134_1_
@@ -3024,7 +3022,9 @@ net/minecraft/src/ContainerRepair.func_75137_b(II)V=|p_75137_1_,p_75137_2_
 net/minecraft/src/ContainerRepair.func_75145_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_75145_1_
 net/minecraft/src/ContainerRepair.func_82846_b(Lnet/minecraft/src/EntityPlayer;I)Lnet/minecraft/src/ItemStack;=|p_82846_1_,p_82846_2_
 net/minecraft/src/ContainerRepair.func_82848_d()V=|
+net/minecraft/src/ContainerRepair.func_82849_b(Lnet/minecraft/src/ContainerRepair;)I=|p_82849_0_
 net/minecraft/src/ContainerRepair.func_82850_a(Ljava/lang/String;)V=|p_82850_1_
+net/minecraft/src/ContainerRepair.func_82851_a(Lnet/minecraft/src/ContainerRepair;)Lnet/minecraft/src/IInventory;=|p_82851_0_
 net/minecraft/src/ContainerRepairINNER1.<init>(Lnet/minecraft/src/ContainerRepair;Ljava/lang/String;ZI)V=|p_i1798_1_,p_i1798_2_,p_i1798_3_,p_i1798_4_
 net/minecraft/src/ContainerRepairINNER1.func_70296_d()V=|
 net/minecraft/src/ContainerRepairINNER1.func_94041_b(ILnet/minecraft/src/ItemStack;)Z=|p_94041_1_,p_94041_2_
@@ -3135,7 +3135,6 @@ net/minecraft/src/CryptManager.func_75895_a(Ljava/lang/String;Ljava/security/Pub
 net/minecraft/src/CryptManager.func_75896_a([B)Ljava/security/PublicKey;=|p_75896_0_
 net/minecraft/src/CryptManager.func_75897_a(Ljavax/crypto/SecretKey;Ljava/io/OutputStream;)Ljava/io/OutputStream;=|p_75897_0_,p_75897_1_
 net/minecraft/src/DamageSource.<init>(Ljava/lang/String;)V=|p_i1566_1_
-net/minecraft/src/DamageSource.func_111181_b(Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;=|p_111181_1_
 net/minecraft/src/DamageSource.func_76345_d()F=|
 net/minecraft/src/DamageSource.func_76346_g()Lnet/minecraft/src/Entity;=|
 net/minecraft/src/DamageSource.func_76347_k()Z=|
@@ -3151,6 +3150,7 @@ net/minecraft/src/DamageSource.func_76356_a(Lnet/minecraft/src/Entity;Lnet/minec
 net/minecraft/src/DamageSource.func_76357_e()Z=|
 net/minecraft/src/DamageSource.func_76358_a(Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/DamageSource;=|p_76358_0_
 net/minecraft/src/DamageSource.func_76359_i()Lnet/minecraft/src/DamageSource;=|
+net/minecraft/src/DamageSource.func_76360_b(Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;=|p_76360_1_
 net/minecraft/src/DamageSource.func_76361_j()Lnet/minecraft/src/DamageSource;=|
 net/minecraft/src/DamageSource.func_76362_a(Lnet/minecraft/src/EntityFireball;Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource;=|p_76362_0_,p_76362_1_
 net/minecraft/src/DamageSource.func_76363_c()Z=|
@@ -3789,10 +3789,10 @@ net/minecraft/src/EntityAIMoveTowardsTarget.func_75249_e()V=|
 net/minecraft/src/EntityAIMoveTowardsTarget.func_75250_a()Z=|
 net/minecraft/src/EntityAIMoveTowardsTarget.func_75251_c()V=|
 net/minecraft/src/EntityAIMoveTowardsTarget.func_75253_b()Z=|
-net/minecraft/src/EntityAIMoveTwardsRestriction.<init>(Lnet/minecraft/src/EntityCreature;D)V=|p_i1639_1_,p_i1639_2_
+net/minecraft/src/EntityAIMoveTowardsRestriction.<init>(Lnet/minecraft/src/EntityCreature;D)V=|p_i1639_1_,p_i1639_2_
-net/minecraft/src/EntityAIMoveTwardsRestriction.func_75249_e()V=|
+net/minecraft/src/EntityAIMoveTowardsRestriction.func_75249_e()V=|
-net/minecraft/src/EntityAIMoveTwardsRestriction.func_75250_a()Z=|
+net/minecraft/src/EntityAIMoveTowardsRestriction.func_75250_a()Z=|
-net/minecraft/src/EntityAIMoveTwardsRestriction.func_75253_b()Z=|
+net/minecraft/src/EntityAIMoveTowardsRestriction.func_75253_b()Z=|
 net/minecraft/src/EntityAINearestAttackableTarget.<init>(Lnet/minecraft/src/EntityCreature;Ljava/lang/Class;IZ)V=|p_i1663_1_,p_i1663_2_,p_i1663_3_,p_i1663_4_
 net/minecraft/src/EntityAINearestAttackableTarget.<init>(Lnet/minecraft/src/EntityCreature;Ljava/lang/Class;IZZ)V=|p_i1664_1_,p_i1664_2_,p_i1664_3_,p_i1664_4_,p_i1664_5_
 net/minecraft/src/EntityAINearestAttackableTarget.<init>(Lnet/minecraft/src/EntityCreature;Ljava/lang/Class;IZZLnet/minecraft/src/IEntitySelector;)V=|p_i1665_1_,p_i1665_2_,p_i1665_3_,p_i1665_4_,p_i1665_5_,p_i1665_6_
@@ -4148,12 +4148,12 @@ net/minecraft/src/EntityCritFX.<init>(Lnet/minecraft/src/World;DDDDDDF)V=|p_i120
 net/minecraft/src/EntityCritFX.func_70071_h_()V=|
 net/minecraft/src/EntityCritFX.func_70539_a(Lnet/minecraft/src/Tessellator;FFFFFF)V=|p_70539_1_,p_70539_2_,p_70539_3_,p_70539_4_,p_70539_5_,p_70539_6_,p_70539_7_
 net/minecraft/src/EntityDamageSource.<init>(Ljava/lang/String;Lnet/minecraft/src/Entity;)V=|p_i1567_1_,p_i1567_2_
-net/minecraft/src/EntityDamageSource.func_111181_b(Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;=|p_111181_1_
 net/minecraft/src/EntityDamageSource.func_76346_g()Lnet/minecraft/src/Entity;=|
 net/minecraft/src/EntityDamageSource.func_76350_n()Z=|
+net/minecraft/src/EntityDamageSource.func_76360_b(Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;=|p_76360_1_
 net/minecraft/src/EntityDamageSourceIndirect.<init>(Ljava/lang/String;Lnet/minecraft/src/Entity;Lnet/minecraft/src/Entity;)V=|p_i1568_1_,p_i1568_2_,p_i1568_3_
-net/minecraft/src/EntityDamageSourceIndirect.func_111181_b(Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;=|p_111181_1_
 net/minecraft/src/EntityDamageSourceIndirect.func_76346_g()Lnet/minecraft/src/Entity;=|
+net/minecraft/src/EntityDamageSourceIndirect.func_76360_b(Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;=|p_76360_1_
 net/minecraft/src/EntityDamageSourceIndirect.func_76364_f()Lnet/minecraft/src/Entity;=|
 net/minecraft/src/EntityDiggingFX.<init>(Lnet/minecraft/src/World;DDDDDDLnet/minecraft/src/Block;I)V=|p_i1234_1_,p_i1234_2_,p_i1234_4_,p_i1234_6_,p_i1234_8_,p_i1234_10_,p_i1234_12_,p_i1234_14_,p_i1234_15_
 net/minecraft/src/EntityDiggingFX.func_70537_b()I=|
@@ -5063,8 +5063,8 @@ net/minecraft/src/EntityOcelot.func_70912_b(I)V=|p_70912_1_
 net/minecraft/src/EntityOcelot.func_70913_u()I=|
 net/minecraft/src/EntityOcelot.func_90011_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityAgeable;=|p_90011_1_
 net/minecraft/src/EntityOtherPlayerMP.<init>(Lnet/minecraft/src/World;Ljava/lang/String;)V=|p_i1239_1_,p_i1239_2_
-net/minecraft/src/EntityOtherPlayerMP.func_110122_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_110122_1_
 net/minecraft/src/EntityOtherPlayerMP.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
+net/minecraft/src/EntityOtherPlayerMP.func_70006_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_70006_1_
 net/minecraft/src/EntityOtherPlayerMP.func_70047_e()F=|
 net/minecraft/src/EntityOtherPlayerMP.func_70053_R()F=|
 net/minecraft/src/EntityOtherPlayerMP.func_70056_a(DDDFFI)V=|p_70056_1_,p_70056_3_,p_70056_5_,p_70056_7_,p_70056_8_,p_70056_9_
@@ -5262,10 +5262,10 @@ net/minecraft/src/EntityPlayer.func_96124_cp()Lnet/minecraft/src/ScorePlayerTeam
 net/minecraft/src/EntityPlayer.func_96125_a(Lnet/minecraft/src/EntityMinecartHopper;)V=|p_96125_1_
 net/minecraft/src/EntityPlayer.func_98034_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_98034_1_
 net/minecraft/src/EntityPlayerMP.<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/src/World;Ljava/lang/String;Lnet/minecraft/src/ItemInWorldManager;)V=|p_i1523_1_,p_i1523_2_,p_i1523_3_,p_i1523_4_
-net/minecraft/src/EntityPlayerMP.func_110122_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_110122_1_
 net/minecraft/src/EntityPlayerMP.func_110298_a(Lnet/minecraft/src/EntityHorse;Lnet/minecraft/src/IInventory;)V=|p_110298_1_,p_110298_2_
 net/minecraft/src/EntityPlayerMP.func_110430_a(FFZZ)V=|p_110430_1_,p_110430_2_,p_110430_3_,p_110430_4_
 net/minecraft/src/EntityPlayerMP.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
+net/minecraft/src/EntityPlayerMP.func_70006_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_70006_1_
 net/minecraft/src/EntityPlayerMP.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityPlayerMP.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
 net/minecraft/src/EntityPlayerMP.func_70047_e()F=|
@@ -5326,12 +5326,12 @@ net/minecraft/src/EntityPlayerMP.func_94064_a(Lnet/minecraft/src/TileEntityHoppe
 net/minecraft/src/EntityPlayerMP.func_96122_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_96122_1_
 net/minecraft/src/EntityPlayerMP.func_96125_a(Lnet/minecraft/src/EntityMinecartHopper;)V=|p_96125_1_
 net/minecraft/src/EntityPlayerSP.<init>(Lnet/minecraft/src/Minecraft;Lnet/minecraft/src/World;Lnet/minecraft/src/Session;I)V=|p_i1238_1_,p_i1238_2_,p_i1238_3_,p_i1238_4_
-net/minecraft/src/EntityPlayerSP.func_110122_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_110122_1_
 net/minecraft/src/EntityPlayerSP.func_110298_a(Lnet/minecraft/src/EntityHorse;Lnet/minecraft/src/IInventory;)V=|p_110298_1_,p_110298_2_
 net/minecraft/src/EntityPlayerSP.func_110317_t()Z=|
 net/minecraft/src/EntityPlayerSP.func_110318_g()V=|
 net/minecraft/src/EntityPlayerSP.func_110319_bJ()F=|
 net/minecraft/src/EntityPlayerSP.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
+net/minecraft/src/EntityPlayerSP.func_70006_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_70006_1_
 net/minecraft/src/EntityPlayerSP.func_70031_b(Z)V=|p_70031_1_
 net/minecraft/src/EntityPlayerSP.func_70048_i(DDD)Z=|p_70048_1_,p_70048_3_,p_70048_5_
 net/minecraft/src/EntityPlayerSP.func_70093_af()Z=|
@@ -6327,11 +6327,11 @@ net/minecraft/src/GuiCreateFlatWorld.func_82272_i()Z=|
 net/minecraft/src/GuiCreateFlatWorld.func_82273_a(Ljava/lang/String;)V=|p_82273_1_
 net/minecraft/src/GuiCreateFlatWorld.func_82275_e()Ljava/lang/String;=|
 net/minecraft/src/GuiCreateFlatWorldListSlot.<init>(Lnet/minecraft/src/GuiCreateFlatWorld;)V=|p_i1028_1_
-net/minecraft/src/GuiCreateFlatWorldListSlot.func_130003_c()V=|
 net/minecraft/src/GuiCreateFlatWorldListSlot.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiCreateFlatWorldListSlot.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiCreateFlatWorldListSlot.func_77217_a()I=|
 net/minecraft/src/GuiCreateFlatWorldListSlot.func_77218_a(I)Z=|p_77218_1_
+net/minecraft/src/GuiCreateFlatWorldListSlot.func_77221_c()V=|
 net/minecraft/src/GuiCreateFlatWorldListSlot.func_77225_g()I=|
 net/minecraft/src/GuiCreateFlatWorldListSlot.func_82450_b(IIII)V=|p_82450_1_,p_82450_2_,p_82450_3_,p_82450_4_
 net/minecraft/src/GuiCreateFlatWorldListSlot.func_82451_d(II)V=|p_82451_1_,p_82451_2_
@@ -6397,11 +6397,11 @@ net/minecraft/src/GuiFlatPresets.func_82297_a(Ljava/lang/String;ILnet/minecraft/
 net/minecraft/src/GuiFlatPresets.func_82298_b(Lnet/minecraft/src/GuiFlatPresets;)Lnet/minecraft/src/GuiTextField;=|p_82298_0_
 net/minecraft/src/GuiFlatPresetsItem.<init>(ILjava/lang/String;Ljava/lang/String;)V=|p_i1047_1_,p_i1047_2_,p_i1047_3_
 net/minecraft/src/GuiFlatPresetsListSlot.<init>(Lnet/minecraft/src/GuiFlatPresets;)V=|p_i1048_1_
-net/minecraft/src/GuiFlatPresetsListSlot.func_130003_c()V=|
 net/minecraft/src/GuiFlatPresetsListSlot.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiFlatPresetsListSlot.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiFlatPresetsListSlot.func_77217_a()I=|
 net/minecraft/src/GuiFlatPresetsListSlot.func_77218_a(I)Z=|p_77218_1_
+net/minecraft/src/GuiFlatPresetsListSlot.func_77221_c()V=|
 net/minecraft/src/GuiFlatPresetsListSlot.func_82455_b(IIII)V=|p_82455_1_,p_82455_2_,p_82455_3_,p_82455_4_
 net/minecraft/src/GuiFlatPresetsListSlot.func_82456_d(II)V=|p_82456_1_,p_82456_2_
 net/minecraft/src/GuiFlatPresetsListSlot.func_82457_a(III)V=|p_82457_1_,p_82457_2_,p_82457_3_
@@ -6447,11 +6447,11 @@ net/minecraft/src/GuiInventory.func_74185_a(FII)V=|p_74185_1_,p_74185_2_,p_74185
 net/minecraft/src/GuiInventory.func_74189_g(II)V=|p_74189_1_,p_74189_2_
 net/minecraft/src/GuiLanguage.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/GameSettings;Lnet/minecraft/src/LanguageManager;)V=|p_i1043_1_,p_i1043_2_,p_i1043_3_
 net/minecraft/src/GuiLanguage.func_135011_a(Lnet/minecraft/src/GuiLanguage;)Lnet/minecraft/src/LanguageManager;=|p_135011_0_
-net/minecraft/src/GuiLanguage.func_135012_b(Lnet/minecraft/src/GuiLanguage;)Lnet/minecraft/src/GameSettings;=|p_135012_0_
-net/minecraft/src/GuiLanguage.func_135013_c(Lnet/minecraft/src/GuiLanguage;)Lnet/minecraft/src/GuiSmallButton;=|p_135013_0_
 net/minecraft/src/GuiLanguage.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiLanguage.func_73866_w_()V=|
 net/minecraft/src/GuiLanguage.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
+net/minecraft/src/GuiLanguage.func_74042_b(Lnet/minecraft/src/GuiLanguage;)Lnet/minecraft/src/GuiSmallButton;=|p_74042_0_
+net/minecraft/src/GuiLanguage.func_74043_a(Lnet/minecraft/src/GuiLanguage;)Lnet/minecraft/src/GameSettings;=|p_74043_0_
 net/minecraft/src/GuiMainMenu.<init>()V=|
 net/minecraft/src/GuiMainMenu.func_110348_a(Lnet/minecraft/src/GuiMainMenu;)Lnet/minecraft/src/Minecraft;=|p_110348_0_
 net/minecraft/src/GuiMainMenu.func_110349_a(Z)Z=|p_110349_0_
@@ -6935,12 +6935,12 @@ net/minecraft/src/GuiScreenTemporaryResourcePackSelect.func_73876_c()V=|
 net/minecraft/src/GuiScreenTemporaryResourcePackSelect.func_73879_b(III)V=|p_73879_1_,p_73879_2_,p_73879_3_
 net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList.<init>(Lnet/minecraft/src/GuiScreenTemporaryResourcePackSelect;Lnet/minecraft/src/ResourcePackRepository;)V=|p_i1301_1_,p_i1301_2_
 net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList.func_110510_a(Lnet/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList;)Lnet/minecraft/src/ResourcePackRepository;=|p_110510_0_
-net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList.func_130003_c()V=|
+net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList.func_77212_b()I=|
-net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList.func_130004_b()I=|
 net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList.func_77217_a()I=|
 net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList.func_77218_a(I)Z=|p_77218_1_
+net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList.func_77221_c()V=|
 net/minecraft/src/GuiSelectWorld.<init>(Lnet/minecraft/src/GuiScreen;)V=|p_i1054_1_
 net/minecraft/src/GuiSelectWorld.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiSelectWorld.func_73866_w_()V=|
@@ -6979,15 +6979,13 @@ net/minecraft/src/GuiSlider.func_73738_a(Z)I=|p_73738_1_
 net/minecraft/src/GuiSlider.func_73739_b(Lnet/minecraft/src/Minecraft;II)V=|p_73739_1_,p_73739_2_,p_73739_3_
 net/minecraft/src/GuiSlider.func_73740_a(II)V=|p_73740_1_,p_73740_2_
 net/minecraft/src/GuiSlot.<init>(Lnet/minecraft/src/Minecraft;IIIII)V=|p_i1052_1_,p_i1052_2_,p_i1052_3_,p_i1052_4_,p_i1052_5_,p_i1052_6_
-net/minecraft/src/GuiSlot.func_110509_d(II)V=|p_110509_1_,p_110509_2_
-net/minecraft/src/GuiSlot.func_130003_c()V=|
-net/minecraft/src/GuiSlot.func_130004_b()I=|
 net/minecraft/src/GuiSlot.func_77206_b(IIII)V=|p_77206_1_,p_77206_2_,p_77206_3_,p_77206_4_
 net/minecraft/src/GuiSlot.func_77207_a(IIII)V=|p_77207_1_,p_77207_2_,p_77207_3_,p_77207_4_
 net/minecraft/src/GuiSlot.func_77208_b(I)V=|p_77208_1_
 net/minecraft/src/GuiSlot.func_77209_d()I=|
 net/minecraft/src/GuiSlot.func_77210_c(II)I=|p_77210_1_,p_77210_2_
 net/minecraft/src/GuiSlot.func_77211_a(IIF)V=|p_77211_1_,p_77211_2_,p_77211_3_
+net/minecraft/src/GuiSlot.func_77212_b()I=|
 net/minecraft/src/GuiSlot.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiSlot.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiSlot.func_77215_b(II)V=|p_77215_1_,p_77215_2_
@@ -6995,18 +6993,20 @@ net/minecraft/src/GuiSlot.func_77216_a(Z)V=|p_77216_1_
 net/minecraft/src/GuiSlot.func_77217_a()I=|
 net/minecraft/src/GuiSlot.func_77218_a(I)Z=|p_77218_1_
 net/minecraft/src/GuiSlot.func_77219_a(Lnet/minecraft/src/GuiButton;)V=|p_77219_1_
+net/minecraft/src/GuiSlot.func_77220_a(II)V=|p_77220_1_,p_77220_2_
+net/minecraft/src/GuiSlot.func_77221_c()V=|
 net/minecraft/src/GuiSlot.func_77222_a(IILnet/minecraft/src/Tessellator;)V=|p_77222_1_,p_77222_2_,p_77222_3_
 net/minecraft/src/GuiSlot.func_77223_a(ZI)V=|p_77223_1_,p_77223_2_
 net/minecraft/src/GuiSlot.func_77224_a(II)V=|p_77224_1_,p_77224_2_
 net/minecraft/src/GuiSlot.func_77225_g()I=|
 net/minecraft/src/GuiSlot.func_77226_h()V=|
 net/minecraft/src/GuiSlotLanguage.<init>(Lnet/minecraft/src/GuiLanguage;)V=|p_i1042_1_
-net/minecraft/src/GuiSlotLanguage.func_130003_c()V=|
+net/minecraft/src/GuiSlotLanguage.func_77212_b()I=|
-net/minecraft/src/GuiSlotLanguage.func_130004_b()I=|
 net/minecraft/src/GuiSlotLanguage.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiSlotLanguage.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiSlotLanguage.func_77217_a()I=|
 net/minecraft/src/GuiSlotLanguage.func_77218_a(I)Z=|p_77218_1_
+net/minecraft/src/GuiSlotLanguage.func_77221_c()V=|
 net/minecraft/src/GuiSlotOnlineServerList.<init>(Lnet/minecraft/src/GuiScreenOnlineServers;)V=|p_i1122_1_
 net/minecraft/src/GuiSlotOnlineServerList.func_104086_b(I)Z=|p_104086_1_
 net/minecraft/src/GuiSlotOnlineServerList.func_77212_b()I=|
@@ -7018,21 +7018,21 @@ net/minecraft/src/GuiSlotOnlineServerList.func_77221_c()V=|
 net/minecraft/src/GuiSlotOnlineServerList.func_96292_b(IIIILnet/minecraft/src/Tessellator;)V=|p_96292_1_,p_96292_2_,p_96292_3_,p_96292_4_,p_96292_5_
 net/minecraft/src/GuiSlotOnlineServerList.func_96293_a(IIILnet/minecraft/src/McoServer;)V=|p_96293_1_,p_96293_2_,p_96293_3_,p_96293_4_
 net/minecraft/src/GuiSlotServer.<init>(Lnet/minecraft/src/GuiMultiplayer;)V=|p_i1039_1_
-net/minecraft/src/GuiSlotServer.func_130003_c()V=|
+net/minecraft/src/GuiSlotServer.func_77212_b()I=|
-net/minecraft/src/GuiSlotServer.func_130004_b()I=|
 net/minecraft/src/GuiSlotServer.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiSlotServer.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiSlotServer.func_77217_a()I=|
 net/minecraft/src/GuiSlotServer.func_77218_a(I)Z=|p_77218_1_
+net/minecraft/src/GuiSlotServer.func_77221_c()V=|
 net/minecraft/src/GuiSlotServer.func_77247_d(IIIILnet/minecraft/src/Tessellator;)V=|p_77247_1_,p_77247_2_,p_77247_3_,p_77247_4_,p_77247_5_
 net/minecraft/src/GuiSlotServer.func_77248_b(IIIILnet/minecraft/src/Tessellator;)V=|p_77248_1_,p_77248_2_,p_77248_3_,p_77248_4_,p_77248_5_
 net/minecraft/src/GuiSlotServer.func_77249_c(IIIILnet/minecraft/src/Tessellator;)V=|p_77249_1_,p_77249_2_,p_77249_3_,p_77249_4_,p_77249_5_
 net/minecraft/src/GuiSlotStats.<init>(Lnet/minecraft/src/GuiStats;)V=|p_i1070_1_
-net/minecraft/src/GuiSlotStats.func_130003_c()V=|
 net/minecraft/src/GuiSlotStats.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiSlotStats.func_77215_b(II)V=|p_77215_1_,p_77215_2_
 net/minecraft/src/GuiSlotStats.func_77217_a()I=|
 net/minecraft/src/GuiSlotStats.func_77218_a(I)Z=|p_77218_1_
+net/minecraft/src/GuiSlotStats.func_77221_c()V=|
 net/minecraft/src/GuiSlotStats.func_77222_a(IILnet/minecraft/src/Tessellator;)V=|p_77222_1_,p_77222_2_,p_77222_3_
 net/minecraft/src/GuiSlotStats.func_77224_a(II)V=|p_77224_1_,p_77224_2_
 net/minecraft/src/GuiSlotStats.func_77257_d(I)Lnet/minecraft/src/StatCrafting;=|p_77257_1_
@@ -7045,12 +7045,12 @@ net/minecraft/src/GuiSlotStatsBlock.func_77214_a(IIIILnet/minecraft/src/Tessella
 net/minecraft/src/GuiSlotStatsBlock.func_77222_a(IILnet/minecraft/src/Tessellator;)V=|p_77222_1_,p_77222_2_,p_77222_3_
 net/minecraft/src/GuiSlotStatsBlock.func_77258_c(I)Ljava/lang/String;=|p_77258_1_
 net/minecraft/src/GuiSlotStatsGeneral.<init>(Lnet/minecraft/src/GuiStats;)V=|p_i1067_1_
-net/minecraft/src/GuiSlotStatsGeneral.func_130003_c()V=|
+net/minecraft/src/GuiSlotStatsGeneral.func_77212_b()I=|
-net/minecraft/src/GuiSlotStatsGeneral.func_130004_b()I=|
 net/minecraft/src/GuiSlotStatsGeneral.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiSlotStatsGeneral.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiSlotStatsGeneral.func_77217_a()I=|
 net/minecraft/src/GuiSlotStatsGeneral.func_77218_a(I)Z=|p_77218_1_
+net/minecraft/src/GuiSlotStatsGeneral.func_77221_c()V=|
 net/minecraft/src/GuiSlotStatsItem.<init>(Lnet/minecraft/src/GuiStats;)V=|p_i1069_1_
 net/minecraft/src/GuiSlotStatsItem.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiSlotStatsItem.func_77222_a(IILnet/minecraft/src/Tessellator;)V=|p_77222_1_,p_77222_2_,p_77222_3_
@@ -7066,11 +7066,11 @@ net/minecraft/src/GuiSnooper.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_738
 net/minecraft/src/GuiSnooper.func_74094_b(Lnet/minecraft/src/GuiSnooper;)Ljava/util/List;=|p_74094_0_
 net/minecraft/src/GuiSnooper.func_74095_a(Lnet/minecraft/src/GuiSnooper;)Ljava/util/List;=|p_74095_0_
 net/minecraft/src/GuiSnooperList.<init>(Lnet/minecraft/src/GuiSnooper;)V=|p_i1060_1_
-net/minecraft/src/GuiSnooperList.func_130003_c()V=|
 net/minecraft/src/GuiSnooperList.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiSnooperList.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiSnooperList.func_77217_a()I=|
 net/minecraft/src/GuiSnooperList.func_77218_a(I)Z=|p_77218_1_
+net/minecraft/src/GuiSnooperList.func_77221_c()V=|
 net/minecraft/src/GuiSnooperList.func_77225_g()I=|
 net/minecraft/src/GuiStats.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/StatFileWriter;)V=|p_i1071_1_,p_i1071_2_
 net/minecraft/src/GuiStats.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
@@ -7147,12 +7147,12 @@ net/minecraft/src/GuiWinGame.func_73876_c()V=|
 net/minecraft/src/GuiWinGame.func_73985_g()V=|
 net/minecraft/src/GuiWinGame.func_73986_b(IIF)V=|p_73986_1_,p_73986_2_,p_73986_3_
 net/minecraft/src/GuiWorldSlot.<init>(Lnet/minecraft/src/GuiSelectWorld;)V=|p_i1053_1_
-net/minecraft/src/GuiWorldSlot.func_130003_c()V=|
+net/minecraft/src/GuiWorldSlot.func_77212_b()I=|
-net/minecraft/src/GuiWorldSlot.func_130004_b()I=|
 net/minecraft/src/GuiWorldSlot.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiWorldSlot.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiWorldSlot.func_77217_a()I=|
 net/minecraft/src/GuiWorldSlot.func_77218_a(I)Z=|p_77218_1_
+net/minecraft/src/GuiWorldSlot.func_77221_c()V=|
 net/minecraft/src/GuiYesNo.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;I)V=|p_i1025_1_,p_i1025_2_,p_i1025_3_,p_i1025_4_
 net/minecraft/src/GuiYesNo.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V=|p_i1026_1_,p_i1026_2_,p_i1026_3_,p_i1026_4_,p_i1026_5_,p_i1026_6_
 net/minecraft/src/GuiYesNo.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
@@ -7195,9 +7195,9 @@ net/minecraft/src/IBlockSource.func_82620_h()I=|
 net/minecraft/src/IBlockSource.func_82621_f()I=|
 net/minecraft/src/IBlockSource.func_82622_e()I=|
 net/minecraft/src/IBlockSource.func_82623_d()I=|
-net/minecraft/src/IBossDisplayData.func_110183_aJ()F=|
+net/minecraft/src/IBossDisplayData.func_110138_aP()F=|
+net/minecraft/src/IBossDisplayData.func_110143_aJ()F=|
 net/minecraft/src/IBossDisplayData.func_70023_ak()Ljava/lang/String;=|
-net/minecraft/src/IBossDisplayData.func_70667_aM()F=|
 net/minecraft/src/ICamera.func_78546_a(Lnet/minecraft/src/AxisAlignedBB;)Z=|p_78546_1_
 net/minecraft/src/ICamera.func_78547_a(DDD)V=|p_78547_1_,p_78547_3_,p_78547_5_
 net/minecraft/src/IChunkLoader.func_75815_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException|p_75815_1_,p_75815_2_,p_75815_3_
@@ -7229,10 +7229,10 @@ net/minecraft/src/ICommandManager.func_71555_a()Ljava/util/Map;=|
 net/minecraft/src/ICommandManager.func_71556_a(Lnet/minecraft/src/ICommandSender;Ljava/lang/String;)I=|p_71556_1_,p_71556_2_
 net/minecraft/src/ICommandManager.func_71557_a(Lnet/minecraft/src/ICommandSender;)Ljava/util/List;=|p_71557_1_
 net/minecraft/src/ICommandManager.func_71558_b(Lnet/minecraft/src/ICommandSender;Ljava/lang/String;)Ljava/util/List;=|p_71558_1_,p_71558_2_
-net/minecraft/src/ICommandSender.func_110122_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_110122_1_
 net/minecraft/src/ICommandSender.func_130014_f_()Lnet/minecraft/src/World;=|
 net/minecraft/src/ICommandSender.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
 net/minecraft/src/ICommandSender.func_70005_c_()Ljava/lang/String;=|
+net/minecraft/src/ICommandSender.func_70006_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_70006_1_
 net/minecraft/src/ICommandSender.func_82114_b()Lnet/minecraft/src/ChunkCoordinates;=|
 net/minecraft/src/ICrafting.func_71110_a(Lnet/minecraft/src/Container;Ljava/util/List;)V=|p_71110_1_,p_71110_2_
 net/minecraft/src/ICrafting.func_71111_a(Lnet/minecraft/src/Container;ILnet/minecraft/src/ItemStack;)V=|p_71111_1_,p_71111_2_,p_71111_3_
@@ -8204,7 +8204,7 @@ net/minecraft/src/MapGenVillage.func_75049_b(II)Lnet/minecraft/src/StructureStar
 net/minecraft/src/MapInfo.<init>(Lnet/minecraft/src/MapData;Lnet/minecraft/src/EntityPlayer;)V=|p_i2138_1_,p_i2138_2_
 net/minecraft/src/MapInfo.func_76204_a(Lnet/minecraft/src/ItemStack;)[B=|p_76204_1_
 net/minecraft/src/MapItemRenderer.<init>(Lnet/minecraft/src/GameSettings;Lnet/minecraft/src/TextureManager;)V=|p_i1045_1_,p_i1045_2_
-net/minecraft/src/MapItemRenderer.func_111275_a(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/MapData;)V=|p_111275_1_,p_111275_2_,p_111275_3_
+net/minecraft/src/MapItemRenderer.func_78319_a(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/MapData;)V=|p_78319_1_,p_78319_2_,p_78319_3_
 net/minecraft/src/MapStorage.<init>(Lnet/minecraft/src/ISaveHandler;)V=|p_i2162_1_
 net/minecraft/src/MapStorage.func_75742_a(Ljava/lang/Class;Ljava/lang/String;)Lnet/minecraft/src/WorldSavedData;=|p_75742_1_,p_75742_2_
 net/minecraft/src/MapStorage.func_75743_a(Ljava/lang/String;)I=|p_75743_1_
@@ -8314,19 +8314,19 @@ net/minecraft/src/McoServer.hashCode()I=|
 net/minecraft/src/McoServerAddress.<init>()V=|
 net/minecraft/src/McoServerAddress.func_98162_a(Ljava/lang/String;)Lnet/minecraft/src/McoServerAddress;=|p_98162_0_
 net/minecraft/src/McoServerList.<init>()V=|
+net/minecraft/src/McoServerList.func_100014_a(Lnet/minecraft/src/McoServerList;)Lnet/minecraft/src/Session;=|p_100014_0_
 net/minecraft/src/McoServerList.func_130122_a(Lnet/minecraft/src/McoServerList;I)V=|p_130122_0_,p_130122_1_
 net/minecraft/src/McoServerList.func_130123_a(I)V=|p_130123_1_
 net/minecraft/src/McoServerList.func_130124_d()I=|
-net/minecraft/src/McoServerList.func_130125_a(Lnet/minecraft/src/McoServerList;)Z=|p_130125_0_
-net/minecraft/src/McoServerList.func_130126_a(Lnet/minecraft/src/McoServerList;Ljava/util/List;)V=|p_130126_0_,p_130126_1_
 net/minecraft/src/McoServerList.func_130127_a()Z=|
-net/minecraft/src/McoServerList.func_130128_b(Lnet/minecraft/src/McoServerList;)Lnet/minecraft/src/Session;=|p_130128_0_
 net/minecraft/src/McoServerList.func_130129_a(Lnet/minecraft/src/Session;)V=|p_130129_1_
 net/minecraft/src/McoServerList.func_140056_e()I=|
 net/minecraft/src/McoServerList.func_140057_b(Lnet/minecraft/src/McoServerList;I)I=|p_140057_0_,p_140057_1_
 net/minecraft/src/McoServerList.func_140058_a(Lnet/minecraft/src/McoServer;)V=|p_140058_1_
 net/minecraft/src/McoServerList.func_96426_a(Ljava/util/List;)V=|p_96426_1_
+net/minecraft/src/McoServerList.func_98247_a(Lnet/minecraft/src/McoServerList;Ljava/util/List;)V=|p_98247_0_,p_98247_1_
 net/minecraft/src/McoServerList.func_98248_d()V=|
+net/minecraft/src/McoServerList.func_98249_b(Lnet/minecraft/src/McoServerList;)Z=|p_98249_0_
 net/minecraft/src/McoServerList.func_98250_b()V=|
 net/minecraft/src/McoServerList.func_98252_c()Ljava/util/List;=|
 net/minecraft/src/McoServerListUpdateTask.<init>(Lnet/minecraft/src/McoServerList;)V=|p_i2328_1_
@@ -8457,17 +8457,17 @@ net/minecraft/src/Minecraft.func_98033_al()Lnet/minecraft/src/ILogAgent;=|
 net/minecraft/src/Minecraft.run()V=|
 net/minecraft/src/MinecraftError.<init>()V=|
 net/minecraft/src/MinecraftException.<init>(Ljava/lang/String;)V=|p_i1955_1_
-net/minecraft/src/MinecraftServerGui.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2332_1_
+net/minecraft/src/MinecraftServerGui.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2342_1_
 net/minecraft/src/MinecraftServerGui.func_120016_a(Lnet/minecraft/src/DedicatedServer;)V=|p_120016_0_
 net/minecraft/src/MinecraftServerGui.func_120017_a(Lnet/minecraft/src/MinecraftServerGui;)Lnet/minecraft/src/DedicatedServer;=|p_120017_0_
 net/minecraft/src/MinecraftServerGui.func_120018_d()Ljavax/swing/JComponent;=|
 net/minecraft/src/MinecraftServerGui.func_120019_b()Ljavax/swing/JComponent;=|
 net/minecraft/src/MinecraftServerGui.func_120020_c()Ljavax/swing/JComponent;=|
-net/minecraft/src/MinecraftServerGuiINNER1.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2333_1_
+net/minecraft/src/MinecraftServerGuiINNER1.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2343_1_
 net/minecraft/src/MinecraftServerGuiINNER1.windowClosing(Ljava/awt/event/WindowEvent;)V=|p_windowClosing_1_
-net/minecraft/src/MinecraftServerGuiINNER2.<init>(Lnet/minecraft/src/MinecraftServerGui;Ljavax/swing/JTextField;)V=|p_i2334_1_,p_i2334_2_
+net/minecraft/src/MinecraftServerGuiINNER2.<init>(Lnet/minecraft/src/MinecraftServerGui;Ljavax/swing/JTextField;)V=|p_i2344_1_,p_i2344_2_
 net/minecraft/src/MinecraftServerGuiINNER2.actionPerformed(Ljava/awt/event/ActionEvent;)V=|p_actionPerformed_1_
-net/minecraft/src/MinecraftServerGuiINNER3.<init>(Lnet/minecraft/src/MinecraftServerGui;)V=|p_i2335_1_
+net/minecraft/src/MinecraftServerGuiINNER3.<init>(Lnet/minecraft/src/MinecraftServerGui;)V=|p_i2345_1_
 net/minecraft/src/MinecraftServerGuiINNER3.focusGained(Ljava/awt/event/FocusEvent;)V=|p_focusGained_1_
 net/minecraft/src/MobSpawnerBaseLogic.<init>()V=|
 net/minecraft/src/MobSpawnerBaseLogic.func_98265_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/Entity;=|p_98265_1_
@@ -9394,7 +9394,6 @@ net/minecraft/src/Packet253ServerAuthData.func_73377_d()Ljava/lang/String;=|
 net/minecraft/src/Packet253ServerAuthData.func_73378_g()[B=|
 net/minecraft/src/Packet254ServerPing.<init>()V=|
 net/minecraft/src/Packet254ServerPing.<init>(ILjava/lang/String;I)V=|p_i2330_1_,p_i2330_2_,p_i2330_3_
-net/minecraft/src/Packet254ServerPing.func_140001_d()Z=|
 net/minecraft/src/Packet254ServerPing.func_140050_d()Z=|
 net/minecraft/src/Packet254ServerPing.func_73267_a(Ljava/io/DataInput;)V=java/io/IOException|p_73267_1_
 net/minecraft/src/Packet254ServerPing.func_73273_a(Ljava/io/DataOutput;)V=java/io/IOException|p_73273_1_
@@ -9829,7 +9828,7 @@ net/minecraft/src/PlayerInstance.func_73256_a(Lnet/minecraft/src/Packet;)V=|p_73
 net/minecraft/src/PlayerInstance.func_73257_a(Lnet/minecraft/src/TileEntity;)V=|p_73257_1_
 net/minecraft/src/PlayerInstance.func_73258_b(Lnet/minecraft/src/PlayerInstance;)Ljava/util/List;=|p_73258_0_
 net/minecraft/src/PlayerInstance.func_73259_a(III)V=|p_73259_1_,p_73259_2_,p_73259_3_
-net/minecraft/src/PlayerListComponent.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i2336_1_
+net/minecraft/src/PlayerListComponent.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i2346_1_
 net/minecraft/src/PlayerListComponent.func_73660_a()V=|
 net/minecraft/src/PlayerManager.<init>(Lnet/minecraft/src/WorldServer;I)V=|p_i1519_1_,p_i1519_2_
 net/minecraft/src/PlayerManager.func_111191_d(Lnet/minecraft/src/PlayerManager;)Ljava/util/List;=|p_111191_0_
@@ -9980,10 +9979,10 @@ net/minecraft/src/PropertyManager.func_73669_a(Ljava/lang/String;I)I=|p_73669_1_
 net/minecraft/src/PropertyManager.func_73670_a(Ljava/lang/String;Z)Z=|p_73670_1_,p_73670_2_
 net/minecraft/src/PropertyManager.func_73671_a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;=|p_73671_1_,p_73671_2_
 net/minecraft/src/RConConsoleSource.<init>()V=|
-net/minecraft/src/RConConsoleSource.func_110122_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_110122_1_
 net/minecraft/src/RConConsoleSource.func_130014_f_()Lnet/minecraft/src/World;=|
 net/minecraft/src/RConConsoleSource.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
 net/minecraft/src/RConConsoleSource.func_70005_c_()Ljava/lang/String;=|
+net/minecraft/src/RConConsoleSource.func_70006_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_70006_1_
 net/minecraft/src/RConConsoleSource.func_70007_b()V=|
 net/minecraft/src/RConConsoleSource.func_70008_c()Ljava/lang/String;=|
 net/minecraft/src/RConConsoleSource.func_82114_b()Lnet/minecraft/src/ChunkCoordinates;=|
@@ -10144,10 +10143,10 @@ net/minecraft/src/RenderBat.func_110775_a(Lnet/minecraft/src/Entity;)Lnet/minecr
 net/minecraft/src/RenderBat.func_110834_a(Lnet/minecraft/src/EntityBat;)Lnet/minecraft/src/ResourceLocation;=|p_110834_1_
 net/minecraft/src/RenderBat.func_76986_a(Lnet/minecraft/src/Entity;DDDFF)V=|p_76986_1_,p_76986_2_,p_76986_4_,p_76986_6_,p_76986_8_,p_76986_9_
 net/minecraft/src/RenderBat.func_77031_a(Lnet/minecraft/src/EntityLiving;DDDFF)V=|p_77031_1_,p_77031_2_,p_77031_4_,p_77031_6_,p_77031_8_,p_77031_9_
+net/minecraft/src/RenderBat.func_77031_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77031_1_,p_77031_2_,p_77031_4_,p_77031_6_,p_77031_8_,p_77031_9_
 net/minecraft/src/RenderBat.func_77039_a(Lnet/minecraft/src/EntityLivingBase;DDD)V=|p_77039_1_,p_77039_2_,p_77039_4_,p_77039_6_
 net/minecraft/src/RenderBat.func_77041_b(Lnet/minecraft/src/EntityLivingBase;F)V=|p_77041_1_,p_77041_2_
 net/minecraft/src/RenderBat.func_77043_a(Lnet/minecraft/src/EntityLivingBase;FFF)V=|p_77043_1_,p_77043_2_,p_77043_3_,p_77043_4_
-net/minecraft/src/RenderBat.func_77101_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77101_1_,p_77101_2_,p_77101_4_,p_77101_6_,p_77101_8_,p_77101_9_
 net/minecraft/src/RenderBat.func_82442_a(Lnet/minecraft/src/EntityBat;F)V=|p_82442_1_,p_82442_2_
 net/minecraft/src/RenderBat.func_82443_a(Lnet/minecraft/src/EntityBat;DDDFF)V=|p_82443_1_,p_82443_2_,p_82443_4_,p_82443_6_,p_82443_8_,p_82443_9_
 net/minecraft/src/RenderBat.func_82444_a(Lnet/minecraft/src/EntityBat;FFF)V=|p_82444_1_,p_82444_2_,p_82444_3_,p_82444_4_
@@ -10425,16 +10424,16 @@ net/minecraft/src/RenderIronGolem.func_77049_a(Lnet/minecraft/src/EntityIronGole
 net/minecraft/src/RenderIronGolem.func_77101_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77101_1_,p_77101_2_,p_77101_4_,p_77101_6_,p_77101_8_,p_77101_9_
 net/minecraft/src/RenderItem.<init>()V=|
 net/minecraft/src/RenderItem.func_110775_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation;=|p_110775_1_
-net/minecraft/src/RenderItem.func_110793_a(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;IILjava/lang/String;)V=|p_110793_1_,p_110793_2_,p_110793_3_,p_110793_4_,p_110793_5_,p_110793_6_
-net/minecraft/src/RenderItem.func_110794_c(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V=|p_110794_1_,p_110794_2_,p_110794_3_,p_110794_4_,p_110794_5_
-net/minecraft/src/RenderItem.func_110795_a(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V=|p_110795_1_,p_110795_2_,p_110795_3_,p_110795_4_,p_110795_5_
 net/minecraft/src/RenderItem.func_110796_a(Lnet/minecraft/src/EntityItem;)Lnet/minecraft/src/ResourceLocation;=|p_110796_1_
-net/minecraft/src/RenderItem.func_110797_b(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V=|p_110797_1_,p_110797_2_,p_110797_3_,p_110797_4_,p_110797_5_
 net/minecraft/src/RenderItem.func_76986_a(Lnet/minecraft/src/Entity;DDDFF)V=|p_76986_1_,p_76986_2_,p_76986_4_,p_76986_6_,p_76986_8_,p_76986_9_
 net/minecraft/src/RenderItem.func_77014_a(Lnet/minecraft/src/EntityItem;DDDFF)V=|p_77014_1_,p_77014_2_,p_77014_4_,p_77014_6_,p_77014_8_,p_77014_9_
+net/minecraft/src/RenderItem.func_77015_a(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V=|p_77015_1_,p_77015_2_,p_77015_3_,p_77015_4_,p_77015_5_
 net/minecraft/src/RenderItem.func_77017_a(Lnet/minecraft/src/Tessellator;IIIII)V=|p_77017_1_,p_77017_2_,p_77017_3_,p_77017_4_,p_77017_5_,p_77017_6_
 net/minecraft/src/RenderItem.func_77018_a(IIIII)V=|p_77018_1_,p_77018_2_,p_77018_3_,p_77018_4_,p_77018_5_
 net/minecraft/src/RenderItem.func_77020_a(Lnet/minecraft/src/EntityItem;Lnet/minecraft/src/Icon;IFFFF)V=|p_77020_1_,p_77020_2_,p_77020_3_,p_77020_4_,p_77020_5_,p_77020_6_,p_77020_7_
+net/minecraft/src/RenderItem.func_77021_b(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V=|p_77021_1_,p_77021_2_,p_77021_3_,p_77021_4_,p_77021_5_
+net/minecraft/src/RenderItem.func_82406_b(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V=|p_82406_1_,p_82406_2_,p_82406_3_,p_82406_4_,p_82406_5_
+net/minecraft/src/RenderItem.func_94148_a(Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;IILjava/lang/String;)V=|p_94148_1_,p_94148_2_,p_94148_3_,p_94148_4_,p_94148_5_,p_94148_6_
 net/minecraft/src/RenderItem.func_94149_a(IILnet/minecraft/src/Icon;II)V=|p_94149_1_,p_94149_2_,p_94149_3_,p_94149_4_,p_94149_5_
 net/minecraft/src/RenderItemFrame.<init>()V=|
 net/minecraft/src/RenderItemFrame.func_110775_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation;=|p_110775_1_
@@ -10526,24 +10525,24 @@ net/minecraft/src/RenderPig.func_77099_a(Lnet/minecraft/src/EntityPig;IF)I=|p_77
 net/minecraft/src/RenderPlayer.<init>()V=|
 net/minecraft/src/RenderPlayer.func_110775_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation;=|p_110775_1_
 net/minecraft/src/RenderPlayer.func_110817_a(Lnet/minecraft/src/AbstractClientPlayer;)Lnet/minecraft/src/ResourceLocation;=|p_110817_1_
-net/minecraft/src/RenderPlayer.func_110818_a(Lnet/minecraft/src/AbstractClientPlayer;IF)I=|p_110818_1_,p_110818_2_,p_110818_3_
-net/minecraft/src/RenderPlayer.func_110819_a(Lnet/minecraft/src/AbstractClientPlayer;DDDFF)V=|p_110819_1_,p_110819_2_,p_110819_4_,p_110819_6_,p_110819_8_,p_110819_9_
-net/minecraft/src/RenderPlayer.func_110820_a(Lnet/minecraft/src/AbstractClientPlayer;F)V=|p_110820_1_,p_110820_2_
-net/minecraft/src/RenderPlayer.func_110821_b(Lnet/minecraft/src/AbstractClientPlayer;IF)V=|p_110821_1_,p_110821_2_,p_110821_3_
-net/minecraft/src/RenderPlayer.func_130009_b(Lnet/minecraft/src/EntityLivingBase;F)V=|p_130009_1_,p_130009_2_
-net/minecraft/src/RenderPlayer.func_130013_a(Lnet/minecraft/src/AbstractClientPlayer;DDDLjava/lang/String;FD)V=|p_130013_1_,p_130013_2_,p_130013_4_,p_130013_6_,p_130013_8_,p_130013_9_,p_130013_10_
-net/minecraft/src/RenderPlayer.func_130198_a(Lnet/minecraft/src/AbstractClientPlayer;FFF)V=|p_130198_1_,p_130198_2_,p_130198_3_,p_130198_4_
-net/minecraft/src/RenderPlayer.func_130199_b(Lnet/minecraft/src/AbstractClientPlayer;DDD)V=|p_130199_1_,p_130199_2_,p_130199_4_,p_130199_6_
 net/minecraft/src/RenderPlayer.func_76986_a(Lnet/minecraft/src/Entity;DDDFF)V=|p_76986_1_,p_76986_2_,p_76986_4_,p_76986_6_,p_76986_8_,p_76986_9_
-net/minecraft/src/RenderPlayer.func_77100_a(Lnet/minecraft/src/EntityLivingBase;F)V=|p_77100_1_,p_77100_2_
+net/minecraft/src/RenderPlayer.func_77029_c(Lnet/minecraft/src/EntityLivingBase;F)V=|p_77029_1_,p_77029_2_
-net/minecraft/src/RenderPlayer.func_77101_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77101_1_,p_77101_2_,p_77101_4_,p_77101_6_,p_77101_8_,p_77101_9_
+net/minecraft/src/RenderPlayer.func_77031_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77031_1_,p_77031_2_,p_77031_4_,p_77031_6_,p_77031_8_,p_77031_9_
-net/minecraft/src/RenderPlayer.func_77102_a(Lnet/minecraft/src/EntityLivingBase;FFF)V=|p_77102_1_,p_77102_2_,p_77102_3_,p_77102_4_
+net/minecraft/src/RenderPlayer.func_77032_a(Lnet/minecraft/src/EntityLivingBase;IF)I=|p_77032_1_,p_77032_2_,p_77032_3_
+net/minecraft/src/RenderPlayer.func_77039_a(Lnet/minecraft/src/EntityLivingBase;DDD)V=|p_77039_1_,p_77039_2_,p_77039_4_,p_77039_6_
+net/minecraft/src/RenderPlayer.func_77041_b(Lnet/minecraft/src/EntityLivingBase;F)V=|p_77041_1_,p_77041_2_
+net/minecraft/src/RenderPlayer.func_77043_a(Lnet/minecraft/src/EntityLivingBase;FFF)V=|p_77043_1_,p_77043_2_,p_77043_3_,p_77043_4_
+net/minecraft/src/RenderPlayer.func_77100_a(Lnet/minecraft/src/AbstractClientPlayer;F)V=|p_77100_1_,p_77100_2_
+net/minecraft/src/RenderPlayer.func_77101_a(Lnet/minecraft/src/AbstractClientPlayer;DDDFF)V=|p_77101_1_,p_77101_2_,p_77101_4_,p_77101_6_,p_77101_8_,p_77101_9_
+net/minecraft/src/RenderPlayer.func_77102_a(Lnet/minecraft/src/AbstractClientPlayer;FFF)V=|p_77102_1_,p_77102_2_,p_77102_3_,p_77102_4_
 net/minecraft/src/RenderPlayer.func_77104_b(Lnet/minecraft/src/AbstractClientPlayer;F)V=|p_77104_1_,p_77104_2_
-net/minecraft/src/RenderPlayer.func_77105_b(Lnet/minecraft/src/EntityLivingBase;DDD)V=|p_77105_1_,p_77105_2_,p_77105_4_,p_77105_6_
+net/minecraft/src/RenderPlayer.func_77105_b(Lnet/minecraft/src/AbstractClientPlayer;DDD)V=|p_77105_1_,p_77105_2_,p_77105_4_,p_77105_6_
-net/minecraft/src/RenderPlayer.func_77107_a(Lnet/minecraft/src/EntityLivingBase;IF)I=|p_77107_1_,p_77107_2_,p_77107_3_
+net/minecraft/src/RenderPlayer.func_77107_a(Lnet/minecraft/src/AbstractClientPlayer;IF)I=|p_77107_1_,p_77107_2_,p_77107_3_
-net/minecraft/src/RenderPlayer.func_82439_b(Lnet/minecraft/src/EntityLivingBase;IF)V=|p_82439_1_,p_82439_2_,p_82439_3_
+net/minecraft/src/RenderPlayer.func_82408_c(Lnet/minecraft/src/EntityLivingBase;IF)V=|p_82408_1_,p_82408_2_,p_82408_3_
+net/minecraft/src/RenderPlayer.func_82439_b(Lnet/minecraft/src/AbstractClientPlayer;IF)V=|p_82439_1_,p_82439_2_,p_82439_3_
 net/minecraft/src/RenderPlayer.func_82441_a(Lnet/minecraft/src/EntityPlayer;)V=|p_82441_1_
 net/minecraft/src/RenderPlayer.func_96449_a(Lnet/minecraft/src/EntityLivingBase;DDDLjava/lang/String;FD)V=|p_96449_1_,p_96449_2_,p_96449_4_,p_96449_6_,p_96449_8_,p_96449_9_,p_96449_10_
+net/minecraft/src/RenderPlayer.func_96450_a(Lnet/minecraft/src/AbstractClientPlayer;DDDLjava/lang/String;FD)V=|p_96450_1_,p_96450_2_,p_96450_4_,p_96450_6_,p_96450_8_,p_96450_9_,p_96450_10_
 net/minecraft/src/RenderSheep.<init>(Lnet/minecraft/src/ModelBase;Lnet/minecraft/src/ModelBase;F)V=|p_i1266_1_,p_i1266_2_,p_i1266_3_
 net/minecraft/src/RenderSheep.func_110775_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation;=|p_110775_1_
 net/minecraft/src/RenderSheep.func_110883_a(Lnet/minecraft/src/EntitySheep;)Lnet/minecraft/src/ResourceLocation;=|p_110883_1_
@@ -10689,11 +10688,12 @@ net/minecraft/src/RenderZombie.func_82429_a(Lnet/minecraft/src/EntityZombie;IF)I
 net/minecraft/src/RenderZombie.func_82430_a(Lnet/minecraft/src/EntityZombie;FFF)V=|p_82430_1_,p_82430_2_,p_82430_3_,p_82430_4_
 net/minecraft/src/RendererLivingEntity.<init>(Lnet/minecraft/src/ModelBase;F)V=|p_i1261_1_,p_i1261_2_
 net/minecraft/src/RendererLivingEntity.func_110813_b(Lnet/minecraft/src/EntityLivingBase;)Z=|p_110813_1_
-net/minecraft/src/RendererLivingEntity.func_130008_a(Lnet/minecraft/src/EntityLivingBase;DDD)V=|p_130008_1_,p_130008_2_,p_130008_4_,p_130008_6_
 net/minecraft/src/RendererLivingEntity.func_76986_a(Lnet/minecraft/src/Entity;DDDFF)V=|p_76986_1_,p_76986_2_,p_76986_4_,p_76986_6_,p_76986_8_,p_76986_9_
 net/minecraft/src/RendererLivingEntity.func_77029_c(Lnet/minecraft/src/EntityLivingBase;F)V=|p_77029_1_,p_77029_2_
 net/minecraft/src/RendererLivingEntity.func_77030_a(Lnet/minecraft/src/EntityLivingBase;FF)I=|p_77030_1_,p_77030_2_,p_77030_3_
+net/minecraft/src/RendererLivingEntity.func_77031_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77031_1_,p_77031_2_,p_77031_4_,p_77031_6_,p_77031_8_,p_77031_9_
 net/minecraft/src/RendererLivingEntity.func_77032_a(Lnet/minecraft/src/EntityLivingBase;IF)I=|p_77032_1_,p_77032_2_,p_77032_3_
+net/minecraft/src/RendererLivingEntity.func_77033_b(Lnet/minecraft/src/EntityLivingBase;DDD)V=|p_77033_1_,p_77033_2_,p_77033_4_,p_77033_6_
 net/minecraft/src/RendererLivingEntity.func_77034_a(FFF)F=|p_77034_1_,p_77034_2_,p_77034_3_
 net/minecraft/src/RendererLivingEntity.func_77035_b(Lnet/minecraft/src/EntityLivingBase;IF)I=|p_77035_1_,p_77035_2_,p_77035_3_
 net/minecraft/src/RendererLivingEntity.func_77036_a(Lnet/minecraft/src/EntityLivingBase;FFFFFF)V=|p_77036_1_,p_77036_2_,p_77036_3_,p_77036_4_,p_77036_5_,p_77036_6_,p_77036_7_
@@ -10705,8 +10705,7 @@ net/minecraft/src/RendererLivingEntity.func_77041_b(Lnet/minecraft/src/EntityLiv
 net/minecraft/src/RendererLivingEntity.func_77042_a(Lnet/minecraft/src/ModelBase;)V=|p_77042_1_
 net/minecraft/src/RendererLivingEntity.func_77043_a(Lnet/minecraft/src/EntityLivingBase;FFF)V=|p_77043_1_,p_77043_2_,p_77043_3_,p_77043_4_
 net/minecraft/src/RendererLivingEntity.func_77044_a(Lnet/minecraft/src/EntityLivingBase;F)F=|p_77044_1_,p_77044_2_
-net/minecraft/src/RendererLivingEntity.func_77101_a(Lnet/minecraft/src/EntityLivingBase;DDDFF)V=|p_77101_1_,p_77101_2_,p_77101_4_,p_77101_6_,p_77101_8_,p_77101_9_
+net/minecraft/src/RendererLivingEntity.func_82408_c(Lnet/minecraft/src/EntityLivingBase;IF)V=|p_82408_1_,p_82408_2_,p_82408_3_
-net/minecraft/src/RendererLivingEntity.func_82439_b(Lnet/minecraft/src/EntityLivingBase;IF)V=|p_82439_1_,p_82439_2_,p_82439_3_
 net/minecraft/src/RendererLivingEntity.func_85093_e(Lnet/minecraft/src/EntityLivingBase;F)V=|p_85093_1_,p_85093_2_
 net/minecraft/src/RendererLivingEntity.func_96449_a(Lnet/minecraft/src/EntityLivingBase;DDDLjava/lang/String;FD)V=|p_96449_1_,p_96449_2_,p_96449_4_,p_96449_6_,p_96449_8_,p_96449_9_,p_96449_10_
 net/minecraft/src/ReportedException.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i1356_1_
@@ -11005,7 +11004,6 @@ net/minecraft/src/ServerCommandTestFor.func_82358_a([Ljava/lang/String;I)Z=|p_82
 net/minecraft/src/ServerCommandTestFor.func_82362_a()I=|
 net/minecraft/src/ServerConfigurationManager.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i1500_1_
 net/minecraft/src/ServerConfigurationManager.func_110459_a(Lnet/minecraft/src/ChatMessageComponent;Z)V=|p_110459_1_,p_110459_2_
-net/minecraft/src/ServerConfigurationManager.func_110460_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_110460_1_
 net/minecraft/src/ServerConfigurationManager.func_72352_l()I=|
 net/minecraft/src/ServerConfigurationManager.func_72353_e(Ljava/lang/String;)Z=|p_72353_1_
 net/minecraft/src/ServerConfigurationManager.func_72354_b(Lnet/minecraft/src/EntityPlayerMP;Lnet/minecraft/src/WorldServer;)V=|p_72354_1_,p_72354_2_
@@ -11056,6 +11054,7 @@ net/minecraft/src/ServerConfigurationManager.func_72398_c()Ljava/lang/String;=|
 net/minecraft/src/ServerConfigurationManager.func_72399_a(Ljava/net/SocketAddress;Ljava/lang/String;)Ljava/lang/String;=|p_72399_1_,p_72399_2_
 net/minecraft/src/ServerConfigurationManager.func_82448_a(Lnet/minecraft/src/Entity;ILnet/minecraft/src/WorldServer;Lnet/minecraft/src/WorldServer;)V=|p_82448_1_,p_82448_2_,p_82448_3_,p_82448_4_
 net/minecraft/src/ServerConfigurationManager.func_82449_a(Lnet/minecraft/src/ChunkCoordinates;IIIIIILjava/util/Map;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/src/World;)Ljava/util/List;=|p_82449_1_,p_82449_2_,p_82449_3_,p_82449_4_,p_82449_5_,p_82449_6_,p_82449_7_,p_82449_8_,p_82449_9_,p_82449_10_,p_82449_11_
+net/minecraft/src/ServerConfigurationManager.func_92062_k(Lnet/minecraft/src/ChatMessageComponent;)V=|p_92062_1_
 net/minecraft/src/ServerConfigurationManager.func_96456_a(Lnet/minecraft/src/ServerScoreboard;Lnet/minecraft/src/EntityPlayerMP;)V=|p_96456_1_,p_96456_2_
 net/minecraft/src/ServerConfigurationManager.func_96457_a(Lnet/minecraft/src/EntityPlayer;Ljava/util/Map;)Z=|p_96457_1_,p_96457_2_
 net/minecraft/src/ServerData.<init>(Ljava/lang/String;Ljava/lang/String;)V=|p_i1193_1_,p_i1193_2_
@@ -11325,12 +11324,12 @@ net/minecraft/src/StatTypeSimple.<init>()V=|
 net/minecraft/src/StatTypeSimple.func_75843_a(I)Ljava/lang/String;=|p_75843_1_
 net/minecraft/src/StatTypeTime.<init>()V=|
 net/minecraft/src/StatTypeTime.func_75843_a(I)Ljava/lang/String;=|p_75843_1_
-net/minecraft/src/StatsComponent.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i2337_1_
+net/minecraft/src/StatsComponent.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i2347_1_
 net/minecraft/src/StatsComponent.func_120033_a(Lnet/minecraft/src/StatsComponent;)V=|p_120033_0_
 net/minecraft/src/StatsComponent.func_120034_a()V=|
 net/minecraft/src/StatsComponent.func_120035_a([J)D=|p_120035_1_
 net/minecraft/src/StatsComponent.paint(Ljava/awt/Graphics;)V=|p_paint_1_
-net/minecraft/src/StatsComponentINNER1.<init>(Lnet/minecraft/src/StatsComponent;)V=|p_i2338_1_
+net/minecraft/src/StatsComponentINNER1.<init>(Lnet/minecraft/src/StatsComponent;)V=|p_i2348_1_
 net/minecraft/src/StatsComponentINNER1.actionPerformed(Ljava/awt/event/ActionEvent;)V=|p_actionPerformed_1_
 net/minecraft/src/StatsSyncher.<init>(Lnet/minecraft/src/Session;Lnet/minecraft/src/StatFileWriter;Ljava/io/File;)V=|p_i1335_1_,p_i1335_2_,p_i1335_3_
 net/minecraft/src/StatsSyncher.func_77406_a(Lnet/minecraft/src/StatsSyncher;Z)Z=|p_77406_0_,p_77406_1_
@@ -11586,11 +11585,11 @@ net/minecraft/src/Tessellator.func_78383_c()V=|
 net/minecraft/src/Tessellator.func_78384_a(II)V=|p_78384_1_,p_78384_2_
 net/minecraft/src/Tessellator.func_78385_a(DD)V=|p_78385_1_,p_78385_3_
 net/minecraft/src/Tessellator.func_78386_a(FFF)V=|p_78386_1_,p_78386_2_,p_78386_3_
-net/minecraft/src/TextAreaLogHandler.<init>(Ljavax/swing/JTextArea;)V=|p_i2339_1_
+net/minecraft/src/TextAreaLogHandler.<init>(Ljavax/swing/JTextArea;)V=|p_i2349_1_
 net/minecraft/src/TextAreaLogHandler.close()V=|
 net/minecraft/src/TextAreaLogHandler.flush()V=|
 net/minecraft/src/TextAreaLogHandler.publish(Ljava/util/logging/LogRecord;)V=|p_publish_1_
-net/minecraft/src/TextAreaLogHandlerINNER1.<init>(Lnet/minecraft/src/TextAreaLogHandler;)V=|p_i2340_1_
+net/minecraft/src/TextAreaLogHandlerINNER1.<init>(Lnet/minecraft/src/TextAreaLogHandler;)V=|p_i2350_1_
 net/minecraft/src/TextAreaLogHandlerINNER1.format(Ljava/util/logging/LogRecord;)Ljava/lang/String;=|p_format_1_
 net/minecraft/src/TextureAtlasSprite.<init>(Ljava/lang/String;)V=|p_i1282_1_
 net/minecraft/src/TextureAtlasSprite.func_110965_a(I)[I=|p_110965_1_
@@ -11681,7 +11680,7 @@ net/minecraft/src/ThreadConnectToOnlineServer.<init>(Lnet/minecraft/src/GuiSlotO
 net/minecraft/src/ThreadConnectToOnlineServer.run()V=|
 net/minecraft/src/ThreadConnectToServer.<init>(Lnet/minecraft/src/GuiConnecting;Ljava/lang/String;I)V=|p_i1180_1_,p_i1180_2_,p_i1180_3_
 net/minecraft/src/ThreadConnectToServer.run()V=|
-net/minecraft/src/ThreadDedicatedServer.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2331_1_
+net/minecraft/src/ThreadDedicatedServer.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i2341_1_
 net/minecraft/src/ThreadDedicatedServer.run()V=|
 net/minecraft/src/ThreadDownloadImageData.<init>(Ljava/lang/String;Lnet/minecraft/src/ResourceLocation;Lnet/minecraft/src/IImageBuffer;)V=|p_i1273_1_,p_i1273_2_,p_i1273_3_
 net/minecraft/src/ThreadDownloadImageData.func_110551_a(Lnet/minecraft/src/ResourceManager;)V=java/io/IOException|p_110551_1_
@@ -11826,10 +11825,10 @@ net/minecraft/src/TileEntityChestRenderer.<init>()V=|
 net/minecraft/src/TileEntityChestRenderer.func_76894_a(Lnet/minecraft/src/TileEntity;DDDF)V=|p_76894_1_,p_76894_2_,p_76894_4_,p_76894_6_,p_76894_8_
 net/minecraft/src/TileEntityChestRenderer.func_76911_a(Lnet/minecraft/src/TileEntityChest;DDDF)V=|p_76911_1_,p_76911_2_,p_76911_4_,p_76911_6_,p_76911_8_
 net/minecraft/src/TileEntityCommandBlock.<init>()V=|
-net/minecraft/src/TileEntityCommandBlock.func_110122_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_110122_1_
 net/minecraft/src/TileEntityCommandBlock.func_130014_f_()Lnet/minecraft/src/World;=|
 net/minecraft/src/TileEntityCommandBlock.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
 net/minecraft/src/TileEntityCommandBlock.func_70005_c_()Ljava/lang/String;=|
+net/minecraft/src/TileEntityCommandBlock.func_70006_a(Lnet/minecraft/src/ChatMessageComponent;)V=|p_70006_1_
 net/minecraft/src/TileEntityCommandBlock.func_70307_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70307_1_
 net/minecraft/src/TileEntityCommandBlock.func_70310_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70310_1_
 net/minecraft/src/TileEntityCommandBlock.func_70319_e()Lnet/minecraft/src/Packet;=|
@@ -11989,10 +11988,10 @@ net/minecraft/src/TileEntityPiston.func_70339_i()V=|
 net/minecraft/src/TileEntityPiston.func_70340_a()I=|
 net/minecraft/src/TileEntityPiston.func_70341_b()Z=|
 net/minecraft/src/TileEntityRecordPlayer.<init>()V=|
-net/minecraft/src/TileEntityRecordPlayer.func_110135_a(Lnet/minecraft/src/ItemStack;)V=|p_110135_1_
-net/minecraft/src/TileEntityRecordPlayer.func_110136_a()Lnet/minecraft/src/ItemStack;=|
 net/minecraft/src/TileEntityRecordPlayer.func_70307_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70307_1_
 net/minecraft/src/TileEntityRecordPlayer.func_70310_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70310_1_
+net/minecraft/src/TileEntityRecordPlayer.func_96097_a()Lnet/minecraft/src/ItemStack;=|
+net/minecraft/src/TileEntityRecordPlayer.func_96098_a(Lnet/minecraft/src/ItemStack;)V=|p_96098_1_
 net/minecraft/src/TileEntityRenderer.<init>()V=|
 net/minecraft/src/TileEntityRenderer.func_76949_a(Lnet/minecraft/src/TileEntity;DDDF)V=|p_76949_1_,p_76949_2_,p_76949_4_,p_76949_6_,p_76949_8_
 net/minecraft/src/TileEntityRenderer.func_76950_a(Lnet/minecraft/src/TileEntity;F)V=|p_76950_1_,p_76950_2_
@@ -12169,7 +12168,7 @@ net/minecraft/src/World.<init>(Lnet/minecraft/src/ISaveHandler;Ljava/lang/String
 net/minecraft/src/World.func_102026_a(Lnet/minecraft/src/Block;I)Z=|p_102026_1_,p_102026_2_
 net/minecraft/src/World.func_110746_b(DDD)F=|p_110746_1_,p_110746_3_,p_110746_5_
 net/minecraft/src/World.func_110750_I(III)F=|p_110750_1_,p_110750_2_,p_110750_3_
-net/minecraft/src/World.func_130001_d()I=|
+net/minecraft/src/World.func_130001_d()F=|
 net/minecraft/src/World.func_72796_p(III)Lnet/minecraft/src/TileEntity;=|p_72796_1_,p_72796_2_,p_72796_3_
 net/minecraft/src/World.func_72797_t(III)Z=|p_72797_1_,p_72797_2_,p_72797_3_
 net/minecraft/src/World.func_72798_a(III)I=|p_72798_1_,p_72798_2_,p_72798_3_
@@ -12217,7 +12216,7 @@ net/minecraft/src/World.func_72849_a(IIIZ)I=|p_72849_1_,p_72849_2_,p_72849_3_,p_
 net/minecraft/src/World.func_72850_v(III)Z=|p_72850_1_,p_72850_2_,p_72850_3_
 net/minecraft/src/World.func_72851_f(IIII)V=|p_72851_1_,p_72851_2_,p_72851_3_,p_72851_4_
 net/minecraft/src/World.func_72852_a(Ljava/util/Collection;)V=|p_72852_1_
-net/minecraft/src/World.func_72853_d()F=|
+net/minecraft/src/World.func_72853_d()I=|
 net/minecraft/src/World.func_72854_c()V=|
 net/minecraft/src/World.func_72855_b(Lnet/minecraft/src/AxisAlignedBB;)Z=|p_72855_1_
 net/minecraft/src/World.func_72856_b(Lnet/minecraft/src/Entity;D)Lnet/minecraft/src/EntityPlayer;=|p_72856_1_,p_72856_2_

fml/conf/joined.srg

@@ -1310,7 +1310,7 @@ CL: px net/minecraft/src/EntityAIAttackOnCollide
 CL: py net/minecraft/src/EntityAIMoveIndoors
 CL: pz net/minecraft/src/EntityAIMoveThroughVillage
 CL: q net/minecraft/src/CrashReportCategoryEntry
-CL: qa net/minecraft/src/EntityAIMoveTwardsRestriction
+CL: qa net/minecraft/src/EntityAIMoveTowardsRestriction
 CL: qb net/minecraft/src/EntityAIMoveTowardsTarget
 CL: qc net/minecraft/src/EntityAIOcelotAttack
 CL: qd net/minecraft/src/EntityAIOcelotSit
@@ -3428,8 +3428,8 @@ FD: avi/c net/minecraft/src/GuiLanguage/field_74044_d #C
 FD: avi/d net/minecraft/src/GuiLanguage/field_135014_d #C
 FD: avi/e net/minecraft/src/GuiLanguage/field_74048_m #C
 FD: avj/a net/minecraft/src/GuiSlotLanguage/field_77252_a #C
-FD: avj/b net/minecraft/src/GuiSlotLanguage/field_135050_b #C
+FD: avj/b net/minecraft/src/GuiSlotLanguage/field_77251_g #C
-FD: avj/h net/minecraft/src/GuiSlotLanguage/field_77251_g #C
+FD: avj/h net/minecraft/src/GuiSlotLanguage/field_77253_h #C
 FD: avm/a net/minecraft/src/MapItemRenderer/field_111277_a #C
 FD: avm/b net/minecraft/src/MapItemRenderer/field_78321_b #C
 FD: avm/c net/minecraft/src/MapItemRenderer/field_78323_a #C
@@ -3866,10 +3866,10 @@ FD: ayq/c net/minecraft/src/GuiScreenOnlineServers/field_96186_b #C
 FD: ayq/d net/minecraft/src/GuiScreenOnlineServers/field_96187_c #C
 FD: ayq/e net/minecraft/src/GuiScreenOnlineServers/field_96185_d #C
 FD: ayq/p net/minecraft/src/GuiScreenOnlineServers/field_96189_n #C
-FD: ayq/q net/minecraft/src/GuiScreenOnlineServers/field_140043_q #C
+FD: ayq/q net/minecraft/src/GuiScreenOnlineServers/field_96190_o #C
 FD: ayq/r net/minecraft/src/GuiScreenOnlineServers/field_96198_p #C
 FD: ayq/s net/minecraft/src/GuiScreenOnlineServers/field_96197_q #C
-FD: ayq/t net/minecraft/src/GuiScreenOnlineServers/field_140042_t #C
+FD: ayq/t net/minecraft/src/GuiScreenOnlineServers/field_96196_r #C
 FD: ayq/u net/minecraft/src/GuiScreenOnlineServers/field_96195_s #C
 FD: ayq/v net/minecraft/src/GuiScreenOnlineServers/field_96194_t #C
 FD: ayq/w net/minecraft/src/GuiScreenOnlineServers/field_96193_u #C
@@ -4882,7 +4882,7 @@ FD: bhv/d net/minecraft/src/Stitcher/field_94315_d #C
 FD: bhv/e net/minecraft/src/Stitcher/field_94316_e #C
 FD: bhv/f net/minecraft/src/Stitcher/field_94313_f #C
 FD: bhv/g net/minecraft/src/Stitcher/field_94314_g #C
-FD: bhv/h net/minecraft/src/Stitcher/field_110938_h #C
+FD: bhv/h net/minecraft/src/Stitcher/field_94323_h #C
 FD: bhw/a net/minecraft/src/StitchHolder/field_98151_a #C
 FD: bhw/b net/minecraft/src/StitchHolder/field_94204_c #C
 FD: bhw/c net/minecraft/src/StitchHolder/field_94201_d #C
@@ -6599,11 +6599,11 @@ FD: pz/e net/minecraft/src/EntityAIMoveThroughVillage/field_75417_e
 FD: pz/f net/minecraft/src/EntityAIMoveThroughVillage/field_75415_f
 FD: q/a net/minecraft/src/CrashReportCategoryEntry/field_85092_a
 FD: q/b net/minecraft/src/CrashReportCategoryEntry/field_85091_b
-FD: qa/a net/minecraft/src/EntityAIMoveTwardsRestriction/field_75436_a
+FD: qa/a net/minecraft/src/EntityAIMoveTowardsRestriction/field_75436_a
-FD: qa/b net/minecraft/src/EntityAIMoveTwardsRestriction/field_75434_b
+FD: qa/b net/minecraft/src/EntityAIMoveTowardsRestriction/field_75434_b
-FD: qa/c net/minecraft/src/EntityAIMoveTwardsRestriction/field_75435_c
+FD: qa/c net/minecraft/src/EntityAIMoveTowardsRestriction/field_75435_c
-FD: qa/d net/minecraft/src/EntityAIMoveTwardsRestriction/field_75432_d
+FD: qa/d net/minecraft/src/EntityAIMoveTowardsRestriction/field_75432_d
-FD: qa/e net/minecraft/src/EntityAIMoveTwardsRestriction/field_75433_e
+FD: qa/e net/minecraft/src/EntityAIMoveTowardsRestriction/field_75433_e
 FD: qb/a net/minecraft/src/EntityAIMoveTowardsTarget/field_75431_a
 FD: qb/b net/minecraft/src/EntityAIMoveTowardsTarget/field_75429_b
 FD: qb/c net/minecraft/src/EntityAIMoveTowardsTarget/field_75430_c
@@ -7983,9 +7983,9 @@ MD: abr/u ()Lacq; net/minecraft/src/World/func_72959_q ()Lnet/minecraft/src/Worl
 MD: abr/u (III)Z net/minecraft/src/World/func_72809_s (III)Z
 MD: abr/v ()Z net/minecraft/src/World/func_72935_r ()Z
 MD: abr/v (III)Z net/minecraft/src/World/func_85174_u (III)Z
-MD: abr/w ()I net/minecraft/src/World/func_130001_d ()I #C
+MD: abr/w ()I net/minecraft/src/World/func_72853_d ()I #C
 MD: abr/w (III)Z net/minecraft/src/World/func_72797_t (III)Z
-MD: abr/x ()F net/minecraft/src/World/func_72853_d ()F
+MD: abr/x ()F net/minecraft/src/World/func_130001_d ()F
 MD: abr/x (III)Z net/minecraft/src/World/func_72884_u (III)Z
 MD: abr/y ()Ljava/lang/String; net/minecraft/src/World/func_72981_t ()Ljava/lang/String; #C
 MD: abr/y (III)Z net/minecraft/src/World/func_72850_v (III)Z
@@ -8167,7 +8167,7 @@ MD: acx/a (Labr;Ljava/util/Random;II)V net/minecraft/src/BiomeGenJungle/func_767
 MD: acx/a (Ljava/util/Random;)Laez; net/minecraft/src/BiomeGenJungle/func_76740_a (Ljava/util/Random;)Lnet/minecraft/src/WorldGenerator;
 MD: acx/b (Ljava/util/Random;)Laez; net/minecraft/src/BiomeGenJungle/func_76730_b (Ljava/util/Random;)Lnet/minecraft/src/WorldGenerator;
 MD: ad/a (ILjava/lang/String;)Z net/minecraft/src/ICommandSender/func_70003_b (ILjava/lang/String;)Z
-MD: ad/a (Lcu;)V net/minecraft/src/ICommandSender/func_110122_a (Lnet/minecraft/src/ChatMessageComponent;)V
+MD: ad/a (Lcu;)V net/minecraft/src/ICommandSender/func_70006_a (Lnet/minecraft/src/ChatMessageComponent;)V
 MD: ad/b ()Lt; net/minecraft/src/ICommandSender/func_82114_b ()Lnet/minecraft/src/ChunkCoordinates;
 MD: ad/c_ ()Ljava/lang/String; net/minecraft/src/ICommandSender/func_70005_c_ ()Ljava/lang/String;
 MD: ad/f_ ()Labr; net/minecraft/src/ICommandSender/func_130014_f_ ()Lnet/minecraft/src/World;
@@ -9765,9 +9765,9 @@ MD: aop/b (Labr;)Lasi; net/minecraft/src/BlockJukeBox/func_72274_a (Lnet/minecra
 MD: aop/b_ (Labr;IIII)I net/minecraft/src/BlockJukeBox/func_94328_b_ (Lnet/minecraft/src/World;IIII)I
 MD: aop/k_ (Labr;III)V net/minecraft/src/BlockJukeBox/func_72276_j_ (Lnet/minecraft/src/World;III)V
 MD: aop/q_ ()Z net/minecraft/src/BlockJukeBox/func_96468_q_ ()Z
-MD: aoq/a ()Lxz; net/minecraft/src/TileEntityRecordPlayer/func_110136_a ()Lnet/minecraft/src/ItemStack;
+MD: aoq/a ()Lxz; net/minecraft/src/TileEntityRecordPlayer/func_96097_a ()Lnet/minecraft/src/ItemStack;
 MD: aoq/a (Lbx;)V net/minecraft/src/TileEntityRecordPlayer/func_70307_a (Lnet/minecraft/src/NBTTagCompound;)V
-MD: aoq/a (Lxz;)V net/minecraft/src/TileEntityRecordPlayer/func_110135_a (Lnet/minecraft/src/ItemStack;)V
+MD: aoq/a (Lxz;)V net/minecraft/src/TileEntityRecordPlayer/func_96098_a (Lnet/minecraft/src/ItemStack;)V
 MD: aoq/b (Lbx;)V net/minecraft/src/TileEntityRecordPlayer/func_70310_b (Lnet/minecraft/src/NBTTagCompound;)V
 MD: aor/a (Labr;IIII)V net/minecraft/src/BlockLadder/func_71863_a (Lnet/minecraft/src/World;IIII)V
 MD: aor/a (Labr;IIIIFFFI)I net/minecraft/src/BlockLadder/func_85104_a (Lnet/minecraft/src/World;IIIIFFFI)I
@@ -10606,7 +10606,7 @@ MD: ars/a (I)V net/minecraft/src/TileEntityCommandBlock/func_96102_a (I)V
 MD: ars/a (ILjava/lang/String;)Z net/minecraft/src/TileEntityCommandBlock/func_70003_b (ILjava/lang/String;)Z
 MD: ars/a (Labr;)I net/minecraft/src/TileEntityCommandBlock/func_82351_a (Lnet/minecraft/src/World;)I
 MD: ars/a (Lbx;)V net/minecraft/src/TileEntityCommandBlock/func_70307_a (Lnet/minecraft/src/NBTTagCompound;)V
-MD: ars/a (Lcu;)V net/minecraft/src/TileEntityCommandBlock/func_110122_a (Lnet/minecraft/src/ChatMessageComponent;)V
+MD: ars/a (Lcu;)V net/minecraft/src/TileEntityCommandBlock/func_70006_a (Lnet/minecraft/src/ChatMessageComponent;)V
 MD: ars/a (Ljava/lang/String;)V net/minecraft/src/TileEntityCommandBlock/func_82352_b (Ljava/lang/String;)V
 MD: ars/b ()Lt; net/minecraft/src/TileEntityCommandBlock/func_82114_b ()Lnet/minecraft/src/ChunkCoordinates;
 MD: ars/b (Lbx;)V net/minecraft/src/TileEntityCommandBlock/func_70310_b (Lnet/minecraft/src/NBTTagCompound;)V
@@ -11220,7 +11220,7 @@ MD: aur/a (I)Z net/minecraft/src/GuiCreateFlatWorldListSlot/func_77218_a (I)Z #C
 MD: aur/a (IIIILbff;)V net/minecraft/src/GuiCreateFlatWorldListSlot/func_77214_a (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: aur/a (IILxz;)V net/minecraft/src/GuiCreateFlatWorldListSlot/func_82452_a (IILnet/minecraft/src/ItemStack;)V #C
 MD: aur/a (IZ)V net/minecraft/src/GuiCreateFlatWorldListSlot/func_77213_a (IZ)V #C
-MD: aur/b ()V net/minecraft/src/GuiCreateFlatWorldListSlot/func_130003_c ()V #C
+MD: aur/b ()V net/minecraft/src/GuiCreateFlatWorldListSlot/func_77221_c ()V #C
 MD: aur/b (IIII)V net/minecraft/src/GuiCreateFlatWorldListSlot/func_82450_b (IIII)V #C
 MD: aur/c ()I net/minecraft/src/GuiCreateFlatWorldListSlot/func_77225_g ()I #C
 MD: aur/e (II)V net/minecraft/src/GuiCreateFlatWorldListSlot/func_82451_d (II)V #C
@@ -11398,10 +11398,10 @@ MD: avf/a ()I net/minecraft/src/GuiSlotServer/func_77217_a ()I #C
 MD: avf/a (I)Z net/minecraft/src/GuiSlotServer/func_77218_a (I)Z #C
 MD: avf/a (IIIILbff;)V net/minecraft/src/GuiSlotServer/func_77214_a (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: avf/a (IZ)V net/minecraft/src/GuiSlotServer/func_77213_a (IZ)V #C
-MD: avf/b ()V net/minecraft/src/GuiSlotServer/func_130003_c ()V #C
+MD: avf/b ()V net/minecraft/src/GuiSlotServer/func_77221_c ()V #C
 MD: avf/b (IIIILbff;)V net/minecraft/src/GuiSlotServer/func_77248_b (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: avf/c (IIIILbff;)V net/minecraft/src/GuiSlotServer/func_77249_c (IIIILnet/minecraft/src/Tessellator;)V #C
-MD: avf/d ()I net/minecraft/src/GuiSlotServer/func_130004_b ()I #C
+MD: avf/d ()I net/minecraft/src/GuiSlotServer/func_77212_b ()I #C
 MD: avf/d (IIIILbff;)V net/minecraft/src/GuiSlotServer/func_77247_d (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: avg/run ()V net/minecraft/src/ThreadPollServers/run ()V #C
 MD: avh/a (Latn;II)V net/minecraft/src/GuiButtonLanguage/func_73737_a (Lnet/minecraft/src/Minecraft;II)V #C
@@ -11409,16 +11409,16 @@ MD: avi/A_ ()V net/minecraft/src/GuiLanguage/func_73866_w_ ()V #C
 MD: avi/a (IIF)V net/minecraft/src/GuiLanguage/func_73863_a (IIF)V #C
 MD: avi/a (Lauk;)V net/minecraft/src/GuiLanguage/func_73875_a (Lnet/minecraft/src/GuiButton;)V #C
 MD: avi/a (Lavi;)Lbjs; net/minecraft/src/GuiLanguage/func_135011_a (Lnet/minecraft/src/GuiLanguage;)Lnet/minecraft/src/LanguageManager; #C
-MD: avi/b (Lavi;)Lauc; net/minecraft/src/GuiLanguage/func_135012_b (Lnet/minecraft/src/GuiLanguage;)Lnet/minecraft/src/GameSettings; #C
+MD: avi/b (Lavi;)Lauc; net/minecraft/src/GuiLanguage/func_74043_a (Lnet/minecraft/src/GuiLanguage;)Lnet/minecraft/src/GameSettings; #C
-MD: avi/c (Lavi;)Lawc; net/minecraft/src/GuiLanguage/func_135013_c (Lnet/minecraft/src/GuiLanguage;)Lnet/minecraft/src/GuiSmallButton; #C
+MD: avi/c (Lavi;)Lawc; net/minecraft/src/GuiLanguage/func_74042_b (Lnet/minecraft/src/GuiLanguage;)Lnet/minecraft/src/GuiSmallButton; #C
 MD: avj/a ()I net/minecraft/src/GuiSlotLanguage/func_77217_a ()I #C
 MD: avj/a (I)Z net/minecraft/src/GuiSlotLanguage/func_77218_a (I)Z #C
 MD: avj/a (IIIILbff;)V net/minecraft/src/GuiSlotLanguage/func_77214_a (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: avj/a (IZ)V net/minecraft/src/GuiSlotLanguage/func_77213_a (IZ)V #C
-MD: avj/b ()V net/minecraft/src/GuiSlotLanguage/func_130003_c ()V #C
+MD: avj/b ()V net/minecraft/src/GuiSlotLanguage/func_77221_c ()V #C
-MD: avj/d ()I net/minecraft/src/GuiSlotLanguage/func_130004_b ()I #C
+MD: avj/d ()I net/minecraft/src/GuiSlotLanguage/func_77212_b ()I #C
 MD: avl/a (Ljava/lang/String;)V net/minecraft/src/GuiButtonLink/func_96135_a (Ljava/lang/String;)V #C
-MD: avm/a (Lua;Lbib;Lalb;)V net/minecraft/src/MapItemRenderer/func_111275_a (Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/MapData;)V #C
+MD: avm/a (Lua;Lbib;Lalb;)V net/minecraft/src/MapItemRenderer/func_78319_a (Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/MapData;)V #C
 MD: avn/A_ ()V net/minecraft/src/GuiOptions/func_73866_w_ ()V #C
 MD: avn/a (IIF)V net/minecraft/src/GuiOptions/func_73863_a (IIF)V #C
 MD: avn/a (Lauk;)V net/minecraft/src/GuiOptions/func_73875_a (Lnet/minecraft/src/GuiButton;)V #C
@@ -11450,7 +11450,7 @@ MD: avs/a (I)Z net/minecraft/src/GuiFlatPresetsListSlot/func_77218_a (I)Z #C
 MD: avs/a (III)V net/minecraft/src/GuiFlatPresetsListSlot/func_82457_a (III)V #C
 MD: avs/a (IIIILbff;)V net/minecraft/src/GuiFlatPresetsListSlot/func_77214_a (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: avs/a (IZ)V net/minecraft/src/GuiFlatPresetsListSlot/func_77213_a (IZ)V #C
-MD: avs/b ()V net/minecraft/src/GuiFlatPresetsListSlot/func_130003_c ()V #C
+MD: avs/b ()V net/minecraft/src/GuiFlatPresetsListSlot/func_77221_c ()V #C
 MD: avs/b (IIII)V net/minecraft/src/GuiFlatPresetsListSlot/func_82455_b (IIII)V #C
 MD: avs/e (II)V net/minecraft/src/GuiFlatPresetsListSlot/func_82456_d (II)V #C
 MD: avu/A_ ()V net/minecraft/src/GuiRenameWorld/func_73866_w_ ()V #C
@@ -11498,14 +11498,14 @@ MD: avx/a (IZ)V net/minecraft/src/GuiSlot/func_77213_a (IZ)V #C
 MD: avx/a (Lauk;)V net/minecraft/src/GuiSlot/func_77219_a (Lnet/minecraft/src/GuiButton;)V #C
 MD: avx/a (Z)V net/minecraft/src/GuiSlot/func_77216_a (Z)V #C
 MD: avx/a (ZI)V net/minecraft/src/GuiSlot/func_77223_a (ZI)V #C
-MD: avx/b ()V net/minecraft/src/GuiSlot/func_130003_c ()V #C
+MD: avx/b ()V net/minecraft/src/GuiSlot/func_77221_c ()V #C
 MD: avx/b (I)V net/minecraft/src/GuiSlot/func_77208_b (I)V #C
 MD: avx/b (II)V net/minecraft/src/GuiSlot/func_77215_b (II)V #C
 MD: avx/b (IIII)V net/minecraft/src/GuiSlot/func_77206_b (IIII)V #C
 MD: avx/c ()I net/minecraft/src/GuiSlot/func_77225_g ()I #C
 MD: avx/c (II)I net/minecraft/src/GuiSlot/func_77210_c (II)I #C
-MD: avx/d ()I net/minecraft/src/GuiSlot/func_130004_b ()I #C
+MD: avx/d ()I net/minecraft/src/GuiSlot/func_77212_b ()I #C
-MD: avx/d (II)V net/minecraft/src/GuiSlot/func_110509_d (II)V #C
+MD: avx/d (II)V net/minecraft/src/GuiSlot/func_77220_a (II)V #C
 MD: avx/e ()I net/minecraft/src/GuiSlot/func_77209_d ()I #C
 MD: avx/h ()V net/minecraft/src/GuiSlot/func_77226_h ()V #C
 MD: avy/A_ ()V net/minecraft/src/GuiSelectWorld/func_73866_w_ ()V #C
@@ -11533,8 +11533,8 @@ MD: avz/a ()I net/minecraft/src/GuiWorldSlot/func_77217_a ()I #C
 MD: avz/a (I)Z net/minecraft/src/GuiWorldSlot/func_77218_a (I)Z #C
 MD: avz/a (IIIILbff;)V net/minecraft/src/GuiWorldSlot/func_77214_a (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: avz/a (IZ)V net/minecraft/src/GuiWorldSlot/func_77213_a (IZ)V #C
-MD: avz/b ()V net/minecraft/src/GuiWorldSlot/func_130003_c ()V #C
+MD: avz/b ()V net/minecraft/src/GuiWorldSlot/func_77221_c ()V #C
-MD: avz/d ()I net/minecraft/src/GuiWorldSlot/func_130004_b ()I #C
+MD: avz/d ()I net/minecraft/src/GuiWorldSlot/func_77212_b ()I #C
 MD: aw/a ()I net/minecraft/src/CommandWeather/func_82362_a ()I
 MD: aw/a (Lad;[Ljava/lang/String;)Ljava/util/List; net/minecraft/src/CommandWeather/func_71516_a (Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;
 MD: aw/b (Lad;[Ljava/lang/String;)V net/minecraft/src/CommandWeather/func_71515_b (Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V
@@ -11558,7 +11558,7 @@ MD: awe/a ()I net/minecraft/src/GuiSnooperList/func_77217_a ()I #C
 MD: awe/a (I)Z net/minecraft/src/GuiSnooperList/func_77218_a (I)Z #C
 MD: awe/a (IIIILbff;)V net/minecraft/src/GuiSnooperList/func_77214_a (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: awe/a (IZ)V net/minecraft/src/GuiSnooperList/func_77213_a (IZ)V #C
-MD: awe/b ()V net/minecraft/src/GuiSnooperList/func_130003_c ()V #C
+MD: awe/b ()V net/minecraft/src/GuiSnooperList/func_77221_c ()V #C
 MD: awe/c ()I net/minecraft/src/GuiSnooperList/func_77225_g ()I #C
 MD: awf/A_ ()V net/minecraft/src/GuiVideoSettings/func_73866_w_ ()V #C
 MD: awf/a (IIF)V net/minecraft/src/GuiVideoSettings/func_73863_a (IIF)V #C
@@ -11610,8 +11610,8 @@ MD: awl/a ()I net/minecraft/src/GuiSlotStatsGeneral/func_77217_a ()I #C
 MD: awl/a (I)Z net/minecraft/src/GuiSlotStatsGeneral/func_77218_a (I)Z #C
 MD: awl/a (IIIILbff;)V net/minecraft/src/GuiSlotStatsGeneral/func_77214_a (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: awl/a (IZ)V net/minecraft/src/GuiSlotStatsGeneral/func_77213_a (IZ)V #C
-MD: awl/b ()V net/minecraft/src/GuiSlotStatsGeneral/func_130003_c ()V #C
+MD: awl/b ()V net/minecraft/src/GuiSlotStatsGeneral/func_77221_c ()V #C
-MD: awl/d ()I net/minecraft/src/GuiSlotStatsGeneral/func_130004_b ()I #C
+MD: awl/d ()I net/minecraft/src/GuiSlotStatsGeneral/func_77212_b ()I #C
 MD: awm/a (IIIILbff;)V net/minecraft/src/GuiSlotStatsItem/func_77214_a (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: awm/a (IILbff;)V net/minecraft/src/GuiSlotStatsItem/func_77222_a (IILnet/minecraft/src/Tessellator;)V #C
 MD: awm/c (I)Ljava/lang/String; net/minecraft/src/GuiSlotStatsItem/func_77258_c (I)Ljava/lang/String; #C
@@ -11624,7 +11624,7 @@ MD: awo/a (IILbff;)V net/minecraft/src/GuiSlotStats/func_77222_a (IILnet/minecra
 MD: awo/a (IZ)V net/minecraft/src/GuiSlotStats/func_77213_a (IZ)V #C
 MD: awo/a (Lkp;II)V net/minecraft/src/GuiSlotStats/func_77259_a (Lnet/minecraft/src/StatCrafting;II)V #C
 MD: awo/a (Lkp;IIZ)V net/minecraft/src/GuiSlotStats/func_77260_a (Lnet/minecraft/src/StatCrafting;IIZ)V #C
-MD: awo/b ()V net/minecraft/src/GuiSlotStats/func_130003_c ()V #C
+MD: awo/b ()V net/minecraft/src/GuiSlotStats/func_77221_c ()V #C
 MD: awo/b (II)V net/minecraft/src/GuiSlotStats/func_77215_b (II)V #C
 MD: awo/c (I)Ljava/lang/String; net/minecraft/src/GuiSlotStats/func_77258_c (I)Ljava/lang/String; #C
 MD: awo/d (I)Lkp; net/minecraft/src/GuiSlotStats/func_77257_d (I)Lnet/minecraft/src/StatCrafting; #C
@@ -12086,13 +12086,13 @@ MD: ayz/c ()V net/minecraft/src/GuiScreenPendingInvitationList/func_77221_c ()V
 MD: aza/a ()Z net/minecraft/src/McoServerList/func_130127_a ()Z #C
 MD: aza/a (I)V net/minecraft/src/McoServerList/func_130123_a (I)V #C
 MD: aza/a (Lauj;)V net/minecraft/src/McoServerList/func_130129_a (Lnet/minecraft/src/Session;)V #C
-MD: aza/a (Laza;)Z net/minecraft/src/McoServerList/func_130125_a (Lnet/minecraft/src/McoServerList;)Z #C
+MD: aza/a (Laza;)Z net/minecraft/src/McoServerList/func_98249_b (Lnet/minecraft/src/McoServerList;)Z #C
 MD: aza/a (Laza;I)V net/minecraft/src/McoServerList/func_130122_a (Lnet/minecraft/src/McoServerList;I)V #C
-MD: aza/a (Laza;Ljava/util/List;)V net/minecraft/src/McoServerList/func_130126_a (Lnet/minecraft/src/McoServerList;Ljava/util/List;)V #C
+MD: aza/a (Laza;Ljava/util/List;)V net/minecraft/src/McoServerList/func_98247_a (Lnet/minecraft/src/McoServerList;Ljava/util/List;)V #C
 MD: aza/a (Lbab;)V net/minecraft/src/McoServerList/func_140058_a (Lnet/minecraft/src/McoServer;)V #C
 MD: aza/a (Ljava/util/List;)V net/minecraft/src/McoServerList/func_96426_a (Ljava/util/List;)V #C
 MD: aza/b ()V net/minecraft/src/McoServerList/func_98250_b ()V #C
-MD: aza/b (Laza;)Lauj; net/minecraft/src/McoServerList/func_130128_b (Lnet/minecraft/src/McoServerList;)Lnet/minecraft/src/Session; #C
+MD: aza/b (Laza;)Lauj; net/minecraft/src/McoServerList/func_100014_a (Lnet/minecraft/src/McoServerList;)Lnet/minecraft/src/Session; #C
 MD: aza/b (Laza;I)I net/minecraft/src/McoServerList/func_140057_b (Lnet/minecraft/src/McoServerList;I)I #C
 MD: aza/c ()Ljava/util/List; net/minecraft/src/McoServerList/func_98252_c ()Ljava/util/List; #C
 MD: aza/d ()I net/minecraft/src/McoServerList/func_130124_d ()I #C
@@ -12670,7 +12670,7 @@ MD: bem/a (Larv;)V net/minecraft/src/EntityPlayerSP/func_71006_a (Lnet/minecraft
 MD: bem/a (Larz;)V net/minecraft/src/EntityPlayerSP/func_71042_a (Lnet/minecraft/src/TileEntityFurnace;)V #C
 MD: bem/a (Lasb;)V net/minecraft/src/EntityPlayerSP/func_94064_a (Lnet/minecraft/src/TileEntityHopper;)V #C
 MD: bem/a (Lasi;)V net/minecraft/src/EntityPlayerSP/func_71014_a (Lnet/minecraft/src/TileEntity;)V #C
-MD: bem/a (Lcu;)V net/minecraft/src/EntityPlayerSP/func_110122_a (Lnet/minecraft/src/ChatMessageComponent;)V #C
+MD: bem/a (Lcu;)V net/minecraft/src/EntityPlayerSP/func_70006_a (Lnet/minecraft/src/ChatMessageComponent;)V #C
 MD: bem/a (Ljava/lang/String;)V net/minecraft/src/EntityPlayerSP/func_71035_c (Ljava/lang/String;)V #C
 MD: bem/a (Ljava/lang/String;FF)V net/minecraft/src/EntityPlayerSP/func_85030_a (Ljava/lang/String;FF)V #C
 MD: bem/a (Lkr;I)V net/minecraft/src/EntityPlayerSP/func_71064_a (Lnet/minecraft/src/StatBase;I)V #C
@@ -12701,7 +12701,7 @@ MD: bem/t ()Z net/minecraft/src/EntityPlayerSP/func_110317_t ()Z #C
 MD: ben/Q ()F net/minecraft/src/EntityOtherPlayerMP/func_70053_R ()F #C
 MD: ben/a (DDDFFI)V net/minecraft/src/EntityOtherPlayerMP/func_70056_a (DDDFFI)V #C
 MD: ben/a (ILjava/lang/String;)Z net/minecraft/src/EntityOtherPlayerMP/func_70003_b (ILjava/lang/String;)Z #C
-MD: ben/a (Lcu;)V net/minecraft/src/EntityOtherPlayerMP/func_110122_a (Lnet/minecraft/src/ChatMessageComponent;)V #C
+MD: ben/a (Lcu;)V net/minecraft/src/EntityOtherPlayerMP/func_70006_a (Lnet/minecraft/src/ChatMessageComponent;)V #C
 MD: ben/a (Lmy;F)Z net/minecraft/src/EntityOtherPlayerMP/func_70097_a (Lnet/minecraft/src/DamageSource;F)Z #C
 MD: ben/b ()Lt; net/minecraft/src/EntityOtherPlayerMP/func_82114_b ()Lnet/minecraft/src/ChunkCoordinates; #C
 MD: ben/c ()V net/minecraft/src/EntityOtherPlayerMP/func_70636_d ()V #C
@@ -12944,7 +12944,7 @@ MD: bfo/a (Luc;DDDFF)V net/minecraft/src/RenderArrow/func_76999_a (Lnet/minecraf
 MD: bfp/a (Lnk;)Lbjd; net/minecraft/src/RenderBat/func_110775_a (Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation; #C
 MD: bfp/a (Lnk;DDDFF)V net/minecraft/src/RenderBat/func_76986_a (Lnet/minecraft/src/Entity;DDDFF)V #C
 MD: bfp/a (Loc;DDD)V net/minecraft/src/RenderBat/func_77039_a (Lnet/minecraft/src/EntityLivingBase;DDD)V #C
-MD: bfp/a (Loc;DDDFF)V net/minecraft/src/RenderBat/func_77101_a (Lnet/minecraft/src/EntityLivingBase;DDDFF)V #C
+MD: bfp/a (Loc;DDDFF)V net/minecraft/src/RenderBat/func_77031_a (Lnet/minecraft/src/EntityLivingBase;DDDFF)V #C
 MD: bfp/a (Loc;F)V net/minecraft/src/RenderBat/func_77041_b (Lnet/minecraft/src/EntityLivingBase;F)V #C
 MD: bfp/a (Loc;FFF)V net/minecraft/src/RenderBat/func_77043_a (Lnet/minecraft/src/EntityLivingBase;FFF)V #C
 MD: bfp/a (Lod;DDDFF)V net/minecraft/src/RenderBat/func_77031_a (Lnet/minecraft/src/EntityLiving;DDDFF)V #C
@@ -13104,16 +13104,16 @@ MD: bgk/b (Loa;)V net/minecraft/src/RenderItemFrame/func_82403_a (Lnet/minecraft
 MD: bgk/c (Loa;)V net/minecraft/src/RenderItemFrame/func_82402_b (Lnet/minecraft/src/EntityItemFrame;)V #C
 MD: bgl/a (IIIII)V net/minecraft/src/RenderItem/func_77018_a (IIIII)V #C
 MD: bgl/a (IILmp;II)V net/minecraft/src/RenderItem/func_94149_a (IILnet/minecraft/src/Icon;II)V #C
-MD: bgl/a (Lauz;Lbib;Lxz;II)V net/minecraft/src/RenderItem/func_110795_a (Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V #C
+MD: bgl/a (Lauz;Lbib;Lxz;II)V net/minecraft/src/RenderItem/func_77015_a (Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V #C
-MD: bgl/a (Lauz;Lbib;Lxz;IILjava/lang/String;)V net/minecraft/src/RenderItem/func_110793_a (Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;IILjava/lang/String;)V #C
+MD: bgl/a (Lauz;Lbib;Lxz;IILjava/lang/String;)V net/minecraft/src/RenderItem/func_94148_a (Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;IILjava/lang/String;)V #C
 MD: bgl/a (Lbff;IIIII)V net/minecraft/src/RenderItem/func_77017_a (Lnet/minecraft/src/Tessellator;IIIII)V #C
 MD: bgl/a (Lnk;)Lbjd; net/minecraft/src/RenderItem/func_110775_a (Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation; #C
 MD: bgl/a (Lnk;DDDFF)V net/minecraft/src/RenderItem/func_76986_a (Lnet/minecraft/src/Entity;DDDFF)V #C
 MD: bgl/a (Lsp;)Lbjd; net/minecraft/src/RenderItem/func_110796_a (Lnet/minecraft/src/EntityItem;)Lnet/minecraft/src/ResourceLocation; #C
 MD: bgl/a (Lsp;DDDFF)V net/minecraft/src/RenderItem/func_77014_a (Lnet/minecraft/src/EntityItem;DDDFF)V #C
 MD: bgl/a (Lsp;Lmp;IFFFF)V net/minecraft/src/RenderItem/func_77020_a (Lnet/minecraft/src/EntityItem;Lnet/minecraft/src/Icon;IFFFF)V #C
-MD: bgl/b (Lauz;Lbib;Lxz;II)V net/minecraft/src/RenderItem/func_110797_b (Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V #C
+MD: bgl/b (Lauz;Lbib;Lxz;II)V net/minecraft/src/RenderItem/func_82406_b (Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V #C
-MD: bgl/c (Lauz;Lbib;Lxz;II)V net/minecraft/src/RenderItem/func_110794_c (Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V #C
+MD: bgl/c (Lauz;Lbib;Lxz;II)V net/minecraft/src/RenderItem/func_77021_b (Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/TextureManager;Lnet/minecraft/src/ItemStack;II)V #C
 MD: bgm/a (Lbff;Lmp;)V net/minecraft/src/RenderSnowball/func_77026_a (Lnet/minecraft/src/Tessellator;Lnet/minecraft/src/Icon;)V #C
 MD: bgm/a (Lnk;)Lbjd; net/minecraft/src/RenderSnowball/func_110775_a (Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation; #C
 MD: bgm/a (Lnk;DDDFF)V net/minecraft/src/RenderSnowball/func_76986_a (Lnet/minecraft/src/Entity;DDDFF)V #C
@@ -13134,7 +13134,7 @@ MD: bgq/a (Lbbf;)V net/minecraft/src/RendererLivingEntity/func_77042_a (Lnet/min
 MD: bgq/a (Lnk;DDDFF)V net/minecraft/src/RendererLivingEntity/func_76986_a (Lnet/minecraft/src/Entity;DDDFF)V #C
 MD: bgq/a (Loc;)F net/minecraft/src/RendererLivingEntity/func_77037_a (Lnet/minecraft/src/EntityLivingBase;)F #C
 MD: bgq/a (Loc;DDD)V net/minecraft/src/RendererLivingEntity/func_77039_a (Lnet/minecraft/src/EntityLivingBase;DDD)V #C
-MD: bgq/a (Loc;DDDFF)V net/minecraft/src/RendererLivingEntity/func_77101_a (Lnet/minecraft/src/EntityLivingBase;DDDFF)V #C
+MD: bgq/a (Loc;DDDFF)V net/minecraft/src/RendererLivingEntity/func_77031_a (Lnet/minecraft/src/EntityLivingBase;DDDFF)V #C
 MD: bgq/a (Loc;DDDLjava/lang/String;FD)V net/minecraft/src/RendererLivingEntity/func_96449_a (Lnet/minecraft/src/EntityLivingBase;DDDLjava/lang/String;FD)V #C
 MD: bgq/a (Loc;F)V net/minecraft/src/RendererLivingEntity/func_77041_b (Lnet/minecraft/src/EntityLivingBase;F)V #C
 MD: bgq/a (Loc;FF)I net/minecraft/src/RendererLivingEntity/func_77030_a (Lnet/minecraft/src/EntityLivingBase;FF)I #C
@@ -13143,11 +13143,11 @@ MD: bgq/a (Loc;FFFFFF)V net/minecraft/src/RendererLivingEntity/func_77036_a (Lne
 MD: bgq/a (Loc;IF)I net/minecraft/src/RendererLivingEntity/func_77032_a (Lnet/minecraft/src/EntityLivingBase;IF)I #C
 MD: bgq/a (Loc;Ljava/lang/String;DDDI)V net/minecraft/src/RendererLivingEntity/func_77038_a (Lnet/minecraft/src/EntityLivingBase;Ljava/lang/String;DDDI)V #C
 MD: bgq/b (Loc;)Z net/minecraft/src/RendererLivingEntity/func_110813_b (Lnet/minecraft/src/EntityLivingBase;)Z #C
-MD: bgq/b (Loc;DDD)V net/minecraft/src/RendererLivingEntity/func_130008_a (Lnet/minecraft/src/EntityLivingBase;DDD)V #C
+MD: bgq/b (Loc;DDD)V net/minecraft/src/RendererLivingEntity/func_77033_b (Lnet/minecraft/src/EntityLivingBase;DDD)V #C
 MD: bgq/b (Loc;F)F net/minecraft/src/RendererLivingEntity/func_77044_a (Lnet/minecraft/src/EntityLivingBase;F)F #C
 MD: bgq/b (Loc;IF)I net/minecraft/src/RendererLivingEntity/func_77035_b (Lnet/minecraft/src/EntityLivingBase;IF)I #C
 MD: bgq/c (Loc;F)V net/minecraft/src/RendererLivingEntity/func_77029_c (Lnet/minecraft/src/EntityLivingBase;F)V #C
-MD: bgq/c (Loc;IF)V net/minecraft/src/RendererLivingEntity/func_82439_b (Lnet/minecraft/src/EntityLivingBase;IF)V #C
+MD: bgq/c (Loc;IF)V net/minecraft/src/RendererLivingEntity/func_82408_c (Lnet/minecraft/src/EntityLivingBase;IF)V #C
 MD: bgq/d (Loc;F)F net/minecraft/src/RendererLivingEntity/func_77040_d (Lnet/minecraft/src/EntityLivingBase;F)F #C
 MD: bgq/e (Loc;F)V net/minecraft/src/RendererLivingEntity/func_85093_e (Lnet/minecraft/src/EntityLivingBase;F)V #C
 MD: bgr/a (Lnk;)Lbjd; net/minecraft/src/RenderMinecart/func_110775_a (Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation; #C
@@ -13191,25 +13191,25 @@ MD: bgx/a (Loc;IF)I net/minecraft/src/RenderPig/func_77032_a (Lnet/minecraft/src
 MD: bgx/a (Lrv;)Lbjd; net/minecraft/src/RenderPig/func_110886_a (Lnet/minecraft/src/EntityPig;)Lnet/minecraft/src/ResourceLocation; #C
 MD: bgx/a (Lrv;IF)I net/minecraft/src/RenderPig/func_77099_a (Lnet/minecraft/src/EntityPig;IF)I #C
 MD: bgy/a (Lbej;)Lbjd; net/minecraft/src/RenderPlayer/func_110817_a (Lnet/minecraft/src/AbstractClientPlayer;)Lnet/minecraft/src/ResourceLocation; #C
-MD: bgy/a (Lbej;DDD)V net/minecraft/src/RenderPlayer/func_130199_b (Lnet/minecraft/src/AbstractClientPlayer;DDD)V #C
+MD: bgy/a (Lbej;DDD)V net/minecraft/src/RenderPlayer/func_77105_b (Lnet/minecraft/src/AbstractClientPlayer;DDD)V #C
-MD: bgy/a (Lbej;DDDFF)V net/minecraft/src/RenderPlayer/func_110819_a (Lnet/minecraft/src/AbstractClientPlayer;DDDFF)V #C
+MD: bgy/a (Lbej;DDDFF)V net/minecraft/src/RenderPlayer/func_77101_a (Lnet/minecraft/src/AbstractClientPlayer;DDDFF)V #C
-MD: bgy/a (Lbej;DDDLjava/lang/String;FD)V net/minecraft/src/RenderPlayer/func_130013_a (Lnet/minecraft/src/AbstractClientPlayer;DDDLjava/lang/String;FD)V #C
+MD: bgy/a (Lbej;DDDLjava/lang/String;FD)V net/minecraft/src/RenderPlayer/func_96450_a (Lnet/minecraft/src/AbstractClientPlayer;DDDLjava/lang/String;FD)V #C
-MD: bgy/a (Lbej;F)V net/minecraft/src/RenderPlayer/func_110820_a (Lnet/minecraft/src/AbstractClientPlayer;F)V #C
+MD: bgy/a (Lbej;F)V net/minecraft/src/RenderPlayer/func_77100_a (Lnet/minecraft/src/AbstractClientPlayer;F)V #C
-MD: bgy/a (Lbej;FFF)V net/minecraft/src/RenderPlayer/func_130198_a (Lnet/minecraft/src/AbstractClientPlayer;FFF)V #C
+MD: bgy/a (Lbej;FFF)V net/minecraft/src/RenderPlayer/func_77102_a (Lnet/minecraft/src/AbstractClientPlayer;FFF)V #C
-MD: bgy/a (Lbej;IF)I net/minecraft/src/RenderPlayer/func_110818_a (Lnet/minecraft/src/AbstractClientPlayer;IF)I #C
+MD: bgy/a (Lbej;IF)I net/minecraft/src/RenderPlayer/func_77107_a (Lnet/minecraft/src/AbstractClientPlayer;IF)I #C
 MD: bgy/a (Lnk;)Lbjd; net/minecraft/src/RenderPlayer/func_110775_a (Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation; #C
 MD: bgy/a (Lnk;DDDFF)V net/minecraft/src/RenderPlayer/func_76986_a (Lnet/minecraft/src/Entity;DDDFF)V #C
-MD: bgy/a (Loc;DDD)V net/minecraft/src/RenderPlayer/func_77105_b (Lnet/minecraft/src/EntityLivingBase;DDD)V #C
+MD: bgy/a (Loc;DDD)V net/minecraft/src/RenderPlayer/func_77039_a (Lnet/minecraft/src/EntityLivingBase;DDD)V #C
-MD: bgy/a (Loc;DDDFF)V net/minecraft/src/RenderPlayer/func_77101_a (Lnet/minecraft/src/EntityLivingBase;DDDFF)V #C
+MD: bgy/a (Loc;DDDFF)V net/minecraft/src/RenderPlayer/func_77031_a (Lnet/minecraft/src/EntityLivingBase;DDDFF)V #C
 MD: bgy/a (Loc;DDDLjava/lang/String;FD)V net/minecraft/src/RenderPlayer/func_96449_a (Lnet/minecraft/src/EntityLivingBase;DDDLjava/lang/String;FD)V #C
-MD: bgy/a (Loc;F)V net/minecraft/src/RenderPlayer/func_130009_b (Lnet/minecraft/src/EntityLivingBase;F)V #C
+MD: bgy/a (Loc;F)V net/minecraft/src/RenderPlayer/func_77041_b (Lnet/minecraft/src/EntityLivingBase;F)V #C
-MD: bgy/a (Loc;FFF)V net/minecraft/src/RenderPlayer/func_77102_a (Lnet/minecraft/src/EntityLivingBase;FFF)V #C
+MD: bgy/a (Loc;FFF)V net/minecraft/src/RenderPlayer/func_77043_a (Lnet/minecraft/src/EntityLivingBase;FFF)V #C
-MD: bgy/a (Loc;IF)I net/minecraft/src/RenderPlayer/func_77107_a (Lnet/minecraft/src/EntityLivingBase;IF)I #C
+MD: bgy/a (Loc;IF)I net/minecraft/src/RenderPlayer/func_77032_a (Lnet/minecraft/src/EntityLivingBase;IF)I #C
 MD: bgy/a (Lua;)V net/minecraft/src/RenderPlayer/func_82441_a (Lnet/minecraft/src/EntityPlayer;)V #C
 MD: bgy/b (Lbej;F)V net/minecraft/src/RenderPlayer/func_77104_b (Lnet/minecraft/src/AbstractClientPlayer;F)V #C
-MD: bgy/b (Lbej;IF)V net/minecraft/src/RenderPlayer/func_110821_b (Lnet/minecraft/src/AbstractClientPlayer;IF)V #C
+MD: bgy/b (Lbej;IF)V net/minecraft/src/RenderPlayer/func_82439_b (Lnet/minecraft/src/AbstractClientPlayer;IF)V #C
-MD: bgy/c (Loc;F)V net/minecraft/src/RenderPlayer/func_77100_a (Lnet/minecraft/src/EntityLivingBase;F)V #C
+MD: bgy/c (Loc;F)V net/minecraft/src/RenderPlayer/func_77029_c (Lnet/minecraft/src/EntityLivingBase;F)V #C
-MD: bgy/c (Loc;IF)V net/minecraft/src/RenderPlayer/func_82439_b (Lnet/minecraft/src/EntityLivingBase;IF)V #C
+MD: bgy/c (Loc;IF)V net/minecraft/src/RenderPlayer/func_82408_c (Lnet/minecraft/src/EntityLivingBase;IF)V #C
 MD: bgz/a (Lnk;)Lbjd; net/minecraft/src/RenderSheep/func_110775_a (Lnet/minecraft/src/Entity;)Lnet/minecraft/src/ResourceLocation; #C
 MD: bgz/a (Loc;IF)I net/minecraft/src/RenderSheep/func_77032_a (Lnet/minecraft/src/EntityLivingBase;IF)I #C
 MD: bgz/a (Lrw;)Lbjd; net/minecraft/src/RenderSheep/func_110883_a (Lnet/minecraft/src/EntitySheep;)Lnet/minecraft/src/ResourceLocation; #C
@@ -13589,8 +13589,8 @@ MD: bjp/a (I)Z net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionLi
 MD: bjp/a (IIIILbff;)V net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList/func_77214_a (IIIILnet/minecraft/src/Tessellator;)V #C
 MD: bjp/a (IZ)V net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList/func_77213_a (IZ)V #C
 MD: bjp/a (Lbjp;)Lbji; net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList/func_110510_a (Lnet/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList;)Lnet/minecraft/src/ResourcePackRepository; #C
-MD: bjp/b ()V net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList/func_130003_c ()V #C
+MD: bjp/b ()V net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList/func_77221_c ()V #C
-MD: bjp/d ()I net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList/func_130004_b ()I #C
+MD: bjp/d ()I net/minecraft/src/GuiScreenTemporaryResourcePackSelectSelectionList/func_77212_b ()I #C
 MD: bjq/a (Lbjt;)V net/minecraft/src/I18n/func_135051_a (Lnet/minecraft/src/Locale;)V #C
 MD: bjq/a (Ljava/lang/String;)Ljava/lang/String; net/minecraft/src/I18n/func_135053_a (Ljava/lang/String;)Ljava/lang/String; #C
 MD: bjq/a (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; net/minecraft/src/I18n/func_135052_a (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; #C
@@ -14689,7 +14689,7 @@ MD: hk/a ()I net/minecraft/src/ServerConfigurationManager/func_72372_a ()I
 MD: hk/a (DDDDILex;)V net/minecraft/src/ServerConfigurationManager/func_72393_a (DDDDILnet/minecraft/src/Packet;)V
 MD: hk/a (Labz;)V net/minecraft/src/ServerConfigurationManager/func_72357_a (Lnet/minecraft/src/EnumGameType;)V #C
 MD: hk/a (Lcl;Ljs;)V net/minecraft/src/ServerConfigurationManager/func_72355_a (Lnet/minecraft/src/INetworkManager;Lnet/minecraft/src/EntityPlayerMP;)V
-MD: hk/a (Lcu;)V net/minecraft/src/ServerConfigurationManager/func_110460_a (Lnet/minecraft/src/ChatMessageComponent;)V
+MD: hk/a (Lcu;)V net/minecraft/src/ServerConfigurationManager/func_92062_k (Lnet/minecraft/src/ChatMessageComponent;)V
 MD: hk/a (Lcu;Z)V net/minecraft/src/ServerConfigurationManager/func_110459_a (Lnet/minecraft/src/ChatMessageComponent;Z)V
 MD: hk/a (Lex;)V net/minecraft/src/ServerConfigurationManager/func_72384_a (Lnet/minecraft/src/Packet;)V
 MD: hk/a (Lex;I)V net/minecraft/src/ServerConfigurationManager/func_72396_a (Lnet/minecraft/src/Packet;I)V
@@ -15159,7 +15159,7 @@ MD: js/a (Larv;)V net/minecraft/src/EntityPlayerMP/func_71006_a (Lnet/minecraft/
 MD: js/a (Larz;)V net/minecraft/src/EntityPlayerMP/func_71042_a (Lnet/minecraft/src/TileEntityFurnace;)V
 MD: js/a (Lasb;)V net/minecraft/src/EntityPlayerMP/func_94064_a (Lnet/minecraft/src/TileEntityHopper;)V
 MD: js/a (Lbx;)V net/minecraft/src/EntityPlayerMP/func_70037_a (Lnet/minecraft/src/NBTTagCompound;)V
-MD: js/a (Lcu;)V net/minecraft/src/EntityPlayerMP/func_110122_a (Lnet/minecraft/src/ChatMessageComponent;)V
+MD: js/a (Lcu;)V net/minecraft/src/EntityPlayerMP/func_70006_a (Lnet/minecraft/src/ChatMessageComponent;)V
 MD: js/a (Ldo;)V net/minecraft/src/EntityPlayerMP/func_71125_a (Lnet/minecraft/src/Packet204ClientInfo;)V
 MD: js/a (Ljava/lang/String;)V net/minecraft/src/EntityPlayerMP/func_71035_c (Ljava/lang/String;)V
 MD: js/a (Ljava/lang/String;I)V net/minecraft/src/EntityPlayerMP/func_71115_a (Ljava/lang/String;I)V
@@ -15308,7 +15308,7 @@ MD: kd/b ([BI)I net/minecraft/src/RConUtils/func_72662_b ([BI)I
 MD: kd/b ([BII)I net/minecraft/src/RConUtils/func_72665_b ([BII)I
 MD: kd/c ([BII)I net/minecraft/src/RConUtils/func_72664_c ([BII)I
 MD: ke/a (ILjava/lang/String;)Z net/minecraft/src/RConConsoleSource/func_70003_b (ILjava/lang/String;)Z
-MD: ke/a (Lcu;)V net/minecraft/src/RConConsoleSource/func_110122_a (Lnet/minecraft/src/ChatMessageComponent;)V
+MD: ke/a (Lcu;)V net/minecraft/src/RConConsoleSource/func_70006_a (Lnet/minecraft/src/ChatMessageComponent;)V
 MD: ke/b ()Lt; net/minecraft/src/RConConsoleSource/func_82114_b ()Lnet/minecraft/src/ChunkCoordinates;
 MD: ke/c_ ()Ljava/lang/String; net/minecraft/src/RConConsoleSource/func_70005_c_ ()Ljava/lang/String;
 MD: ke/d ()V net/minecraft/src/RConConsoleSource/func_70007_b ()V
@@ -15635,7 +15635,7 @@ MD: mw/i ()F net/minecraft/src/CombatEntry/func_94561_i ()F
 MD: mx/a ()V net/minecraft/src/CombatTracker/func_94545_a ()V
 MD: mx/a (Lmw;)Ljava/lang/String; net/minecraft/src/CombatTracker/func_94548_b (Lnet/minecraft/src/CombatEntry;)Ljava/lang/String;
 MD: mx/a (Lmy;FF)V net/minecraft/src/CombatTracker/func_94547_a (Lnet/minecraft/src/DamageSource;FF)V
-MD: mx/b ()Lcu; net/minecraft/src/CombatTracker/func_111182_b ()Lnet/minecraft/src/ChatMessageComponent;
+MD: mx/b ()Lcu; net/minecraft/src/CombatTracker/func_94546_b ()Lnet/minecraft/src/ChatMessageComponent;
 MD: mx/c ()Loc; net/minecraft/src/CombatTracker/func_94550_c ()Lnet/minecraft/src/EntityLivingBase;
 MD: mx/f ()Lmw; net/minecraft/src/CombatTracker/func_94544_f ()Lnet/minecraft/src/CombatEntry;
 MD: mx/g ()V net/minecraft/src/CombatTracker/func_94542_g ()V
@@ -15650,7 +15650,7 @@ MD: my/a (Luc;Lnk;)Lmy; net/minecraft/src/DamageSource/func_76353_a (Lnet/minecr
 MD: my/a (Lue;Lnk;)Lmy; net/minecraft/src/DamageSource/func_76362_a (Lnet/minecraft/src/EntityFireball;Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource;
 MD: my/b ()Lmy; net/minecraft/src/DamageSource/func_76349_b ()Lnet/minecraft/src/DamageSource;
 MD: my/b (Lnk;Lnk;)Lmy; net/minecraft/src/DamageSource/func_76354_b (Lnet/minecraft/src/Entity;Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource;
-MD: my/b (Loc;)Lcu; net/minecraft/src/DamageSource/func_111181_b (Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;
+MD: my/b (Loc;)Lcu; net/minecraft/src/DamageSource/func_76360_b (Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;
 MD: my/c ()Z net/minecraft/src/DamageSource/func_94541_c ()Z
 MD: my/d ()Lmy; net/minecraft/src/DamageSource/func_94540_d ()Lnet/minecraft/src/DamageSource;
 MD: my/e ()Z net/minecraft/src/DamageSource/func_76363_c ()Z
@@ -15667,12 +15667,12 @@ MD: my/o ()Lmy; net/minecraft/src/DamageSource/func_76351_m ()Lnet/minecraft/src
 MD: my/p ()Z net/minecraft/src/DamageSource/func_76350_n ()Z
 MD: my/q ()Z net/minecraft/src/DamageSource/func_82725_o ()Z
 MD: my/r ()Lmy; net/minecraft/src/DamageSource/func_82726_p ()Lnet/minecraft/src/DamageSource;
-MD: mz/b (Loc;)Lcu; net/minecraft/src/EntityDamageSource/func_111181_b (Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;
+MD: mz/b (Loc;)Lcu; net/minecraft/src/EntityDamageSource/func_76360_b (Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;
 MD: mz/i ()Lnk; net/minecraft/src/EntityDamageSource/func_76346_g ()Lnet/minecraft/src/Entity;
 MD: mz/p ()Z net/minecraft/src/EntityDamageSource/func_76350_n ()Z
 MD: n/a ()Ljava/lang/String; net/minecraft/src/CallableBlockType/func_85079_a ()Ljava/lang/String;
 MD: n/call ()Ljava/lang/Object; net/minecraft/src/CallableBlockType/call ()Ljava/lang/Object;
-MD: na/b (Loc;)Lcu; net/minecraft/src/EntityDamageSourceIndirect/func_111181_b (Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;
+MD: na/b (Loc;)Lcu; net/minecraft/src/EntityDamageSourceIndirect/func_76360_b (Lnet/minecraft/src/EntityLivingBase;)Lnet/minecraft/src/ChatMessageComponent;
 MD: na/h ()Lnk; net/minecraft/src/EntityDamageSourceIndirect/func_76364_f ()Lnet/minecraft/src/Entity;
 MD: na/i ()Lnk; net/minecraft/src/EntityDamageSourceIndirect/func_76346_g ()Lnet/minecraft/src/Entity;
 MD: nb/a (Loc;Los;I)V net/minecraft/src/PotionAbsoption/func_111187_a (Lnet/minecraft/src/EntityLivingBase;Lnet/minecraft/src/BaseAttributeMap;I)V
@@ -15715,7 +15715,7 @@ MD: net/minecraft/server/MinecraftServer/a (Labz;)V net/minecraft/server/Minecra
 MD: net/minecraft/server/MinecraftServer/a (Labz;Z)Ljava/lang/String; net/minecraft/server/MinecraftServer/func_71206_a (Lnet/minecraft/src/EnumGameType;Z)Ljava/lang/String;
 MD: net/minecraft/server/MinecraftServer/a (Lad;Ljava/lang/String;)Ljava/util/List; net/minecraft/server/MinecraftServer/func_71248_a (Lnet/minecraft/src/ICommandSender;Ljava/lang/String;)Ljava/util/List;
 MD: net/minecraft/server/MinecraftServer/a (Lb;)V net/minecraft/server/MinecraftServer/func_71228_a (Lnet/minecraft/src/CrashReport;)V
-MD: net/minecraft/server/MinecraftServer/a (Lcu;)V net/minecraft/server/MinecraftServer/func_110122_a (Lnet/minecraft/src/ChatMessageComponent;)V
+MD: net/minecraft/server/MinecraftServer/a (Lcu;)V net/minecraft/server/MinecraftServer/func_70006_a (Lnet/minecraft/src/ChatMessageComponent;)V
 MD: net/minecraft/server/MinecraftServer/a (Lhk;)V net/minecraft/server/MinecraftServer/func_71210_a (Lnet/minecraft/src/ServerConfigurationManager;)V
 MD: net/minecraft/server/MinecraftServer/a (Lho;)V net/minecraft/server/MinecraftServer/func_82010_a (Lnet/minecraft/src/IUpdatePlayerListBox;)V #S
 MD: net/minecraft/server/MinecraftServer/a (Ljava/lang/String;)V net/minecraft/server/MinecraftServer/func_71237_c (Ljava/lang/String;)V
@@ -16510,9 +16510,9 @@ MD: pz/d ()V net/minecraft/src/EntityAIMoveThroughVillage/func_75251_c ()V
 MD: pz/f ()V net/minecraft/src/EntityAIMoveThroughVillage/func_75414_f ()V
 MD: q/a ()Ljava/lang/String; net/minecraft/src/CrashReportCategoryEntry/func_85089_a ()Ljava/lang/String;
 MD: q/b ()Ljava/lang/String; net/minecraft/src/CrashReportCategoryEntry/func_85090_b ()Ljava/lang/String;
-MD: qa/a ()Z net/minecraft/src/EntityAIMoveTwardsRestriction/func_75250_a ()Z
+MD: qa/a ()Z net/minecraft/src/EntityAIMoveTowardsRestriction/func_75250_a ()Z
-MD: qa/b ()Z net/minecraft/src/EntityAIMoveTwardsRestriction/func_75253_b ()Z
+MD: qa/b ()Z net/minecraft/src/EntityAIMoveTowardsRestriction/func_75253_b ()Z
-MD: qa/c ()V net/minecraft/src/EntityAIMoveTwardsRestriction/func_75249_e ()V
+MD: qa/c ()V net/minecraft/src/EntityAIMoveTowardsRestriction/func_75249_e ()V
 MD: qb/a ()Z net/minecraft/src/EntityAIMoveTowardsTarget/func_75250_a ()Z
 MD: qb/b ()Z net/minecraft/src/EntityAIMoveTowardsTarget/func_75253_b ()Z
 MD: qb/c ()V net/minecraft/src/EntityAIMoveTowardsTarget/func_75249_e ()V
@@ -17058,8 +17058,8 @@ MD: sc/p (I)V net/minecraft/src/EntityWolf/func_82185_r (I)V
 MD: sc/r ()Ljava/lang/String; net/minecraft/src/EntityWolf/func_70639_aQ ()Ljava/lang/String;
 MD: sc/s ()I net/minecraft/src/EntityWolf/func_70633_aT ()I
 MD: sc/t ()Z net/minecraft/src/EntityWolf/func_70692_ba ()Z
-MD: sd/aJ ()F net/minecraft/src/IBossDisplayData/func_110183_aJ ()F #C
+MD: sd/aJ ()F net/minecraft/src/IBossDisplayData/func_110143_aJ ()F #C
-MD: sd/aP ()F net/minecraft/src/IBossDisplayData/func_70667_aM ()F #C
+MD: sd/aP ()F net/minecraft/src/IBossDisplayData/func_110138_aP ()F #C
 MD: sd/al ()Ljava/lang/String; net/minecraft/src/IBossDisplayData/func_70023_ak ()Ljava/lang/String; #C
 MD: se/a (Lsf;Lmy;F)Z net/minecraft/src/IEntityMultiPart/func_70965_a (Lnet/minecraft/src/EntityDragonPart;Lnet/minecraft/src/DamageSource;F)Z
 MD: se/b ()Labr; net/minecraft/src/IEntityMultiPart/func_82194_d ()Lnet/minecraft/src/World;
@@ -17985,12 +17985,12 @@ MD: ut/d (II)I net/minecraft/src/Container/func_94534_d (II)I #C
 MD: uv/a (Ljava/lang/String;)V net/minecraft/src/ContainerRepair/func_82850_a (Ljava/lang/String;)V
 MD: uv/a (Lml;)V net/minecraft/src/ContainerRepair/func_75130_a (Lnet/minecraft/src/IInventory;)V
 MD: uv/a (Lua;)Z net/minecraft/src/ContainerRepair/func_75145_c (Lnet/minecraft/src/EntityPlayer;)Z
-MD: uv/a (Luv;)Lml; net/minecraft/src/ContainerRepair/func_135073_a (Lnet/minecraft/src/ContainerRepair;)Lnet/minecraft/src/IInventory;
+MD: uv/a (Luv;)Lml; net/minecraft/src/ContainerRepair/func_82851_a (Lnet/minecraft/src/ContainerRepair;)Lnet/minecraft/src/IInventory;
 MD: uv/a (Lvd;)V net/minecraft/src/ContainerRepair/func_75132_a (Lnet/minecraft/src/ICrafting;)V
 MD: uv/b (II)V net/minecraft/src/ContainerRepair/func_75137_b (II)V #C
 MD: uv/b (Lua;)V net/minecraft/src/ContainerRepair/func_75134_a (Lnet/minecraft/src/EntityPlayer;)V
 MD: uv/b (Lua;I)Lxz; net/minecraft/src/ContainerRepair/func_82846_b (Lnet/minecraft/src/EntityPlayer;I)Lnet/minecraft/src/ItemStack;
-MD: uv/b (Luv;)I net/minecraft/src/ContainerRepair/func_135072_b (Lnet/minecraft/src/ContainerRepair;)I
+MD: uv/b (Luv;)I net/minecraft/src/ContainerRepair/func_82849_b (Lnet/minecraft/src/ContainerRepair;)I
 MD: uv/e ()V net/minecraft/src/ContainerRepair/func_82848_d ()V
 MD: uw/b (ILxz;)Z net/minecraft/src/ContainerRepairINNER1/func_94041_b (ILnet/minecraft/src/ItemStack;)Z
 MD: uw/e ()V net/minecraft/src/ContainerRepairINNER1/func_70296_d ()V

fml/conf/mcp.cfg

@@ -96,8 +96,8 @@ BinClient       = %(DirBin)s/minecraft
 BinServer       = %(DirBin)s/minecraft_server
 LogClient       = %(DirLogs)s/client_compile.log
 LogServer       = %(DirLogs)s/server_compile.log
-ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
+ClassPathClient = 
-ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
+ClassPathServer = 
 ClientFixes     = %(DirConf)s/patches
 FixStart        = Start
 IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax/xml,javax/ws,argo
@@ -159,5 +159,5 @@ CmdFernflower = %s -Xmx512M -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir
 CmdExceptor   = %s -jar %s {input} {output} {conf} {log}
 CmdRecomp     = %s -encoding UTF-8 -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
 CmdRecompScala = %s -encoding UTF-8 -deprecation -target:jvm-1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
-CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
+CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" "{mainclass}" "{extraargs}"
-CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
+CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} "net.minecraft.launchwrapper.Launch" "--tweakClass cpw.mods.fml.common.launcher.FMLTweaker --version FML_DEV {extraargs}"

fml/conf/methods.csv

@@ -17,8 +17,7 @@ func_70003_b,canCommandSenderUseCommand,2,Returns true if the command sender is
 func_70004_a,translateString,0,Translates and formats the given string key with the given arguments.
 func_70004_a,translateString,1,Translates and formats the given string key with the given arguments.
 func_70005_c_,getCommandSenderName,2,"Gets the name of this command sender (usually username, but possibly ""Rcon"")"
-func_70006_a,sendChatToPlayer,0,
+func_70006_a,sendChatToPlayer,2,
-func_70006_a,sendChatToPlayer,1,
 func_70007_b,resetLog,2,Clears the RCon log
 func_70008_c,getChatBuffer,2,
 func_70011_f,getDistance,2,"Gets the distance to the position. Args: x, y, z"
@@ -1434,7 +1433,8 @@ func_72849_a,getBlockLightValue_do,2,"Gets the light value of a block location.
 func_72850_v,isBlockFreezableNaturally,2,checks to see if a given block is both water and has at least one immediately adjacent non-water block
 func_72851_f,notifyBlockChange,2,"The block type change and need to notify other systems  Args: x, y, z, blockID"
 func_72852_a,addTileEntity,2,
-func_72853_d,getMoonPhase,2,
+func_72853_d,getMoonPhase,0,
+func_72853_d,getMoonPhase,1,
 func_72854_c,updateAllPlayersSleepingFlag,2,Updates the flag that indicates whether or not all players in the world are sleeping.
 func_72855_b,checkNoEntityCollision,2,"Returns true if there are no solid, live entities in the specified AxisAlignedBB"
 func_72856_b,getClosestVulnerablePlayerToEntity,2,"Returns the closest vulnerable player to this entity within the given radius, or null if none is found"
@@ -2824,8 +2824,7 @@ func_76356_a,causeThrownDamage,2,
 func_76357_e,canHarmInCreative,2,
 func_76358_a,causeMobDamage,2,
 func_76359_i,setDamageAllowedInCreativeMode,2,
-func_76360_b,getDeathMessage,0,Returns the message to be displayed on player death.
+func_76360_b,getDeathMessage,2,Returns the message to be displayed on player death.
-func_76360_b,getDeathMessage,1,Returns the message to be displayed on player death.
 func_76361_j,setFireDamage,2,Define the damage type as fire based.
 func_76362_a,causeFireballDamage,2,returns EntityDamageSourceIndirect of a fireball
 func_76363_c,isUnblockable,2,
@@ -4118,11 +4117,9 @@ func_82845_b,getArmorCraftingMaterial,2,"Return the crafting material for this a
 func_82846_b,transferStackInSlot,2,Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that.
 func_82847_b,removeCraftingFromCrafters,0,Remove this crafting listener from the listener list.
 func_82848_d,updateRepairOutput,2,"called when the Anvil Input Slot changes, calculates the new result and puts it in the output slot"
-func_82849_b,getStackSizeUsedInRepair,0,
+func_82849_b,getStackSizeUsedInRepair,2,
-func_82849_b,getStackSizeUsedInRepair,1,
 func_82850_a,updateItemName,2,used by the Anvil GUI to update the Item Name being typed by the player
-func_82851_a,getRepairInputInventory,0,
+func_82851_a,getRepairInputInventory,2,
-func_82851_a,getRepairInputInventory,1,
 func_82863_d,getBeacon,2,Returns the Tile Entity behind this beacon inventory / container
 func_82869_a,canTakeStack,2,Return whether this slot's stack can be taken from this slot.
 func_82870_a,onPickupFromSlot,2,
@@ -4233,8 +4230,7 @@ func_90054_a,callUpdatingScreenName,0,
 func_90999_ad,canRenderOnFire,0,Return whether this entity should be rendered as on fire.
 func_92058_a,setEntityItemStack,2,Sets the ItemStack for this entity
 func_92059_d,getEntityItem,2,"Returns the ItemStack corresponding to the Entity (Note: if no item exists, will log an error but still return an ItemStack containing Block.stone)"
-func_92062_k,sendChatMsg,0,Sends the given string to every player as chat message.
+func_92062_k,sendChatMsg,2,Sends the given string to every player as chat message.
-func_92062_k,sendChatMsg,1,Sends the given string to every player as chat message.
 func_92085_d,getIsBlank,2,
 func_92087_a,causeThornsDamage,2,Returns the EntityDamageSource of the Thorns enchantment
 func_92089_a,canApply,2,

fml/conf/packages.csv

@@ -164,7 +164,7 @@ AbstractClientPlayer,net/minecraft/client/entity
 EntityClientPlayerMP,net/minecraft/client/entity
 EntityOtherPlayerMP,net/minecraft/client/entity
 EntityPlayerSP,net/minecraft/client/entity
-RenderMinecartMobSpawner,net/minecraft/client/entity/render
+RenderMinecartMobSpawner,net/minecraft/client/renderer/entity
 ChatClickData,net/minecraft/client/gui
 ChatLine,net/minecraft/client/gui
 FontRenderer,net/minecraft/client/gui
@@ -762,7 +762,7 @@ EntityAIMate,net/minecraft/entity/ai
 EntityAIMoveIndoors,net/minecraft/entity/ai
 EntityAIMoveThroughVillage,net/minecraft/entity/ai
 EntityAIMoveTowardsTarget,net/minecraft/entity/ai
-EntityAIMoveTwardsRestriction,net/minecraft/entity/ai
+EntityAIMoveTowardsRestriction,net/minecraft/entity/ai
 EntityAINearestAttackableTarget,net/minecraft/entity/ai
 EntityAINearestAttackableTargetSelector,net/minecraft/entity/ai
 EntityAINearestAttackableTargetSorter,net/minecraft/entity/ai

fml/conf/params.csv

@@ -3,6 +3,7 @@ p_100006_1_,par1Str,2
 p_100006_2_,par2Str,2
 p_100009_0_,par0,2
 p_100012_1_,par1,2
+p_100014_0_,par0McoServerList,2
 p_100015_0_,par0KeyBinding,2
 p_101001_1_,par1,2
 p_101001_2_,par2,2
@@ -88,7 +89,6 @@ p_104088_3_,par3Tessellator,2
 p_104089_1_,par1,2
 p_104089_2_,par2,2
 p_110121_0_,par0Str,2
-p_110122_1_,par1ChatMessageComponent,2
 p_110125_1_,par1Icon,2
 p_110128_1_,par1Entity,2
 p_110129_0_,par0World,2
@@ -103,7 +103,6 @@ p_110131_1_,par1ItemStack,2
 p_110132_1_,par1IInvBasic,2
 p_110133_1_,par1Str,2
 p_110134_1_,par1IInvBasic,2
-p_110135_1_,par1ItemStack,2
 p_110145_1_,par1Entity,2
 p_110146_1_,par1,2
 p_110146_2_,par2,2
@@ -214,7 +213,6 @@ p_110431_0_,par0Minecraft,2
 p_110439_1_,par1File,2
 p_110459_1_,par1ChatMessageComponent,2
 p_110459_2_,par2,2
-p_110460_1_,par1ChatMessageComponent,2
 p_110468_1_,par1,2
 p_110470_1_,par1,2
 p_110472_1_,par1,2
@@ -260,8 +258,6 @@ p_110503_1_,par1Str,2
 p_110503_2_,par2JsonObject,2
 p_110504_1_,par1MetadataSectionSerializer,2
 p_110504_2_,par2Class,2
-p_110509_1_,par1,2
-p_110509_2_,par2,2
 p_110510_0_,par0GuiScreenTemporaryResourcePackSelectSelectionList,2
 p_110518_1_,par1TextureManager,2
 p_110526_1_,par1Str,2
@@ -381,28 +377,7 @@ p_110786_1_,par1EntityEnderCrystal,2
 p_110788_1_,par1EntityItemFrame,2
 p_110790_1_,par1EntityFireball,2
 p_110791_1_,par1EntityFishHook,2
-p_110793_1_,par1FontRenderer,2
-p_110793_2_,par2TextureManager,2
-p_110793_3_,par3ItemStack,2
-p_110793_4_,par4,2
-p_110793_5_,par5,2
-p_110793_6_,par6Str,2
-p_110794_1_,par1FontRenderer,2
-p_110794_2_,par2TextureManager,2
-p_110794_3_,par3ItemStack,2
-p_110794_4_,par4,2
-p_110794_5_,par5,2
-p_110795_1_,par1FontRenderer,2
-p_110795_2_,par2TextureManager,2
-p_110795_3_,par3ItemStack,2
-p_110795_4_,par4,2
-p_110795_5_,par5,2
 p_110796_1_,par1EntityItem,2
-p_110797_1_,par1FontRenderer,2
-p_110797_2_,par2TextureManager,2
-p_110797_3_,par3ItemStack,2
-p_110797_4_,par4,2
-p_110797_5_,par5,2
 p_110799_1_,par1EntityLeashKnot,2
 p_110799_2_,par2,2
 p_110799_4_,par4,2
@@ -417,20 +392,6 @@ p_110808_1_,par1EntityTNTPrimed,2
 p_110809_1_,par1EntityWitherSkull,2
 p_110813_1_,par1EntityLivingBase,2
 p_110817_1_,par1AbstractClientPlayer,2
-p_110818_1_,par1AbstractClientPlayer,2
-p_110818_2_,par2,2
-p_110818_3_,par3,2
-p_110819_1_,par1AbstractClientPlayer,2
-p_110819_2_,par2,2
-p_110819_4_,par4,2
-p_110819_6_,par6,2
-p_110819_8_,par8,2
-p_110819_9_,par9,2
-p_110820_1_,par1AbstractClientPlayer,2
-p_110820_2_,par2,2
-p_110821_1_,par1AbstractClientPlayer,2
-p_110821_2_,par2,2
-p_110821_3_,par3,2
 p_110827_1_,par1EntityLiving,2
 p_110827_2_,par2,2
 p_110827_4_,par4,2
@@ -618,7 +579,6 @@ p_111157_1_,par1Attribute,2
 p_111158_1_,par1Str,2
 p_111159_1_,par1Attribute,2
 p_111168_1_,par1,2
-p_111181_1_,par1EntityLivingBase,2
 p_111183_1_,par1,2
 p_111183_2_,par2AttributeModifier,2
 p_111184_1_,par1Attribute,2
@@ -669,9 +629,6 @@ p_111261_0_,par0AttributeInstance,2
 p_111262_0_,par0AttributeModifier,2
 p_111270_1_,par1AxisAlignedBB,2
 p_111271_1_,par1,2
-p_111275_1_,par1EntityPlayer,2
-p_111275_2_,par2TextureManager,2
-p_111275_3_,par3MapData,2
 p_111282_1_,par1EntityPlayer,2
 p_111282_2_,par2EntityLivingBase,2
 p_120016_0_,par0DedicatedServer,2
@@ -685,20 +642,7 @@ p_130006_1_,par1EntityLiving,2
 p_130006_2_,par2,2
 p_130006_3_,par3,2
 p_130007_1_,par1EntityLiving,2
-p_130008_1_,par1EntityLivingBase,2
-p_130008_2_,par2,2
-p_130008_4_,par4,2
-p_130008_6_,par6,2
-p_130009_1_,par1EntityLivingBase,2
-p_130009_2_,par2,2
 p_130011_1_,par1Entity,2
-p_130013_10_,par10,2
-p_130013_1_,par1AbstractClientPlayer,2
-p_130013_2_,par2,2
-p_130013_4_,par4,2
-p_130013_6_,par6,2
-p_130013_8_,par8Str,2
-p_130013_9_,par9,2
 p_130015_1_,par1,2
 p_130015_2_,par2,2
 p_130015_3_,par3,2
@@ -779,22 +723,8 @@ p_130119_5_,par5Tessellator,2
 p_130122_0_,par0McoServerList,2
 p_130122_1_,par1,2
 p_130123_1_,par1,2
-p_130125_0_,par0McoServerList,2
-p_130126_0_,par0McoServerList,2
-p_130126_1_,par1List,2
-p_130128_0_,par0McoServerList,2
 p_130129_1_,par1Session,2
-p_130198_1_,par1AbstractClientPlayer,2
-p_130198_2_,par2,2
-p_130198_3_,par3,2
-p_130198_4_,par4,2
-p_130199_1_,par1AbstractClientPlayer,2
-p_130199_2_,par2,2
-p_130199_4_,par4,2
-p_130199_6_,par6,2
 p_135011_0_,par0GuiLanguage,2
-p_135012_0_,par0GuiLanguage,2
-p_135013_0_,par0GuiLanguage,2
 p_135020_1_,par1JsonElement,2
 p_135020_2_,par2Type,2
 p_135020_3_,par3JsonDeserializationContext,2
@@ -823,8 +753,6 @@ p_135066_1_,par1World,2
 p_135066_2_,par2,2
 p_135066_3_,par3,2
 p_135066_4_,par4,2
-p_135072_0_,par0ContainerRepair,2
-p_135073_0_,par0ContainerRepair,2
 p_140008_0_,par0GuiScreenOnlineServers,2
 p_140008_1_,par1,2
 p_140009_1_,par1,2
@@ -882,6 +810,7 @@ p_70000_1_,par1PlayerUsageSnooper,2
 p_70001_1_,par1PlayerUsageSnooper,2
 p_70003_1_,par1,2
 p_70003_2_,par2Str,2
+p_70006_1_,par1ChatMessageComponent,2
 p_70011_1_,par1,2
 p_70011_3_,par3,2
 p_70011_5_,par5,2
@@ -3403,6 +3332,8 @@ p_74015_1_,par1,2
 p_74017_0_,par0ServerData,2
 p_74019_0_,par0GuiMultiplayer,2
 p_74020_0_,par0GuiMultiplayer,2
+p_74042_0_,par0GuiLanguage,2
+p_74043_0_,par0GuiLanguage,2
 p_74059_0_,par0GuiSelectWorld,2
 p_74061_0_,par0GuiScreen,2
 p_74061_1_,par1Str,2
@@ -4981,6 +4912,7 @@ p_76354_1_,par1Entity,2
 p_76356_0_,par0Entity,2
 p_76356_1_,par1Entity,2
 p_76358_0_,par0EntityLivingBase,2
+p_76360_1_,par1EntityLivingBase,2
 p_76362_0_,par0EntityFireball,2
 p_76362_1_,par1Entity,2
 p_76365_0_,par0EntityPlayer,2
@@ -5497,6 +5429,11 @@ p_77014_4_,par4,2
 p_77014_6_,par6,2
 p_77014_8_,par8,2
 p_77014_9_,par9,2
+p_77015_1_,par1FontRenderer,2
+p_77015_2_,par2TextureManager,2
+p_77015_3_,par3ItemStack,2
+p_77015_4_,par4,2
+p_77015_5_,par5,2
 p_77017_1_,par1Tessellator,2
 p_77017_2_,par2,2
 p_77017_3_,par3,2
@@ -5515,6 +5452,11 @@ p_77020_4_,par4,2
 p_77020_5_,par5,2
 p_77020_6_,par6,2
 p_77020_7_,par7,2
+p_77021_1_,par1FontRenderer,2
+p_77021_2_,par2TextureManager,2
+p_77021_3_,par3ItemStack,2
+p_77021_4_,par4,2
+p_77021_5_,par5,2
 p_77026_1_,par1Tessellator,2
 p_77026_2_,par2Icon,2
 p_77028_1_,par1EntityLightningBolt,2
@@ -5528,7 +5470,7 @@ p_77029_2_,par2,2
 p_77030_1_,par1EntityLivingBase,2
 p_77030_2_,par2,2
 p_77030_3_,par3,2
-p_77031_1_,par1EntityLiving,2
+p_77031_1_,par1,2
 p_77031_2_,par2,2
 p_77031_4_,par4,2
 p_77031_6_,par6,2
@@ -5537,6 +5479,10 @@ p_77031_9_,par9,2
 p_77032_1_,par1EntityLivingBase,2
 p_77032_2_,par2,2
 p_77032_3_,par3,2
+p_77033_1_,par1EntityLivingBase,2
+p_77033_2_,par2,2
+p_77033_4_,par4,2
+p_77033_6_,par6,2
 p_77034_1_,par1,2
 p_77034_2_,par2,2
 p_77034_3_,par3,2
@@ -5687,25 +5633,25 @@ p_77097_3_,par3,2
 p_77099_1_,par1EntityPig,2
 p_77099_2_,par2,2
 p_77099_3_,par3,2
-p_77100_1_,par1EntityLivingBase,2
+p_77100_1_,par1AbstractClientPlayer,2
 p_77100_2_,par2,2
-p_77101_1_,par1EntityLivingBase,2
+p_77101_1_,par1,2
 p_77101_2_,par2,2
 p_77101_4_,par4,2
 p_77101_6_,par6,2
 p_77101_8_,par8,2
 p_77101_9_,par9,2
-p_77102_1_,par1EntityLivingBase,2
+p_77102_1_,par1AbstractClientPlayer,2
 p_77102_2_,par2,2
 p_77102_3_,par3,2
 p_77102_4_,par4,2
 p_77104_1_,par1AbstractClientPlayer,2
 p_77104_2_,par2,2
-p_77105_1_,par1EntityLivingBase,2
+p_77105_1_,par1AbstractClientPlayer,2
 p_77105_2_,par2,2
 p_77105_4_,par4,2
 p_77105_6_,par6,2
-p_77107_1_,par1EntityLivingBase,2
+p_77107_1_,par1AbstractClientPlayer,2
 p_77107_2_,par2,2
 p_77107_3_,par3,2
 p_77113_1_,par1EntitySheep,2
@@ -5812,6 +5758,8 @@ p_77215_2_,par2,2
 p_77216_1_,par1,2
 p_77218_1_,par1,2
 p_77219_1_,par1GuiButton,2
+p_77220_1_,par1,2
+p_77220_2_,par2,2
 p_77222_1_,par1,2
 p_77222_2_,par2,2
 p_77222_3_,par3Tessellator,2
@@ -6320,6 +6268,9 @@ p_78280_1_,par1Str,2
 p_78280_2_,par2,2
 p_78282_0_,par0Str,2
 p_78283_1_,par1Str,2
+p_78319_1_,par1EntityPlayer,2
+p_78319_2_,par2TextureManager,2
+p_78319_3_,par3MapData,2
 p_78334_1_,par1StatCrafting,2
 p_78334_2_,par2StatCrafting,2
 p_78337_1_,par1StatCrafting,2
@@ -7100,7 +7051,12 @@ p_82404_4_,par4,2
 p_82404_6_,par6,2
 p_82404_8_,par8,2
 p_82404_9_,par9,2
-p_82408_1_,par1EntityLiving,2
+p_82406_1_,par1FontRenderer,2
+p_82406_2_,par2TextureManager,2
+p_82406_3_,par3ItemStack,2
+p_82406_4_,par4,2
+p_82406_5_,par5,2
+p_82408_1_,par1,2
 p_82408_2_,par2,2
 p_82408_3_,par3,2
 p_82409_1_,par1EntityWitch,2
@@ -7147,7 +7103,7 @@ p_82430_3_,par3,2
 p_82430_4_,par4,2
 p_82438_1_,par1EntitySkeleton,2
 p_82438_2_,par2,2
-p_82439_1_,par1EntityLivingBase,2
+p_82439_1_,par1,2
 p_82439_2_,par2,2
 p_82439_3_,par3,2
 p_82441_1_,par1EntityPlayer,2
@@ -7464,7 +7420,9 @@ p_82842_1_,par1EntityItemFrame,2
 p_82846_1_,par1EntityPlayer,2
 p_82846_2_,par2,2
 p_82847_1_,par1ICrafting,2
+p_82849_0_,par0ContainerRepair,2
 p_82850_1_,par1Str,2
+p_82851_0_,par0ContainerRepair,2
 p_82869_1_,par1EntityPlayer,2
 p_82870_1_,par1EntityPlayer,2
 p_82870_2_,par2ItemStack,2
@@ -7658,6 +7616,7 @@ p_92044_1_,par1,2
 p_92045_1_,par1,2
 p_92046_1_,par1,2
 p_92058_1_,par1ItemStack,2
+p_92062_1_,par1ChatMessageComponent,2
 p_92070_1_,par1Str,2
 p_92070_2_,par2,2
 p_92070_3_,par3,2
@@ -7767,6 +7726,12 @@ p_94146_1_,par1EntityMinecartTNT,2
 p_94146_2_,par2,2
 p_94146_3_,par3Block,2
 p_94146_4_,par4,2
+p_94148_1_,par1FontRenderer,2
+p_94148_2_,par2TextureManager,2
+p_94148_3_,par3ItemStack,2
+p_94148_4_,par4,2
+p_94148_5_,par5,2
+p_94148_6_,par6Str,2
 p_94149_1_,par1,2
 p_94149_2_,par2,2
 p_94149_3_,par3Icon,2
@@ -8027,6 +7992,7 @@ p_96095_1_,par1,2
 p_96095_2_,par2,2
 p_96095_3_,par3,2
 p_96095_4_,par4,2
+p_96098_1_,par1ItemStack,2
 p_96099_1_,par1,2
 p_96102_1_,par1,2
 p_96104_1_,par1Str,2
@@ -8221,6 +8187,13 @@ p_96449_4_,par4,2
 p_96449_6_,par6,2
 p_96449_8_,par8Str,2
 p_96449_9_,par9,2
+p_96450_10_,par10,2
+p_96450_1_,par1AbstractClientPlayer,2
+p_96450_2_,par2,2
+p_96450_4_,par4,2
+p_96450_6_,par6,2
+p_96450_8_,par8Str,2
+p_96450_9_,par9,2
 p_96456_1_,par1ServerScoreboard,2
 p_96456_2_,par2EntityPlayerMP,2
 p_96457_1_,par1EntityPlayer,2
@@ -8400,6 +8373,9 @@ p_98235_1_,par1Str,2
 p_98235_2_,par2Throwable,2
 p_98236_1_,par1Str,2
 p_98237_0_,par0LogAgent,2
+p_98247_0_,par0McoServerList,2
+p_98247_1_,par1List,2
+p_98249_0_,par0McoServerList,2
 p_98263_1_,par1,2
 p_98263_2_,par2,2
 p_98263_3_,par3,2
@@ -11655,17 +11631,17 @@ p_i2329_2_,par2McoServerListEmptyAnon,2
 p_i2330_1_,par1,2
 p_i2330_2_,par2Str,2
 p_i2330_3_,par3,2
-p_i2331_1_,par1DedicatedServer,2
+p_i2341_1_,par1DedicatedServer,2
-p_i2332_1_,par1DedicatedServer,2
+p_i2342_1_,par1DedicatedServer,2
-p_i2333_1_,par1DedicatedServer,2
+p_i2343_1_,par1DedicatedServer,2
-p_i2334_1_,par1MinecraftServerGui,2
+p_i2344_1_,par1MinecraftServerGui,2
-p_i2334_2_,par2JTextField,2
+p_i2344_2_,par2JTextField,2
-p_i2335_1_,par1MinecraftServerGui,2
+p_i2345_1_,par1MinecraftServerGui,2
-p_i2336_1_,par1MinecraftServer,2
+p_i2346_1_,par1MinecraftServer,2
-p_i2337_1_,par1MinecraftServer,2
+p_i2347_1_,par1MinecraftServer,2
-p_i2338_1_,par1StatsComponent,2
+p_i2348_1_,par1StatsComponent,2
-p_i2339_1_,par1JTextArea,2
+p_i2349_1_,par1JTextArea,2
-p_i2340_1_,par1TextAreaLogHandler,2
+p_i2350_1_,par1TextAreaLogHandler,2
 p_main_0_,par0ArrayOfStr,2
 p_openConnection_1_,par1URL,2
 p_paint_1_,par1Graphics,2

fml/conf/patches/minecraft_ff.patch

@@ -54,41 +54,6 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
        super.func_71190_q();
        this.func_71333_ah();
     }
-diff -r -U 3 minecraft\net\minecraft\src\EntityDragon.java minecraft_patched\net\minecraft\src\EntityDragon.java
---- minecraft\net\minecraft\src\EntityDragon.java	Sun Jun 30 21:44:01 2013
-+++ minecraft_patched\net\minecraft\src\EntityDragon.java	Sun Jun 30 21:45:42 2013
-@@ -551,4 +551,14 @@
-    protected float func_70599_aP() {
-       return 5.0F;
-    }
-+
-+   @Override
-+   public float func_70667_aM() {
-+      return 0.0f;
-+   }
-+
-+   @Override
-+   public float func_110183_aJ() {
-+      return 0.0f;
-+   }
- }
-diff -r -U 3 minecraft\net\minecraft\src\EntityWither.java minecraft_patched\net\minecraft\src\EntityWither.java
---- minecraft\net\minecraft\src\EntityWither.java	Sun Jun 30 21:44:02 2013
-+++ minecraft_patched\net\minecraft\src\EntityWither.java	Sun Jun 30 21:45:42 2013
-@@ -458,4 +458,13 @@
-       this.field_70154_o = null;
-    }
- 
-+   @Override
-+   public float func_70667_aM() {
-+      return 0.0f;
-+   }
-+
-+   @Override
-+   public float func_110183_aJ() {
-+      return 0.0f;
-+   }
- }
 diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
 --- minecraft\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 21:44:02 2013
 +++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 21:45:42 2013

fml/conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 8.02
+MCPVersion = 8.03
 ClientVersion = 1.6.1
 ServerVersion = 1.6.1

fml/mc_versions.cfg

@@ -104,6 +104,6 @@ mcp_md5    = 39da81bbb4d73b3f5e2d1f8f5682cdb9
 [1.6.1]
 client_md5 = 3c56fb4b77b1ca37dde69b5eb896fc4d
 server_md5 = ff8f81970a5955737c356b534d3aee96
-mcp_ver    = 8.02
+mcp_ver    = 8.03
-mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp802.zip
+mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp803.zip
-mcp_md5    = 2878cf6045696916a43c6c52826a4204
+mcp_md5    = 7810c2fba33e15889685b21ac8dc66cf

fml/patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch

@@ -9,4 +9,4 @@
 -@SideOnly(Side.CLIENT)
  public interface IBossDisplayData
  {
-     float func_70667_aM();
+     float func_110138_aP();