Update to MC 1.4.4

connection handler assigned to it. Hi SmartMoving! Perhaps you should try
@Mod instead of BaseMod?

common/cpw/mods/fml/common/asm/transformers/MCPMerger.java

@@ -289,7 +289,7 @@ public class MCPMerger
 
         reader.accept(classNode, 0);
 
-        if (!classNode.name.equals("bdz")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
+        if (!classNode.name.equals("beg")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
         {
             if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>();
             classNode.visibleAnnotations.add(getSideAnn(isClientOnly));

common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java

@@ -39,7 +39,7 @@ public class ModLoaderConnectionHandler implements IConnectionHandler
     @Override
     public void connectionClosed(INetworkManager manager)
     {
-        if (!ModLoaderHelper.sidedHelper.clientConnectionClosed(manager, mod))
+        if (ModLoaderHelper.sidedHelper==null || !ModLoaderHelper.sidedHelper.clientConnectionClosed(manager, mod))
         {
             mod.serverDisconnect();
             mod.onClientLogout(manager);

common/fml_at.cfg

@@ -2,61 +2,61 @@
 # TileEntity addMapping
 public anq.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
-public lu.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
-public lu.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
-public lu.b #FD:EntityList/field_75625_b #nameToClassMap
-public lu.c #FD:EntityList/field_75626_c #classToNameMap
-public lu.d #FD:EntityList/field_75623_d #idToClassMap
+public lv.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
+public lv.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
+public lv.b #FD:EntityList/field_75625_b #nameToClassMap
+public lv.c #FD:EntityList/field_75626_c #classToNameMap
+public lv.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
-public bai.h #FD:RenderEngine/field_78367_h #textureList
-public bai.k #FD:RenderEngine/field_78366_k #texturePack
+public bap.h #FD:RenderEngine/field_78367_h #textureList
+public bap.k #FD:RenderEngine/field_78366_k #texturePack
 # RenderManager
-public bbc.p #FD:RenderManager/field_78729_o #renderers
+public bbj.p #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public baj.* #FD:RenderBlocks/*
-public baj.*() #MD:RenderBlocks/*
+public baq.* #FD:RenderBlocks/*
+public baq.*() #MD:RenderBlocks/*
 #RenderPlayer
-public-f bbw.h #FD:RenderPlayer/field_77110_j #armorlist
+public-f bcd.h #FD:RenderPlayer/field_77110_j #armorlist
 #RenderBiped
-public-f bbk.k #FD:RenderBiped/field_82424_k #armorlist
+public-f bbr.k #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
-public bm.b #FD:StringTranslate/field_74815_b
-public bm.d #FD:StringTranslate/field_74813_d
+public bn.b #FD:StringTranslate/field_74815_b
+public bn.d #FD:StringTranslate/field_74813_d
 # TileEntityRenderer
-public bde.m #FD:TileEntityRenderer/field_76966_m
+public bdl.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
 public wh.a(Lum;[Ljava/lang/Object;)V #MD:CraftingManager/func_77595_a
 public wh.b(Lum;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
 # WeightedRandomItem
-public ku.a #FD:WeightedRandomItem/field_76292_a #probability
+public kv.a #FD:WeightedRandomItem/field_76292_a #probability
 # ItemStack
 #public+f tv.c #FD:ItemStack/field_77993_c #itemId
 # StatBase
-public jk.a #FD:StatBase/field_75978_a #statName
+public jl.a #FD:StatBase/field_75978_a #statName
 # NetLoginHandler
-public is.a(Lis;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
-public is.h #FD:NetLoginHandler/field_72543_h #userName
+public it.a(Lit;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
+public it.h #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public ip.cg()V #MD:EntityPlayerMP/func_71117_bO
-public ip.cs #FD:EntityPlayerMP/field_71139_cq
+public iq.ch()V #MD:EntityPlayerMP/func_71117_bO
+public iq.cs #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
-public nd #CL:EntityAITaskEntry
+public ne #CL:EntityAITaskEntry
 # EntityAITasks
-public nc.a #FD:EntityAITasks/field_75782_a #taskList
+public nd.a #FD:EntityAITasks/field_75782_a #taskList
 # BlockChest
 public ajd.n(Lxv;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
-public mc.aS #FD:EntityLiving/field_70736_aM #carryoverDamage
-public mc.bm #FD:EntityLiving/field_70714_bg #tasks
-public mc.bE #FD:EntityLiving/field_70703_bu #isJumping
+public md.aS #FD:EntityLiving/field_70736_aM #carryoverDamage
+public md.bm #FD:EntityLiving/field_70714_bg #tasks
+public md.bE #FD:EntityLiving/field_70703_bu #isJumping
 # EntityAIOcelotSit
-protected np.a(Lxv;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
-protected np.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
+protected nq.a(Lxv;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
+protected nq.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
 public b #CL:CallableMinecraftVersion
 public b.<init>(La;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
 # EntityAnimal
-public oy.d #FD:EntityAnimal/field_70881_d #inLove
+public ox.d #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
 public yg.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
 public yg.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
@@ -68,4 +68,4 @@ public qu.b(Lxn;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
 public qu.bN #FD:EntityVillager/field_70958_bB
 public qu.bO #FD:EntityVillager/field_70960_bC
 # GuiButtonMerchant
-public avr #CL:GuiButtonMerchant
+public avu #CL:GuiButtonMerchant

common/mcpmod.info

@@ -3,8 +3,8 @@
   "modid": "mcp",
   "name": "Minecraft Coder Pack",
   "description": "Modding toolkit to decompile and deobfuscate the Minecraft client and server files.",
-  "version": "7.19",
-  "mcversion": "1.4.2",
+  "version": "7.21",
+  "mcversion": "1.4.4",
   "logoFile": "/mcp.png",
   "url": "http://mcp.ocean-labs.de/",
   "updateUrl": "",

conf/joined.exc

@@ -397,7 +397,6 @@ net/minecraft/src/Block.func_71904_a(Lnet/minecraft/src/Entity;)F=|p_71904_1_
 net/minecraft/src/Block.func_71905_a(FFFFFF)V=|p_71905_1_,p_71905_2_,p_71905_3_,p_71905_4_,p_71905_5_,p_71905_6_
 net/minecraft/src/Block.func_71907_b(Z)Lnet/minecraft/src/Block;=|p_71907_1_
 net/minecraft/src/Block.func_71908_a(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;III)F=|p_71908_1_,p_71908_2_,p_71908_3_,p_71908_4_,p_71908_5_
-net/minecraft/src/Block.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/Block.func_71910_a(ILjava/util/Random;)I=|p_71910_1_,p_71910_2_
 net/minecraft/src/Block.func_71911_a_(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71911_1_,p_71911_2_,p_71911_3_,p_71911_4_
 net/minecraft/src/Block.func_71913_a(IZ)Z=|p_71913_1_,p_71913_2_
@@ -416,12 +415,17 @@ net/minecraft/src/Block.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_,
 net/minecraft/src/Block.func_71932_i(I)Z=|p_71932_0_
 net/minecraft/src/Block.func_71934_m(Lnet/minecraft/src/World;III)F=|p_71934_1_,p_71934_2_,p_71934_3_,p_71934_4_
 net/minecraft/src/Block.func_71936_b(Lnet/minecraft/src/Vec3;)Z=|p_71936_1_
+net/minecraft/src/Block.func_85103_a(Lnet/minecraft/src/Explosion;)Z=|p_85103_1_
+net/minecraft/src/Block.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
+net/minecraft/src/Block.func_85105_g(Lnet/minecraft/src/World;IIII)V=|p_85105_1_,p_85105_2_,p_85105_3_,p_85105_4_,p_85105_5_
 net/minecraft/src/BlockAnvil.<init>(I)V=|p_i5098_1_
 net/minecraft/src/BlockAnvil.func_71851_a(I)I=|p_71851_1_
 net/minecraft/src/BlockAnvil.func_71858_a(II)I=|p_71858_1_,p_71858_2_
 net/minecraft/src/BlockAnvil.func_71860_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityLiving;)V=|p_71860_1_,p_71860_2_,p_71860_3_,p_71860_4_,p_71860_5_
+net/minecraft/src/BlockAnvil.func_71877_c(Lnet/minecraft/src/IBlockAccess;IIII)Z=|p_71877_1_,p_71877_2_,p_71877_3_,p_71877_4_,p_71877_5_
 net/minecraft/src/BlockAnvil.func_71879_a(ILnet/minecraft/src/CreativeTabs;Ljava/util/List;)V=|p_71879_1_,p_71879_2_,p_71879_3_
 net/minecraft/src/BlockAnvil.func_71899_b(I)I=|p_71899_1_
+net/minecraft/src/BlockAnvil.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
 net/minecraft/src/BlockAnvil.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
 net/minecraft/src/BlockAnvil.func_82519_a_(Lnet/minecraft/src/World;IIII)V=|p_82519_1_,p_82519_2_,p_82519_3_,p_82519_4_,p_82519_5_
 net/minecraft/src/BlockAnvil.func_82520_a(Lnet/minecraft/src/EntityFallingSand;)V=|p_82520_1_
@@ -429,6 +433,7 @@ net/minecraft/src/BlockBeacon.<init>(I)V=|p_i5099_1_
 net/minecraft/src/BlockBeacon.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
 net/minecraft/src/BlockBeacon.func_72274_a(Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity;=|p_72274_1_
 net/minecraft/src/BlockBed.<init>(I)V=|p_i3919_1_
+net/minecraft/src/BlockBed.func_71846_a(Lnet/minecraft/src/World;IIIILnet/minecraft/src/EntityPlayer;)V=|p_71846_1_,p_71846_2_,p_71846_3_,p_71846_4_,p_71846_5_,p_71846_6_
 net/minecraft/src/BlockBed.func_71858_a(II)I=|p_71858_1_,p_71858_2_
 net/minecraft/src/BlockBed.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_
 net/minecraft/src/BlockBed.func_71885_a(ILjava/util/Random;I)I=|p_71885_1_,p_71885_2_,p_71885_3_
@@ -465,7 +470,6 @@ net/minecraft/src/BlockButton.func_71869_a(Lnet/minecraft/src/World;IIILnet/mine
 net/minecraft/src/BlockButton.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_
 net/minecraft/src/BlockButton.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
 net/minecraft/src/BlockButton.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
-net/minecraft/src/BlockButton.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/BlockButton.func_71921_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)V=|p_71921_1_,p_71921_2_,p_71921_3_,p_71921_4_,p_71921_5_
 net/minecraft/src/BlockButton.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_,p_71930_2_,p_71930_3_,p_71930_4_
 net/minecraft/src/BlockButton.func_72260_l(Lnet/minecraft/src/World;III)I=|p_72260_1_,p_72260_2_,p_72260_3_,p_72260_4_
@@ -473,6 +477,7 @@ net/minecraft/src/BlockButton.func_72261_n(Lnet/minecraft/src/World;III)Z=|p_722
 net/minecraft/src/BlockButton.func_82534_e(I)V=|p_82534_1_
 net/minecraft/src/BlockButton.func_82535_o(Lnet/minecraft/src/World;III)V=|p_82535_1_,p_82535_2_,p_82535_3_,p_82535_4_
 net/minecraft/src/BlockButton.func_82536_d(Lnet/minecraft/src/World;IIII)V=|p_82536_1_,p_82536_2_,p_82536_3_,p_82536_4_,p_82536_5_
+net/minecraft/src/BlockButton.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
 net/minecraft/src/BlockCactus.<init>(II)V=|p_i3925_1_,p_i3925_2_
 net/minecraft/src/BlockCactus.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_
 net/minecraft/src/BlockCactus.func_71851_a(I)I=|p_71851_1_
@@ -513,6 +518,7 @@ net/minecraft/src/BlockChest.func_71860_a(Lnet/minecraft/src/World;IIILnet/minec
 net/minecraft/src/BlockChest.func_71861_g(Lnet/minecraft/src/World;III)V=|p_71861_1_,p_71861_2_,p_71861_3_,p_71861_4_
 net/minecraft/src/BlockChest.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_
 net/minecraft/src/BlockChest.func_71895_b(Lnet/minecraft/src/IBlockAccess;IIII)I=|p_71895_1_,p_71895_2_,p_71895_3_,p_71895_4_,p_71895_5_
+net/minecraft/src/BlockChest.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
 net/minecraft/src/BlockChest.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
 net/minecraft/src/BlockChest.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_,p_71930_2_,p_71930_3_,p_71930_4_
 net/minecraft/src/BlockChest.func_72274_a(Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity;=|p_72274_1_
@@ -535,12 +541,13 @@ net/minecraft/src/BlockCocoa.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_718
 net/minecraft/src/BlockCocoa.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_
 net/minecraft/src/BlockCocoa.func_71873_h(Lnet/minecraft/src/World;III)I=|p_71873_1_,p_71873_2_,p_71873_3_,p_71873_4_
 net/minecraft/src/BlockCocoa.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
-net/minecraft/src/BlockCocoa.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/BlockCocoa.func_71911_a_(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71911_1_,p_71911_2_,p_71911_3_,p_71911_4_
 net/minecraft/src/BlockCocoa.func_71914_a(Lnet/minecraft/src/World;IIIIFI)V=|p_71914_1_,p_71914_2_,p_71914_3_,p_71914_4_,p_71914_5_,p_71914_6_,p_71914_7_
 net/minecraft/src/BlockCocoa.func_71922_a(Lnet/minecraft/src/World;III)I=|p_71922_1_,p_71922_2_,p_71922_3_,p_71922_4_
 net/minecraft/src/BlockCocoa.func_72219_c(I)I=|p_72219_0_
+net/minecraft/src/BlockCocoa.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
 net/minecraft/src/BlockCommandBlock.<init>(I)V=|p_i5102_1_
+net/minecraft/src/BlockCommandBlock.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_
 net/minecraft/src/BlockCommandBlock.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_
 net/minecraft/src/BlockCommandBlock.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
 net/minecraft/src/BlockCommandBlock.func_72274_a(Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity;=|p_72274_1_
@@ -589,6 +596,7 @@ net/minecraft/src/BlockDispenser.func_72280_l(Lnet/minecraft/src/World;III)V=|p_
 net/minecraft/src/BlockDispenser.func_82525_a(Lnet/minecraft/src/IBlockSource;)Lnet/minecraft/src/IPosition;=|p_82525_0_
 net/minecraft/src/BlockDispenser.func_82526_n(Lnet/minecraft/src/World;III)V=|p_82526_1_,p_82526_2_,p_82526_3_,p_82526_4_
 net/minecraft/src/BlockDoor.<init>(ILnet/minecraft/src/Material;)V=|p_i3939_1_,p_i3939_2_
+net/minecraft/src/BlockDoor.func_71846_a(Lnet/minecraft/src/World;IIIILnet/minecraft/src/EntityPlayer;)V=|p_71846_1_,p_71846_2_,p_71846_3_,p_71846_4_,p_71846_5_,p_71846_6_
 net/minecraft/src/BlockDoor.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_
 net/minecraft/src/BlockDoor.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_
 net/minecraft/src/BlockDoor.func_71878_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/Vec3;Lnet/minecraft/src/Vec3;)Lnet/minecraft/src/MovingObjectPosition;=|p_71878_1_,p_71878_2_,p_71878_3_,p_71878_4_,p_71878_5_,p_71878_6_
@@ -610,6 +618,7 @@ net/minecraft/src/BlockDragonEgg.<init>(II)V=|p_i3940_1_,p_i3940_2_
 net/minecraft/src/BlockDragonEgg.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_
 net/minecraft/src/BlockDragonEgg.func_71861_g(Lnet/minecraft/src/World;III)V=|p_71861_1_,p_71861_2_,p_71861_3_,p_71861_4_
 net/minecraft/src/BlockDragonEgg.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_
+net/minecraft/src/BlockDragonEgg.func_71877_c(Lnet/minecraft/src/IBlockAccess;IIII)Z=|p_71877_1_,p_71877_2_,p_71877_3_,p_71877_4_,p_71877_5_
 net/minecraft/src/BlockDragonEgg.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
 net/minecraft/src/BlockDragonEgg.func_71921_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)V=|p_71921_1_,p_71921_2_,p_71921_3_,p_71921_4_,p_71921_5_
 net/minecraft/src/BlockDragonEgg.func_71922_a(Lnet/minecraft/src/World;III)I=|p_71922_1_,p_71922_2_,p_71922_3_,p_71922_4_
@@ -659,6 +668,7 @@ net/minecraft/src/BlockFarmland.func_72248_l(Lnet/minecraft/src/World;III)Z=|p_7
 net/minecraft/src/BlockFence.<init>(II)V=|p_i3947_1_,p_i3947_2_
 net/minecraft/src/BlockFence.<init>(IILnet/minecraft/src/Material;)V=|p_i3948_1_,p_i3948_2_,p_i3948_3_
 net/minecraft/src/BlockFence.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_
+net/minecraft/src/BlockFence.func_71877_c(Lnet/minecraft/src/IBlockAccess;IIII)Z=|p_71877_1_,p_71877_2_,p_71877_3_,p_71877_4_,p_71877_5_
 net/minecraft/src/BlockFence.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
 net/minecraft/src/BlockFence.func_71918_c(Lnet/minecraft/src/IBlockAccess;III)Z=|p_71918_1_,p_71918_2_,p_71918_3_,p_71918_4_
 net/minecraft/src/BlockFence.func_72249_c(I)Z=|p_72249_0_
@@ -667,6 +677,7 @@ net/minecraft/src/BlockFenceGate.<init>(II)V=|p_i3946_1_,p_i3946_2_
 net/minecraft/src/BlockFenceGate.func_71860_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityLiving;)V=|p_71860_1_,p_71860_2_,p_71860_3_,p_71860_4_,p_71860_5_
 net/minecraft/src/BlockFenceGate.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_
 net/minecraft/src/BlockFenceGate.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_
+net/minecraft/src/BlockFenceGate.func_71877_c(Lnet/minecraft/src/IBlockAccess;IIII)Z=|p_71877_1_,p_71877_2_,p_71877_3_,p_71877_4_,p_71877_5_
 net/minecraft/src/BlockFenceGate.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
 net/minecraft/src/BlockFenceGate.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
 net/minecraft/src/BlockFenceGate.func_71918_c(Lnet/minecraft/src/IBlockAccess;III)Z=|p_71918_1_,p_71918_2_,p_71918_3_,p_71918_4_
@@ -772,9 +783,9 @@ net/minecraft/src/BlockHalfSlab.func_71871_a(Lnet/minecraft/src/World;IIILnet/mi
 net/minecraft/src/BlockHalfSlab.func_71877_c(Lnet/minecraft/src/IBlockAccess;IIII)Z=|p_71877_1_,p_71877_2_,p_71877_3_,p_71877_4_,p_71877_5_
 net/minecraft/src/BlockHalfSlab.func_71899_b(I)I=|p_71899_1_
 net/minecraft/src/BlockHalfSlab.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
-net/minecraft/src/BlockHalfSlab.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/BlockHalfSlab.func_71925_a(Ljava/util/Random;)I=|p_71925_1_
 net/minecraft/src/BlockHalfSlab.func_72241_e(I)Z=|p_72241_0_
+net/minecraft/src/BlockHalfSlab.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
 net/minecraft/src/BlockIce.<init>(II)V=|p_i3959_1_,p_i3959_2_
 net/minecraft/src/BlockIce.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_
 net/minecraft/src/BlockIce.func_71877_c(Lnet/minecraft/src/IBlockAccess;IIII)Z=|p_71877_1_,p_71877_2_,p_71877_3_,p_71877_4_,p_71877_5_
@@ -787,14 +798,16 @@ net/minecraft/src/BlockJukeBox.func_71903_a(Lnet/minecraft/src/World;IIILnet/min
 net/minecraft/src/BlockJukeBox.func_71914_a(Lnet/minecraft/src/World;IIIIFI)V=|p_71914_1_,p_71914_2_,p_71914_3_,p_71914_4_,p_71914_5_,p_71914_6_,p_71914_7_
 net/minecraft/src/BlockJukeBox.func_72274_a(Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity;=|p_72274_1_
 net/minecraft/src/BlockJukeBox.func_72276_j_(Lnet/minecraft/src/World;III)V=|p_72276_1_,p_72276_2_,p_72276_3_,p_72276_4_
-net/minecraft/src/BlockJukeBox.func_72277_e(Lnet/minecraft/src/World;IIII)V=|p_72277_1_,p_72277_2_,p_72277_3_,p_72277_4_,p_72277_5_
+net/minecraft/src/BlockJukeBox.func_85106_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/ItemStack;)V=|p_85106_1_,p_85106_2_,p_85106_3_,p_85106_4_,p_85106_5_
 net/minecraft/src/BlockLadder.<init>(II)V=|p_i3960_1_,p_i3960_2_
 net/minecraft/src/BlockLadder.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_
 net/minecraft/src/BlockLadder.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_
-net/minecraft/src/BlockLadder.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
+net/minecraft/src/BlockLadder.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
 net/minecraft/src/BlockLadder.func_71911_a_(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71911_1_,p_71911_2_,p_71911_3_,p_71911_4_
 net/minecraft/src/BlockLadder.func_71925_a(Ljava/util/Random;)I=|p_71925_1_
 net/minecraft/src/BlockLadder.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_,p_71930_2_,p_71930_3_,p_71930_4_
+net/minecraft/src/BlockLadder.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
+net/minecraft/src/BlockLadder.func_85107_d(I)V=|p_85107_1_
 net/minecraft/src/BlockLeaves.<init>(II)V=|p_i3961_1_,p_i3961_2_
 net/minecraft/src/BlockLeaves.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_
 net/minecraft/src/BlockLeaves.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_71852_1_,p_71852_2_,p_71852_3_,p_71852_4_,p_71852_5_,p_71852_6_
@@ -821,11 +834,11 @@ net/minecraft/src/BlockLever.func_71865_a(Lnet/minecraft/src/IBlockAccess;IIII)Z
 net/minecraft/src/BlockLever.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_
 net/minecraft/src/BlockLever.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
 net/minecraft/src/BlockLever.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
-net/minecraft/src/BlockLever.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/BlockLever.func_71921_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)V=|p_71921_1_,p_71921_2_,p_71921_3_,p_71921_4_,p_71921_5_
 net/minecraft/src/BlockLever.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_,p_71930_2_,p_71930_3_,p_71930_4_
 net/minecraft/src/BlockLever.func_72195_l(Lnet/minecraft/src/World;III)Z=|p_72195_1_,p_72195_2_,p_72195_3_,p_72195_4_
 net/minecraft/src/BlockLever.func_72196_d(I)I=|p_72196_0_
+net/minecraft/src/BlockLever.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
 net/minecraft/src/BlockLilyPad.<init>(II)V=|p_i4020_1_,p_i4020_2_
 net/minecraft/src/BlockLilyPad.func_71854_d(Lnet/minecraft/src/World;III)Z=|p_71854_1_,p_71854_2_,p_71854_3_,p_71854_4_
 net/minecraft/src/BlockLilyPad.func_71871_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/src/Entity;)V=|p_71871_1_,p_71871_2_,p_71871_3_,p_71871_4_,p_71871_5_,p_71871_6_,p_71871_7_
@@ -845,9 +858,9 @@ net/minecraft/src/BlockLog.func_71879_a(ILnet/minecraft/src/CreativeTabs;Ljava/u
 net/minecraft/src/BlockLog.func_71880_c_(I)Lnet/minecraft/src/ItemStack;=|p_71880_1_
 net/minecraft/src/BlockLog.func_71885_a(ILjava/util/Random;I)I=|p_71885_1_,p_71885_2_,p_71885_3_
 net/minecraft/src/BlockLog.func_71899_b(I)I=|p_71899_1_
-net/minecraft/src/BlockLog.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/BlockLog.func_71925_a(Ljava/util/Random;)I=|p_71925_1_
 net/minecraft/src/BlockLog.func_72141_e(I)I=|p_72141_0_
+net/minecraft/src/BlockLog.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
 net/minecraft/src/BlockMelon.<init>(I)V=|p_i3968_1_
 net/minecraft/src/BlockMelon.func_71851_a(I)I=|p_71851_1_
 net/minecraft/src/BlockMelon.func_71858_a(II)I=|p_71858_1_,p_71858_2_
@@ -1044,6 +1057,7 @@ net/minecraft/src/BlockRedstoneRepeater.func_71930_b(Lnet/minecraft/src/World;II
 net/minecraft/src/BlockRedstoneRepeater.func_72220_e(Lnet/minecraft/src/World;IIII)Z=|p_72220_1_,p_72220_2_,p_72220_3_,p_72220_4_,p_72220_5_
 net/minecraft/src/BlockRedstoneRepeater.func_82523_e(Lnet/minecraft/src/IBlockAccess;IIII)Z=|p_82523_1_,p_82523_2_,p_82523_3_,p_82523_4_,p_82523_5_
 net/minecraft/src/BlockRedstoneRepeater.func_82524_c(I)Z=|p_82524_0_
+net/minecraft/src/BlockRedstoneRepeater.func_83011_d(Lnet/minecraft/src/World;IIII)Z=|p_83011_1_,p_83011_2_,p_83011_3_,p_83011_4_,p_83011_5_
 net/minecraft/src/BlockRedstoneTorch.<init>(IIZ)V=|p_i3976_1_,p_i3976_2_,p_i3976_3_
 net/minecraft/src/BlockRedstoneTorch.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_
 net/minecraft/src/BlockRedstoneTorch.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_71852_1_,p_71852_2_,p_71852_3_,p_71852_4_,p_71852_5_,p_71852_6_
@@ -1177,7 +1191,6 @@ net/minecraft/src/BlockStairs.func_71901_a(Lnet/minecraft/src/World;IIILnet/mine
 net/minecraft/src/BlockStairs.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
 net/minecraft/src/BlockStairs.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
 net/minecraft/src/BlockStairs.func_71904_a(Lnet/minecraft/src/Entity;)F=|p_71904_1_
-net/minecraft/src/BlockStairs.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/BlockStairs.func_71911_a_(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71911_1_,p_71911_2_,p_71911_3_,p_71911_4_
 net/minecraft/src/BlockStairs.func_71913_a(IZ)Z=|p_71913_1_,p_71913_2_
 net/minecraft/src/BlockStairs.func_71921_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)V=|p_71921_1_,p_71921_2_,p_71921_3_,p_71921_4_,p_71921_5_
@@ -1187,6 +1200,7 @@ net/minecraft/src/BlockStairs.func_82541_d(Lnet/minecraft/src/IBlockAccess;III)V
 net/minecraft/src/BlockStairs.func_82542_g(Lnet/minecraft/src/IBlockAccess;III)Z=|p_82542_1_,p_82542_2_,p_82542_3_,p_82542_4_
 net/minecraft/src/BlockStairs.func_82543_e(I)Z=|p_82543_0_
 net/minecraft/src/BlockStairs.func_82544_h(Lnet/minecraft/src/IBlockAccess;III)Z=|p_82544_1_,p_82544_2_,p_82544_3_,p_82544_4_
+net/minecraft/src/BlockStairs.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
 net/minecraft/src/BlockStationary.<init>(ILnet/minecraft/src/Material;)V=|p_i3966_1_,p_i3966_2_
 net/minecraft/src/BlockStationary.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_
 net/minecraft/src/BlockStationary.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_
@@ -1229,6 +1243,7 @@ net/minecraft/src/BlockTNT.func_71869_a(Lnet/minecraft/src/World;IIILnet/minecra
 net/minecraft/src/BlockTNT.func_71898_d(Lnet/minecraft/src/World;IIII)V=|p_71898_1_,p_71898_2_,p_71898_3_,p_71898_4_,p_71898_5_
 net/minecraft/src/BlockTNT.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
 net/minecraft/src/BlockTNT.func_71925_a(Ljava/util/Random;)I=|p_71925_1_
+net/minecraft/src/BlockTNT.func_85103_a(Lnet/minecraft/src/Explosion;)Z=|p_85103_1_
 net/minecraft/src/BlockTallGrass.<init>(II)V=|p_i4002_1_,p_i4002_2_
 net/minecraft/src/BlockTallGrass.func_71858_a(II)I=|p_71858_1_,p_71858_2_
 net/minecraft/src/BlockTallGrass.func_71873_h(Lnet/minecraft/src/World;III)I=|p_71873_1_,p_71873_2_,p_71873_3_,p_71873_4_
@@ -1245,10 +1260,10 @@ net/minecraft/src/BlockTorch.func_71862_a(Lnet/minecraft/src/World;IIILjava/util
 net/minecraft/src/BlockTorch.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_
 net/minecraft/src/BlockTorch.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_
 net/minecraft/src/BlockTorch.func_71878_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/Vec3;Lnet/minecraft/src/Vec3;)Lnet/minecraft/src/MovingObjectPosition;=|p_71878_1_,p_71878_2_,p_71878_3_,p_71878_4_,p_71878_5_,p_71878_6_
-net/minecraft/src/BlockTorch.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/BlockTorch.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_,p_71930_2_,p_71930_3_,p_71930_4_
 net/minecraft/src/BlockTorch.func_72125_l(Lnet/minecraft/src/World;III)Z=|p_72125_1_,p_72125_2_,p_72125_3_,p_72125_4_
 net/minecraft/src/BlockTorch.func_72126_n(Lnet/minecraft/src/World;III)Z=|p_72126_1_,p_72126_2_,p_72126_3_,p_72126_4_
+net/minecraft/src/BlockTorch.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
 net/minecraft/src/BlockTrapDoor.<init>(ILnet/minecraft/src/Material;)V=|p_i4015_1_,p_i4015_2_
 net/minecraft/src/BlockTrapDoor.func_71850_a_(Lnet/minecraft/src/World;IIII)Z=|p_71850_1_,p_71850_2_,p_71850_3_,p_71850_4_,p_71850_5_
 net/minecraft/src/BlockTrapDoor.func_71863_a(Lnet/minecraft/src/World;IIII)V=|p_71863_1_,p_71863_2_,p_71863_3_,p_71863_4_,p_71863_5_
@@ -1256,7 +1271,6 @@ net/minecraft/src/BlockTrapDoor.func_71872_e(Lnet/minecraft/src/World;III)Lnet/m
 net/minecraft/src/BlockTrapDoor.func_71878_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/Vec3;Lnet/minecraft/src/Vec3;)Lnet/minecraft/src/MovingObjectPosition;=|p_71878_1_,p_71878_2_,p_71878_3_,p_71878_4_,p_71878_5_,p_71878_6_
 net/minecraft/src/BlockTrapDoor.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
 net/minecraft/src/BlockTrapDoor.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
-net/minecraft/src/BlockTrapDoor.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/BlockTrapDoor.func_71911_a_(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71911_1_,p_71911_2_,p_71911_3_,p_71911_4_
 net/minecraft/src/BlockTrapDoor.func_71918_c(Lnet/minecraft/src/IBlockAccess;III)Z=|p_71918_1_,p_71918_2_,p_71918_3_,p_71918_4_
 net/minecraft/src/BlockTrapDoor.func_71921_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;)V=|p_71921_1_,p_71921_2_,p_71921_3_,p_71921_4_,p_71921_5_
@@ -1264,6 +1278,7 @@ net/minecraft/src/BlockTrapDoor.func_72137_g(I)Z=|p_72137_0_
 net/minecraft/src/BlockTrapDoor.func_72138_a(Lnet/minecraft/src/World;IIIZ)V=|p_72138_1_,p_72138_2_,p_72138_3_,p_72138_4_,p_72138_5_
 net/minecraft/src/BlockTrapDoor.func_72139_e(I)V=|p_72139_1_
 net/minecraft/src/BlockTrapDoor.func_72140_j(I)Z=|p_72140_0_
+net/minecraft/src/BlockTrapDoor.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
 net/minecraft/src/BlockTripWire.<init>(I)V=|p_i4018_1_
 net/minecraft/src/BlockTripWire.func_71846_a(Lnet/minecraft/src/World;IIIILnet/minecraft/src/EntityPlayer;)V=|p_71846_1_,p_71846_2_,p_71846_3_,p_71846_4_,p_71846_5_,p_71846_6_
 net/minecraft/src/BlockTripWire.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_
@@ -1287,12 +1302,13 @@ net/minecraft/src/BlockTripWireSource.func_71863_a(Lnet/minecraft/src/World;IIII
 net/minecraft/src/BlockTripWireSource.func_71865_a(Lnet/minecraft/src/IBlockAccess;IIII)Z=|p_71865_1_,p_71865_2_,p_71865_3_,p_71865_4_,p_71865_5_
 net/minecraft/src/BlockTripWireSource.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_
 net/minecraft/src/BlockTripWireSource.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
-net/minecraft/src/BlockTripWireSource.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/BlockTripWireSource.func_71930_b(Lnet/minecraft/src/World;III)Z=|p_71930_1_,p_71930_2_,p_71930_3_,p_71930_4_
 net/minecraft/src/BlockTripWireSource.func_72143_a(Lnet/minecraft/src/World;IIIIIZII)V=|p_72143_1_,p_72143_2_,p_72143_3_,p_72143_4_,p_72143_5_,p_72143_6_,p_72143_7_,p_72143_8_,p_72143_9_
 net/minecraft/src/BlockTripWireSource.func_72144_l(Lnet/minecraft/src/World;III)Z=|p_72144_1_,p_72144_2_,p_72144_3_,p_72144_4_
 net/minecraft/src/BlockTripWireSource.func_72145_a(Lnet/minecraft/src/World;IIIZZZZ)V=|p_72145_1_,p_72145_2_,p_72145_3_,p_72145_4_,p_72145_5_,p_72145_6_,p_72145_7_,p_72145_8_
 net/minecraft/src/BlockTripWireSource.func_72146_e(Lnet/minecraft/src/World;IIII)V=|p_72146_1_,p_72146_2_,p_72146_3_,p_72146_4_,p_72146_5_
+net/minecraft/src/BlockTripWireSource.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
+net/minecraft/src/BlockTripWireSource.func_85105_g(Lnet/minecraft/src/World;IIII)V=|p_85105_1_,p_85105_2_,p_85105_3_,p_85105_4_,p_85105_5_
 net/minecraft/src/BlockVine.<init>(I)V=|p_i4019_1_
 net/minecraft/src/BlockVine.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_
 net/minecraft/src/BlockVine.func_71850_a_(Lnet/minecraft/src/World;IIII)Z=|p_71850_1_,p_71850_2_,p_71850_3_,p_71850_4_,p_71850_5_
@@ -1302,14 +1318,15 @@ net/minecraft/src/BlockVine.func_71885_a(ILjava/util/Random;I)I=|p_71885_1_,p_71
 net/minecraft/src/BlockVine.func_71889_f_(I)I=|p_71889_1_
 net/minecraft/src/BlockVine.func_71893_a(Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;IIII)V=|p_71893_1_,p_71893_2_,p_71893_3_,p_71893_4_,p_71893_5_,p_71893_6_
 net/minecraft/src/BlockVine.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
-net/minecraft/src/BlockVine.func_71909_a(Lnet/minecraft/src/World;IIIIFFF)V=|p_71909_1_,p_71909_2_,p_71909_3_,p_71909_4_,p_71909_5_,p_71909_6_,p_71909_7_,p_71909_8_
 net/minecraft/src/BlockVine.func_71920_b(Lnet/minecraft/src/IBlockAccess;III)I=|p_71920_1_,p_71920_2_,p_71920_3_,p_71920_4_
 net/minecraft/src/BlockVine.func_71925_a(Ljava/util/Random;)I=|p_71925_1_
 net/minecraft/src/BlockVine.func_72150_l(Lnet/minecraft/src/World;III)Z=|p_72150_1_,p_72150_2_,p_72150_3_,p_72150_4_
 net/minecraft/src/BlockVine.func_72151_e(I)Z=|p_72151_1_
+net/minecraft/src/BlockVine.func_85104_a(Lnet/minecraft/src/World;IIIIFFFI)I=|p_85104_1_,p_85104_2_,p_85104_3_,p_85104_4_,p_85104_5_,p_85104_6_,p_85104_7_,p_85104_8_,p_85104_9_
 net/minecraft/src/BlockWall.<init>(ILnet/minecraft/src/Block;)V=|p_i5108_1_,p_i5108_2_
 net/minecraft/src/BlockWall.func_71858_a(II)I=|p_71858_1_,p_71858_2_
 net/minecraft/src/BlockWall.func_71872_e(Lnet/minecraft/src/World;III)Lnet/minecraft/src/AxisAlignedBB;=|p_71872_1_,p_71872_2_,p_71872_3_,p_71872_4_
+net/minecraft/src/BlockWall.func_71877_c(Lnet/minecraft/src/IBlockAccess;IIII)Z=|p_71877_1_,p_71877_2_,p_71877_3_,p_71877_4_,p_71877_5_
 net/minecraft/src/BlockWall.func_71879_a(ILnet/minecraft/src/CreativeTabs;Ljava/util/List;)V=|p_71879_1_,p_71879_2_,p_71879_3_
 net/minecraft/src/BlockWall.func_71899_b(I)I=|p_71899_1_
 net/minecraft/src/BlockWall.func_71902_a(Lnet/minecraft/src/IBlockAccess;III)V=|p_71902_1_,p_71902_2_,p_71902_3_,p_71902_4_
@@ -1334,16 +1351,34 @@ net/minecraft/src/BlockWorkbench.<init>(I)V=|p_i4024_1_
 net/minecraft/src/BlockWorkbench.func_71851_a(I)I=|p_71851_1_
 net/minecraft/src/BlockWorkbench.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
 net/minecraft/src/BossStatus.func_82824_a(Lnet/minecraft/src/IBossDisplayData;Z)V=|p_82824_0_,p_82824_1_
+net/minecraft/src/CallableBlockDataValue.<init>(I)V=|p_i6806_1_
+net/minecraft/src/CallableBlockLocation.<init>(III)V=|p_i6807_1_,p_i6807_2_,p_i6807_3_
+net/minecraft/src/CallableBlockType.<init>(I)V=|p_i6805_1_
+net/minecraft/src/CallableChunkPosHash.<init>(Lnet/minecraft/src/MapGenStructure;II)V=|p_i6818_1_,p_i6818_2_,p_i6818_3_
 net/minecraft/src/CallableClientMemoryStats.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i5000_1_
 net/minecraft/src/CallableClientProfiler.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3017_1_
+net/minecraft/src/CallableCrashMemoryReport.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i6000_1_
+net/minecraft/src/CallableEntityType.<init>(Lnet/minecraft/src/Entity;)V=|p_i6811_1_
 net/minecraft/src/CallableGLInfo.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3016_1_
+net/minecraft/src/CallableIntCache.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i6804_1_
+net/minecraft/src/CallableIsFeatureChunk.<init>(Lnet/minecraft/src/MapGenStructure;II)V=|p_i6817_1_,p_i6817_2_,p_i6817_3_
 net/minecraft/src/CallableIsModded.<init>(Lnet/minecraft/src/IntegratedServer;)V=|p_i3123_1_
 net/minecraft/src/CallableIsServerModded.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i3372_1_
 net/minecraft/src/CallableJVMFlags.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3249_1_
 net/minecraft/src/CallableJavaInfo.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3246_1_
 net/minecraft/src/CallableJavaInfo2.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3247_1_
 net/minecraft/src/CallableLWJGLVersion.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3002_1_
-net/minecraft/src/CallableLvl1.<init>(Lnet/minecraft/src/World;)V=|p_i3728_1_
+net/minecraft/src/CallableLastTickedParticle.<init>(Lnet/minecraft/src/EffectRenderer;Lnet/minecraft/src/EntityFX;)V=|p_i7003_1_,p_i7003_2_
+net/minecraft/src/CallableLevelDimension.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6825_1_
+net/minecraft/src/CallableLevelGamemode.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6828_1_
+net/minecraft/src/CallableLevelGenerator.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6821_1_
+net/minecraft/src/CallableLevelGeneratorOptions.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6822_1_
+net/minecraft/src/CallableLevelSeed.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6820_1_
+net/minecraft/src/CallableLevelSpawnLocation.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6823_1_
+net/minecraft/src/CallableLevelStorageVersion.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6826_1_
+net/minecraft/src/CallableLevelTime.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6824_1_
+net/minecraft/src/CallableLevelWeather.<init>(Lnet/minecraft/src/WorldInfo;)V=|p_i6827_1_
+net/minecraft/src/CallableLvl1.<init>(Lnet/minecraft/src/World;I)V=|p_i6814_1_,p_i6814_2_
 net/minecraft/src/CallableLvl2.<init>(Lnet/minecraft/src/World;)V=|p_i3729_1_
 net/minecraft/src/CallableLvl3.<init>(Lnet/minecraft/src/World;)V=|p_i3730_1_
 net/minecraft/src/CallableMPL1.<init>(Lnet/minecraft/src/WorldClient;)V=|p_i3098_1_
@@ -1351,16 +1386,26 @@ net/minecraft/src/CallableMPL2.<init>(Lnet/minecraft/src/WorldClient;)V=|p_i3097
 net/minecraft/src/CallableMemoryInfo.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3248_1_
 net/minecraft/src/CallableMinecraftVersion.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3244_1_
 net/minecraft/src/CallableModded.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3006_1_
+net/minecraft/src/CallableMouseLocation.<init>(Lnet/minecraft/src/EntityRenderer;II)V=|p_i7005_1_,p_i7005_2_,p_i7005_3_
 net/minecraft/src/CallableOSInfo.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3245_1_
-net/minecraft/src/CallablePlayers.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i3374_1_
+net/minecraft/src/CallableParticlePositionInfo.<init>(Lnet/minecraft/src/RenderGlobal;DDD)V=|p_i6801_1_,p_i6801_2_,p_i6801_4_,p_i6801_6_
+net/minecraft/src/CallableParticleScreenName.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i7001_1_
+net/minecraft/src/CallableScreenName.<init>(Lnet/minecraft/src/EntityRenderer;)V=|p_i7006_1_
+net/minecraft/src/CallableScreenSize.<init>(Lnet/minecraft/src/EntityRenderer;Lnet/minecraft/src/ScaledResolution;)V=|p_i7004_1_,p_i7004_2_
 net/minecraft/src/CallableServerMemoryStats.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i5042_1_
 net/minecraft/src/CallableServerProfiler.<init>(Lnet/minecraft/server/MinecraftServer;)V=|p_i3373_1_
+net/minecraft/src/CallableServerType.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i6810_1_
+net/minecraft/src/CallableStructureType.<init>(Lnet/minecraft/src/MapGenStructure;)V=|p_i6819_1_
+net/minecraft/src/CallableSuspiciousClasses.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i6803_1_
 net/minecraft/src/CallableTagCompound1.<init>(Lnet/minecraft/src/NBTTagCompound;Ljava/lang/String;)V=|p_i5029_1_,p_i5029_2_
 net/minecraft/src/CallableTagCompound2.<init>(Lnet/minecraft/src/NBTTagCompound;I)V=|p_i5030_1_,p_i5030_2_
 net/minecraft/src/CallableTexturePack.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3012_1_
+net/minecraft/src/CallableTickingScreenName.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i7000_1_
+net/minecraft/src/CallableTileEntityName.<init>(Lnet/minecraft/src/TileEntity;)V=|p_i6829_1_
 net/minecraft/src/CallableType.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i3381_1_
 net/minecraft/src/CallableType2.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i3007_1_
 net/minecraft/src/CallableType3.<init>(Lnet/minecraft/src/IntegratedServer;)V=|p_i3120_1_
+net/minecraft/src/CallableUpdatingScreenName.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i7002_1_
 net/minecraft/src/CanvasCrashReport.<init>(I)V=|p_i3008_1_
 net/minecraft/src/CanvasMinecraftApplet.<init>(Lnet/minecraft/client/MinecraftApplet;)V=|p_i3020_1_
 net/minecraft/src/CanvasMojangLogo.paint(Ljava/awt/Graphics;)V=|p_paint_1_
@@ -1552,6 +1597,10 @@ net/minecraft/src/CommandDifficulty.func_71515_b(Lnet/minecraft/src/ICommandSend
 net/minecraft/src/CommandDifficulty.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
 net/minecraft/src/CommandDifficulty.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
 net/minecraft/src/CommandDifficulty.func_82364_d(Lnet/minecraft/src/ICommandSender;Ljava/lang/String;)I=|p_82364_1_,p_82364_2_
+net/minecraft/src/CommandEnchant.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
+net/minecraft/src/CommandEnchant.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
+net/minecraft/src/CommandEnchant.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
+net/minecraft/src/CommandEnchant.func_82358_a(I)Z=|p_82358_1_
 net/minecraft/src/CommandException.<init>(Ljava/lang/String;[Ljava/lang/Object;)V=|p_i3254_1_,p_i3254_2_
 net/minecraft/src/CommandGameMode.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)V=|p_71515_1_,p_71515_2_
 net/minecraft/src/CommandGameMode.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
@@ -1648,6 +1697,9 @@ net/minecraft/src/CommandXP.func_71515_b(Lnet/minecraft/src/ICommandSender;[Ljav
 net/minecraft/src/CommandXP.func_71516_a(Lnet/minecraft/src/ICommandSender;[Ljava/lang/String;)Ljava/util/List;=|p_71516_1_,p_71516_2_
 net/minecraft/src/CommandXP.func_71518_a(Lnet/minecraft/src/ICommandSender;)Ljava/lang/String;=|p_71518_1_
 net/minecraft/src/CommandXP.func_82358_a(I)Z=|p_82358_1_
+net/minecraft/src/ComparatorClassSorter.<init>(Lnet/minecraft/src/CallableSuspiciousClasses;)V=|p_i6802_1_
+net/minecraft/src/ComparatorClassSorter.compare(Ljava/lang/Object;Ljava/lang/Object;)I=|p_compare_1_,p_compare_2_
+net/minecraft/src/ComparatorClassSorter.func_85081_a(Ljava/lang/Class;Ljava/lang/Class;)I=|p_85081_1_,p_85081_2_
 net/minecraft/src/ComponentMineshaftCorridor.<init>(ILjava/util/Random;Lnet/minecraft/src/StructureBoundingBox;I)V=|p_i3807_1_,p_i3807_2_,p_i3807_3_,p_i3807_4_
 net/minecraft/src/ComponentMineshaftCorridor.func_74861_a(Lnet/minecraft/src/StructureComponent;Ljava/util/List;Ljava/util/Random;)V=|p_74861_1_,p_74861_2_,p_74861_3_
 net/minecraft/src/ComponentMineshaftCorridor.func_74875_a(Lnet/minecraft/src/World;Ljava/util/Random;Lnet/minecraft/src/StructureBoundingBox;)Z=|p_74875_1_,p_74875_2_,p_74875_3_
@@ -1931,6 +1983,8 @@ net/minecraft/src/ContainerRepair.func_82846_b(Lnet/minecraft/src/EntityPlayer;I
 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/ContainerSheep.<init>(Lnet/minecraft/src/EntitySheep;)V=|p_i7007_1_
+net/minecraft/src/ContainerSheep.func_75145_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_75145_1_
 net/minecraft/src/ContainerWorkbench.<init>(Lnet/minecraft/src/InventoryPlayer;Lnet/minecraft/src/World;III)V=|p_i3603_1_,p_i3603_2_,p_i3603_3_,p_i3603_4_,p_i3603_5_
 net/minecraft/src/ContainerWorkbench.func_75130_a(Lnet/minecraft/src/IInventory;)V=|p_75130_1_
 net/minecraft/src/ContainerWorkbench.func_75134_a(Lnet/minecraft/src/EntityPlayer;)V=|p_75134_1_
@@ -1945,11 +1999,23 @@ net/minecraft/src/CraftingManager.func_77595_a(Lnet/minecraft/src/ItemStack;[Lja
 net/minecraft/src/CraftingManager.func_77596_b(Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)V=|p_77596_1_,p_77596_2_
 net/minecraft/src/CraftingManager.func_82787_a(Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Lnet/minecraft/src/ItemStack;=|p_82787_1_,p_82787_2_
 net/minecraft/src/CrashReport.<init>(Ljava/lang/String;Ljava/lang/Throwable;)V=|p_i3250_1_,p_i3250_2_
-net/minecraft/src/CrashReport.func_71499_a(Ljava/lang/String;Ljava/lang/Throwable;)V=|p_71499_1_,p_71499_2_
-net/minecraft/src/CrashReport.func_71500_a(Ljava/lang/String;Ljava/util/concurrent/Callable;)V=|p_71500_1_,p_71500_2_
 net/minecraft/src/CrashReport.func_71506_a(Ljava/lang/StringBuilder;)V=|p_71506_1_
-net/minecraft/src/CrashReport.func_71507_a(Ljava/lang/String;Ljava/lang/Object;)V=|p_71507_1_,p_71507_2_
 net/minecraft/src/CrashReport.func_71508_a(Ljava/io/File;)Z=|p_71508_1_
+net/minecraft/src/CrashReport.func_85055_a(Ljava/lang/Throwable;Ljava/lang/String;)Lnet/minecraft/src/CrashReport;=|p_85055_0_,p_85055_1_
+net/minecraft/src/CrashReport.func_85057_a(Ljava/lang/String;I)Lnet/minecraft/src/CrashReportCategory;=|p_85057_1_,p_85057_2_
+net/minecraft/src/CrashReport.func_85058_a(Ljava/lang/String;)Lnet/minecraft/src/CrashReportCategory;=|p_85058_1_
+net/minecraft/src/CrashReportCategory.<init>(Lnet/minecraft/src/CrashReport;Ljava/lang/String;)V=|p_i6809_1_,p_i6809_2_
+net/minecraft/src/CrashReportCategory.func_71499_a(Ljava/lang/String;Ljava/lang/Throwable;)V=|p_71499_1_,p_71499_2_
+net/minecraft/src/CrashReportCategory.func_71500_a(Ljava/lang/String;Ljava/util/concurrent/Callable;)V=|p_71500_1_,p_71500_2_
+net/minecraft/src/CrashReportCategory.func_71507_a(Ljava/lang/String;Ljava/lang/Object;)V=|p_71507_1_,p_71507_2_
+net/minecraft/src/CrashReportCategory.func_85068_a(Lnet/minecraft/src/CrashReportCategory;IIIII)V=|p_85068_0_,p_85068_1_,p_85068_2_,p_85068_3_,p_85068_4_,p_85068_5_
+net/minecraft/src/CrashReportCategory.func_85069_a(Ljava/lang/StackTraceElement;Ljava/lang/StackTraceElement;)Z=|p_85069_1_,p_85069_2_
+net/minecraft/src/CrashReportCategory.func_85070_b(I)V=|p_85070_1_
+net/minecraft/src/CrashReportCategory.func_85071_a(III)Ljava/lang/String;=|p_85071_0_,p_85071_1_,p_85071_2_
+net/minecraft/src/CrashReportCategory.func_85072_a(Ljava/lang/StringBuilder;)V=|p_85072_1_
+net/minecraft/src/CrashReportCategory.func_85073_a(I)I=|p_85073_1_
+net/minecraft/src/CrashReportCategory.func_85074_a(DDD)Ljava/lang/String;=|p_85074_0_,p_85074_2_,p_85074_4_
+net/minecraft/src/CrashReportCategoryEntry.<init>(Ljava/lang/String;Ljava/lang/Object;)V=|p_i6808_1_,p_i6808_2_
 net/minecraft/src/CreativeCrafting.<init>(Lnet/minecraft/client/Minecraft;)V=|p_i5008_1_
 net/minecraft/src/CreativeCrafting.func_71110_a(Lnet/minecraft/src/Container;Ljava/util/List;)V=|p_71110_1_,p_71110_2_
 net/minecraft/src/CreativeCrafting.func_71111_a(Lnet/minecraft/src/Container;ILnet/minecraft/src/ItemStack;)V=|p_71111_1_,p_71111_2_,p_71111_3_
@@ -2060,6 +2126,7 @@ net/minecraft/src/EffectRenderer.func_78871_a(IIIII)V=|p_78871_1_,p_78871_2_,p_7
 net/minecraft/src/EffectRenderer.func_78872_b(Lnet/minecraft/src/Entity;F)V=|p_78872_1_,p_78872_2_
 net/minecraft/src/EffectRenderer.func_78873_a(Lnet/minecraft/src/EntityFX;)V=|p_78873_1_
 net/minecraft/src/EffectRenderer.func_78874_a(Lnet/minecraft/src/Entity;F)V=|p_78874_1_,p_78874_2_
+net/minecraft/src/EffectRenderer.func_90037_b(Lnet/minecraft/src/EntityFX;)V=|p_90037_1_
 net/minecraft/src/EmptyChunk.<init>(Lnet/minecraft/src/World;II)V=|p_i3770_1_,p_i3770_2_,p_i3770_3_
 net/minecraft/src/EmptyChunk.func_76588_a(Lnet/minecraft/src/Entity;Lnet/minecraft/src/AxisAlignedBB;Ljava/util/List;)V=|p_76588_1_,p_76588_2_,p_76588_3_
 net/minecraft/src/EmptyChunk.func_76589_b(IIII)Z=|p_76589_1_,p_76589_2_,p_76589_3_,p_76589_4_
@@ -2134,13 +2201,13 @@ net/minecraft/src/EnchantmentHelper.func_77511_a(I[Lnet/minecraft/src/ItemStack;
 net/minecraft/src/EnchantmentHelper.func_77512_a(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/EntityLiving;)I=|p_77512_0_,p_77512_1_
 net/minecraft/src/EnchantmentHelper.func_77513_b(Ljava/util/Random;Lnet/minecraft/src/ItemStack;I)Ljava/util/List;=|p_77513_0_,p_77513_1_,p_77513_2_
 net/minecraft/src/EnchantmentHelper.func_77514_a(Ljava/util/Random;IILnet/minecraft/src/ItemStack;)I=|p_77514_0_,p_77514_1_,p_77514_2_,p_77514_3_
-net/minecraft/src/EnchantmentHelper.func_77515_c(Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/EntityLiving;)I=|p_77515_0_,p_77515_1_
 net/minecraft/src/EnchantmentHelper.func_77516_a(Lnet/minecraft/src/IEnchantmentModifier;[Lnet/minecraft/src/ItemStack;)V=|p_77516_0_,p_77516_1_
 net/minecraft/src/EnchantmentHelper.func_77517_e(Lnet/minecraft/src/EntityLiving;)I=|p_77517_0_
 net/minecraft/src/EnchantmentHelper.func_77518_a(Lnet/minecraft/src/IEnchantmentModifier;Lnet/minecraft/src/ItemStack;)V=|p_77518_0_,p_77518_1_
 net/minecraft/src/EnchantmentHelper.func_77519_f(Lnet/minecraft/src/EntityLiving;)I=|p_77519_0_
 net/minecraft/src/EnchantmentHelper.func_82781_a(Lnet/minecraft/src/ItemStack;)Ljava/util/Map;=|p_82781_0_
 net/minecraft/src/EnchantmentHelper.func_82782_a(Ljava/util/Map;Lnet/minecraft/src/ItemStack;)V=|p_82782_0_,p_82782_1_
+net/minecraft/src/EnchantmentHelper.func_90036_a(Lnet/minecraft/src/EntityLiving;)I=|p_90036_0_
 net/minecraft/src/EnchantmentKnockback.<init>(II)V=|p_i3715_1_,p_i3715_2_
 net/minecraft/src/EnchantmentKnockback.func_77317_b(I)I=|p_77317_1_
 net/minecraft/src/EnchantmentKnockback.func_77321_a(I)I=|p_77321_1_
@@ -2231,6 +2298,9 @@ net/minecraft/src/Entity.func_82141_a(Lnet/minecraft/src/Entity;Z)V=|p_82141_1_,
 net/minecraft/src/Entity.func_82142_c(Z)V=|p_82142_1_
 net/minecraft/src/Entity.func_82146_a(Lnet/minecraft/src/Explosion;Lnet/minecraft/src/Block;III)F=|p_82146_1_,p_82146_2_,p_82146_3_,p_82146_4_,p_82146_5_
 net/minecraft/src/Entity.func_82149_j(Lnet/minecraft/src/Entity;)V=|p_82149_1_
+net/minecraft/src/Entity.func_85029_a(Lnet/minecraft/src/CrashReportCategory;)V=|p_85029_1_
+net/minecraft/src/Entity.func_85030_a(Ljava/lang/String;FF)V=|p_85030_1_,p_85030_2_,p_85030_3_
+net/minecraft/src/Entity.func_85031_j(Lnet/minecraft/src/Entity;)Z=|p_85031_1_
 net/minecraft/src/EntityAIArrowAttack.<init>(Lnet/minecraft/src/IRangedAttackMob;FIF)V=|p_i5059_1_,p_i5059_2_,p_i5059_3_,p_i5059_4_
 net/minecraft/src/EntityAIAttackOnCollide.<init>(Lnet/minecraft/src/EntityLiving;FZ)V=|p_i3477_1_,p_i3477_2_,p_i3477_3_
 net/minecraft/src/EntityAIAttackOnCollide.<init>(Lnet/minecraft/src/EntityLiving;Ljava/lang/Class;FZ)V=|p_i3476_1_,p_i3476_2_,p_i3476_3_,p_i3476_4_
@@ -2291,6 +2361,7 @@ net/minecraft/src/EntityAITasks.func_75773_a(Lnet/minecraft/src/EntityAITaskEntr
 net/minecraft/src/EntityAITasks.func_75775_b(Lnet/minecraft/src/EntityAITaskEntry;)Z=|p_75775_1_
 net/minecraft/src/EntityAITasks.func_75776_a(ILnet/minecraft/src/EntityAIBase;)V=|p_75776_1_,p_75776_2_
 net/minecraft/src/EntityAITasks.func_75777_a(Lnet/minecraft/src/EntityAITaskEntry;Lnet/minecraft/src/EntityAITaskEntry;)Z=|p_75777_1_,p_75777_2_
+net/minecraft/src/EntityAITasks.func_85156_a(Lnet/minecraft/src/EntityAIBase;)V=|p_85156_1_
 net/minecraft/src/EntityAITempt.<init>(Lnet/minecraft/src/EntityCreature;FIZ)V=|p_i3495_1_,p_i3495_2_,p_i3495_3_,p_i3495_4_
 net/minecraft/src/EntityAITradePlayer.<init>(Lnet/minecraft/src/EntityVillager;)V=|p_i3496_1_
 net/minecraft/src/EntityAIVillagerMate.<init>(Lnet/minecraft/src/EntityVillager;)V=|p_i3475_1_
@@ -2301,6 +2372,7 @@ net/minecraft/src/EntityAIWatchClosest2.<init>(Lnet/minecraft/src/EntityLiving;L
 net/minecraft/src/EntityAgeable.<init>(Lnet/minecraft/src/World;)V=|p_i3436_1_
 net/minecraft/src/EntityAgeable.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityAgeable.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
+net/minecraft/src/EntityAgeable.func_70085_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_70085_1_
 net/minecraft/src/EntityAgeable.func_70873_a(I)V=|p_70873_1_
 net/minecraft/src/EntityAmbientCreature.<init>(Lnet/minecraft/src/World;)V=|p_i5062_1_
 net/minecraft/src/EntityAnimal.<init>(Lnet/minecraft/src/World;)V=|p_i3514_1_
@@ -2323,10 +2395,10 @@ net/minecraft/src/EntityArrow.func_70016_h(DDD)V=|p_70016_1_,p_70016_3_,p_70016_
 net/minecraft/src/EntityArrow.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
 net/minecraft/src/EntityArrow.func_70056_a(DDDFFI)V=|p_70056_1_,p_70056_3_,p_70056_5_,p_70056_7_,p_70056_8_,p_70056_9_
 net/minecraft/src/EntityArrow.func_70100_b_(Lnet/minecraft/src/EntityPlayer;)V=|p_70100_1_
+net/minecraft/src/EntityArrow.func_70186_c(DDDFF)V=|p_70186_1_,p_70186_3_,p_70186_5_,p_70186_7_,p_70186_8_
 net/minecraft/src/EntityArrow.func_70239_b(D)V=|p_70239_1_
 net/minecraft/src/EntityArrow.func_70240_a(I)V=|p_70240_1_
 net/minecraft/src/EntityArrow.func_70243_d(Z)V=|p_70243_1_
-net/minecraft/src/EntityArrow.func_70244_c(DDDFF)V=|p_70244_1_,p_70244_3_,p_70244_5_,p_70244_7_,p_70244_8_
 net/minecraft/src/EntityAuraFX.<init>(Lnet/minecraft/src/World;DDDDDD)V=|p_i3166_1_,p_i3166_2_,p_i3166_4_,p_i3166_6_,p_i3166_8_,p_i3166_10_,p_i3166_12_
 net/minecraft/src/EntityBat.<init>(Lnet/minecraft/src/World;)V=|p_i5063_1_
 net/minecraft/src/EntityBat.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
@@ -2334,6 +2406,7 @@ net/minecraft/src/EntityBat.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p
 net/minecraft/src/EntityBat.func_70064_a(DZ)V=|p_70064_1_,p_70064_3_
 net/minecraft/src/EntityBat.func_70069_a(F)V=|p_70069_1_
 net/minecraft/src/EntityBat.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_
+net/minecraft/src/EntityBat.func_82167_n(Lnet/minecraft/src/Entity;)V=|p_82167_1_
 net/minecraft/src/EntityBat.func_82236_f(Z)V=|p_82236_1_
 net/minecraft/src/EntityBlaze.<init>(Lnet/minecraft/src/World;)V=|p_i3545_1_
 net/minecraft/src/EntityBlaze.func_70013_c(F)F=|p_70013_1_
@@ -2369,7 +2442,8 @@ net/minecraft/src/EntityChicken.func_70036_a(IIII)V=|p_70036_1_,p_70036_2_,p_700
 net/minecraft/src/EntityChicken.func_70069_a(F)V=|p_70069_1_
 net/minecraft/src/EntityChicken.func_70628_a(ZI)V=|p_70628_1_,p_70628_2_
 net/minecraft/src/EntityChicken.func_70877_b(Lnet/minecraft/src/ItemStack;)Z=|p_70877_1_
-net/minecraft/src/EntityChicken.func_70879_a(Lnet/minecraft/src/EntityAnimal;)Lnet/minecraft/src/EntityAnimal;=|p_70879_1_
+net/minecraft/src/EntityChicken.func_70879_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityChicken;=|p_70879_1_
+net/minecraft/src/EntityChicken.func_90011_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityAgeable;=|p_90011_1_
 net/minecraft/src/EntityClientPlayerMP.<init>(Lnet/minecraft/client/Minecraft;Lnet/minecraft/src/World;Lnet/minecraft/src/Session;Lnet/minecraft/src/NetClientHandler;)V=|p_i3101_1_,p_i3101_2_,p_i3101_3_,p_i3101_4_
 net/minecraft/src/EntityClientPlayerMP.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_
 net/minecraft/src/EntityClientPlayerMP.func_70665_d(Lnet/minecraft/src/DamageSource;I)V=|p_70665_1_,p_70665_2_
@@ -2385,7 +2459,8 @@ net/minecraft/src/EntityCow.<init>(Lnet/minecraft/src/World;)V=|p_i3516_1_
 net/minecraft/src/EntityCow.func_70036_a(IIII)V=|p_70036_1_,p_70036_2_,p_70036_3_,p_70036_4_
 net/minecraft/src/EntityCow.func_70085_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_70085_1_
 net/minecraft/src/EntityCow.func_70628_a(ZI)V=|p_70628_1_,p_70628_2_
-net/minecraft/src/EntityCow.func_70879_a(Lnet/minecraft/src/EntityAnimal;)Lnet/minecraft/src/EntityAnimal;=|p_70879_1_
+net/minecraft/src/EntityCow.func_70879_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityCow;=|p_70879_1_
+net/minecraft/src/EntityCow.func_90011_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityAgeable;=|p_90011_1_
 net/minecraft/src/EntityCreature.<init>(Lnet/minecraft/src/World;)V=|p_i3450_1_
 net/minecraft/src/EntityCreature.func_70778_a(Lnet/minecraft/src/PathEntity;)V=|p_70778_1_
 net/minecraft/src/EntityCreature.func_70783_a(III)F=|p_70783_1_,p_70783_2_,p_70783_3_
@@ -2413,6 +2488,7 @@ net/minecraft/src/EntityDamageSourceIndirect.func_76360_b(Lnet/minecraft/src/Ent
 net/minecraft/src/EntityDiggingFX.<init>(Lnet/minecraft/src/World;DDDDDDLnet/minecraft/src/Block;II)V=|p_i3185_1_,p_i3185_2_,p_i3185_4_,p_i3185_6_,p_i3185_8_,p_i3185_10_,p_i3185_12_,p_i3185_14_,p_i3185_15_,p_i3185_16_
 net/minecraft/src/EntityDiggingFX.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/EntityDiggingFX.func_70596_a(III)Lnet/minecraft/src/EntityDiggingFX;=|p_70596_1_,p_70596_2_,p_70596_3_
+net/minecraft/src/EntityDiggingFX.func_90019_g(I)Lnet/minecraft/src/EntityDiggingFX;=|p_90019_1_
 net/minecraft/src/EntityDragon.<init>(Lnet/minecraft/src/World;)V=|p_i3531_1_
 net/minecraft/src/EntityDragon.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_
 net/minecraft/src/EntityDragon.func_70965_a(Lnet/minecraft/src/EntityDragonPart;Lnet/minecraft/src/DamageSource;I)Z=|p_70965_1_,p_70965_2_,p_70965_3_
@@ -2536,6 +2612,7 @@ net/minecraft/src/EntityHanging.func_70091_d(DDD)V=|p_70091_1_,p_70091_3_,p_7009
 net/minecraft/src/EntityHanging.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_
 net/minecraft/src/EntityHanging.func_70517_b(I)F=|p_70517_1_
 net/minecraft/src/EntityHanging.func_82328_a(I)V=|p_82328_1_
+net/minecraft/src/EntityHanging.func_85031_j(Lnet/minecraft/src/Entity;)Z=|p_85031_1_
 net/minecraft/src/EntityHeartFX.<init>(Lnet/minecraft/src/World;DDDDDD)V=|p_i3174_1_,p_i3174_2_,p_i3174_4_,p_i3174_6_,p_i3174_8_,p_i3174_10_,p_i3174_12_
 net/minecraft/src/EntityHeartFX.<init>(Lnet/minecraft/src/World;DDDDDDF)V=|p_i3175_1_,p_i3175_2_,p_i3175_4_,p_i3175_6_,p_i3175_8_,p_i3175_10_,p_i3175_12_,p_i3175_14_
 net/minecraft/src/EntityHeartFX.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_
@@ -2562,6 +2639,7 @@ net/minecraft/src/EntityItem.func_70081_e(I)V=|p_70081_1_
 net/minecraft/src/EntityItem.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_
 net/minecraft/src/EntityItem.func_70100_b_(Lnet/minecraft/src/EntityPlayer;)V=|p_70100_1_
 net/minecraft/src/EntityItem.func_70289_a(Lnet/minecraft/src/EntityItem;)Z=|p_70289_1_
+net/minecraft/src/EntityItem.func_71027_c(I)V=|p_71027_1_
 net/minecraft/src/EntityItemFrame.<init>(Lnet/minecraft/src/World;)V=|p_i5055_1_
 net/minecraft/src/EntityItemFrame.<init>(Lnet/minecraft/src/World;IIII)V=|p_i5056_1_,p_i5056_2_,p_i5056_3_,p_i5056_4_,p_i5056_5_
 net/minecraft/src/EntityItemFrame.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
@@ -2594,6 +2672,7 @@ net/minecraft/src/EntityList.func_75618_a(Ljava/lang/Class;Ljava/lang/String;I)V
 net/minecraft/src/EntityList.func_75619_a(Lnet/minecraft/src/Entity;)I=|p_75619_0_
 net/minecraft/src/EntityList.func_75620_a(Ljava/lang/String;Lnet/minecraft/src/World;)Lnet/minecraft/src/Entity;=|p_75620_0_,p_75620_1_
 net/minecraft/src/EntityList.func_75621_b(Lnet/minecraft/src/Entity;)Ljava/lang/String;=|p_75621_0_
+net/minecraft/src/EntityList.func_90035_a(I)Ljava/lang/Class;=|p_90035_0_
 net/minecraft/src/EntityLiving.<init>(Lnet/minecraft/src/World;)V=|p_i3443_1_
 net/minecraft/src/EntityLiving.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityLiving.func_70034_d(F)V=|p_70034_1_
@@ -2654,6 +2733,7 @@ net/minecraft/src/EntityLiving.func_82165_m(I)Z=|p_82165_1_
 net/minecraft/src/EntityLiving.func_82167_n(Lnet/minecraft/src/Entity;)V=|p_82167_1_
 net/minecraft/src/EntityLiving.func_82169_q(I)Lnet/minecraft/src/ItemStack;=|p_82169_1_
 net/minecraft/src/EntityLiving.func_82170_o(I)V=|p_82170_1_
+net/minecraft/src/EntityLiving.func_85034_r(I)V=|p_85034_1_
 net/minecraft/src/EntityLookHelper.<init>(Lnet/minecraft/src/EntityLiving;)V=|p_i3455_1_
 net/minecraft/src/EntityLookHelper.func_75650_a(DDDFF)V=|p_75650_1_,p_75650_3_,p_75650_5_,p_75650_7_,p_75650_8_
 net/minecraft/src/EntityLookHelper.func_75651_a(Lnet/minecraft/src/Entity;FF)V=|p_75651_1_,p_75651_2_,p_75651_3_
@@ -2693,7 +2773,9 @@ net/minecraft/src/EntityMob.func_70785_a(Lnet/minecraft/src/Entity;F)V=|p_70785_
 net/minecraft/src/EntityMob.func_82193_c(Lnet/minecraft/src/Entity;)I=|p_82193_1_
 net/minecraft/src/EntityMooshroom.<init>(Lnet/minecraft/src/World;)V=|p_i3518_1_
 net/minecraft/src/EntityMooshroom.func_70085_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_70085_1_
-net/minecraft/src/EntityMooshroom.func_70879_a(Lnet/minecraft/src/EntityAnimal;)Lnet/minecraft/src/EntityAnimal;=|p_70879_1_
+net/minecraft/src/EntityMooshroom.func_70879_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityCow;=|p_70879_1_
+net/minecraft/src/EntityMooshroom.func_70879_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityMooshroom;=|p_70879_1_
+net/minecraft/src/EntityMooshroom.func_90011_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityAgeable;=|p_90011_1_
 net/minecraft/src/EntityMoveHelper.<init>(Lnet/minecraft/src/EntityLiving;)V=|p_i3456_1_
 net/minecraft/src/EntityMoveHelper.func_75639_a(FFF)F=|p_75639_1_,p_75639_2_,p_75639_3_
 net/minecraft/src/EntityMoveHelper.func_75642_a(DDDF)V=|p_75642_1_,p_75642_3_,p_75642_5_,p_75642_7_
@@ -2710,8 +2792,9 @@ net/minecraft/src/EntityOcelot.func_70628_a(ZI)V=|p_70628_1_,p_70628_2_
 net/minecraft/src/EntityOcelot.func_70652_k(Lnet/minecraft/src/Entity;)Z=|p_70652_1_
 net/minecraft/src/EntityOcelot.func_70877_b(Lnet/minecraft/src/ItemStack;)Z=|p_70877_1_
 net/minecraft/src/EntityOcelot.func_70878_b(Lnet/minecraft/src/EntityAnimal;)Z=|p_70878_1_
-net/minecraft/src/EntityOcelot.func_70879_a(Lnet/minecraft/src/EntityAnimal;)Lnet/minecraft/src/EntityAnimal;=|p_70879_1_
+net/minecraft/src/EntityOcelot.func_70879_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityOcelot;=|p_70879_1_
 net/minecraft/src/EntityOcelot.func_70912_b(I)V=|p_70912_1_
+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_i3117_1_,p_i3117_2_
 net/minecraft/src/EntityOtherPlayerMP.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
 net/minecraft/src/EntityOtherPlayerMP.func_70006_a(Ljava/lang/String;)V=|p_70006_1_
@@ -2734,8 +2817,9 @@ net/minecraft/src/EntityPig.func_70077_a(Lnet/minecraft/src/EntityLightningBolt;
 net/minecraft/src/EntityPig.func_70085_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_70085_1_
 net/minecraft/src/EntityPig.func_70628_a(ZI)V=|p_70628_1_,p_70628_2_
 net/minecraft/src/EntityPig.func_70877_b(Lnet/minecraft/src/ItemStack;)Z=|p_70877_1_
-net/minecraft/src/EntityPig.func_70879_a(Lnet/minecraft/src/EntityAnimal;)Lnet/minecraft/src/EntityAnimal;=|p_70879_1_
+net/minecraft/src/EntityPig.func_70879_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityPig;=|p_70879_1_
 net/minecraft/src/EntityPig.func_70900_e(Z)V=|p_70900_1_
+net/minecraft/src/EntityPig.func_90011_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityAgeable;=|p_90011_1_
 net/minecraft/src/EntityPigZombie.<init>(Lnet/minecraft/src/World;)V=|p_i3553_1_
 net/minecraft/src/EntityPigZombie.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityPigZombie.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
@@ -2808,6 +2892,9 @@ net/minecraft/src/EntityPlayer.func_82242_a(I)V=|p_82242_1_
 net/minecraft/src/EntityPlayer.func_82244_d(III)V=|p_82244_1_,p_82244_2_,p_82244_3_
 net/minecraft/src/EntityPlayer.func_82246_f(III)Z=|p_82246_1_,p_82246_2_,p_82246_3_
 net/minecraft/src/EntityPlayer.func_82247_a(IIIILnet/minecraft/src/ItemStack;)Z=|p_82247_1_,p_82247_2_,p_82247_3_,p_82247_4_,p_82247_5_
+net/minecraft/src/EntityPlayer.func_85030_a(Ljava/lang/String;FF)V=|p_85030_1_,p_85030_2_,p_85030_3_
+net/minecraft/src/EntityPlayer.func_85039_t(I)V=|p_85039_1_
+net/minecraft/src/EntityPlayer.func_85040_s(I)V=|p_85040_1_
 net/minecraft/src/EntityPlayerMP.<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/src/World;Ljava/lang/String;Lnet/minecraft/src/ItemInWorldManager;)V=|p_i3396_1_,p_i3396_2_,p_i3396_3_,p_i3396_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(Ljava/lang/String;)V=|p_70006_1_
@@ -2853,9 +2940,7 @@ net/minecraft/src/EntityPlayerMP.func_82244_d(III)V=|p_82244_1_,p_82244_2_,p_822
 net/minecraft/src/EntityPlayerSP.<init>(Lnet/minecraft/client/Minecraft;Lnet/minecraft/src/World;Lnet/minecraft/src/Session;I)V=|p_i3116_1_,p_i3116_2_,p_i3116_3_,p_i3116_4_
 net/minecraft/src/EntityPlayerSP.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
 net/minecraft/src/EntityPlayerSP.func_70006_a(Ljava/lang/String;)V=|p_70006_1_
-net/minecraft/src/EntityPlayerSP.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntityPlayerSP.func_70031_b(Z)V=|p_70031_1_
-net/minecraft/src/EntityPlayerSP.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
 net/minecraft/src/EntityPlayerSP.func_70048_i(DDD)Z=|p_70048_1_,p_70048_3_,p_70048_5_
 net/minecraft/src/EntityPlayerSP.func_70091_d(DDD)V=|p_70091_1_,p_70091_3_,p_70091_5_
 net/minecraft/src/EntityPlayerSP.func_71001_a(Lnet/minecraft/src/Entity;I)V=|p_71001_1_,p_71001_2_
@@ -2877,6 +2962,7 @@ net/minecraft/src/EntityPlayerSP.func_71152_a(FII)V=|p_71152_1_,p_71152_2_,p_711
 net/minecraft/src/EntityPlayerSP.func_71153_f(III)Z=|p_71153_1_,p_71153_2_,p_71153_3_
 net/minecraft/src/EntityPlayerSP.func_82240_a(Lnet/minecraft/src/TileEntityBeacon;)V=|p_82240_1_
 net/minecraft/src/EntityPlayerSP.func_82244_d(III)V=|p_82244_1_,p_82244_2_,p_82244_3_
+net/minecraft/src/EntityPlayerSP.func_85030_a(Ljava/lang/String;FF)V=|p_85030_1_,p_85030_2_,p_85030_3_
 net/minecraft/src/EntityPortalFX.<init>(Lnet/minecraft/src/World;DDDDDD)V=|p_i3177_1_,p_i3177_2_,p_i3177_4_,p_i3177_6_,p_i3177_8_,p_i3177_10_,p_i3177_12_
 net/minecraft/src/EntityPortalFX.func_70013_c(F)F=|p_70013_1_
 net/minecraft/src/EntityPortalFX.func_70070_b(F)I=|p_70070_1_
@@ -2914,6 +3000,7 @@ net/minecraft/src/EntityRenderer.func_78482_e(F)V=|p_78482_1_
 net/minecraft/src/EntityRenderer.func_78483_a(D)V=|p_78483_1_
 net/minecraft/src/EntityRenderer.func_82829_a(Lnet/minecraft/src/RenderGlobal;F)V=|p_82829_1_,p_82829_2_
 net/minecraft/src/EntityRenderer.func_82830_a(Lnet/minecraft/src/EntityPlayer;F)F=|p_82830_1_,p_82830_2_
+net/minecraft/src/EntityRenderer.func_90030_a(Lnet/minecraft/src/EntityRenderer;)Lnet/minecraft/client/Minecraft;=|p_90030_0_
 net/minecraft/src/EntitySenses.<init>(Lnet/minecraft/src/EntityLiving;)V=|p_i3508_1_
 net/minecraft/src/EntitySenses.func_75522_a(Lnet/minecraft/src/Entity;)Z=|p_75522_1_
 net/minecraft/src/EntitySheep.<init>(Lnet/minecraft/src/World;)V=|p_i3521_1_
@@ -2923,12 +3010,15 @@ net/minecraft/src/EntitySheep.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=
 net/minecraft/src/EntitySheep.func_70085_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_70085_1_
 net/minecraft/src/EntitySheep.func_70103_a(B)V=|p_70103_1_
 net/minecraft/src/EntitySheep.func_70628_a(ZI)V=|p_70628_1_,p_70628_2_
-net/minecraft/src/EntitySheep.func_70879_a(Lnet/minecraft/src/EntityAnimal;)Lnet/minecraft/src/EntityAnimal;=|p_70879_1_
 net/minecraft/src/EntitySheep.func_70890_k(F)F=|p_70890_1_
 net/minecraft/src/EntitySheep.func_70891_b(I)V=|p_70891_1_
 net/minecraft/src/EntitySheep.func_70893_e(Z)V=|p_70893_1_
 net/minecraft/src/EntitySheep.func_70894_j(F)F=|p_70894_1_
 net/minecraft/src/EntitySheep.func_70895_a(Ljava/util/Random;)I=|p_70895_0_
+net/minecraft/src/EntitySheep.func_90011_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityAgeable;=|p_90011_1_
+net/minecraft/src/EntitySheep.func_90013_b(Lnet/minecraft/src/EntityAnimal;)I=|p_90013_1_
+net/minecraft/src/EntitySheep.func_90014_a(Lnet/minecraft/src/EntityAnimal;Lnet/minecraft/src/EntityAnimal;)I=|p_90014_1_,p_90014_2_
+net/minecraft/src/EntitySheep.func_90015_b(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntitySheep;=|p_90015_1_
 net/minecraft/src/EntitySilverfish.<init>(Lnet/minecraft/src/World;)V=|p_i3554_1_
 net/minecraft/src/EntitySilverfish.func_70036_a(IIII)V=|p_70036_1_,p_70036_2_,p_70036_3_,p_70036_4_
 net/minecraft/src/EntitySilverfish.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_
@@ -2939,6 +3029,7 @@ net/minecraft/src/EntitySkeleton.<init>(Lnet/minecraft/src/World;)V=|p_i3555_1_
 net/minecraft/src/EntitySkeleton.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
 net/minecraft/src/EntitySkeleton.func_70036_a(IIII)V=|p_70036_1_,p_70036_2_,p_70036_3_,p_70036_4_
 net/minecraft/src/EntitySkeleton.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
+net/minecraft/src/EntitySkeleton.func_70062_b(ILnet/minecraft/src/ItemStack;)V=|p_70062_1_,p_70062_2_
 net/minecraft/src/EntitySkeleton.func_70600_l(I)V=|p_70600_1_
 net/minecraft/src/EntitySkeleton.func_70628_a(ZI)V=|p_70628_1_,p_70628_2_
 net/minecraft/src/EntitySkeleton.func_70645_a(Lnet/minecraft/src/DamageSource;)V=|p_70645_1_
@@ -2976,7 +3067,7 @@ net/minecraft/src/EntitySpellParticleFX.<init>(Lnet/minecraft/src/World;DDDDDD)V
 net/minecraft/src/EntitySpellParticleFX.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/EntitySpellParticleFX.func_70589_b(I)V=|p_70589_1_
 net/minecraft/src/EntitySpider.<init>(Lnet/minecraft/src/World;)V=|p_i3557_1_
-net/minecraft/src/EntitySpider.func_70041_e_(IIII)V=|p_70041_1_,p_70041_2_,p_70041_3_,p_70041_4_
+net/minecraft/src/EntitySpider.func_70036_a(IIII)V=|p_70036_1_,p_70036_2_,p_70036_3_,p_70036_4_
 net/minecraft/src/EntitySpider.func_70628_a(ZI)V=|p_70628_1_,p_70628_2_
 net/minecraft/src/EntitySpider.func_70687_e(Lnet/minecraft/src/PotionEffect;)Z=|p_70687_1_
 net/minecraft/src/EntitySpider.func_70785_a(Lnet/minecraft/src/Entity;F)V=|p_70785_1_,p_70785_2_
@@ -3014,6 +3105,7 @@ net/minecraft/src/EntityTracker.func_72787_a(Lnet/minecraft/src/EntityPlayerMP;)
 net/minecraft/src/EntityTracker.func_72789_b(Lnet/minecraft/src/Entity;Lnet/minecraft/src/Packet;)V=|p_72789_1_,p_72789_2_
 net/minecraft/src/EntityTracker.func_72790_b(Lnet/minecraft/src/Entity;)V=|p_72790_1_
 net/minecraft/src/EntityTracker.func_72791_a(Lnet/minecraft/src/Entity;II)V=|p_72791_1_,p_72791_2_,p_72791_3_
+net/minecraft/src/EntityTracker.func_85172_a(Lnet/minecraft/src/EntityPlayerMP;Lnet/minecraft/src/Chunk;)V=|p_85172_1_,p_85172_2_
 net/minecraft/src/EntityTrackerEntry.<init>(Lnet/minecraft/src/Entity;IIZ)V=|p_i3398_1_,p_i3398_2_,p_i3398_3_,p_i3398_4_
 net/minecraft/src/EntityTrackerEntry.equals(Ljava/lang/Object;)Z=|p_equals_1_
 net/minecraft/src/EntityTrackerEntry.func_73116_b(Lnet/minecraft/src/Packet;)V=|p_73116_1_
@@ -3047,6 +3139,8 @@ net/minecraft/src/EntityVillager.func_70949_b(Lnet/minecraft/src/MerchantRecipeL
 net/minecraft/src/EntityVillager.func_70950_c(I)V=|p_70950_1_
 net/minecraft/src/EntityVillager.func_70951_a(ILjava/util/Random;)Lnet/minecraft/src/ItemStack;=|p_70951_0_,p_70951_1_
 net/minecraft/src/EntityVillager.func_82188_j(F)F=|p_82188_1_
+net/minecraft/src/EntityVillager.func_90011_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityAgeable;=|p_90011_1_
+net/minecraft/src/EntityVillager.func_90012_b(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityVillager;=|p_90012_1_
 net/minecraft/src/EntityWaterMob.<init>(Lnet/minecraft/src/World;)V=|p_i3525_1_
 net/minecraft/src/EntityWaterMob.func_70693_a(Lnet/minecraft/src/EntityPlayer;)I=|p_70693_1_
 net/minecraft/src/EntityWeatherEffect.<init>(Lnet/minecraft/src/World;)V=|p_i3532_1_
@@ -3086,8 +3180,8 @@ net/minecraft/src/EntityWitherSkull.func_82146_a(Lnet/minecraft/src/Explosion;Ln
 net/minecraft/src/EntityWitherSkull.func_82343_e(Z)V=|p_82343_1_
 net/minecraft/src/EntityWolf.<init>(Lnet/minecraft/src/World;)V=|p_i3526_1_
 net/minecraft/src/EntityWolf.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
+net/minecraft/src/EntityWolf.func_70036_a(IIII)V=|p_70036_1_,p_70036_2_,p_70036_3_,p_70036_4_
 net/minecraft/src/EntityWolf.func_70037_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70037_1_
-net/minecraft/src/EntityWolf.func_70041_e_(IIII)V=|p_70041_1_,p_70041_2_,p_70041_3_,p_70041_4_
 net/minecraft/src/EntityWolf.func_70085_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_70085_1_
 net/minecraft/src/EntityWolf.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p_70097_1_,p_70097_2_
 net/minecraft/src/EntityWolf.func_70103_a(B)V=|p_70103_1_
@@ -3095,13 +3189,14 @@ net/minecraft/src/EntityWolf.func_70624_b(Lnet/minecraft/src/EntityLiving;)V=|p_
 net/minecraft/src/EntityWolf.func_70652_k(Lnet/minecraft/src/Entity;)Z=|p_70652_1_
 net/minecraft/src/EntityWolf.func_70877_b(Lnet/minecraft/src/ItemStack;)Z=|p_70877_1_
 net/minecraft/src/EntityWolf.func_70878_b(Lnet/minecraft/src/EntityAnimal;)Z=|p_70878_1_
-net/minecraft/src/EntityWolf.func_70879_a(Lnet/minecraft/src/EntityAnimal;)Lnet/minecraft/src/EntityAnimal;=|p_70879_1_
+net/minecraft/src/EntityWolf.func_70879_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityWolf;=|p_70879_1_
 net/minecraft/src/EntityWolf.func_70915_j(F)F=|p_70915_1_
 net/minecraft/src/EntityWolf.func_70916_h(Z)V=|p_70916_1_
 net/minecraft/src/EntityWolf.func_70917_k(F)F=|p_70917_1_
 net/minecraft/src/EntityWolf.func_70918_i(Z)V=|p_70918_1_
 net/minecraft/src/EntityWolf.func_70923_f(FF)F=|p_70923_1_,p_70923_2_
 net/minecraft/src/EntityWolf.func_82185_r(I)V=|p_82185_1_
+net/minecraft/src/EntityWolf.func_90011_a(Lnet/minecraft/src/EntityAgeable;)Lnet/minecraft/src/EntityAgeable;=|p_90011_1_
 net/minecraft/src/EntityXPOrb.<init>(Lnet/minecraft/src/World;)V=|p_i3441_1_
 net/minecraft/src/EntityXPOrb.<init>(Lnet/minecraft/src/World;DDDI)V=|p_i3440_1_,p_i3440_2_,p_i3440_4_,p_i3440_6_,p_i3440_8_
 net/minecraft/src/EntityXPOrb.func_70014_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70014_1_
@@ -3212,14 +3307,14 @@ net/minecraft/src/FontRenderer.func_78272_b(C)Z=|p_78272_0_
 net/minecraft/src/FontRenderer.func_78273_d(Ljava/lang/String;)Ljava/lang/String;=|p_78273_1_
 net/minecraft/src/FontRenderer.func_78274_b(Ljava/lang/String;IIIIZ)I=|p_78274_1_,p_78274_2_,p_78274_3_,p_78274_4_,p_78274_5_,p_78274_6_
 net/minecraft/src/FontRenderer.func_78275_b(Z)V=|p_78275_1_
-net/minecraft/src/FontRenderer.func_78276_b(Ljava/lang/String;III)V=|p_78276_1_,p_78276_2_,p_78276_3_,p_78276_4_
+net/minecraft/src/FontRenderer.func_78276_b(Ljava/lang/String;III)I=|p_78276_1_,p_78276_2_,p_78276_3_,p_78276_4_
 net/minecraft/src/FontRenderer.func_78277_a(CZ)F=|p_78277_1_,p_78277_2_
 net/minecraft/src/FontRenderer.func_78278_a(ICZ)F=|p_78278_1_,p_78278_2_,p_78278_3_
 net/minecraft/src/FontRenderer.func_78279_b(Ljava/lang/String;IIII)V=|p_78279_1_,p_78279_2_,p_78279_3_,p_78279_4_,p_78279_5_
 net/minecraft/src/FontRenderer.func_78280_d(Ljava/lang/String;I)Ljava/lang/String;=|p_78280_1_,p_78280_2_
-net/minecraft/src/FontRenderer.func_78281_c(Ljava/lang/String;IIII)V=|p_78281_1_,p_78281_2_,p_78281_3_,p_78281_4_,p_78281_5_
 net/minecraft/src/FontRenderer.func_78282_e(Ljava/lang/String;)Ljava/lang/String;=|p_78282_0_
 net/minecraft/src/FontRenderer.func_78283_c(Ljava/lang/String;)Ljava/lang/String;=|p_78283_1_
+net/minecraft/src/FontRenderer.func_85187_a(Ljava/lang/String;IIIZ)I=|p_85187_1_,p_85187_2_,p_85187_3_,p_85187_4_,p_85187_5_
 net/minecraft/src/FoodStats.func_75111_a(Lnet/minecraft/src/ItemFood;)V=|p_75111_1_
 net/minecraft/src/FoodStats.func_75112_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_75112_1_
 net/minecraft/src/FoodStats.func_75113_a(F)V=|p_75113_1_
@@ -3386,6 +3481,7 @@ net/minecraft/src/GuiContainer.<init>(Lnet/minecraft/src/Container;)V=|p_i3079_1
 net/minecraft/src/GuiContainer.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiContainer.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiContainer.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
+net/minecraft/src/GuiContainer.func_73879_b(III)V=|p_73879_1_,p_73879_2_,p_73879_3_
 net/minecraft/src/GuiContainer.func_74184_a(Lnet/minecraft/src/ItemStack;II)V=|p_74184_1_,p_74184_2_,p_74184_3_
 net/minecraft/src/GuiContainer.func_74186_a(Lnet/minecraft/src/Slot;II)Z=|p_74186_1_,p_74186_2_,p_74186_3_
 net/minecraft/src/GuiContainer.func_74187_b(II)Lnet/minecraft/src/Slot;=|p_74187_1_,p_74187_2_
@@ -3395,6 +3491,8 @@ net/minecraft/src/GuiContainer.func_74190_a(Ljava/lang/String;II)V=|p_74190_1_,p
 net/minecraft/src/GuiContainer.func_74191_a(Lnet/minecraft/src/Slot;III)V=|p_74191_1_,p_74191_2_,p_74191_3_,p_74191_4_
 net/minecraft/src/GuiContainer.func_74192_a(Lnet/minecraft/src/Slot;)V=|p_74192_1_
 net/minecraft/src/GuiContainer.func_82319_a(I)Z=|p_82319_1_
+net/minecraft/src/GuiContainer.func_85041_a(IIIJ)V=|p_85041_1_,p_85041_2_,p_85041_3_,p_85041_4_
+net/minecraft/src/GuiContainer.func_85044_b(Lnet/minecraft/src/ItemStack;II)V=|p_85044_1_,p_85044_2_,p_85044_3_
 net/minecraft/src/GuiContainerCreative.<init>(Lnet/minecraft/src/EntityPlayer;)V=|p_i3083_1_
 net/minecraft/src/GuiContainerCreative.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiContainerCreative.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
@@ -3585,6 +3683,7 @@ net/minecraft/src/GuiScreen.func_73872_a(Lnet/minecraft/client/Minecraft;II)V=|p
 net/minecraft/src/GuiScreen.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
 net/minecraft/src/GuiScreen.func_73878_a(ZI)V=|p_73878_1_,p_73878_2_
 net/minecraft/src/GuiScreen.func_73879_b(III)V=|p_73879_1_,p_73879_2_,p_73879_3_
+net/minecraft/src/GuiScreen.func_85041_a(IIIJ)V=|p_85041_1_,p_85041_2_,p_85041_3_,p_85041_4_
 net/minecraft/src/GuiScreenAddServer.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/ServerData;)V=|p_i3049_1_,p_i3049_2_
 net/minecraft/src/GuiScreenAddServer.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenAddServer.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
@@ -3815,6 +3914,7 @@ net/minecraft/src/IntHashMapEntry.<init>(IILjava/lang/Object;Lnet/minecraft/src/
 net/minecraft/src/IntHashMapEntry.equals(Ljava/lang/Object;)Z=|p_equals_1_
 net/minecraft/src/IntegratedPlayerList.<init>(Lnet/minecraft/src/IntegratedServer;)V=|p_i3125_1_
 net/minecraft/src/IntegratedPlayerList.func_72391_b(Lnet/minecraft/src/EntityPlayerMP;)V=|p_72391_1_
+net/minecraft/src/IntegratedPlayerList.func_72399_a(Ljava/net/SocketAddress;Ljava/lang/String;)Ljava/lang/String;=|p_72399_1_,p_72399_2_
 net/minecraft/src/IntegratedServer.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/src/WorldSettings;)V=|p_i3118_1_,p_i3118_2_,p_i3118_3_,p_i3118_4_
 net/minecraft/src/IntegratedServer.func_70000_a(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_70000_1_
 net/minecraft/src/IntegratedServer.func_71197_b()Z=java/io/IOException|
@@ -3855,6 +3955,7 @@ net/minecraft/src/InventoryLargeChest.func_70299_a(ILnet/minecraft/src/ItemStack
 net/minecraft/src/InventoryLargeChest.func_70300_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_70300_1_
 net/minecraft/src/InventoryLargeChest.func_70301_a(I)Lnet/minecraft/src/ItemStack;=|p_70301_1_
 net/minecraft/src/InventoryLargeChest.func_70304_b(I)Lnet/minecraft/src/ItemStack;=|p_70304_1_
+net/minecraft/src/InventoryLargeChest.func_90010_a(Lnet/minecraft/src/IInventory;)Z=|p_90010_1_
 net/minecraft/src/InventoryMerchant.<init>(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/IMerchant;)V=|p_i3612_1_,p_i3612_2_
 net/minecraft/src/InventoryMerchant.func_70298_a(II)Lnet/minecraft/src/ItemStack;=|p_70298_1_,p_70298_2_
 net/minecraft/src/InventoryMerchant.func_70299_a(ILnet/minecraft/src/ItemStack;)V=|p_70299_1_,p_70299_2_
@@ -4071,7 +4172,7 @@ net/minecraft/src/ItemMonsterPlacer.func_77618_c(II)I=|p_77618_1_,p_77618_2_
 net/minecraft/src/ItemMonsterPlacer.func_77628_j(Lnet/minecraft/src/ItemStack;)Ljava/lang/String;=|p_77628_1_
 net/minecraft/src/ItemMonsterPlacer.func_77633_a(ILnet/minecraft/src/CreativeTabs;Ljava/util/List;)V=|p_77633_1_,p_77633_2_,p_77633_3_
 net/minecraft/src/ItemMonsterPlacer.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_
-net/minecraft/src/ItemMonsterPlacer.func_77840_a(Lnet/minecraft/src/World;IDDD)Z=|p_77840_0_,p_77840_1_,p_77840_2_,p_77840_4_,p_77840_6_
+net/minecraft/src/ItemMonsterPlacer.func_77840_a(Lnet/minecraft/src/World;IDDD)Lnet/minecraft/src/Entity;=|p_77840_0_,p_77840_1_,p_77840_2_,p_77840_4_,p_77840_6_
 net/minecraft/src/ItemMonsterPlacer.func_82790_a(Lnet/minecraft/src/ItemStack;I)I=|p_82790_1_,p_82790_2_
 net/minecraft/src/ItemMultiTextureTile.<init>(ILnet/minecraft/src/Block;[Ljava/lang/String;)V=|p_i5085_1_,p_i5085_2_,p_i5085_3_
 net/minecraft/src/ItemMultiTextureTile.func_77617_a(I)I=|p_77617_1_
@@ -4104,6 +4205,7 @@ net/minecraft/src/ItemRecord.<init>(ILjava/lang/String;)V=|p_i3677_1_,p_i3677_2_
 net/minecraft/src/ItemRecord.func_77613_e(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/EnumRarity;=|p_77613_1_
 net/minecraft/src/ItemRecord.func_77624_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Ljava/util/List;Z)V=|p_77624_1_,p_77624_2_,p_77624_3_,p_77624_4_
 net/minecraft/src/ItemRecord.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_
+net/minecraft/src/ItemRecord.func_90042_d(Ljava/lang/String;)Lnet/minecraft/src/ItemRecord;=|p_90042_0_
 net/minecraft/src/ItemRedstone.<init>(I)V=|p_i3678_1_
 net/minecraft/src/ItemRedstone.func_77648_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z=|p_77648_1_,p_77648_2_,p_77648_3_,p_77648_4_,p_77648_5_,p_77648_6_,p_77648_7_,p_77648_8_,p_77648_9_,p_77648_10_
 net/minecraft/src/ItemReed.<init>(ILnet/minecraft/src/Block;)V=|p_i3691_1_,p_i3691_2_
@@ -4354,6 +4456,7 @@ net/minecraft/src/ModelBase.func_78085_a(Ljava/lang/String;II)V=|p_78085_1_,p_78
 net/minecraft/src/ModelBase.func_78086_a(Lnet/minecraft/src/EntityLiving;FFF)V=|p_78086_1_,p_78086_2_,p_78086_3_,p_78086_4_
 net/minecraft/src/ModelBase.func_78087_a(FFFFFFLnet/minecraft/src/Entity;)V=|p_78087_1_,p_78087_2_,p_78087_3_,p_78087_4_,p_78087_5_,p_78087_6_,p_78087_7_
 net/minecraft/src/ModelBase.func_78088_a(Lnet/minecraft/src/Entity;FFFFFF)V=|p_78088_1_,p_78088_2_,p_78088_3_,p_78088_4_,p_78088_5_,p_78088_6_,p_78088_7_
+net/minecraft/src/ModelBase.func_85181_a(Ljava/util/Random;)Lnet/minecraft/src/ModelRenderer;=|p_85181_1_
 net/minecraft/src/ModelBat.func_78088_a(Lnet/minecraft/src/Entity;FFFFFF)V=|p_78088_1_,p_78088_2_,p_78088_3_,p_78088_4_,p_78088_5_,p_78088_6_,p_78088_7_
 net/minecraft/src/ModelBiped.<init>(F)V=|p_i3134_1_
 net/minecraft/src/ModelBiped.<init>(FFII)V=|p_i5021_1_,p_i5021_2_,p_i5021_3_,p_i5021_4_
@@ -4451,7 +4554,7 @@ net/minecraft/src/ModelZombie.func_78087_a(FFFFFFLnet/minecraft/src/Entity;)V=|p
 net/minecraft/src/ModelZombieVillager.<init>(FFZ)V=|p_i5020_1_,p_i5020_2_,p_i5020_3_
 net/minecraft/src/ModelZombieVillager.func_78087_a(FFFFFFLnet/minecraft/src/Entity;)V=|p_78087_1_,p_78087_2_,p_78087_3_,p_78087_4_,p_78087_5_,p_78087_6_,p_78087_7_
 net/minecraft/src/MouseFilter.func_76333_a(FF)F=|p_76333_1_,p_76333_2_
-net/minecraft/src/MouseHelper.<init>(Ljava/awt/Component;)V=|p_i3015_1_
+net/minecraft/src/MouseHelper.<init>(Ljava/awt/Component;Lnet/minecraft/src/GameSettings;)V=|p_i6800_1_,p_i6800_2_
 net/minecraft/src/MovementInputFromOptions.<init>(Lnet/minecraft/src/GameSettings;)V=|p_i3115_1_
 net/minecraft/src/MovingObjectPosition.<init>(IIIILnet/minecraft/src/Vec3;)V=|p_i4032_1_,p_i4032_2_,p_i4032_3_,p_i4032_4_,p_i4032_5_
 net/minecraft/src/MovingObjectPosition.<init>(Lnet/minecraft/src/Entity;)V=|p_i4033_1_
@@ -5177,6 +5280,7 @@ net/minecraft/src/PlayerControllerMP.func_78764_a(Lnet/minecraft/src/EntityPlaye
 net/minecraft/src/PlayerControllerMP.func_78766_c(Lnet/minecraft/src/EntityPlayer;)V=|p_78766_1_
 net/minecraft/src/PlayerControllerMP.func_78768_b(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/Entity;)Z=|p_78768_1_,p_78768_2_
 net/minecraft/src/PlayerControllerMP.func_78769_a(Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;Lnet/minecraft/src/ItemStack;)Z=|p_78769_1_,p_78769_2_,p_78769_3_
+net/minecraft/src/PlayerControllerMP.func_85182_a(III)Z=|p_85182_1_,p_85182_2_,p_85182_3_
 net/minecraft/src/PlayerInstance.<init>(Lnet/minecraft/src/PlayerManager;II)V=|p_i3391_1_,p_i3391_2_,p_i3391_3_
 net/minecraft/src/PlayerInstance.func_73252_b(Lnet/minecraft/src/EntityPlayerMP;)V=|p_73252_1_
 net/minecraft/src/PlayerInstance.func_73253_a(Lnet/minecraft/src/PlayerInstance;)Lnet/minecraft/src/ChunkCoordIntPair;=|p_73253_0_
@@ -5224,6 +5328,7 @@ net/minecraft/src/PlayerUsageSnooper.func_76473_a(Lnet/minecraft/src/PlayerUsage
 net/minecraft/src/PlayerUsageSnooper.func_76474_b(Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/lang/Object;=|p_76474_0_
 net/minecraft/src/PlayerUsageSnooper.func_76475_e(Lnet/minecraft/src/PlayerUsageSnooper;)Ljava/net/URL;=|p_76475_0_
 net/minecraft/src/PlayerUsageSnooperThread.<init>(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_i3427_1_
+net/minecraft/src/PortalPosition.<init>(Lnet/minecraft/src/Teleporter;IIIJ)V=|p_i6815_1_,p_i6815_2_,p_i6815_3_,p_i6815_4_,p_i6815_5_
 net/minecraft/src/PositionImpl.<init>(DDD)V=|p_i5028_1_,p_i5028_3_,p_i5028_5_
 net/minecraft/src/PositionTextureVertex.<init>(FFFFF)V=|p_i3140_1_,p_i3140_2_,p_i3140_3_,p_i3140_4_,p_i3140_5_
 net/minecraft/src/PositionTextureVertex.<init>(Lnet/minecraft/src/PositionTextureVertex;FF)V=|p_i3141_1_,p_i3141_2_,p_i3141_3_
@@ -5463,6 +5568,10 @@ net/minecraft/src/RenderBlocks.func_82777_a(Lnet/minecraft/src/BlockAnvil;IIIIFF
 net/minecraft/src/RenderBlocks.func_82778_a(Lnet/minecraft/src/BlockBeacon;III)Z=|p_82778_1_,p_82778_2_,p_82778_3_,p_82778_4_
 net/minecraft/src/RenderBlocks.func_82779_a(Lnet/minecraft/src/BlockWall;III)Z=|p_82779_1_,p_82779_2_,p_82779_3_,p_82779_4_
 net/minecraft/src/RenderBlocks.func_82780_a(Lnet/minecraft/src/BlockFlowerPot;III)Z=|p_82780_1_,p_82780_2_,p_82780_3_,p_82780_4_
+net/minecraft/src/RenderBlocks.func_83018_a(Lnet/minecraft/src/Block;)V=|p_83018_1_
+net/minecraft/src/RenderBlocks.func_83019_b(DDDDDD)V=|p_83019_1_,p_83019_3_,p_83019_5_,p_83019_7_,p_83019_9_,p_83019_11_
+net/minecraft/src/RenderBlocks.func_83020_a(DDDDDD)V=|p_83020_1_,p_83020_3_,p_83020_5_,p_83020_7_,p_83020_9_,p_83020_11_
+net/minecraft/src/RenderBlocks.func_85096_a(Lnet/minecraft/src/BlockAnvil;IIII)Z=|p_85096_1_,p_85096_2_,p_85096_3_,p_85096_4_,p_85096_5_
 net/minecraft/src/RenderBoat.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/RenderBoat.func_76997_a(Lnet/minecraft/src/EntityBoat;DDDFF)V=|p_76997_1_,p_76997_2_,p_76997_4_,p_76997_6_,p_76997_8_,p_76997_9_
 net/minecraft/src/RenderChicken.<init>(Lnet/minecraft/src/ModelBase;F)V=|p_i3200_1_,p_i3200_2_
@@ -5570,6 +5679,7 @@ net/minecraft/src/RenderGlobal.func_72732_a(Lnet/minecraft/src/WorldClient;)V=|p
 net/minecraft/src/RenderGlobal.func_72733_a(ID)V=|p_72733_1_,p_72733_2_
 net/minecraft/src/RenderGlobal.func_72736_c(F)V=|p_72736_1_
 net/minecraft/src/RenderGlobal.func_82746_a(IIIII)V=|p_82746_1_,p_82746_2_,p_82746_3_,p_82746_4_,p_82746_5_
+net/minecraft/src/RenderGlobal.func_85102_a(Lnet/minecraft/src/EntityPlayer;Ljava/lang/String;DDDFF)V=|p_85102_1_,p_85102_2_,p_85102_3_,p_85102_5_,p_85102_7_,p_85102_9_,p_85102_10_
 net/minecraft/src/RenderHelper.func_74517_a(DDDD)Ljava/nio/FloatBuffer;=|p_74517_0_,p_74517_2_,p_74517_4_,p_74517_6_
 net/minecraft/src/RenderHelper.func_74521_a(FFFF)Ljava/nio/FloatBuffer;=|p_74521_0_,p_74521_1_,p_74521_2_,p_74521_3_
 net/minecraft/src/RenderIronGolem.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_
@@ -5616,6 +5726,7 @@ net/minecraft/src/RenderLiving.func_77042_a(Lnet/minecraft/src/ModelBase;)V=|p_7
 net/minecraft/src/RenderLiving.func_77043_a(Lnet/minecraft/src/EntityLiving;FFF)V=|p_77043_1_,p_77043_2_,p_77043_3_,p_77043_4_
 net/minecraft/src/RenderLiving.func_77044_a(Lnet/minecraft/src/EntityLiving;F)F=|p_77044_1_,p_77044_2_
 net/minecraft/src/RenderLiving.func_82408_c(Lnet/minecraft/src/EntityLiving;IF)V=|p_82408_1_,p_82408_2_,p_82408_3_
+net/minecraft/src/RenderLiving.func_85093_e(Lnet/minecraft/src/EntityLiving;F)V=|p_85093_1_,p_85093_2_
 net/minecraft/src/RenderMagmaCube.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/RenderMagmaCube.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/RenderMagmaCube.func_77041_b(Lnet/minecraft/src/EntityLiving;F)V=|p_77041_1_,p_77041_2_
@@ -5628,6 +5739,7 @@ net/minecraft/src/RenderManager.func_78717_a(Lnet/minecraft/src/World;)V=|p_7871
 net/minecraft/src/RenderManager.func_78718_a(Lnet/minecraft/src/World;Lnet/minecraft/src/RenderEngine;Lnet/minecraft/src/FontRenderer;Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/GameSettings;F)V=|p_78718_1_,p_78718_2_,p_78718_3_,p_78718_4_,p_78718_5_,p_78718_6_
 net/minecraft/src/RenderManager.func_78719_a(Lnet/minecraft/src/Entity;DDDFF)V=|p_78719_1_,p_78719_2_,p_78719_4_,p_78719_6_,p_78719_8_,p_78719_9_
 net/minecraft/src/RenderManager.func_78720_a(Lnet/minecraft/src/Entity;F)V=|p_78720_1_,p_78720_2_
+net/minecraft/src/RenderManager.func_85094_b(Lnet/minecraft/src/Entity;DDDFF)V=|p_85094_1_,p_85094_2_,p_85094_4_,p_85094_6_,p_85094_8_,p_85094_9_
 net/minecraft/src/RenderMinecart.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/RenderMinecart.func_77012_a(Lnet/minecraft/src/EntityMinecart;DDDFF)V=|p_77012_1_,p_77012_2_,p_77012_4_,p_77012_6_,p_77012_8_,p_77012_9_
 net/minecraft/src/RenderMooshroom.<init>(Lnet/minecraft/src/ModelBase;F)V=|p_i3207_1_,p_i3207_2_
@@ -5657,7 +5769,6 @@ net/minecraft/src/RenderPlayer.func_77029_c(Lnet/minecraft/src/EntityLiving;F)V=
 net/minecraft/src/RenderPlayer.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/RenderPlayer.func_77032_a(Lnet/minecraft/src/EntityLiving;IF)I=|p_77032_1_,p_77032_2_,p_77032_3_
 net/minecraft/src/RenderPlayer.func_77033_b(Lnet/minecraft/src/EntityLiving;DDD)V=|p_77033_1_,p_77033_2_,p_77033_4_,p_77033_6_
-net/minecraft/src/RenderPlayer.func_77036_a(Lnet/minecraft/src/EntityLiving;FFFFFF)V=|p_77036_1_,p_77036_2_,p_77036_3_,p_77036_4_,p_77036_5_,p_77036_6_,p_77036_7_
 net/minecraft/src/RenderPlayer.func_77039_a(Lnet/minecraft/src/EntityLiving;DDD)V=|p_77039_1_,p_77039_2_,p_77039_4_,p_77039_6_
 net/minecraft/src/RenderPlayer.func_77041_b(Lnet/minecraft/src/EntityLiving;F)V=|p_77041_1_,p_77041_2_
 net/minecraft/src/RenderPlayer.func_77043_a(Lnet/minecraft/src/EntityLiving;FFF)V=|p_77043_1_,p_77043_2_,p_77043_3_,p_77043_4_
@@ -5670,7 +5781,6 @@ net/minecraft/src/RenderPlayer.func_77105_b(Lnet/minecraft/src/EntityPlayer;DDD)
 net/minecraft/src/RenderPlayer.func_77107_a(Lnet/minecraft/src/EntityPlayer;IF)I=|p_77107_1_,p_77107_2_,p_77107_3_
 net/minecraft/src/RenderPlayer.func_82408_c(Lnet/minecraft/src/EntityLiving;IF)V=|p_82408_1_,p_82408_2_,p_82408_3_
 net/minecraft/src/RenderPlayer.func_82439_b(Lnet/minecraft/src/EntityPlayer;IF)V=|p_82439_1_,p_82439_2_,p_82439_3_
-net/minecraft/src/RenderPlayer.func_82440_a(Lnet/minecraft/src/EntityPlayer;FFFFFF)V=|p_82440_1_,p_82440_2_,p_82440_3_,p_82440_4_,p_82440_5_,p_82440_6_,p_82440_7_
 net/minecraft/src/RenderPlayer.func_82441_a(Lnet/minecraft/src/EntityPlayer;)V=|p_82441_1_
 net/minecraft/src/RenderSheep.<init>(Lnet/minecraft/src/ModelBase;Lnet/minecraft/src/ModelBase;F)V=|p_i3209_1_,p_i3209_2_,p_i3209_3_
 net/minecraft/src/RenderSheep.func_77032_a(Lnet/minecraft/src/EntityLiving;IF)I=|p_77032_1_,p_77032_2_,p_77032_3_
@@ -5772,6 +5882,7 @@ net/minecraft/src/SaveFormatOld.func_75804_a(Ljava/lang/String;Z)Lnet/minecraft/
 net/minecraft/src/SaveFormatOld.func_75805_a(Ljava/lang/String;Lnet/minecraft/src/IProgressUpdate;)Z=|p_75805_1_,p_75805_2_
 net/minecraft/src/SaveFormatOld.func_75806_a(Ljava/lang/String;Ljava/lang/String;)V=|p_75806_1_,p_75806_2_
 net/minecraft/src/SaveFormatOld.func_75807_a([Ljava/io/File;)Z=|p_75807_0_
+net/minecraft/src/SaveFormatOld.func_90033_f(Ljava/lang/String;)Z=|p_90033_1_
 net/minecraft/src/SaveHandler.<init>(Ljava/io/File;Ljava/lang/String;Z)V=|p_i3912_1_,p_i3912_2_,p_i3912_3_
 net/minecraft/src/SaveHandler.func_75752_b(Lnet/minecraft/src/EntityPlayer;)V=|p_75752_1_
 net/minecraft/src/SaveHandler.func_75753_a(Lnet/minecraft/src/EntityPlayer;)V=|p_75753_1_
@@ -6110,9 +6221,11 @@ net/minecraft/src/TcpMasterThread.<init>(Lnet/minecraft/src/TcpConnection;)V=|p_
 net/minecraft/src/TcpMonitorThread.<init>(Lnet/minecraft/src/TcpConnection;)V=|p_i3286_1_
 net/minecraft/src/TcpReaderThread.<init>(Lnet/minecraft/src/TcpConnection;Ljava/lang/String;)V=|p_i3283_1_,p_i3283_2_
 net/minecraft/src/TcpWriterThread.<init>(Lnet/minecraft/src/TcpConnection;Ljava/lang/String;)V=|p_i3284_1_,p_i3284_2_
-net/minecraft/src/Teleporter.func_77184_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Entity;DDDF)Z=|p_77184_1_,p_77184_2_,p_77184_3_,p_77184_5_,p_77184_7_,p_77184_9_
-net/minecraft/src/Teleporter.func_77185_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Entity;DDDF)V=|p_77185_1_,p_77185_2_,p_77185_3_,p_77185_5_,p_77185_7_,p_77185_9_
-net/minecraft/src/Teleporter.func_77186_c(Lnet/minecraft/src/World;Lnet/minecraft/src/Entity;)Z=|p_77186_1_,p_77186_2_
+net/minecraft/src/Teleporter.<init>(Lnet/minecraft/src/WorldServer;)V=|p_i6816_1_
+net/minecraft/src/Teleporter.func_77184_b(Lnet/minecraft/src/Entity;DDDF)Z=|p_77184_1_,p_77184_2_,p_77184_4_,p_77184_6_,p_77184_8_
+net/minecraft/src/Teleporter.func_77185_a(Lnet/minecraft/src/Entity;DDDF)V=|p_77185_1_,p_77185_2_,p_77185_4_,p_77185_6_,p_77185_8_
+net/minecraft/src/Teleporter.func_85188_a(Lnet/minecraft/src/Entity;)Z=|p_85188_1_
+net/minecraft/src/Teleporter.func_85189_a(J)V=|p_85189_1_
 net/minecraft/src/Tessellator.<init>(I)V=|p_i3191_1_
 net/minecraft/src/Tessellator.func_78369_a(FFFF)V=|p_78369_1_,p_78369_2_,p_78369_3_,p_78369_4_
 net/minecraft/src/Tessellator.func_78370_a(IIII)V=|p_78370_1_,p_78370_2_,p_78370_3_,p_78370_4_
@@ -6189,6 +6302,7 @@ net/minecraft/src/TileEntity.func_70310_b(Lnet/minecraft/src/NBTTagCompound;)V=|
 net/minecraft/src/TileEntity.func_70315_b(II)V=|p_70315_1_,p_70315_2_
 net/minecraft/src/TileEntity.func_70317_c(Lnet/minecraft/src/NBTTagCompound;)Lnet/minecraft/src/TileEntity;=|p_70317_0_
 net/minecraft/src/TileEntity.func_70318_a(DDD)D=|p_70318_1_,p_70318_3_,p_70318_5_
+net/minecraft/src/TileEntity.func_85027_a(Lnet/minecraft/src/CrashReportCategory;)V=|p_85027_1_
 net/minecraft/src/TileEntityBeacon.func_70298_a(II)Lnet/minecraft/src/ItemStack;=|p_70298_1_,p_70298_2_
 net/minecraft/src/TileEntityBeacon.func_70299_a(ILnet/minecraft/src/ItemStack;)V=|p_70299_1_,p_70299_2_
 net/minecraft/src/TileEntityBeacon.func_70300_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_70300_1_
@@ -6218,6 +6332,7 @@ net/minecraft/src/TileEntityChest.func_70304_b(I)Lnet/minecraft/src/ItemStack;=|
 net/minecraft/src/TileEntityChest.func_70307_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70307_1_
 net/minecraft/src/TileEntityChest.func_70310_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70310_1_
 net/minecraft/src/TileEntityChest.func_70315_b(II)V=|p_70315_1_,p_70315_2_
+net/minecraft/src/TileEntityChest.func_90009_a(Lnet/minecraft/src/TileEntityChest;I)V=|p_90009_1_,p_90009_2_
 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.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
@@ -6434,7 +6549,7 @@ net/minecraft/src/World.func_72872_a(Ljava/lang/Class;Lnet/minecraft/src/AxisAli
 net/minecraft/src/World.func_72873_a(IIII)Z=|p_72873_1_,p_72873_2_,p_72873_3_,p_72873_4_
 net/minecraft/src/World.func_72874_g(II)I=|p_72874_1_,p_72874_2_
 net/minecraft/src/World.func_72875_a(Lnet/minecraft/src/AxisAlignedBB;Lnet/minecraft/src/Material;)Z=|p_72875_1_,p_72875_2_
-net/minecraft/src/World.func_72876_a(Lnet/minecraft/src/Entity;DDDFZZ)Lnet/minecraft/src/Explosion;=|p_72876_1_,p_72876_2_,p_72876_4_,p_72876_6_,p_72876_8_,p_72876_9_,p_72876_10_
+net/minecraft/src/World.func_72876_a(Lnet/minecraft/src/Entity;DDDFZ)Lnet/minecraft/src/Explosion;=|p_72876_1_,p_72876_2_,p_72876_4_,p_72876_6_,p_72876_8_,p_72876_9_
 net/minecraft/src/World.func_72877_b(J)V=|p_72877_1_
 net/minecraft/src/World.func_72878_l(IIII)Z=|p_72878_1_,p_72878_2_,p_72878_3_,p_72878_4_
 net/minecraft/src/World.func_72879_k(IIII)Z=|p_72879_1_,p_72879_2_,p_72879_3_,p_72879_4_
@@ -6442,7 +6557,7 @@ net/minecraft/src/World.func_72880_h(F)F=|p_72880_1_
 net/minecraft/src/World.func_72881_d(IIII)Z=|p_72881_1_,p_72881_2_,p_72881_3_,p_72881_4_
 net/minecraft/src/World.func_72883_k(III)I=|p_72883_1_,p_72883_2_,p_72883_3_
 net/minecraft/src/World.func_72884_u(III)Z=|p_72884_1_,p_72884_2_,p_72884_3_
-net/minecraft/src/World.func_72885_a(Lnet/minecraft/src/Entity;DDDFZ)Lnet/minecraft/src/Explosion;=|p_72885_1_,p_72885_2_,p_72885_4_,p_72885_6_,p_72885_8_,p_72885_9_
+net/minecraft/src/World.func_72885_a(Lnet/minecraft/src/Entity;DDDFZZ)Lnet/minecraft/src/Explosion;=|p_72885_1_,p_72885_2_,p_72885_4_,p_72885_6_,p_72885_8_,p_72885_9_,p_72885_10_
 net/minecraft/src/World.func_72886_a(Lnet/minecraft/src/EntityPlayer;IIII)Z=|p_72886_1_,p_72886_2_,p_72886_3_,p_72886_4_,p_72886_5_
 net/minecraft/src/World.func_72887_b(IIIZ)Z=|p_72887_1_,p_72887_2_,p_72887_3_,p_72887_4_
 net/minecraft/src/World.func_72888_f(IIIII)V=|p_72888_1_,p_72888_2_,p_72888_3_,p_72888_4_,p_72888_5_
@@ -6463,7 +6578,7 @@ net/minecraft/src/World.func_72906_B()V=net/minecraft/src/MinecraftException|
 net/minecraft/src/World.func_72907_a(Ljava/lang/Class;)I=|p_72907_1_
 net/minecraft/src/World.func_72908_a(DDDLjava/lang/String;FF)V=|p_72908_1_,p_72908_3_,p_72908_5_,p_72908_7_,p_72908_8_,p_72908_9_
 net/minecraft/src/World.func_72909_d(IIIIII)V=|p_72909_1_,p_72909_2_,p_72909_3_,p_72909_4_,p_72909_5_,p_72909_6_
-net/minecraft/src/World.func_72914_a(Lnet/minecraft/src/CrashReport;)Lnet/minecraft/src/CrashReport;=|p_72914_1_
+net/minecraft/src/World.func_72914_a(Lnet/minecraft/src/CrashReport;)Lnet/minecraft/src/CrashReportCategory;=|p_72914_1_
 net/minecraft/src/World.func_72915_b(Lnet/minecraft/src/EnumSkyBlock;IIII)V=|p_72915_1_,p_72915_2_,p_72915_3_,p_72915_4_,p_72915_5_
 net/minecraft/src/World.func_72916_c(II)Z=|p_72916_1_,p_72916_2_
 net/minecraft/src/World.func_72917_a(Lnet/minecraft/src/AxisAlignedBB;Lnet/minecraft/src/Entity;)Z=|p_72917_1_,p_72917_2_
@@ -6525,6 +6640,9 @@ net/minecraft/src/World.func_82735_a(Lnet/minecraft/src/EntityMinecart;)Lnet/min
 net/minecraft/src/World.func_82738_a(J)V=|p_82738_1_
 net/minecraft/src/World.func_82739_e(IIIII)V=|p_82739_1_,p_82739_2_,p_82739_3_,p_82739_4_,p_82739_5_
 net/minecraft/src/World.func_82740_a(IIIIII)V=|p_82740_1_,p_82740_2_,p_82740_3_,p_82740_4_,p_82740_5_,p_82740_6_
+net/minecraft/src/World.func_85173_a(Lnet/minecraft/src/EntityPlayer;Ljava/lang/String;FF)V=|p_85173_1_,p_85173_2_,p_85173_3_,p_85173_4_
+net/minecraft/src/World.func_85174_u(III)Z=|p_85174_1_,p_85174_2_,p_85174_3_
+net/minecraft/src/World.func_85175_e(III)I=|p_85175_1_,p_85175_2_,p_85175_3_
 net/minecraft/src/WorldChunkManager.<init>(JLnet/minecraft/src/WorldType;)V=|p_i3751_1_,p_i3751_3_
 net/minecraft/src/WorldChunkManager.<init>(Lnet/minecraft/src/World;)V=|p_i3752_1_
 net/minecraft/src/WorldChunkManager.func_76931_a([Lnet/minecraft/src/BiomeGenBase;IIIIZ)[Lnet/minecraft/src/BiomeGenBase;=|p_76931_1_,p_76931_2_,p_76931_3_,p_76931_4_,p_76931_5_,p_76931_6_
@@ -6549,7 +6667,7 @@ net/minecraft/src/WorldClient.<init>(Lnet/minecraft/src/NetClientHandler;Lnet/mi
 net/minecraft/src/WorldClient.func_72838_d(Lnet/minecraft/src/Entity;)Z=|p_72838_1_
 net/minecraft/src/WorldClient.func_72847_b(Lnet/minecraft/src/Entity;)V=|p_72847_1_
 net/minecraft/src/WorldClient.func_72900_e(Lnet/minecraft/src/Entity;)V=|p_72900_1_
-net/minecraft/src/WorldClient.func_72914_a(Lnet/minecraft/src/CrashReport;)Lnet/minecraft/src/CrashReport;=|p_72914_1_
+net/minecraft/src/WorldClient.func_72914_a(Lnet/minecraft/src/CrashReport;)Lnet/minecraft/src/CrashReportCategory;=|p_72914_1_
 net/minecraft/src/WorldClient.func_72923_a(Lnet/minecraft/src/Entity;)V=|p_72923_1_
 net/minecraft/src/WorldClient.func_72980_b(DDDLjava/lang/String;FF)V=|p_72980_1_,p_72980_3_,p_72980_5_,p_72980_7_,p_72980_8_,p_72980_9_
 net/minecraft/src/WorldClient.func_73023_g(IIIII)Z=|p_73023_1_,p_73023_2_,p_73023_3_,p_73023_4_,p_73023_5_
@@ -6648,6 +6766,24 @@ net/minecraft/src/WorldInfo.func_76087_c(I)V=|p_76087_1_
 net/minecraft/src/WorldInfo.func_76090_f(I)V=|p_76090_1_
 net/minecraft/src/WorldInfo.func_76091_d(Z)V=|p_76091_1_
 net/minecraft/src/WorldInfo.func_82572_b(J)V=|p_82572_1_
+net/minecraft/src/WorldInfo.func_85116_n(Lnet/minecraft/src/WorldInfo;)Z=|p_85116_0_
+net/minecraft/src/WorldInfo.func_85117_p(Lnet/minecraft/src/WorldInfo;)Z=|p_85117_0_
+net/minecraft/src/WorldInfo.func_85118_a(Lnet/minecraft/src/CrashReportCategory;)V=|p_85118_1_
+net/minecraft/src/WorldInfo.func_85119_k(Lnet/minecraft/src/WorldInfo;)I=|p_85119_0_
+net/minecraft/src/WorldInfo.func_85120_o(Lnet/minecraft/src/WorldInfo;)Lnet/minecraft/src/EnumGameType;=|p_85120_0_
+net/minecraft/src/WorldInfo.func_85121_j(Lnet/minecraft/src/WorldInfo;)I=|p_85121_0_
+net/minecraft/src/WorldInfo.func_85122_i(Lnet/minecraft/src/WorldInfo;)I=|p_85122_0_
+net/minecraft/src/WorldInfo.func_85123_f(Lnet/minecraft/src/WorldInfo;)I=|p_85123_0_
+net/minecraft/src/WorldInfo.func_85124_e(Lnet/minecraft/src/WorldInfo;)I=|p_85124_0_
+net/minecraft/src/WorldInfo.func_85125_d(Lnet/minecraft/src/WorldInfo;)I=|p_85125_0_
+net/minecraft/src/WorldInfo.func_85126_g(Lnet/minecraft/src/WorldInfo;)J=|p_85126_0_
+net/minecraft/src/WorldInfo.func_85127_l(Lnet/minecraft/src/WorldInfo;)Z=|p_85127_0_
+net/minecraft/src/WorldInfo.func_85128_b(Lnet/minecraft/src/WorldInfo;)Z=|p_85128_0_
+net/minecraft/src/WorldInfo.func_85129_h(Lnet/minecraft/src/WorldInfo;)J=|p_85129_0_
+net/minecraft/src/WorldInfo.func_85130_c(Lnet/minecraft/src/WorldInfo;)Ljava/lang/String;=|p_85130_0_
+net/minecraft/src/WorldInfo.func_85131_q(Lnet/minecraft/src/WorldInfo;)Z=|p_85131_0_
+net/minecraft/src/WorldInfo.func_85132_a(Lnet/minecraft/src/WorldInfo;)Lnet/minecraft/src/WorldType;=|p_85132_0_
+net/minecraft/src/WorldInfo.func_85133_m(Lnet/minecraft/src/WorldInfo;)I=|p_85133_0_
 net/minecraft/src/WorldManager.<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/src/WorldServer;)V=|p_i3390_1_,p_i3390_2_
 net/minecraft/src/WorldManager.func_72702_a(Ljava/lang/String;III)V=|p_72702_1_,p_72702_2_,p_72702_3_,p_72702_4_
 net/minecraft/src/WorldManager.func_72703_a(Lnet/minecraft/src/Entity;)V=|p_72703_1_
@@ -6660,6 +6796,7 @@ net/minecraft/src/WorldManager.func_72709_b(Lnet/minecraft/src/Entity;)V=|p_7270
 net/minecraft/src/WorldManager.func_72710_a(III)V=|p_72710_1_,p_72710_2_,p_72710_3_
 net/minecraft/src/WorldManager.func_72711_b(III)V=|p_72711_1_,p_72711_2_,p_72711_3_
 net/minecraft/src/WorldManager.func_82746_a(IIIII)V=|p_82746_1_,p_82746_2_,p_82746_3_,p_82746_4_,p_82746_5_
+net/minecraft/src/WorldManager.func_85102_a(Lnet/minecraft/src/EntityPlayer;Ljava/lang/String;DDDFF)V=|p_85102_1_,p_85102_2_,p_85102_3_,p_85102_5_,p_85102_7_,p_85102_9_,p_85102_10_
 net/minecraft/src/WorldProvider.func_76558_a(Lnet/minecraft/src/World;)V=|p_76558_1_
 net/minecraft/src/WorldProvider.func_76559_b(JF)I=|p_76559_1_,p_76559_3_
 net/minecraft/src/WorldProvider.func_76560_a(FF)[F=|p_76560_1_,p_76560_2_

conf/mcp.cfg

@@ -36,8 +36,8 @@ DirNatives = %(DirJars)s/bin/natives
 Client     = %(DirJars)s/bin/minecraft.jar
 Server     = %(DirJars)s/minecraft_server.jar
 LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
-MD5Client  = 9cc3295931edb6339f22989fe1b612a6
-MD5Server  = 21b673f18d20cf7682b77fa8df6c195c
+MD5Client  = 7aa46c8058cba2f38e9d2ddddcc77c72
+MD5Server  = b5feed15df1db87c9aaf78dcefad513d
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -123,8 +123,8 @@ LogFile           = %(DirLogs)s/mcp.log
 LogFileErr        = %(DirLogs)s/mcperr.log
 UpdateUrl         = 
 IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
-RGIndex           = 85000
-ParamIndex        = 6800
+RGIndex           = 90000
+ParamIndex        = 7000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg

conf/params.csv

@@ -327,7 +327,7 @@ p_70873_1_,par1,2
 p_70876_1_,par1EntityAnimal,2
 p_70877_1_,par1ItemStack,2
 p_70878_1_,par1EntityAnimal,2
-p_70879_1_,par1EntityAnimal,2
+p_70879_1_,par1EntityAgeable,2
 p_70890_1_,par1,2
 p_70891_1_,par1,2
 p_70893_1_,par1,2
@@ -5442,8 +5442,6 @@ p_77514_0_,par0Random,2
 p_77514_1_,par1,2
 p_77514_2_,par2,2
 p_77514_3_,par3ItemStack,2
-p_77515_0_,par0EntityLiving,2
-p_77515_1_,par1EntityLiving,2
 p_77516_0_,par0IEnchantmentModifier,2
 p_77516_1_,par1ArrayOfItemStack,2
 p_77517_0_,par0EntityLiving,2
@@ -7134,12 +7132,6 @@ p_85130_0_,par0WorldInfo,2
 p_85131_0_,par0WorldInfo,2
 p_85132_0_,par0WorldInfo,2
 p_85133_0_,par0WorldInfo,2
-p_85147_1_,par1EntityAnimal,2
-p_85147_2_,par2EntityAnimal,2
-p_85147_3_,par3EntityAnimal,2
-p_85148_1_,par1EntityAnimal,2
-p_85149_1_,par1EntityAnimal,2
-p_85149_2_,par2EntityAnimal,2
 p_85156_1_,par1EntityAIBase,2
 p_85172_1_,par1EntityPlayerMP,2
 p_85172_2_,par2Chunk,2
@@ -7164,6 +7156,22 @@ p_85187_4_,par4,2
 p_85187_5_,par5,2
 p_85188_1_,par1Entity,2
 p_85189_1_,par1,2
+p_90009_1_,par1TileEntityChest,2
+p_90009_2_,par2,2
+p_90010_1_,par1IInventory,2
+p_90011_1_,par1EntityAgeable,2
+p_90012_1_,par1EntityAgeable,2
+p_90013_1_,par1EntityAnimal,2
+p_90014_1_,par1EntityAnimal,2
+p_90014_2_,par2EntityAnimal,2
+p_90015_1_,par1EntityAgeable,2
+p_90019_1_,par1,2
+p_90030_0_,par0EntityRenderer,2
+p_90033_1_,par1Str,2
+p_90035_0_,par0,2
+p_90036_0_,par0EntityLiving,2
+p_90037_1_,par1EntityFX,2
+p_90042_0_,par0Str,2
 p_accept_1_,par1File,2
 p_accept_2_,par2Str,2
 p_actionPerformed_1_,par1ActionEvent,2
@@ -9990,9 +9998,6 @@ p_i6809_1_,par1CrashReport,2
 p_i6809_2_,par2Str,2
 p_i6810_1_,par1DedicatedServer,2
 p_i6811_1_,par1Entity,2
-p_i6812_1_,par1EntityAIBreedSheep,2
-p_i6813_1_,par1EntityAnimal,2
-p_i6813_2_,par2,2
 p_i6814_1_,par1World,2
 p_i6814_2_,par2,2
 p_i6815_1_,par1Teleporter,2
@@ -10018,6 +10023,18 @@ p_i6826_1_,par1WorldInfo,2
 p_i6827_1_,par1WorldInfo,2
 p_i6828_1_,par1WorldInfo,2
 p_i6829_1_,par1TileEntity,2
+p_i7000_1_,par1Minecraft,2
+p_i7001_1_,par1Minecraft,2
+p_i7002_1_,par1Minecraft,2
+p_i7003_1_,par1EffectRenderer,2
+p_i7003_2_,par2EntityFX,2
+p_i7004_1_,par1EntityRenderer,2
+p_i7004_2_,par2ScaledResolution,2
+p_i7005_1_,par1EntityRenderer,2
+p_i7005_2_,par2,2
+p_i7005_3_,par3,2
+p_i7006_1_,par1EntityRenderer,2
+p_i7007_1_,par1EntitySheep,2
 p_implies_1_,par1Permission,2
 p_init_1_,par1,2
 p_init_2_,par2CipherParameters,2

conf/patches/minecraft_ff.patch

@@ -1,7 +1,7 @@
 diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
---- minecraft\net\minecraft\client\Minecraft.java	Thu Nov 01 23:59:08 2012
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Fri Nov 02 00:00:40 2012
-@@ -543,9 +543,8 @@
+--- minecraft\net\minecraft\client\Minecraft.java	Thu Nov 08 22:48:11 2012
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Thu Nov 08 22:50:26 2012
+@@ -546,9 +546,8 @@
           return;
        }
  
@@ -12,7 +12,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
                 if(this.field_71434_R && this.field_71433_S != null) {
                    this.func_71377_b(this.field_71433_S);
                    return;
-@@ -563,7 +562,6 @@
+@@ -566,7 +565,6 @@
                    this.func_71373_a(new GuiMemoryErrorScreen());
                    System.gc();
                 }
@@ -20,7 +20,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
              }
           } catch (MinecraftError var12) {
              ;
-@@ -581,8 +579,6 @@
+@@ -584,8 +582,6 @@
              this.func_71405_e();
           }
  
@@ -30,8 +30,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
  
     private void func_71411_J() {
 diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Thu Nov 01 23:59:09 2012
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 02 00:06:57 2012
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Thu Nov 08 22:48:11 2012
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Thu Nov 08 22:50:26 2012
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() {
@@ -51,8 +51,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraf
        boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
        HashMap var6 = new HashMap();
 diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
---- minecraft\net\minecraft\src\CodecMus.java	Thu Nov 01 23:59:09 2012
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Fri Nov 02 00:00:40 2012
+--- minecraft\net\minecraft\src\CodecMus.java	Thu Nov 08 22:48:11 2012
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Thu Nov 08 22:50:26 2012
 @@ -1,5 +1,6 @@
  package net.minecraft.src;
  
@@ -73,8 +73,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
     }
  }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Thu Nov 01 23:59:09 2012
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 02 00:00:40 2012
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Thu Nov 08 22:48:12 2012
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Thu Nov 08 22:50:26 2012
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -87,8 +87,8 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minec
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
---- minecraft\net\minecraft\src\DedicatedServer.java	Thu Nov 01 23:59:09 2012
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Fri Nov 02 00:00:40 2012
+--- minecraft\net\minecraft\src\DedicatedServer.java	Thu Nov 08 22:48:12 2012
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Thu Nov 08 22:50:26 2012
 @@ -202,7 +202,7 @@
        System.exit(0);
     }
@@ -98,32 +98,27 @@ 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\EnumFacing.java minecraft_patched\net\minecraft\src\EnumFacing.java
---- minecraft\net\minecraft\src\EnumFacing.java	Thu Nov 01 23:59:10 2012
-+++ minecraft_patched\net\minecraft\src\EnumFacing.java	Fri Nov 02 00:00:40 2012
-@@ -15,10 +15,6 @@
-    private final int field_82612_k;
-    private static final EnumFacing[] field_82609_l = new EnumFacing[6];
- 
--   public static EnumFacing[] func_82598_values() {
--      return (EnumFacing[])field_82610_m.clone();
--   }
--
-    private EnumFacing(int p_i5027_3_, int p_i5027_4_, int p_i5027_5_, int p_i5027_6_, int p_i5027_7_) {
-       this.field_82603_g = p_i5027_3_;
-       this.field_82613_h = p_i5027_4_;
-@@ -40,7 +36,7 @@
+diff -r -U 3 minecraft\net\minecraft\src\EntityMooshroom.java minecraft_patched\net\minecraft\src\EntityMooshroom.java
+--- minecraft\net\minecraft\src\EntityMooshroom.java	Thu Nov 08 22:48:12 2012
++++ minecraft_patched\net\minecraft\src\EntityMooshroom.java	Thu Nov 08 22:50:26 2012
+@@ -56,10 +56,10 @@
+       return new EntityMooshroom(this.field_70170_p);
     }
  
-    static {
--      EnumFacing[] var0 = func_82598_values();
-+      EnumFacing[] var0 = values();
-       int var1 = var0.length;
+-   // $FF: synthetic method
+-   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
+-      return this.func_70879_a(p_70879_1_);
+-   }
++//   // $FF: synthetic method
++//   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
++//      return this.func_70879_a(p_70879_1_);
++//   }
  
-       for(int var2 = 0; var2 < var1; ++var2) {
+    // $FF: synthetic method
+    public EntityAgeable func_90011_a(EntityAgeable p_90011_1_) {
 diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
---- minecraft\net\minecraft\src\IntegratedServer.java	Thu Nov 01 23:59:10 2012
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Fri Nov 02 00:00:40 2012
+--- minecraft\net\minecraft\src\IntegratedServer.java	Thu Nov 08 22:48:13 2012
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Thu Nov 08 22:50:26 2012
 @@ -98,7 +98,7 @@
        return true;
     }
@@ -134,9 +129,9 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
        this.field_71348_o = this.field_71347_n.func_71752_f();
        if(!var1 && this.field_71348_o) {
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
---- minecraft\net\minecraft\src\RenderGlobal.java	Thu Nov 01 23:59:11 2012
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Fri Nov 02 00:00:40 2012
-@@ -1457,7 +1457,7 @@
+--- minecraft\net\minecraft\src\RenderGlobal.java	Thu Nov 08 22:48:14 2012
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Thu Nov 08 22:50:26 2012
+@@ -1446,7 +1446,7 @@
           double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
           double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
           double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
@@ -146,8 +141,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
              this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
           } else if(p_72726_1_.equals("largeexplode")) {
 diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
---- minecraft\net\minecraft\src\TcpMasterThread.java	Thu Nov 01 23:59:12 2012
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Fri Nov 02 00:00:40 2012
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Thu Nov 08 22:48:14 2012
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Thu Nov 08 22:50:26 2012
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -157,8 +152,8 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\
        try {
           Thread.sleep(5000L);
 diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
---- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Thu Nov 01 23:59:12 2012
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 02 00:00:40 2012
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Thu Nov 08 22:48:14 2012
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Thu Nov 08 22:50:26 2012
 @@ -20,7 +20,8 @@
     }
  

conf/patches/minecraft_server_ff.patch

@@ -1,6 +1,6 @@
 diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 02 00:00:17 2012
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 02 00:07:35 2012
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Thu Nov 08 22:07:52 2012
++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Thu Nov 08 22:09:16 2012
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() {
@@ -20,8 +20,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java m
        boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
        HashMap var6 = new HashMap();
 diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 02 00:00:18 2012
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 02 00:00:47 2012
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Thu Nov 08 22:07:53 2012
++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Thu Nov 08 22:09:16 2012
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -34,8 +34,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.jav
        if(this.field_74885_f != 2 && this.field_74885_f != 3) {
           this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
---- minecraft_server\net\minecraft\src\DedicatedServer.java	Fri Nov 02 00:00:18 2012
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Fri Nov 02 00:00:47 2012
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Thu Nov 08 22:07:53 2012
++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Thu Nov 08 22:09:16 2012
 @@ -203,7 +203,7 @@
        System.exit(0);
     }
@@ -45,32 +45,27 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
        super.func_71190_q();
        this.func_71333_ah();
     }
-diff -r -U 3 minecraft_server\net\minecraft\src\EnumFacing.java minecraft_server_patched\net\minecraft\src\EnumFacing.java
---- minecraft_server\net\minecraft\src\EnumFacing.java	Fri Nov 02 00:00:18 2012
-+++ minecraft_server_patched\net\minecraft\src\EnumFacing.java	Fri Nov 02 00:00:47 2012
-@@ -15,10 +15,6 @@
-    private final int field_82612_k;
-    private static final EnumFacing[] field_82609_l = new EnumFacing[6];
- 
--   public static EnumFacing[] func_82598_values() {
--      return (EnumFacing[])field_82610_m.clone();
--   }
--
-    private EnumFacing(int p_i5027_3_, int p_i5027_4_, int p_i5027_5_, int p_i5027_6_, int p_i5027_7_) {
-       this.field_82603_g = p_i5027_3_;
-       this.field_82613_h = p_i5027_4_;
-@@ -40,7 +36,7 @@
+diff -r -U 3 minecraft_server\net\minecraft\src\EntityMooshroom.java minecraft_server_patched\net\minecraft\src\EntityMooshroom.java
+--- minecraft_server\net\minecraft\src\EntityMooshroom.java	Thu Nov 08 22:07:53 2012
++++ minecraft_server_patched\net\minecraft\src\EntityMooshroom.java	Thu Nov 08 22:15:13 2012
+@@ -56,10 +56,10 @@
+       return new EntityMooshroom(this.field_70170_p);
     }
  
-    static {
--      EnumFacing[] var0 = func_82598_values();
-+      EnumFacing[] var0 = values();
-       int var1 = var0.length;
+-   // $FF: synthetic method
+-   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
+-      return this.func_70879_a(p_70879_1_);
+-   }
++//   // $FF: synthetic method
++//   public EntityCow func_70879_a(EntityAgeable p_70879_1_) {
++//      return this.func_70879_a(p_70879_1_);
++//   }
  
-       for(int var2 = 0; var2 < var1; ++var2) {
+    // $FF: synthetic method
+    public EntityAgeable func_90011_a(EntityAgeable p_90011_1_) {
 diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
---- minecraft_server\net\minecraft\src\TcpMasterThread.java	Fri Nov 02 00:00:19 2012
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Fri Nov 02 00:00:47 2012
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Thu Nov 08 22:07:54 2012
++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Thu Nov 08 22:09:16 2012
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -80,8 +75,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s
        try {
           Thread.sleep(5000L);
 diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
---- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 02 00:00:19 2012
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 02 00:00:47 2012
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Thu Nov 08 22:07:54 2012
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Thu Nov 08 22:09:16 2012
 @@ -20,7 +20,8 @@
     }
  

conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.20
-ClientVersion = 1.4.3
-ServerVersion = 1.4.3
+MCPVersion = 7.21
+ClientVersion = 1.4.4
+ServerVersion = 1.4.4

install/fml.py

@@ -61,8 +61,8 @@ def pre_decompile(mcp_dir, fml_dir):
     with open(server_jar, 'rb') as fh:
         md5_s = md5(fh.read()).hexdigest()
         
-    clean_c = "9cc3295931edb6339f22989fe1b612a6"
-    clean_s = "21b673f18d20cf7682b77fa8df6c195c"
+    clean_c = "7aa46c8058cba2f38e9d2ddddcc77c72"
+    clean_s = "b5feed15df1db87c9aaf78dcefad513d"
     
     if not md5_c == clean_c:
         print 'Warning, Modified Client jar detected'

mcp_merge.cfg

@@ -1,20 +1,20 @@
 >pl #net/minecraft/src/IBossDisplayData
->jh #net/minecraft/src/IStatStringFormat
+>ji #net/minecraft/src/IStatStringFormat
 >xu #net/minecraft/src/ColorizerGrass
 >xr #net/minecraft/src/ColorizerFoliage
 >aom #org/bouncycastle/crypto/CipherKeyGenerator
 >aor #org/bouncycastle/crypto/KeyGenerationParameters
->jv #net/minecraft/src/HttpUtilRunnable
+>jw #net/minecraft/src/HttpUtilRunnable
 >uw #net/minecraft/src/EnumRarity
 >aid #net/minecraft/src/SaveFormatComparator
->jw #net/minecraft/src/IDownloadSuccess
-<fw #net/minecraft/src/ThreadDedicatedServer
-<hu #net/minecraft/src/ServerGUI
-<hv #net/minecraft/src/ServerWindowAdapter
-<hw #net/minecraft/src/ServerGuiCommandListener
-<hx #net/minecraft/src/ServerGuiFocusAdapter
-<hy #net/minecraft/src/PlayerListBox
-<hz #net/minecraft/src/GuiStatsComponent
-<ia #net/minecraft/src/GuiStatsListener
-<ib #net/minecraft/src/GuiLogOutputHandler
-<ic #net/minecraft/src/GuiLogFormatter
+>jx #net/minecraft/src/IDownloadSuccess
+<fx #net/minecraft/src/ThreadDedicatedServer
+<hv #net/minecraft/src/ServerGUI
+<hw #net/minecraft/src/ServerWindowAdapter
+<hx #net/minecraft/src/ServerGuiCommandListener
+<hy #net/minecraft/src/ServerGuiFocusAdapter
+<hz #net/minecraft/src/PlayerListBox
+<ia #net/minecraft/src/GuiStatsComponent
+<ib #net/minecraft/src/GuiStatsListener
+<ic #net/minecraft/src/GuiLogOutputHandler
+<id #net/minecraft/src/GuiLogFormatter

patches/common/net/minecraft/server/MinecraftServer.java.patch

@@ -10,7 +10,7 @@
  import net.minecraft.src.AnvilSaveConverter;
  import net.minecraft.src.AxisAlignedBB;
  import net.minecraft.src.BehaviorArrowDispense;
-@@ -384,7 +387,10 @@
+@@ -382,7 +385,10 @@
          {
              if (this.func_71197_b())
              {
@@ -21,7 +21,7 @@
  
                  for (long var50 = 0L; this.field_71317_u; this.field_71296_Q = true)
                  {
-@@ -423,6 +429,7 @@
+@@ -421,6 +427,7 @@
  
                      Thread.sleep(1L);
                  }
@@ -29,7 +29,7 @@
              }
              else
              {
-@@ -486,8 +493,10 @@
+@@ -484,8 +491,10 @@
  
      public void func_71217_p()
      {
@@ -40,7 +40,7 @@
          ++this.field_71315_w;
  
          if (this.field_71295_T)
-@@ -533,6 +542,7 @@
+@@ -531,6 +540,7 @@
  
          this.field_71304_b.func_76319_b();
          this.field_71304_b.func_76319_b();
@@ -48,7 +48,7 @@
      }
  
      public void func_71190_q()
-@@ -559,6 +569,7 @@
+@@ -558,6 +568,7 @@
                  }
  
                  this.field_71304_b.func_76320_a("tick");
@@ -56,7 +56,7 @@
                  CrashReport var6;
  
                  try
-@@ -583,6 +594,7 @@
+@@ -582,6 +593,7 @@
                      throw new ReportedException(var6);
                  }
  
@@ -64,7 +64,7 @@
                  this.field_71304_b.func_76319_b();
                  this.field_71304_b.func_76320_a("tracker");
                  var4.func_73039_n().func_72788_a();
-@@ -1153,6 +1165,12 @@
+@@ -1150,6 +1162,12 @@
      @SideOnly(Side.SERVER)
      public static void main(String[] p_main_0_)
      {

patches/common/net/minecraft/src/AnvilChunkLoader.java.patch

@@ -10,7 +10,7 @@
  
  public class AnvilChunkLoader implements IThreadedFileIO, IChunkLoader
  {
-@@ -227,9 +230,18 @@
+@@ -223,9 +226,18 @@
                  p_75820_1_.field_76644_m = true;
                  var10 = new NBTTagCompound();
  
@@ -32,7 +32,7 @@
                  }
              }
          }
-@@ -242,8 +254,17 @@
+@@ -238,8 +250,17 @@
          {
              TileEntity var21 = (TileEntity)var17.next();
              var10 = new NBTTagCompound();

patches/common/net/minecraft/src/EntityPlayer.java.patch

@@ -27,7 +27,7 @@
      }
  
      public int func_82145_z()
-@@ -1745,4 +1750,9 @@
+@@ -1755,4 +1760,9 @@
      {
          return this.func_82241_s(1);
      }

patches/common/net/minecraft/src/EntityTrackerEntry.java.patch

@@ -23,7 +23,7 @@
                      if (this.field_73143_t && !(var6 instanceof Packet24MobSpawn))
                      {
                          p_73117_1_.field_71135_a.func_72567_b(new Packet28EntityVelocity(this.field_73132_a.field_70157_k, this.field_73132_a.field_70159_w, this.field_73132_a.field_70181_x, this.field_73132_a.field_70179_y));
-@@ -379,6 +388,13 @@
+@@ -376,6 +385,13 @@
          if (this.field_73132_a.field_70128_L)
          {
              System.out.println("Fetching addPacket for removed entity");

patches/common/net/minecraft/src/EntityVillager.java.patch

@@ -9,7 +9,7 @@
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.Iterator;
-@@ -199,7 +201,7 @@
+@@ -202,7 +204,7 @@
              case 4:
                  return "/mob/villager/butcher.png";
              default:
@@ -18,7 +18,7 @@
          }
      }
  
-@@ -380,6 +382,7 @@
+@@ -383,6 +385,7 @@
  
          MerchantRecipeList var2;
          var2 = new MerchantRecipeList();
@@ -26,7 +26,7 @@
          label48:
  
          switch (this.func_70946_n())
-@@ -584,7 +587,7 @@
+@@ -587,7 +590,7 @@
  
      public void func_82163_bD()
      {

patches/common/net/minecraft/src/RegionFileCache.java.patch

@@ -1,54 +0,0 @@
---- ../src-base/common/net/minecraft/src/RegionFileCache.java
-+++ ../src-work/common/net/minecraft/src/RegionFileCache.java
-@@ -4,8 +4,6 @@
- import java.io.DataOutputStream;
- import java.io.File;
- import java.io.IOException;
--import java.lang.ref.Reference;
--import java.lang.ref.SoftReference;
- import java.util.HashMap;
- import java.util.Iterator;
- import java.util.Map;
-@@ -18,17 +16,11 @@
-     {
-         File var3 = new File(p_76550_0_, "region");
-         File var4 = new File(var3, "r." + (p_76550_1_ >> 5) + "." + (p_76550_2_ >> 5) + ".mca");
--        Reference var5 = (Reference)field_76553_a.get(var4);
--        RegionFile var6;
-+        RegionFile var6 = (RegionFile) field_76553_a.get(var4);
- 
--        if (var5 != null)
-+        if (var6 != null)
-         {
--            var6 = (RegionFile)var5.get();
--
--            if (var6 != null)
--            {
--                return var6;
--            }
-+            return var6;
-         }
- 
-         if (!var3.exists())
-@@ -42,7 +34,7 @@
-         }
- 
-         var6 = new RegionFile(var4);
--        field_76553_a.put(var4, new SoftReference(var6));
-+        field_76553_a.put(var4, var6);
-         return var6;
-     }
- 
-@@ -52,11 +44,9 @@
- 
-         while (var0.hasNext())
-         {
--            Reference var1 = (Reference)var0.next();
--
-             try
-             {
--                RegionFile var2 = (RegionFile)var1.get();
-+                RegionFile var2 = (RegionFile)var0.next();
- 
-                 if (var2 != null)
-                 {

patches/common/net/minecraft/src/ServerConfigurationManager.java.patch

@@ -19,7 +19,7 @@
      }
  
      public void func_72364_a(WorldServer[] p_72364_1_)
-@@ -148,6 +153,7 @@
+@@ -147,6 +152,7 @@
  
      public void func_72367_e(EntityPlayerMP p_72367_1_)
      {
@@ -27,7 +27,7 @@
          this.func_72391_b(p_72367_1_);
          WorldServer var2 = p_72367_1_.func_71121_q();
          var2.func_72900_e(p_72367_1_);
-@@ -298,6 +304,7 @@
+@@ -296,6 +302,7 @@
          var8.func_72838_d(var7);
          this.field_72404_b.add(var7);
          var7.func_71116_b();
@@ -35,7 +35,7 @@
          return var7;
      }
  
-@@ -323,6 +330,7 @@
+@@ -321,6 +328,7 @@
              PotionEffect var7 = (PotionEffect)var6.next();
              p_72356_1_.field_71135_a.func_72567_b(new Packet41EntityEffect(p_72356_1_.field_70157_k, var7));
          }

patches/common/net/minecraft/src/World.java.patch

@@ -9,15 +9,15 @@
  
  public abstract class World implements IBlockAccess
  {
-@@ -1693,7 +1695,6 @@
-             this.func_72847_b(var2);
+@@ -1652,7 +1654,6 @@
+             this.func_72847_b((Entity)this.field_72997_g.get(var1));
          }
  
 -        this.field_72997_g.clear();
          this.field_72984_F.func_76318_c("regular");
  
          for (var1 = 0; var1 < this.field_72996_f.size(); ++var1)
-@@ -3644,7 +3645,7 @@
+@@ -3595,7 +3596,7 @@
      @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {
@@ -25,4 +25,4 @@
 +        return this.field_72986_A.func_76067_t().getHorizon(this);
      }
  
-     public CrashReportCategory func_72914_a(CrashReport var1)
+     public CrashReportCategory func_72914_a(CrashReport p_72914_1_)

patches/common/net/minecraft/src/WorldInfo.java.patch

@@ -19,7 +19,7 @@
      {
 @@ -528,4 +533,24 @@
      {
-         return var0.field_76110_t;
+         return p_85131_0_.field_76110_t;
      }
 +
 +    /**

patches/common/net/minecraft/src/WorldType.java.patch

@@ -45,7 +45,7 @@
      }
  
      public String func_77127_a()
-@@ -96,4 +116,69 @@
+@@ -91,4 +111,69 @@
      {
          return this.field_82748_f;
      }

patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -10,7 +10,7 @@
  import net.minecraft.src.AchievementList;
  import net.minecraft.src.AnvilSaveConverter;
  import net.minecraft.src.AxisAlignedBB;
-@@ -119,6 +121,7 @@
+@@ -122,6 +124,7 @@
  import net.minecraft.src.WorldInfo;
  import net.minecraft.src.WorldRenderer;
  import net.minecraft.src.WorldSettings;
@@ -18,7 +18,7 @@
  import org.lwjgl.LWJGLException;
  import org.lwjgl.Sys;
  import org.lwjgl.input.Keyboard;
-@@ -131,6 +134,12 @@
+@@ -134,6 +137,12 @@
  import org.lwjgl.opengl.GLContext;
  import org.lwjgl.opengl.PixelFormat;
  import org.lwjgl.util.glu.GLU;
@@ -31,7 +31,7 @@
  
  @SideOnly(Side.CLIENT)
  public abstract class Minecraft implements Runnable, IPlayerUsage
-@@ -313,7 +322,7 @@
+@@ -316,7 +325,7 @@
          this.func_71357_I();
          this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false);
          this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false);
@@ -40,7 +40,7 @@
          if (this.field_71474_y.field_74363_ab != null)
          {
              StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab);
-@@ -358,6 +367,8 @@
+@@ -361,6 +370,8 @@
          GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
          this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
  
@@ -49,7 +49,7 @@
          try
          {
              this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this);
-@@ -386,6 +397,7 @@
+@@ -389,6 +400,7 @@
          {
              this.func_71352_k();
          }
@@ -57,7 +57,7 @@
      }
  
      private void func_71357_I() throws LWJGLException
-@@ -744,9 +756,11 @@
+@@ -747,9 +759,11 @@
  
              if (!this.field_71454_w)
              {
@@ -69,7 +69,7 @@
              }
  
              GL11.glFlush();
-@@ -1272,11 +1286,13 @@
+@@ -1279,11 +1293,13 @@
  
      public void func_71407_l()
      {
@@ -83,7 +83,7 @@
          this.field_71424_I.func_76320_a("stats");
          this.field_71413_E.func_77449_e();
          this.field_71424_I.func_76318_c("gui");
-@@ -1698,6 +1714,7 @@
+@@ -1739,6 +1755,7 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -91,7 +91,7 @@
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1952,6 +1969,12 @@
+@@ -1993,6 +2010,12 @@
  
      public static void main(String[] p_main_0_)
      {

patches/minecraft/net/minecraft/client/MinecraftApplet.java.patch

@@ -21,7 +21,7 @@
      {
          this.field_71483_a = new CanvasMinecraftApplet(this);
          boolean var1 = "true".equalsIgnoreCase(this.getParameter("fullscreen"));
-@@ -63,6 +70,11 @@
+@@ -64,6 +71,11 @@
  
      public void start()
      {

patches/minecraft/net/minecraft/src/GameSettings.java.patch

@@ -7,7 +7,7 @@
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.io.BufferedReader;
-@@ -609,6 +610,7 @@
+@@ -604,6 +605,7 @@
  
      public void func_74303_b()
      {

patches/minecraft/net/minecraft/src/IntegratedServerListenThread.java.patch

@@ -19,15 +19,6 @@
  import net.minecraft.server.MinecraftServer;
  
  @SideOnly(Side.CLIENT)
-@@ -48,7 +58,7 @@
- 
-             try
-             {
--                this.field_71757_g = new ServerListenThread(this, InetAddress.getLocalHost(), var1);
-+                this.field_71757_g = new ServerListenThread(this, null, var1);
-                 this.field_71757_g.start();
-             }
-             catch (IOException var3)
 @@ -57,7 +67,7 @@
              }
          }

patches/minecraft/net/minecraft/src/NetClientHandler.java.patch

@@ -48,7 +48,7 @@
          this.field_72563_h.field_71474_y.func_82879_c();
      }
  
-@@ -583,6 +591,7 @@
+@@ -580,6 +588,7 @@
          {
              this.field_72555_g.func_74429_a(p_72546_1_);
              this.field_72555_g.func_74423_d();
@@ -56,7 +56,7 @@
          }
      }
  
-@@ -622,6 +631,7 @@
+@@ -619,6 +628,7 @@
  
      public void func_72481_a(Packet3Chat p_72481_1_)
      {
@@ -64,7 +64,7 @@
          this.field_72563_h.field_71456_v.func_73827_b().func_73765_a(p_72481_1_.field_73476_b);
      }
  
-@@ -1114,6 +1124,11 @@
+@@ -1108,6 +1118,11 @@
  
      public void func_72494_a(Packet131MapData p_72494_1_)
      {
@@ -76,7 +76,7 @@
          if (p_72494_1_.field_73438_a == Item.field_77744_bd.field_77779_bT)
          {
              ItemMap.func_77874_a(p_72494_1_.field_73436_b, this.field_72563_h.field_71441_e).func_76192_a(p_72494_1_.field_73437_c);
-@@ -1223,6 +1238,11 @@
+@@ -1217,6 +1232,11 @@
  
      public void func_72501_a(Packet250CustomPayload p_72501_1_)
      {
@@ -88,7 +88,7 @@
          if ("MC|TPack".equals(p_72501_1_.field_73630_a))
          {
              String[] var2 = (new String(p_72501_1_.field_73629_c)).split("\u0000");
-@@ -1267,4 +1287,20 @@
+@@ -1261,4 +1281,20 @@
      {
          return this.field_72555_g;
      }

patches/minecraft/net/minecraft/src/RenderEngine.java.patch

@@ -59,15 +59,15 @@
          this.field_78367_h.add(p_78355_1_);
          p_78355_1_.func_76846_a();
      }
-@@ -418,15 +429,31 @@
-         {
-             var3 = (TextureFX)var2.next();
+@@ -418,15 +429,30 @@
+             TextureFX var3 = (TextureFX)this.field_78367_h.get(var2);
              var3.field_76851_c = this.field_78365_j.field_74337_g;
+             var3.func_76846_a();
+-            var1 = this.func_82772_a(var3, var1);
 +            if (TextureFXManager.instance().onUpdateTextureEffect(var3))
 +            {
 +                var1 = this.func_82772_a(var3, var1);
 +            }
-             var3.func_76846_a();
          }
      }
  
@@ -80,7 +80,7 @@
 +        int tWidth  = dim.width >> 4;
 +        int tHeight = dim.height >> 4;
 +        int tLen = tWidth * tHeight << 2;
-+        
++
 +        if (p_82772_1_.field_76852_a.length == tLen)
 +        {
 +            this.field_78358_g.clear();
@@ -94,7 +94,7 @@
  
          if (p_82772_1_.field_76850_b != p_82772_2_)
          {
-@@ -436,9 +463,11 @@
+@@ -436,9 +462,11 @@
  
          for (int var3 = 0; var3 < p_82772_1_.field_76849_e; ++var3)
          {
@@ -107,7 +107,7 @@
              }
          }
  
-@@ -504,8 +533,9 @@
+@@ -504,8 +532,9 @@
                  this.field_78361_b = false;
                  this.field_78363_a = false;
              }
@@ -119,7 +119,7 @@
                  var7.printStackTrace();
              }
          }
-@@ -541,8 +571,9 @@
+@@ -541,8 +570,9 @@
                  this.field_78361_b = false;
                  this.field_78363_a = false;
              }

updateasmdata.py

@@ -12,9 +12,10 @@ ctorparamre = re.compile('(([ZBCSIJFD]|L([\w\/]+);))')
 common = gen_merged_srg('..',None)
 rev_common = {t:{v.split(' ')[0]:k for k, v in m.items()} for t,m in common.items()}
 
-if len(sys.argv) < 1:
+if len(sys.argv) < 2:
   print('Give me a file to process please')
   sys.exit(1)
+print(sys.argv, len(sys.argv))
 
 if sys.argv[1]=='mcp_merge.cfg':
   print('Fixing mcp_merge.cfg')
@@ -26,7 +27,7 @@ if sys.argv[1]=='mcp_merge.cfg':
         newpart = parts[0][0]+rev_common['CL:'][target]+" #"+target+'\n'
 	nf.write(newpart)
   sys.exit(0)
-elif len(sys.argv)==1:
+elif len(sys.argv)==2:
   with open(sys.argv[1]+'-new','w') as nf:
     with open(sys.argv[1]) as f:
       for line in f: