Update to MC 1.4.4

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/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

@@ -677,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_
@@ -1367,6 +1368,7 @@ net/minecraft/src/CallableJVMFlags.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i
 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/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_
@@ -1384,8 +1386,12 @@ 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/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_
@@ -1394,10 +1400,12 @@ net/minecraft/src/CallableSuspiciousClasses.<init>(Lnet/minecraft/src/CrashRepor
 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_
@@ -1589,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_
@@ -1948,8 +1960,6 @@ net/minecraft/src/ContainerFurnace.func_75132_a(Lnet/minecraft/src/ICrafting;)V=
 net/minecraft/src/ContainerFurnace.func_75137_b(II)V=|p_75137_1_,p_75137_2_
 net/minecraft/src/ContainerFurnace.func_75145_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_75145_1_
 net/minecraft/src/ContainerFurnace.func_82846_b(Lnet/minecraft/src/EntityPlayer;I)Lnet/minecraft/src/ItemStack;=|p_82846_1_,p_82846_2_
-net/minecraft/src/ContainerMateAI.<init>(Lnet/minecraft/src/EntityAIBreedSheep;)V=|p_i6812_1_
-net/minecraft/src/ContainerMateAI.func_75145_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_75145_1_
 net/minecraft/src/ContainerMerchant.<init>(Lnet/minecraft/src/InventoryPlayer;Lnet/minecraft/src/IMerchant;Lnet/minecraft/src/World;)V=|p_i3613_1_,p_i3613_2_,p_i3613_3_
 net/minecraft/src/ContainerMerchant.func_75130_a(Lnet/minecraft/src/IInventory;)V=|p_75130_1_
 net/minecraft/src/ContainerMerchant.func_75132_a(Lnet/minecraft/src/ICrafting;)V=|p_75132_1_
@@ -1973,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_
@@ -2114,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_
@@ -2188,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_
@@ -2296,10 +2309,6 @@ net/minecraft/src/EntityAIBase.func_75248_a(I)V=|p_75248_1_
 net/minecraft/src/EntityAIBeg.<init>(Lnet/minecraft/src/EntityWolf;F)V=|p_i3459_1_,p_i3459_2_
 net/minecraft/src/EntityAIBeg.func_75382_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_75382_1_
 net/minecraft/src/EntityAIBreakDoor.<init>(Lnet/minecraft/src/EntityLiving;)V=|p_i3460_1_
-net/minecraft/src/EntityAIBreedSheep.<init>(Lnet/minecraft/src/EntityAnimal;F)V=|p_i6813_1_,p_i6813_2_
-net/minecraft/src/EntityAIBreedSheep.func_85147_a(Lnet/minecraft/src/EntityAnimal;Lnet/minecraft/src/EntityAnimal;Lnet/minecraft/src/EntityAnimal;)V=|p_85147_1_,p_85147_2_,p_85147_3_
-net/minecraft/src/EntityAIBreedSheep.func_85148_a(Lnet/minecraft/src/EntityAnimal;)I=|p_85148_1_
-net/minecraft/src/EntityAIBreedSheep.func_85149_a(Lnet/minecraft/src/EntityAnimal;Lnet/minecraft/src/EntityAnimal;)I=|p_85149_1_,p_85149_2_
 net/minecraft/src/EntityAIControlledByPlayer.<init>(Lnet/minecraft/src/EntityLiving;F)V=|p_i5058_1_,p_i5058_2_
 net/minecraft/src/EntityAICreeperSwell.<init>(Lnet/minecraft/src/EntityCreeper;)V=|p_i3493_1_
 net/minecraft/src/EntityAIDefendVillage.<init>(Lnet/minecraft/src/EntityIronGolem;)V=|p_i3497_1_
@@ -2316,7 +2325,6 @@ net/minecraft/src/EntityAILookAtTradePlayer.<init>(Lnet/minecraft/src/EntityVill
 net/minecraft/src/EntityAILookAtVillager.<init>(Lnet/minecraft/src/EntityIronGolem;)V=|p_i3483_1_
 net/minecraft/src/EntityAILookIdle.<init>(Lnet/minecraft/src/EntityLiving;)V=|p_i3488_1_
 net/minecraft/src/EntityAIMate.<init>(Lnet/minecraft/src/EntityAnimal;F)V=|p_i3461_1_,p_i3461_2_
-net/minecraft/src/EntityAIMate.func_85147_a(Lnet/minecraft/src/EntityAnimal;Lnet/minecraft/src/EntityAnimal;Lnet/minecraft/src/EntityAnimal;)V=|p_85147_1_,p_85147_2_,p_85147_3_
 net/minecraft/src/EntityAIMoveIndoors.<init>(Lnet/minecraft/src/EntityCreature;)V=|p_i3478_1_
 net/minecraft/src/EntityAIMoveThroughVillage.<init>(Lnet/minecraft/src/EntityCreature;FZ)V=|p_i3479_1_,p_i3479_2_,p_i3479_3_
 net/minecraft/src/EntityAIMoveThroughVillage.func_75412_a(Lnet/minecraft/src/Village;)Lnet/minecraft/src/VillageDoorInfo;=|p_75412_1_
@@ -2364,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_
@@ -2433,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_
@@ -2449,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_
@@ -2477,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_
@@ -2660,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_
@@ -2760,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_
@@ -2777,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_
@@ -2801,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_
@@ -2983,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_
@@ -2992,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_
@@ -3118,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_
@@ -3166,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_
@@ -3931,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_
@@ -4180,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_
@@ -5856,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_
@@ -6305,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_

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()
      {

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: