Merge joined.exc add update howto

Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit."
This reverts commit fa567014a5.
2026-11-14 01:04:24 +00:00 · 2012-11-20 08:38:33 -05:00 · 2012-11-20 08:27:13 -05:00 · 2012-11-19 17:45:53 -08:00 · 2012-11-19 15:47:18 -08:00 · 2012-11-19 15:35:08 -08:00
49 changed files with 9714 additions and 9326 deletions
@@ -1,7 +1,9 @@
 * text eol=lf
 *.bat text eol=crlf
-*.patch text
+*.patch text eol=lf
 *.png binary
 *.exe binary
 *.dll binary
-*.zip binary
+*.zip binary
+*.cfg text eol=lf
+*.py text eol=lf
@@ -93,16 +93,16 @@
    <exec executable="${python.exe}" dir="${mcp.home}" failonerror="true">
      <arg value="${mcp.home}/runtime/reobfuscate.py" />
    </exec>
-  	<fail message="Reobfuscation failed">
-  		<condition>
-  	        <not>
-  	        	<and>
-  	        	  <available file="${mcp.home}/temp/client.md5"/>
+    <fail message="Reobfuscation failed">
+        <condition>
+            <not>
+                <and>
+                  <available file="${mcp.home}/temp/client.md5"/>
                  <available file="${mcp.home}/temp/client_reobf.md5"/>
-  	        	</and>
-  	        </not>
-  		</condition>
-  	</fail>
+                </and>
+            </not>
+        </condition>
+    </fail>
    <exec executable="${python.exe}" dir="${mcp.home}">
      <arg value="${basedir}/generatechangedfilelist.py"/>
      <arg value="${mcp.home}"/>
@@ -114,13 +114,13 @@
    <exec executable="${python.exe}" dir="${mcp.home}" failonerror="true">
      <arg value="${mcp.home}/runtime/recompile.py" />
    </exec>
-  	<fail message="Compilation failed">
-  		<condition>
-  	        <not>
-        	  <available file="${mcp.home}/bin/minecraft/net/minecraft/client/Minecraft.class"/>
-  	        </not>
-  		</condition>
-  	</fail>
+    <fail message="Compilation failed">
+        <condition>
+            <not>
+              <available file="${mcp.home}/bin/minecraft/net/minecraft/client/Minecraft.class"/>
+            </not>
+        </condition>
+    </fail>
  </target>

  <target name="merge-client" depends="buildenvsetup">
@@ -203,7 +203,7 @@
  <target name="build-source-pack" depends="makeversion">
    <property name="srcpack.jarname" value="${modname}-src-${version}" />
    <zip destfile="${basedir}/target/${srcpack.jarname}.zip">
-      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch,mcp_merge.cfg" prefix="fml" />
+      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch,mcp_merge.cfg,mc_versions.cfg" prefix="fml" />
      <zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="fml/common" />
      <zipfileset dir="${client.src.dir}" includes="**/*.java" prefix="fml/client" />
      <zipfileset dir="${client.src.dir}" includes="mcp.png" prefix="fml/client" />
@@ -252,7 +252,7 @@
    </condition>
    <fail if="do.not.continue">You have decided not to continue. This script will stop now.</fail>
    <echo>Preparing the MCP environment at ${mcp.home}</echo>
-  	<antcall target="fmldecompile"/>
+    <antcall target="fmldecompile"/>
    <echo>Moving old patched sources at ${patch.mcp.srcdir} out of the way</echo>
    <move todir="${mcp.home}/src-work${timestamp}" failonerror="false" verbose="true">
      <fileset dir="${patch.mcp.srcdir}"/>
@@ -334,15 +334,15 @@
  <target name="checkpatches" depends="buildenvsetup">
    <uptodate property="checkUptodate.uptodate">
      <srcfiles dir="${patch.mcp.srcdir}" includes="**/*.java">
-      	<present targetdir="${patch.src.dir}">
-      		<globmapper from="*.java" to="*.java.patch"/>
-      	</present>
+        <present targetdir="${patch.src.dir}">
+            <globmapper from="*.java" to="*.java.patch"/>
+        </present>
      </srcfiles>
      <globmapper from="*.java" to="${patch.src.dir}/*.java.patch"/>
    </uptodate>
-  	<fail unless="checkUptodate.uptodate">
-  		A patch is out of date. Update your patches!
-  	</fail>
+    <fail unless="checkUptodate.uptodate">
+        A patch is out of date. Update your patches!
+    </fail>
  </target>

  <target name="updatepatches" depends="buildenvsetup">
@@ -37,6 +37,7 @@ import net.minecraft.src.World;
 import net.minecraft.src.WorldClient;

 import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

 import cpw.mods.fml.client.modloader.ModLoaderClientHelper;
@@ -289,7 +290,7 @@ public class FMLClientHandler implements IFMLSidedHandler
        {
            return Arrays.asList(String.format("Optifine %s",optifineContainer.getVersion()));
        } else {
-            return Collections.emptyList();
+            return ImmutableList.<String>of();
        }
    }

@@ -54,7 +54,7 @@ public class GuiModList extends GuiScreen
        this.mods=new ArrayList<ModContainer>();
        FMLClientHandler.instance().addSpecialModEntries(mods);
        for (ModContainer mod : Loader.instance().getModList()) {
-            if (mod.getMetadata()!=null && !Strings.isNullOrEmpty(mod.getMetadata().parent)) {
+            if (mod.getMetadata()!=null && mod.getMetadata().parentMod==null && !Strings.isNullOrEmpty(mod.getMetadata().parent)) {
                String parentMod = mod.getMetadata().parent;
                ModContainer parentContainer = Loader.instance().getIndexedModList().get(parentMod);
                if (parentContainer != null)
@@ -64,6 +64,10 @@ public class GuiModList extends GuiScreen
                    continue;
                }
            }
+            else if (mod.getMetadata()!=null && mod.getMetadata().parentMod!=null)
+            {
+            	 continue;
+            }
            mods.add(mod);
        }
    }
@@ -159,15 +159,11 @@ public class TextureFXManager
        }

        int old = GL11.glGetInteger(GL_TEXTURE_BINDING_2D);
-
        effect.func_76845_a(client.field_71446_o);
-
        id = GL11.glGetInteger(GL_TEXTURE_BINDING_2D);
-
        GL11.glBindTexture(GL_TEXTURE_2D, old);
-
        effectTextures.put(effect, id);
-
+        effect.field_76848_d = id;
        return id;
    }

@@ -32,7 +32,7 @@ public class ModTextureStatic extends FMLTextureFX
    private String targetTex = null;
    private int storedSize;
    private BufferedImage overrideData = null;
-    private int needApply = 2;
+    private int needApply = 10;


    public ModTextureStatic(int icon, int target, BufferedImage image)
@@ -106,7 +106,7 @@ public class ModTextureStatic extends FMLTextureFX

    public void update()
    {
-        needApply = 2;
+        needApply = 10;
        for (int idx = 0; idx < pixels.length; idx++)
        {
            int i = idx * 4;
@@ -45,6 +45,7 @@ public class MCPMerger
    private static Hashtable<String, ClassInfo> servers = new Hashtable<String, ClassInfo>();
    private static HashSet<String> copyToServer = new HashSet<String>();
    private static HashSet<String> copyToClient = new HashSet<String>();
+    private static HashSet<String> dontAnnotate = new HashSet<String>();
    private static final boolean DEBUG = false;

    public static void main(String[] args)
@@ -134,11 +135,16 @@ public class MCPMerger
            String line;
            while ((line = br.readLine()) != null)
            {
-		line = line.split("#")[0];
-                boolean toClient = line.charAt(0) == '<';
+                line = line.split("#")[0];
+                char cmd = line.charAt(0);
                line = line.substring(1).trim();
-                if (toClient) copyToClient.add(line);
-                else copyToServer.add(line);
+                
+                switch (cmd)
+                {
+                    case '!': dontAnnotate.add(line); break;
+                    case '<': copyToClient.add(line); break;
+                    case '>': copyToServer.add(line); break; 
+                }
            }

            in.close();
@@ -225,20 +231,14 @@ public class MCPMerger
                cAdded.add(name);
                sAdded.add(name);
            }
+
            for (Entry<String, ZipEntry> entry : sClasses.entrySet())
            {
-                if (!copyToClient.contains(entry.getKey()))
+                if (DEBUG)
                {
-                    copyClass(sInJar, entry.getValue(), null, sOutJar, false);
-                }
-                else
-                {
-                    if (DEBUG)
-                    {
-                        System.out.println("Copy class s->c : " + entry.getKey());
-                    }
-                    copyClass(sInJar, entry.getValue(), cOutJar, sOutJar, false);
+                    System.out.println("Copy class s->c : " + entry.getKey());
                }
+                copyClass(sInJar, entry.getValue(), cOutJar, sOutJar, false);
            }

            for (String name : new String[]{SideOnly.class.getName(), Side.class.getName()})
@@ -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 (!dontAnnotate.contains(classNode.name))
        {
            if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>();
            classNode.visibleAnnotations.add(getSideAnn(isClientOnly));
@@ -2,7 +2,9 @@ package cpw.mods.fml.common.event;

 import java.io.File;
 import java.util.Properties;
+import java.util.logging.Logger;

+import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.LoaderState.ModState;
 import cpw.mods.fml.common.FMLModContainer;
 import cpw.mods.fml.common.ModContainer;
@@ -74,4 +76,16 @@ public class FMLPreInitializationEvent extends FMLStateEvent

        return null;
    }
+
+    /**
+     * Get a logger instance configured to write to the FML Log as a parent, identified by modid. Handy for mod logging!
+     *
+     * @return A logger
+     */
+    public Logger getModLog()
+    {
+        Logger log = Logger.getLogger(modContainer.getModId());
+        log.setParent(FMLLog.getLogger());
+        return log;
+    }
 }
@@ -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);
@@ -170,11 +170,11 @@ public class RelaunchLibraryManager

                    if (!download)
                    {
-                        downloadMonitor.updateProgressString("Found library file %s present and correct in lib dir\n", libName);
+                        downloadMonitor.updateProgressString("Found library file %s present and correct in lib dir", libName);
                    }
                    else
                    {
-                        downloadMonitor.updateProgressString("Library file %s was downloaded and verified successfully\n", libName);
+                        downloadMonitor.updateProgressString("Library file %s was downloaded and verified successfully", libName);
                    }

                    try
@@ -455,11 +455,9 @@ public class RelaunchLibraryManager
    {
        try
        {
-        	//rootUrl.replace("%s", libFile.getPath())
            URL libDownload = new URL(String.format(rootUrl,realFilePath));
-            String infoString = String.format("Downloading file %s", libDownload.toString());
-            downloadMonitor.updateProgressString(infoString);
-            FMLRelaunchLog.info(infoString);
+            downloadMonitor.updateProgressString("Downloading file %s", libDownload.toString());
+            FMLRelaunchLog.info("Downloading file %s", libDownload.toString());
            URLConnection connection = libDownload.openConnection();
            connection.setConnectTimeout(5000);
            connection.setReadTimeout(5000);
@@ -14,6 +14,8 @@ package cpw.mods.fml.server;

 import java.util.List;

+import com.google.common.collect.ImmutableList;
+
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.src.Entity;
 import net.minecraft.src.NetClientHandler;
@@ -117,7 +119,7 @@ public class FMLServerHandler implements IFMLSidedHandler
    @Override
    public List<String> getAdditionalBrandingInformation()
    {
-        return null;
+        return ImmutableList.<String>of();
    }

    /* (non-Javadoc)
@@ -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
@@ -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.22",
+  "mcversion": "1.4.5",
  "logoFile": "/mcp.png",
  "url": "http://mcp.ocean-labs.de/",
  "updateUrl": "",
@@ -141,6 +141,8 @@ field_70278_an,velocityZ,2,
 field_70280_j,velocityY,2,
 field_70281_h,boatPitch,2,
 field_70282_i,velocityX,2,
+field_70284_d,shouldDropItem,2,
+field_70285_b,metadata,2,
 field_70286_c,fallTime,2,How long the block has been falling for.
 field_70287_a,blockID,2,
 field_70290_d,hoverStart,2,The EntityItem's random initial float height.
@@ -447,8 +449,8 @@ field_70994_bF,slowed,2,"Activated if the dragon is flying though obsidian, whit
 field_70995_bG,deathTicks,2,
 field_71067_cb,experienceTotal,2,The total amount of experience the player has. This also includes the amount of experience within their Experience Bar.
 field_71068_ca,experienceLevel,2,The current experience level the player is on.
-field_71069_bz,inventorySlots,2,the crafting inventory in you get when opening your inventory
-field_71070_bA,craftingInventory,2,the crafting inventory you are currently using
+field_71069_bz,inventoryContainer,2,The Container for the player's inventory (which opens when they press E)
+field_71070_bA,openContainer,2,The Container the player has open.
 field_71071_by,inventory,2,Inventory of the player
 field_71072_f,itemInUseCount,2,This field starts off equal to getMaxItemUseDuration and is decremented on each tick
 field_71073_d,startMinecartRidingCoordinate,2,Holds the coordinate of the player when enter a minecraft to ride.
@@ -698,6 +700,7 @@ field_71772_g,myServerAddress,2,
 field_71773_d,connectionCounter,2,
 field_71774_e,myServerSocket,2,
 field_71775_b,pendingConnections,2,
+field_71776_c,recentConnections,2,This map stores a list of InetAddresses and the last time which they connected at
 field_71777_a,logger,2,
 field_71778_h,myPort,2,
 field_71781_b,parameters,2,
@@ -1522,6 +1525,7 @@ field_73556_g,worldHeight,2,Defaults to 128
 field_73557_d,gameType,2,
 field_73558_e,dimension,2,"-1: The Nether, 0: The Overworld, 1: The End"
 field_73559_b,terrainType,2,
+field_73560_c,hardcoreMode,2,
 field_73561_a,clientEntityId,2,The player's entity ID
 field_73562_h,maxPlayers,2,The maximum players.
 field_73563_d,posY,2,
@@ -1745,6 +1749,7 @@ field_74001_a,message1,2,Unused class. Would contain a message drawn to the cent
 field_74022_d,serverSlotContainer,2,Slot container for the server list
 field_74023_b,lock,2,Lock object for use with synchronized()
 field_74025_c,parentScreen,2,A reference to the screen object that created this. Used for navigating between screens.
+field_74026_B,listofLanServers,2,
 field_74027_a,threadsPending,2,Number of outstanding ThreadPollServers threads
 field_74028_n,selectedServer,2,Index of the currently selected server
 field_74029_o,buttonEdit,2,The 'Edit' button
@@ -2010,6 +2015,7 @@ field_74516_a,keybindArray,2,
 field_74522_a,colorBuffer,2,Float buffer used to set OpenGL material colors
 field_74532_a,mc,2,A reference to the Minecraft object.
 field_74533_a,enumOSMappingHelperArray,2,
+field_74534_a,arguments,2,"Arguments that were passed to Minecraft.jar (username, sessionid etc)"
 field_74536_a,mc,2,Minecraft instance
 field_74537_a,logo,2,BufferedImage object containing the Majong logo.
 field_74541_b,lineString,2,
@@ -2737,9 +2743,9 @@ field_76235_G,canBurn,2,Bool defining if the block can burn or not.
 field_76236_A,dragonEgg,2,
 field_76237_B,portal,2,Material used for portals
 field_76238_C,cake,2,"Cake's material, see BlockCake"
-field_76239_H,groundCover,2,"Indicates if the material is a form of ground cover, e.g. Snow"
+field_76239_H,replaceable,2,"Determines whether blocks with this material can be ""overwritten"" by other blocks when placed - eg snow, vines and tall grass."
 field_76240_I,isTranslucent,2,Indicates if the material is translucent
-field_76241_J,canHarvest,2,Determines if the materials is one that can be collected by the player.
+field_76241_J,requiresNoTool,2,Determines if the material can be harvested without a tool (or with the wrong tool)
 field_76242_K,mobilityFlag,2,"Mobility information flag. 0 indicates that this block is normal, 1 indicates that it can't push other blocks, 2 indicates that it can't be pushed."
 field_76243_f,iron,2,
 field_76244_g,water,2,
@@ -3315,7 +3321,9 @@ field_77481_a,grassBuffer,2,Color buffer for grass
 field_77482_b,syncher,2,
 field_77485_a,theWorld,2,Reference to the World object.
 field_77486_a,syncher,2,
+field_77490_b,lanServerIpPort,2,
 field_77491_c,timeLastSeen,2,Last time this LanServer was seen.
+field_77492_a,lanServerMotd,2,
 field_77494_b,entityLiving,2,Used as parameter to calculate the (magic) extra damage based on enchantments of current equipped player item.
 field_77495_a,livingModifier,2,Used to calculate the (magic) extra damage based on enchantments of current equipped player item.
 field_77496_b,source,2,Used as parameter to calculate the damage modifier (extra armor) on enchantments that the player have on equipped armors.
@@ -3339,6 +3347,8 @@ field_77546_b,firstDescriptionLine,2,First line of texture pack description (fro
 field_77547_c,secondDescriptionLine,2,Second line of texture pack description (from /pack.txt) displayed in the GUI
 field_77548_a,texturePackFile,2,File object for the texture pack's zip file in TexturePackCustom or the directory in TexturePackFolder.
 field_77550_e,texturePackZipFile,2,ZipFile object used to access the texture pack file's contents.
+field_77555_b,listOfLanServers,2,
+field_77556_a,wasUpdated,2,
 field_77574_d,recipeItems,2,Is a array of ItemStack that composes the recipe.
 field_77575_e,recipeOutput,2,Is the ItemStack that you get when craft the recipe.
 field_77576_b,recipeWidth,2,How many horizontal slots this recipe is wide.
@@ -3552,6 +3562,7 @@ field_77882_bY,maxDamageArray,2,Holds the 'base' maxDamage that each armorType h
 field_77885_a,blockID,2,The block ID of the Block associated with this ItemBlock
 field_77889_b,theHalfSlab,2,Instance of BlockHalfSlab.
 field_77890_c,theHalfSlab2,2,Instance of BlockHalfSlab.
+field_77891_a,isFullBlock,2,
 field_77895_b,blockNames,2,
 field_77896_a,blockRef,2,
 field_77918_f,speckledMelonEffect,2,
@@ -4168,6 +4179,8 @@ field_82134_g,secondaryEffect,2,Secondary potion effect given by this beacon.
 field_82136_e,levels,2,Level of this beacon's pyramid.
 field_82139_a,effectsList,2,List of effects that Beacon can apply
 field_82140_h,payment,2,Item given to this beacon as payment.
+field_82155_f,isAnvil,2,
+field_82157_e,isBreakingAnvil,2,
 field_82172_bs,canPickUpLoot,2,Whether this entity can pick up items from the ground.
 field_82173_br,swingProgressInt,2,
 field_82174_bp,equipmentDropChances,2,Chances for each equipment piece from dropping when this entity dies.
@@ -4181,6 +4194,7 @@ field_82192_a,mobSelector,2,Entity selector for IMob types.
 field_82199_d,witchDrops,2,List of items a witch should drop on death.
 field_82200_e,witchAttackTimer,2,"Timer used as interval for a witch's attack, decremented every tick if aggressive and when reaches zero the witch will throw a potion at the target entity."
 field_82219_bJ,attackEntitySelector,2,Selector used to determine the entities a wither boss should attack.
+field_82225_f,fuseTime,2,
 field_82226_g,explosionRadius,2,Explosion radius for this creeper.
 field_82234_d,conversionTime,2,Ticker used to determine the time remaining for this zombie to convert into a villager when cured.
 field_82237_a,currentFlightTarget,2,randomly selected ChunkCoordinates in a 7x6x7 box around the bat (y offset -2 to 4) towards which it will fly. upon getting close a new target will be selected
@@ -4215,8 +4229,10 @@ field_82320_o,theSlot,2,
 field_82321_q,buttonsNotDrawn,2,
 field_82322_p,beaconConfirmButton,2,
 field_82323_o,beacon,2,
+field_82332_a,hangingDirection,2,
 field_82337_e,itemDropChance,2,Chance for this item frame's item to drop from the frame.
 field_82346_a,theContainer,2,Container of this anvil's block.
+field_82354_a,command,2,The command this block will execute when powered.
 field_82365_a,difficulties,2,
 field_82373_c,directions,2,
 field_82374_e,facings,2,
@@ -4251,7 +4267,7 @@ field_82510_ck,anvil,2,
 field_82511_ci,woodenButton,2,
 field_82512_cj,skull,2,
 field_82513_cg,carrot,2,
-field_82514_ch,potatoe,2,
+field_82514_ch,potato,2,
 field_82515_ce,cobblestoneWall,2,
 field_82516_cf,flowerPot,2,
 field_82517_cc,commandBlock,2,
@@ -4266,11 +4282,14 @@ field_82552_a,mcServer,2,
 field_82553_a,mcServer,2,
 field_82555_a,mcServer,2,
 field_82557_a,mcServer,2,Reference to the MinecraftServer object.
+field_82564_f,showCape,2,
 field_82575_g,dayTime,2,Total time for this world.
+field_82576_c,generatorOptions,2,
 field_82577_x,theGameRules,2,
 field_82578_b,NBTTypes,2,
 field_82584_b,theNBTTagCompound,2,
 field_82587_b,theNBTTagCompound,2,
+field_82592_a,vec3dPool,2,
 field_82596_a,registryObjects,2,Objects registered on this registry.
 field_82597_b,defaultObject,2,"Default object for this registry, returned when an object is not found."
 field_82624_d,zPos,2,
@@ -4290,6 +4309,9 @@ field_82661_d,layerMinimumY,2,
 field_82662_b,layerFillBlock,2,Block type used on this set of layers.
 field_82663_c,layerFillBlockMeta,2,Block metadata used on this set of laeyrs.
 field_82664_a,layerCount,2,Amount of layers for this set of layers.
+field_82668_f,scatteredFeatureSpawnList,2,contains possible spawns for scattered features
+field_82669_g,maxDistanceBetweenScatteredFeatures,2,the maximum distance between scattered features
+field_82670_h,minDistanceBetweenScatteredFeatures,2,the minimum distance between scattered features
 field_82678_d,cropTypeC,2,Third crop type for this field.
 field_82679_b,cropTypeA,2,First crop type for this field.
 field_82680_c,cropTypeB,2,Second crop type for this field.
@@ -4316,7 +4338,7 @@ field_82786_e,maxTradeUses,2,Maximum times this trade can be used.
 field_82791_bT,pumpkinPie,2,
 field_82792_bS,netherStar,2,
 field_82793_bR,carrotOnAStick,2,
-field_82794_bL,potatoe,2,
+field_82794_bL,potato,2,
 field_82795_bM,bakedPotato,2,
 field_82796_bJ,flowerPot,2,
 field_82797_bK,carrot,2,
@@ -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_
@@ -2134,13 +2200,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 +2297,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 +2360,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 +2371,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 +2394,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 +2405,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 +2441,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 +2458,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 +2487,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 +2611,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 +2638,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 +2671,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 +2732,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 +2772,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 +2791,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 +2816,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 +2891,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 +2939,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 +2961,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 +2999,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 +3009,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 +3028,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 +3066,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 +3104,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 +3138,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 +3179,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 +3188,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 +3306,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 +3480,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 +3490,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 +3682,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 +3913,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 +3954,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 +4171,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 +4204,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 +4455,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 +4553,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 +5279,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 +5327,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 +5567,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 +5678,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 +5725,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 +5738,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 +5768,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 +5780,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 +5881,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 +6220,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 +6301,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 +6331,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 +6548,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 +6556,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 +6577,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 +6639,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 +6666,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 +6765,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 +6795,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_
@@ -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  = b15e2b2b6b4629f0d99a95b6b44412a0
+MD5Server  = 250654ceae7a26ba955a30095d90a475

 [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           = 91000
+ParamIndex        = 7100

 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
@@ -76,6 +76,7 @@ func_70075_an,canAttackWithItem,2,"If returns false, the item will not inflict a
 func_70076_C,kill,2,sets the dead flag. Used when you fall off the bottom of the world.
 func_70077_a,onStruckByLightning,2,Called when a lightning bolt hits the entity.
 func_70078_a,mountEntity,2,"Called when a player mounts an entity. e.g. mounts a pig, mounts a boat."
+func_70079_am,setRotationYawHead,2,
 func_70080_a,setPositionAndRotation,2,"Sets the entity's position and rotation. Args: posX, posY, posZ, yaw, pitch"
 func_70081_e,dealFireDamage,2,Will deal the specified amount of damage to the entity if the entity isn't immune to fire damage. Args: amountDamage
 func_70082_c,setAngles,2,"Adds par1*0.15 to the entity's yaw, and *subtracts* par2*0.15 from the pitch. Clamps pitch from -90 to 90. Both arguments in degrees."
@@ -337,7 +338,7 @@ func_70682_h,decreaseAirSupply,2,Decrements the entity's air supply when underwa
 func_70683_ar,getJumpHelper,2,
 func_70684_aJ,isPlayer,2,Only use is to identify if class is an instance of player for experience dropping
 func_70685_l,canEntityBeSeen,2,returns true if the entity provided in the argument can be seen. (Raytrace)
-func_70686_a,isExplosiveMob,2,
+func_70686_a,canAttackClass,2,Returns true if this entity can attack entities of the specified class.
 func_70687_e,isPotionApplicable,2,
 func_70688_c,onFinishedPotionEffect,2,
 func_70689_ay,getAIMoveSpeed,2,the movespeed used for the new AI system
@@ -378,14 +379,14 @@ func_70824_q,getCarryingData,2,Get the metadata of the block an enderman carries
 func_70825_j,teleportTo,2,Teleport the enderman
 func_70829_a,setCreeperState,2,"Sets the state of creeper, -1 to idle and 1 to be 'in fuse'"
 func_70830_n,getPowered,2,Returns true if the creeper is powered by a lightning bolt.
-func_70831_j,setCreeperFlashTime,2,Connects the the creeper flashes to the creeper's color multiplier
+func_70831_j,getCreeperFlashIntensity,2,Params: (Float)Render tick. Returns the intensity of the creeper's flash when it is ignited.
 func_70832_p,getCreeperState,2,"Returns the current state of creeper, -1 is idle, 1 is 'in fuse'"
 func_70835_c,becomeAngryAt,2,Causes this PigZombie to become angry at the supplied Entity (which will be a player).
 func_70839_e,setBesideClimbableBlock,2,"Updates the WatchableObject (Byte) created in entityInit(), setting it to 0x01 if par1 is true or 0x00 if it is false."
 func_70840_n,spiderScaleAmount,2,How large the spider should be scaled.
 func_70841_p,isBesideClimbableBlock,2,Returns true if the WatchableObject (Byte) is 0x01 otherwise returns false. The WatchableObject is updated using setBesideClimableBlock.
-func_70849_f,setBit1FlagTo,2,
-func_70850_q,getBit1Flag,2,
+func_70849_f,setPlayerCreated,2,
+func_70850_q,isPlayerCreated,2,
 func_70851_e,setHoldingRose,2,
 func_70852_n,getVillage,2,
 func_70853_p,getHoldRoseTick,2,
@@ -452,7 +453,7 @@ func_70973_b,simplifyAngle,2,Simplifies the value of a number by adding/subtract
 func_70974_a,getMovementOffsets,2,"Returns a double[3] array with movement offsets, used to calculate trailing tail/neck positions. [0] = yaw offset, [1] = y offset, [2] = unused, always 0. Parameters: buffer index offset, partial ticks."
 func_70975_a,createEnderPortal,2,Creates the ender portal leading back to the normal world after defeating the enderdragon.
 func_70996_bM,shouldHeal,2,Checks if the player's health is not full and not zero.
-func_70997_bJ,getSpawnChunk,2,Returns the coordinates to respawn the player based on last bed that the player sleep.
+func_70997_bJ,getBedLocation,2,"Returns the location of the bed the player will respawn at, or null if the player has not slept in a bed."
 func_70998_m,interactWith,2,
 func_70999_a,wakeUpPlayer,2,Wake up the player if they're sleeping.
 func_71000_j,addMovementStat,2,"Adds a value to a movement statistic field - like run, walk, swin or climb."
@@ -517,9 +518,9 @@ func_71063_a,setSpawnChunk,2,Defines a spawn coordinate to player spawn. Used by
 func_71064_a,addStat,2,Adds a value to a statistic field.
 func_71065_l,isInBed,2,Checks if the player is currently in a bed
 func_71110_a,sendContainerAndContentsToPlayer,2,
-func_71111_a,updateCraftingInventorySlot,2,inform the player of a change in a single slot
-func_71112_a,updateCraftingInventoryInfo,2,send information about the crafting inventory to the client(currently only for furnace times)
-func_71113_k,sendInventoryToPlayer,2,
+func_71111_a,sendSlotContents,2,"Sends the contents of an inventory slot to the client-side Container. This doesn't have to match the actual contents of that slot. Args: Container, slot number, slot contents"
+func_71112_a,sendProgressBarUpdate,2,"Sends two ints to the client-side Container. Used for furnace burning time, smelting progress, brewing progress, and enchanting level. Normally the first int identifies which variable to update, and the second contains the new value. Both are truncated to shorts in non-local SMP."
+func_71113_k,updateHeldItem,2,updates item held by mouse
 func_71115_a,requestTexturePackLoad,2,on recieving this message the client (if permission is given) will download the requested textures
 func_71116_b,addSelfToInternalCraftingInventory,2,
 func_71117_bO,incrementWindowID,2,
@@ -720,6 +721,7 @@ func_71500_a,addCrashSectionCallable,2,Adds a Crashreport section with the given
 func_71501_a,getDescription,2,Returns the description of the Crash Report.
 func_71502_e,getCompleteReport,2,"Gets the complete report with headers, stack trace, and different sections as a string."
 func_71503_h,getWittyComment,2,Gets a random witty comment for inclusion in this CrashReport
+func_71504_g,populateEnvironment,2,Populates this crash report with initial information about the running server and operating system / java environment
 func_71505_b,getCrashCause,2,Returns the Throwable object that is the cause for the crash and Crash Report.
 func_71506_a,getSectionsInStringBuilder,2,Gets the various sections of the crash report into the given StringBuilder
 func_71507_a,addCrashSection,2,Adds a Crashreport section with the given name with the given value (convered .toString())
@@ -771,7 +773,7 @@ func_71566_a,isAllowedCharacter,2,
 func_71569_e,getDistanceSquared,2,Returns the squared distance between this coordinates and the coordinates given as argument.
 func_71570_a,compareChunkCoordinate,2,Compare the coordinate with another coordinate
 func_71571_b,set,2,
-func_71575_a,getTheReportedExceptionCrashReport,2,Gets the CrashReport Instance.
+func_71575_a,getCrashReport,2,Gets the CrashReport wrapped by this exception.
 func_71606_a,toASN1Primitive,2,
 func_71607_a,asn1Equals,2,
 func_71742_a,getType,2,
@@ -802,7 +804,7 @@ func_71851_a,getBlockTextureFromSide,2,Returns the block texture based on the si
 func_71852_a,breakBlock,2,"ejects contained items into the world, and notifies neighbours of an update, as appropriate"
 func_71853_i,canProvidePower,2,Can this block provide power. Only wire currently seems to have this change based on its state.
 func_71854_d,canBlockStay,2,Can this block stay at this position.  Similar to canPlaceBlockAt except gets checked often with plants.
-func_71855_c,isIndirectlyPoweringTo,2,Is this block indirectly powering the block on the specified side
+func_71855_c,isProvidingStrongPower,2,"Returns true if the block is emitting direct/strong redstone power on the specified side. Args: World, X, Y, Z, side"
 func_71856_s_,getRenderBlockPass,2,Returns which pass should this block be rendered on. 0 for solids and 1 for alpha
 func_71857_b,getRenderType,2,The type of render function that is called for this block
 func_71858_a,getBlockTextureFromSideAndMetadata,2,"From the specified side and block metadata retrieves the blocks texture. Args: side, metadata"
@@ -812,7 +814,7 @@ func_71861_g,onBlockAdded,2,"Called whenever the block is added into the world.
 func_71862_a,randomDisplayTick,2,A randomly called display update to be able to add particles or other items for display
 func_71863_a,onNeighborBlockChange,2,"Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are their own) Args: x, y, z, neighbor blockID"
 func_71864_b,setBlockName,2,set name of block from language file
-func_71865_a,isPoweringTo,2,Is this block powering the block on the specified side
+func_71865_a,isProvidingWeakPower,2,"Returns true if the block is emitting indirect/weak redstone power on the specified side. If isBlockNormalCube returns true, standard redstone propagation rules will apply instead and this will not be called. Args: World, X, Y, Z, side"
 func_71866_a,onFallenUpon,2,Block's chance to react to an entity falling on it.
 func_71867_k,onBlockDestroyedByExplosion,2,Called upon the block being destroyed by an explosion
 func_71868_h,setLightOpacity,2,Sets how much light is blocked going through this block. Returns the object for convenience in constructing.
@@ -1255,6 +1257,7 @@ func_72687_a,flagChunkForUpdate,2,"the ""PlayerInstance""/ chunkWatcher will sen
 func_72688_a,getWorldServer,2,
 func_72689_b,getChunkWatchers,2,
 func_72690_a,getOrCreateChunkWatcher,2,
+func_72691_b,filterChunkLoadQueue,2,Removes all chunks from the given player's chunk load queue that are not in viewing range of the player.
 func_72692_a,getWorldServer,2,
 func_72693_b,updatePlayerInstances,2,updates all the player instances that need to be updated
 func_72694_a,isPlayerWatchingChunk,2,
@@ -1264,11 +1267,11 @@ func_72703_a,obtainEntitySkin,2,"Start the skin for this entity downloading, if
 func_72704_a,playSound,2,"Plays the specified sound. Arg: soundName, x, y, z, volume, pitch"
 func_72705_a,destroyBlockPartially,2,Starts (or continues) destroying a block with given ID at the given coordinates for the given partially destroyed value
 func_72706_a,playAuxSFX,2,"Plays a pre-canned sound effect along with potentially auxiliary data-driven one-shot behaviour (particles, etc)."
-func_72707_a,markBlockRangeNeedsUpdate,2,"Called across all registered IWorldAccess instances when a block range is invalidated. Args: minX, minY, minZ, maxX, maxY, maxZ"
+func_72707_a,markBlockRangeForRenderUpdate,2,"On the client, re-renders all blocks in this range, inclusive. On the server, does nothing. Args: min x, min y, min z, max x, max y, max z"
 func_72708_a,spawnParticle,2,"Spawns a particle. Arg: particleType, x, y, z, velX, velY, velZ"
 func_72709_b,releaseEntitySkin,2,Decrement the reference counter for this entity's skin image data
-func_72710_a,markBlockNeedsUpdate,2,"Will mark the block and neighbors that their renderers need an update (could be all the same renderer potentially) Args: x, y, z"
-func_72711_b,markBlockNeedsUpdate2,2,As of mc 1.2.3 this method has exactly the same signature and does exactly the same as markBlockNeedsUpdate
+func_72710_a,markBlockForUpdate,2,"On the client, re-renders the block. On the server, sends the block to the client (which will re-render it), including the tile entity description packet if applicable. Args: x, y, z"
+func_72711_b,markBlockForRenderUpdate,2,"On the client, re-renders this block. On the server, does nothing. Used for lighting updates."
 func_72712_a,loadRenderers,2,Loads all the renderers and sets up the basic settings usage
 func_72713_a,renderEntities,2,"Renders all entities within range and within the frustrum. Args: pos, frustrum, partialTickTime"
 func_72714_a,renderSky,2,Renders the sky with the partial tick time. Args: partialTickTime
@@ -1343,7 +1346,7 @@ func_72841_b,getUniqueDataId,2,Returns an unique new data id from the MapStorage
 func_72842_a,getBlockDensity,2,"Gets the percentage of real blocks within within a bounding box, along a specified vector."
 func_72843_D,setRandomSeed,2,puts the World Random seed to a specific state dependant on the inputs
 func_72844_a,getEntityPathToXYZ,2,
-func_72845_h,markBlockNeedsUpdate,2,"Marks the block as needing an update with the renderer. Args: x, y, z"
+func_72845_h,markBlockForUpdate,2,"On the client, re-renders the block. On the server, sends the block to the client (which will re-render it), including the tile entity description packet if applicable. Args: x, y, z"
 func_72846_b,getClosestVulnerablePlayer,2,"Returns the closest vulnerable player within the given radius, or null if none is found."
 func_72847_b,releaseEntitySkin,2,Decrement the reference counter for this entity's skin image data
 func_72848_b,removeWorldAccess,2,Removes a worldAccess from the worldAccesses object
@@ -1360,7 +1363,7 @@ func_72858_w,canSnowAt,2,Tests whether or not snow can be placed at a given loca
 func_72859_e,setBlockWithNotify,2,"Sets a block and notifies relevant systems with the block change  Args: x, y, z, blockID"
 func_72860_G,getSaveHandler,2,Returns this world's current save handler
 func_72861_E,getSpawnPoint,2,Returns the coordinates of the spawn point
-func_72862_i,markBlockAsNeedsUpdate,2,calls the 'MarkBlockAsNeedsUpdate' in all block accesses in this world
+func_72862_i,markBlockForRenderUpdate2,2,"On the client, re-renders this block. On the server, does nothing. Appears to be redundant."
 func_72863_F,getChunkProvider,2,gets the IChunkProvider this world uses.
 func_72864_z,isBlockIndirectlyGettingPowered,2,"Used to see if one of the blocks next to you or your block is getting power from a neighboring block. Used by items like TNT or Doors so they don't have redstone going straight into them.  Args: x, y, z"
 func_72865_a,getPathEntityToEntity,2,
@@ -1400,14 +1403,14 @@ func_72898_h,notifyBlocksOfNeighborChange,2,"Notifies neighboring blocks that th
 func_72899_e,blockExists,2,"Returns whether a block exists at world coordinates x, y, z"
 func_72900_e,setEntityDead,2,"Dismounts the entity (and anything riding the entity), sets the dead flag, and removes the player entity from the player entity list. Called by the playerLoggedOut function."
 func_72901_a,rayTraceBlocks_do,2,
-func_72902_n,markBlockNeedsUpdateForAll,2,all WorldAcceses mark this block as dirty
+func_72902_n,markBlockForRenderUpdate,2,"On the client, re-renders this block. On the server, does nothing. Used for lighting updates."
 func_72903_x,setActivePlayerChunksAndCheckLight,2,
 func_72904_c,checkChunksExist,2,"Checks between a min and max all the chunks inbetween actually exist. Args: minX, minY, minZ, maxX, maxY, maxZ"
 func_72905_C,getSeed,2,Retrieve the world seed from level.dat
 func_72906_B,checkSessionLock,2,Checks whether the session lock file was modified by another process
 func_72907_a,countEntities,2,Counts how many entities of an entity class exist in the world. Args: entityClass
 func_72908_a,playSoundEffect,2,"Play a sound effect. Many many parameters for this function. Not sure what they do, but a classic call is : (double)i + 0.5D, (double)j + 0.5D, (double)k + 0.5D, 'random.door_open', 1.0F, world.rand.nextFloat() * 0.1F + 0.9F with i,j,k position of the block."
-func_72909_d,markBlocksDirty,2,
+func_72909_d,markBlockRangeForRenderUpdate,2,"On the client, re-renders all blocks in this range, inclusive. On the server, does nothing. Args: min x, min y, min z, max x, max y, max z"
 func_72910_y,getLoadedEntityList,2,Accessor for world Loaded Entity List
 func_72911_I,isThundering,2,Returns true if the current thunder strength (weighted with the rain strength) is greater than 0.9
 func_72912_H,getWorldInfo,2,Gets the World's WorldInfo instance
@@ -1783,11 +1786,16 @@ func_73970_b,drawPanorama,2,Draws the main menu panorama
 func_73971_c,renderSkybox,2,Renders the skybox in the main menu
 func_73972_b,addDemoButtons,2,Adds Demo buttons on Main Menu for players who are playing Demo.
 func_73985_g,respawnPlayer,2,Respawns the player.
+func_74002_a,connectToServer,2,
+func_74003_b,getListOfLanServers,2,
 func_74004_a,joinServer,2,Join server by slot index
 func_74005_e,getButtonEdit,2,Return buttonEdit GuiButton
+func_74006_a,getInternetServerList,2,
 func_74014_d,getButtonSelect,2,Return buttonSelect GuiButton
+func_74015_a,getAndSetSelectedServer,2,
 func_74016_g,initGuiControls,2,Populate the GuiScreen controlList
 func_74019_f,getButtonDelete,2,Return buttonDelete GuiButton
+func_74020_c,getSelectedServer,2,
 func_74042_b,getDoneButton,2,Returns the private doneButton field.
 func_74043_a,getGameSettings,2,Gets the relevant instance of GameSettings. Synthetic method for use in GuiSlotLanguage
 func_74059_d,getRenameButton,2,returns the rename button
@@ -2261,6 +2269,7 @@ func_75217_a,isSlotInInventory,2,returns true if this slot is in par2 of par1
 func_75218_e,onSlotChanged,2,Called when the stack in a Slot changes
 func_75219_a,getSlotStackLimit,2,"Returns the maximum stack size for a given slot (usually the same as getInventoryStackLimit(), but 1 in the case of armor slots)"
 func_75220_a,onSlotChange,2,"if par2 has more items than par1, onCrafting(item,countIncrease) is called"
+func_75243_a_,canHoldPotion,2,Returns true if this itemstack can be filled with a potion
 func_75246_d,updateTask,2,Updates the task
 func_75247_h,getMutexBits,2,"Get a bitmask telling which other tasks may not run concurrently. The test is a simple bitwise AND - if it yields zero, the two tasks may run concurrently, if not - they must run exclusively from each other."
 func_75248_a,setMutexBits,2,"Sets a bitmask telling which other tasks may not run concurrently. The test is a simple bitwise AND - if it yields zero, the two tasks may run concurrently, if not - they must run exclusively from each other."
@@ -2272,6 +2281,7 @@ func_75253_b,continueExecuting,2,Returns whether an in-progress EntityAIBase sho
 func_75270_a,setSitting,2,Sets the sitting flag.
 func_75296_a,isSuitableTarget,2,A method used to see if an entity is a suitable target through a number of checks.
 func_75349_a,findUsableDoor,2,Determines if a door can be broken with AI.
+func_75362_f,getEatGrassTick,2,
 func_75366_f,findPossibleShelter,2,
 func_75382_a,hasPlayerGotBoneInHand,2,Gets if the Player has the Bone in the hand.
 func_75388_i,spawnBaby,2,Spawns a baby animal of the same type.
@@ -2506,6 +2516,7 @@ func_75912_b,choose,2,randomly choose between the four args
 func_75913_a,choose,2,randomly choose between the two args
 func_75917_a,choose,2,Chooses one of the two inputs randomly.
 func_75918_d,initCraftableStats,2,Initializes statistics related to craftable items. Is only called after both block and item stats have been initialized.
+func_75919_a,nopInit,2,This method simply NOPs. It is presumably used to call the static constructors on server start.
 func_75920_a,initUsableStats,2,Initializes statistic fields related to usable items and blocks.
 func_75921_a,initMinableStats,2,Initializes statistic fields related to minable items and blocks.
 func_75922_b,initBreakableStats,2,Initializes statistic fields related to breakable items and blocks.
@@ -2634,22 +2645,23 @@ func_76187_b,writeToNBT,2,"write data to NBTTagCompound from this MapDataBase, s
 func_76188_b,isDirty,2,Whether this MapDataBase needs saving to disk.
 func_76191_a,updateVisiblePlayers,2,Adds the player passed to the list of visible players and checks to see which players are visible
 func_76192_a,updateMPMapData,2,Updates the client's map with information from other players in MP
+func_76194_a,setColumnDirty,2,"Marks a vertical range of pixels as being modified so they will be resent to clients. Parameters: X, lowest Y, highest Y"
 func_76204_a,getPlayersOnMap,2,"returns a 1+players*3 array, of x,y, and color . the name of this function may be partially wrong, as there is a second branch to the code here"
 func_76217_h,getCanBurn,2,Returns if the block can burn or not.
 func_76218_k,isOpaque,2,Indicate if the material is opaque
 func_76219_n,setNoPushMobility,2,"This type of material can't be pushed, but pistons can move over it."
 func_76220_a,isSolid,2,
-func_76221_f,setNoHarvest,2,Disables the ability to harvest this material.
-func_76222_j,isGroundCover,2,"Return whether the material is a form of ground cover, e.g. Snow"
+func_76221_f,setRequiresTool,2,Makes blocks with this material require the correct tool to be harvested.
+func_76222_j,isReplaceable,2,"Returns whether the material can be replaced by other blocks when placed - eg snow, vines and tall grass."
 func_76223_p,setTranslucent,2,Marks the material as translucent
 func_76224_d,isLiquid,2,Returns if blocks of these materials are liquids.
 func_76225_o,setImmovableMobility,2,"This type of material can't be pushed, and pistons are blocked to move."
 func_76226_g,setBurning,2,Set the canBurn bool to True and return the current object.
 func_76227_m,getMaterialMobility,2,"Returns the mobility information of the material, 0 = free, 1 = can't push but can move over, 2 = total immobility and stop pistons."
 func_76228_b,getCanBlockGrass,2,Will prevent grass from growing on dirt underneath and kill any grass below it if it returns true
-func_76229_l,isHarvestable,2,Returns true if material can be harvested by player.
+func_76229_l,isToolNotRequired,2,Returns true if the material can be harvested without a tool (or with the wrong tool)
 func_76230_c,blocksMovement,2,Returns if this material is considered solid or not
-func_76231_i,setGroundCover,2,"Sets the material as a form of ground cover, e.g. Snow"
+func_76231_i,setReplaceable,2,Sets {@link #replaceable} to true.
 func_76269_a,getRandomItem,2,"Returns a random choice from the input array of items, with a total weight value."
 func_76270_a,getTotalWeight,2,Returns the total weight of all items in a array.
 func_76271_a,getRandomItem,2,Returns a random choice from the input items.
@@ -2758,7 +2770,7 @@ func_76550_a,createOrLoadRegionFile,2,
 func_76551_a,clearRegionFileReferences,2,Saves the current Chunk Map Cache
 func_76552_d,getChunkOutputStream,2,"Returns an output stream for the specified chunk. Args: worldDir, chunkX, chunkZ"
 func_76554_h,getEntrancePortalLocation,2,Gets the hard-coded portal location to use when entering this dimension.
-func_76555_c,getChunkProvider,2,Returns the chunk provider back for the world provider
+func_76555_c,createChunkGenerator,2,Returns a new chunk provider which generates chunks for this world
 func_76556_a,generateLightBrightnessTable,2,Creates the light to brightness table
 func_76557_i,getAverageGroundLevel,2,
 func_76558_a,registerWorld,2,"associate an existing world with a World provider, and setup its lightbrightness table"
@@ -3164,7 +3176,7 @@ func_77458_a,getRandomSoundFromSoundPool,2,"gets a random sound from the specifi
 func_77459_a,addSound,2,Adds a sound to this sound pool.
 func_77460_a,getRandomSound,2,Gets a random SoundPoolEntry.
 func_77466_a,getFoliageColorPine,2,Gets the foliage color for pine type (metadata 1) trees
-func_77467_a,getFoilageBiomeColorizer,2,
+func_77467_a,setFoliageBiomeColorizer,2,
 func_77468_c,getFoliageColorBasic,2,
 func_77469_b,getFoliageColorBirch,2,Gets the foliage color for birch type (metadata 2) trees
 func_77470_a,getFoliageColor,2,"Gets foliage color from temperature and humidity. Args: temperature, humidity"
@@ -3175,6 +3187,8 @@ func_77475_a,setLightmapTextureCoords,2,Sets the current coordinates of the give
 func_77479_a,setGrassBiomeColorizer,2,
 func_77480_a,getGrassColor,2,"Gets grass color from temperature and humidity. Args: temperature, humidity"
 func_77484_a,getWorldEntitiesAsString,2,
+func_77487_a,getServerMotd,2,
+func_77488_b,getServerIpPort,2,
 func_77489_c,updateLastSeen,2,Updates the time this LanServer was last seen.
 func_77493_a,calculateModifier,2,Generic method use to calculate modifiers of offensive or defensive enchantment values.
 func_77501_a,getRespiration,2,Returns the 'Water Breathing' modifier of enchantments on player equipped armors.
@@ -3196,6 +3210,8 @@ func_77516_a,applyEnchantmentModifierArray,2,Executes the enchantment modifier o
 func_77517_e,getFortuneModifier,2,Returns the fortune enchantment modifier of the current equipped item of player.
 func_77518_a,applyEnchantmentModifier,2,Executes the enchantment modifier on the ItemStack passed.
 func_77519_f,getLootingModifier,2,Returns the looting enchantment modifier of the current equipped item of player.
+func_77523_b,getAdFromPingResponse,2,
+func_77524_a,getMotdFromPingResponse,2,
 func_77525_a,getPingResponse,2,
 func_77531_d,getFirstDescriptionLine,2,Get the first line of the texture pack description (read from the pack.txt file)
 func_77532_a,getResourceAsStream,2,Gives a texture resource as InputStream.
@@ -3209,6 +3225,9 @@ func_77539_g,loadThumbnailImage,2,Load and initialize thumbnailImage from the th
 func_77540_a,loadDescription,2,Load texture pack description from /pack.txt file in the texture pack
 func_77541_b,trimStringToGUIWidth,2,Truncate strings to at most 34 characters. Truncates description lines
 func_77549_g,openTexturePackFile,2,Open the texture pack's file and initialize texturePackZipFile
+func_77552_b,setWasNotUpdated,2,
+func_77553_a,getWasUpdated,2,
+func_77554_c,getLanServers,2,
 func_77557_a,canEnchantItem,2,Return true if the item passed can be enchanted by a enchantment of this type.
 func_77569_a,matches,2,Used to check if a recipe matches current crafting inventory
 func_77570_a,getRecipeSize,2,Returns the size of the recipe area
@@ -3360,6 +3379,7 @@ func_77979_a,splitStack,2,Remove the argument from the stack size. Return a new
 func_77980_a,onCrafting,2,
 func_77981_g,getHasSubtypes,2,
 func_77982_d,setTagCompound,2,"Assigns a NBTTagCompound to the ItemStack, minecraft validates that only non-stackable items can have it."
+func_77983_a,setTagInfo,2,
 func_77984_f,isItemStackDamageable,2,true if this itemStack is damageable
 func_77985_e,isStackable,2,Returns true if the ItemStack can hold 2 or more units of the item.
 func_77986_q,getEnchantmentTagList,2,
@@ -3643,6 +3663,7 @@ func_78856_c,countServers,2,Counts the number of ServerData instances in the lis
 func_78857_a,swapServers,2,"Takes two list indexes, and swaps their order around."
 func_78861_a,getIP,2,
 func_78862_a,parseIntWithDefault,2,
+func_78863_b,getServerAddress,2,"Returns a server's address and port for the specified hostname, looking up the SRV record if possible"
 func_78864_b,getPort,2,
 func_78867_a,addBlockHitEffects,2,"Adds block hit particles for the specified block. Args: x, y, z, sideHit"
 func_78868_a,updateEffects,2,
@@ -3690,17 +3711,23 @@ func_79014_a,updateStats,2,Updates the stat values and calls paint to redraw the
 func_80003_ah,getPlayerUsageSnooper,2,
 func_80006_f,getUniqueID,2,
 func_80007_l,getDimensionName,2,"Returns the dimension's name, e.g. ""The End"", ""Nether"", or ""Overworld""."
+func_82011_an,enableGui,2,
 func_82114_b,getPlayerCoordinates,2,Return the coordinates for this player as ChunkCoordinates.
 func_82126_i,getPrimaryEffect,2,Return the primary potion effect given by this beacon.
 func_82129_c,setLevels,2,Set the levels of this beacon's pyramid.
 func_82130_k,getLevels,2,Return the levels of this beacon's pyramid.
 func_82132_j,getSecondaryEffect,2,Return the secondary potion effect given by this beacon.
 func_82141_a,copyDataFrom,2,"Copies important data from another entity to this entity. Used when teleporting entities between worlds, as this actually deletes the teleporting entity and re-creates it on the other side. Params: Entity to copy from, unused (always true)"
+func_82142_c,setHasActivePotion,2,
 func_82144_au,doesEntityNotTriggerPressurePlate,2,Return whether this entity should NOT trigger a pressure plate or a tripwire.
 func_82145_z,getMaxInPortalTime,2,Return the amount of time this entity should stay in a portal before being transported.
 func_82147_ab,getPortalCooldown,2,Return the amount of cooldown before this entity can use a portal again.
+func_82150_aj,getHasActivePotion,2,
+func_82154_e,setIsAnvil,2,
 func_82160_b,dropEquipment,2,Drop the equipment for this entity.
+func_82161_a,getArmorItemForSlot,2,"Params: Armor slot, Item tier"
 func_82163_bD,initCreature,2,Initialize this creature.
+func_82165_m,isPotionActive,2,
 func_82166_i,getArmSwingAnimationEnd,2,"Returns an integer indicating the end point of the swing animation, used by {@link #swingProgress} to provide a progress indicator. Takes dig speed enchantments into account."
 func_82167_n,collideWithEntity,2,
 func_82168_bl,updateArmSwingProgress,2,Updates the arm swing progress counters and animation progress
@@ -3720,29 +3747,41 @@ func_82203_t,getWatchedTargetId,2,"Returns the target entity ID if present, or -
 func_82205_o,isArmored,2,Returns whether the wither is armored with its boss armor or not by checking whether its health is below half of its maximum.
 func_82227_f,setChild,2,Set whether this zombie is a child.
 func_82228_a,startConversion,2,Starts converting this zombie into a villager. The zombie converts into a villager after the specified time in ticks.
-func_82229_g,setVillager,2,Set whether this zombie is a villager.
+func_82229_g,setIsVillager,2,Set whether this zombie is a villager.
 func_82231_m,isVillager,2,Return whether this zombie is a villager.
 func_82232_p,convertToVillager,2,Convert this zombie into a villager.
 func_82233_q,getConversionTimeBoost,2,Return the amount of time decremented from conversionTime every tick.
 func_82235_h,getIsBatHanging,2,
 func_82236_f,setIsBatHanging,2,
+func_82238_cc,getHideCape,2,
+func_82239_b,setHideCape,2,
 func_82240_a,displayGUIBeacon,2,Displays the GUI for interacting with a beacon.
+func_82241_s,getHideCape,2,
 func_82242_a,addExperienceLevel,2,Add experience levels to this player.
 func_82244_d,displayGUIAnvil,2,Displays the GUI for interacting with an anvil.
+func_82245_bX,isSpawnForced,2,
 func_82246_f,canCurrentToolHarvestBlock,2,"Returns true if the item the player is holding can harvest the block at the given coords. Args: x, y, z."
+func_82247_a,canPlayerEdit,2,
+func_82273_a,setFlatGeneratorInfo,2,
 func_82274_h,getRenderItem,2,
+func_82275_e,getFlatGeneratorInfo,2,
 func_82294_a,addPreset,2,Add a flat world preset.
 func_82295_i,getPresets,2,Return the list of defined flat world presets.
 func_82297_a,addPresetNoFeatures,2,Add a flat world preset with no world features.
 func_82299_h,getPresetIconRenderer,2,Return the RenderItem instance used to render preset icons.
+func_82328_a,setDirection,2,
 func_82331_h,dropItemStack,2,Drop the item currently on this item frame.
 func_82333_j,getRotation,2,Return the rotation of the item currently on this frame.
+func_82334_a,setDisplayedItem,2,
+func_82335_i,getDisplayedItem,2,
+func_82336_g,setItemRotation,2,
 func_82340_a,setPotionDamage,2,
 func_82341_c,getMotionFactor,2,Return the motion factor for this projectile. The factor is multiplied by the original motion.
 func_82342_d,isInvulnerable,2,Return whether this skull comes from an invulnerable (aura) wither boss.
 func_82343_e,setInvulnerable,2,Set whether this skull comes from an invulnerable (aura) wither boss.
 func_82347_b,clearInventory,2,"Clear this player's inventory, using the specified ID and metadata as filters or -1 for no filter."
 func_82351_a,executeCommandOnPowered,2,"Execute the command, called when the command block is powered."
+func_82352_b,setCommand,2,Sets the command this block will execute when powered.
 func_82353_c,getCommand,2,Return the command this command block is set to execute.
 func_82355_al,registerDispenseBehaviors,2,Register all dispense behaviors.
 func_82356_Z,isCommandBlockEnabled,2,Return whether command blocks are enabled.
@@ -3777,18 +3816,23 @@ func_82489_a,spawnDispenseParticles,2,Order clients to display dispense particle
 func_82499_a,getProjectileEntity,2,Return the projectile entity spawned by this dispense behavior.
 func_82519_a_,onFinishFalling,2,Called when the falling block entity for this block hits the ground and turns back into a block
 func_82520_a,onStartFalling,2,Called when the falling block entity for this block is created
+func_82526_n,dispense,2,
+func_82529_a,makeWither,2,This method attempts to create a wither at the given location and skull
 func_82530_a,getMetaForPlant,2,Return the flower pot metadata value associated with the specified item.
 func_82531_c,getPlantForMeta,2,Return the item associated with the specified flower pot metadata value.
 func_82532_h,getSeedItem,2,Generate a seed ItemStack for this crop.
 func_82533_j,getCropItem,2,Generate a crop produce ItemStack for this crop.
 func_82538_d,canConnectWallTo,2,Return whether an adjacent block can connect to a wall.
 func_82547_a,comparePlayers,2,Compare the position of two players.
+func_82563_j,getShowCape,2,
+func_82572_b,incrementTotalWorldTime,2,
 func_82573_f,getWorldTotalTime,2,
 func_82574_x,getGameRulesInstance,2,Gets the GameRules class Instance.
 func_82579_a,getTagMap,2,Return the tag map for this compound.
 func_82580_o,removeTag,2,Remove the specified tag.
 func_82581_a,createCrashReport,2,Create a crash report which indicates a NBT read error.
 func_82582_d,hasNoTags,2,Return whether this compound has no tags.
+func_82591_c,getPoolSize,2,
 func_82593_b,getPlaceSound,2,Used when a player places a block.
 func_82595_a,putObject,2,Register an object on this registry.
 func_82615_a,getX,2,
@@ -3804,12 +3848,15 @@ func_82634_f,isSpeedBoosted,2,Return whether the entity's speed is boosted.
 func_82644_b,getWorldFeatures,2,Return the list of world features enabled on this preset.
 func_82647_a,setBiome,2,Set the biome used on this preset.
 func_82648_a,getBiome,2,Return the biome used on this preset.
+func_82649_e,getDefaultFlatGenerator,2,
 func_82650_c,getFlatLayers,2,Return the list of layers on this preset.
+func_82651_a,createFlatGeneratorFromString,2,
 func_82656_d,getMinY,2,"Return the minimum Y coordinate for this layer, set during generation."
 func_82657_a,getLayerCount,2,Return the amount of layers for this set of layers.
 func_82658_c,getFillBlockMeta,2,Return the block metadata used on this set of layers.
 func_82659_b,getFillBlock,2,Return the block type used on this set of layers.
 func_82660_d,setMinY,2,Set the minimum Y coordinate for this layer.
+func_82667_a,getScatteredFeatureSpawnList,2,returns possible spawns for scattered features
 func_82674_a,pickRandomCrop,2,Returns a crop type to be planted on this field.
 func_82677_a,pickRandomCrop,2,Returns a crop type to be planted on this field.
 func_82684_a,getReputationForPlayer,2,Return the village reputation for a player
@@ -3817,32 +3864,45 @@ func_82687_d,isPlayerReputationTooLow,2,Return whether this player has a too low
 func_82688_a,setReputationForPlayer,2,Set the village reputation for a player
 func_82689_b,writeVillageDataToNBT,2,Write this village's data to NBT.
 func_82690_a,readVillageDataFromNBT,2,Read this village's data from NBT.
+func_82695_e,recreateStructures,2,
 func_82704_a,isEntityApplicable,2,Return whether the specified entity is applicable to this filter.
 func_82705_e,getAnimal,2,Return whether this creature type is an animal.
 func_82709_a,addObjectByDataType,2,"Add a new object for the DataWatcher to watch, using the specified data type."
 func_82710_f,getWatchableObjectItemStack,2,Get a watchable object as an ItemStack.
 func_82711_a,setWatchableObjectWatched,2,Set whether the specified watchable object is being watched.
+func_82712_a,parseDoubleWithDefault,2,parses the string as double or returns the second parameter if it fails.
+func_82714_a,parseIntWithDefaultAndMax,2,parses the string as integer or returns the second parameter if it fails. this value is capped to par2
+func_82715_a,parseIntWithDefault,2,parses the string as integer or returns the second parameter if it fails
+func_82716_a,getRandomDoubleInRange,2,
 func_82719_a,writeCustomPotionEffectToNBT,2,Write a custom potion effect to a potion item's NBT data.
 func_82721_a,setSplashPotion,2,Set whether this potion is a splash potion.
 func_82722_b,readCustomPotionEffectFromNBT,2,Read a custom potion effect from a potion item's NBT data.
 func_82725_o,isMagicDamage,2,Returns true if the damage is magic based.
 func_82726_p,setMagicDamage,2,Define the damage type as magic based.
 func_82732_R,getWorldVec3Pool,2,Return the Vec3Pool object for this world.
+func_82733_a,selectEntitiesWithinAABB,2,
 func_82736_K,getGameRules,2,Gets the GameRules instance
 func_82737_E,getTotalWorldTime,2,
+func_82742_i,resetUpdateEntityTick,2,Resets the updateEntityTick field to 0
 func_82743_f,getCreationCloudUpdateTick,2,retrieves the 'date' at which the PartiallyDestroyedBlock was created
 func_82744_b,setCloudUpdateTick,2,saves the current Cloud update tick into the PartiallyDestroyedBlock
+func_82746_a,broadcastSound,2,
 func_82752_c,isAdventure,2,Returns true if this is the ADVENTURE game type
 func_82756_a,getGameRuleStringValue,2,Gets the GameRule's value as String.
 func_82757_a,setValue,2,Set this game rule value.
 func_82758_b,getGameRuleBooleanValue,2,Gets the GameRule's value as boolean.
 func_82763_b,getRules,2,Return the defined game rules.
+func_82764_b,setOrCreateGameRule,2,
 func_82765_e,hasRule,2,Return whether the specified game rule is defined.
 func_82766_b,getGameRuleBooleanValue,2,Gets the boolean Game Rule value.
 func_82767_a,getGameRuleStringValue,2,Gets the string Game Rule value.
 func_82768_a,readGameRulesFromNBT,2,Set defined game rules from NBT.
 func_82769_a,addGameRule,2,Define a game rule and its default value.
 func_82770_a,writeGameRulesToNBT,2,Return the defined game rules as NBT.
+func_82775_a,renderBlockAnvil,2,Renders anvil
+func_82778_a,renderBlockBeacon,2,Renders beacon block
+func_82779_a,renderBlockWall,2,Renders wall block
+func_82780_a,renderBlockFlowerpot,2,Renders flower pot
 func_82781_a,getEnchantments,2,Return the enchantments for the specified stack.
 func_82782_a,setEnchantments,2,Set the enchantments for the specified stack.
 func_82787_a,findMatchingRecipe,2,
@@ -3853,6 +3913,8 @@ func_82812_d,getArmorMaterial,2,Return the armor material for this armor item.
 func_82814_b,getColor,2,Return the color for the specified armor ItemStack.
 func_82815_c,removeColor,2,Remove the color from the specified armor ItemStack.
 func_82816_b_,hasColor,2,Return whether the specified armor ItemStack has a color.
+func_82819_b,setHideAddress,2,
+func_82820_d,isHidingAddress,2,
 func_82833_r,getDisplayName,2,returns the display name of the itemstack
 func_82834_c,setItemName,2,Sets the item's name (used by anvil to rename the items).
 func_82836_z,getItemFrame,2,Return the item frame this stack is on. Returns null if not on an item frame.
@@ -3866,6 +3928,7 @@ func_82844_f,getToolCraftingMaterial,2,"Return the crafting material for this to
 func_82845_b,getArmorCraftingMaterial,2,"Return the crafting material for this armor material, used to determine the item that can be used to repair an armor piece with an anvil"
 func_82846_b,transferStackInSlot,2,Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that.
 func_82847_b,removeCraftingFromCrafters,2,Remove this crafting listener from the listener list.
+func_82863_d,getBeacon,2,Returns the Tile Entity behind this beacon inventory / container
 func_82869_a,canTakeStack,2,Return whether this slot's stack can be taken from this slot.
 func_82870_a,onPickupFromSlot,2,
 func_82879_c,sendSettingsToServer,2,Send a client info packet with settings information to the server
@@ -3877,5 +3940,7 @@ func_83007_w,getBlockBoundsMaxX,2,returns the block bounderies maxX value
 func_83008_x,getBlockBoundsMinY,2,returns the block bounderies minY value
 func_83009_v,getBlockBoundsMinX,2,returns the block bounderies minX value
 func_83010_y,getBlockBoundsMaxY,2,returns the block bounderies maxY value
+func_83012_d,getnextPoolIndex,2,
+func_83013_c,getlistAABBsize,2,
 func_83015_S,getCurrentDate,2,returns a calendar object containing the current date
 func_83020_a,setRenderMinMax,2,"Sets the size and offset of the block to be rendered, ie: half size and rendered center block: 0.25D, 0.75D"
@@ -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,21 @@ 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_90042_0_,par0Str,2
 p_accept_1_,par1File,2
 p_accept_2_,par2Str,2
 p_actionPerformed_1_,par1ActionEvent,2
@@ -9990,9 +9997,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 +10022,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
@@ -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	Fri Nov 16 21:42:28 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java	Fri Nov 16 21:44:38 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	Fri Nov 16 21:42:29 2012
+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 16 21:44:38 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	Fri Nov 16 21:42:29 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java	Fri Nov 16 21:44:38 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	Fri Nov 16 21:42:29 2012
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 16 21:44:38 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	Fri Nov 16 21:42:29 2012
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Fri Nov 16 21:44:38 2012
@@ -202,7 +202,7 @@
       System.exit(0);
    }
@@ -98,32 +98,48 @@ 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	Fri Nov 16 21:42:30 2012
+++ minecraft_patched\net\minecraft\src\EntityMooshroom.java	Fri Nov 16 21:44:38 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\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
+--- minecraft\net\minecraft\src\FontRenderer.java	Fri Nov 16 21:42:30 2012
+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Fri Nov 16 21:47:09 2012
+@@ -611,8 +611,6 @@
+          case 10:
+             --var5;
+             break;
+-         case 32:
+-            var6 = var5;
+          case 167:
+             if(var5 < var3 - 1) {
+                ++var5;
+@@ -626,6 +624,8 @@
+                }
+             }
+             break;
+         case 32:
+             var6 = var5;
+          default:
+             var4 += this.func_78263_a(var8);
+             if(var7) {
 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	Fri Nov 16 21:42:30 2012
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Fri Nov 16 21:44:38 2012
@@ -98,7 +98,7 @@
       return true;
    }
@@ -134,9 +150,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	Fri Nov 16 21:42:31 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Fri Nov 16 21:44:38 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 +162,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	Fri Nov 16 21:42:32 2012
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Fri Nov 16 21:44:38 2012
@@ -11,6 +11,7 @@
       this.field_74504_a = p_i3285_1_;
    }
@@ -157,8 +173,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	Fri Nov 16 21:42:32 2012
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 16 21:44:38 2012
@@ -20,7 +20,8 @@
    }
 
@@ -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	Fri Nov 16 21:43:38 2012
+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 16 21:44:48 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	Fri Nov 16 21:43:38 2012
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 16 21:44:48 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	Fri Nov 16 21:43:38 2012
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Fri Nov 16 21:44:48 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	Fri Nov 16 21:43:39 2012
+++ minecraft_server_patched\net\minecraft\src\EntityMooshroom.java	Fri Nov 16 21:44:48 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	Fri Nov 16 21:43:40 2012
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Fri Nov 16 21:44:48 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	Fri Nov 16 21:43:40 2012
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 16 21:44:48 2012
@@ -20,7 +20,8 @@
    }
 
@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.20
-ClientVersion = 1.4.3
-ServerVersion = 1.4.3
+MCPVersion = 7.23
+ClientVersion = 1.4.5
+ServerVersion = 1.4.5
@@ -45,6 +45,11 @@
 			<type>2</type>
 			<locationURI>MCP_LOC/src-work/common</locationURI>
 		</link>
+		<link>
+			<name>fml-common/fmlversion.properties</name>
+			<type>1</type>
+			<locationURI>FML_LOC/fmlversion.properties</locationURI>
+		</link>
 	</linkedResources>
 	<filteredResources>
 		<filter>
@@ -2,26 +2,16 @@ import os, os.path, sys
 import urllib, zipfile
 import shutil, glob, fnmatch
 import subprocess, logging, re, shlex
-import csv
+import csv, ConfigParser
 from hashlib import md5  # pylint: disable-msg=E0611
+from pprint import pprint
+from zipfile import ZipFile
+from pprint import pprint
+
+mcp_version = '7.23'

 def download_deps(mcp_path):
-    bin_path = os.path.normpath(os.path.join(mcp_path, 'runtime', 'bin'))
-    ff_path = os.path.normpath(os.path.join(bin_path, 'fernflower.jar'))
    ret = True
-    
-    if not os.path.isfile(ff_path):
-        try:
-            urllib.urlretrieve("http://goo.gl/PnJHp", 'fernflower.zip')
-            zf = zipfile.ZipFile('fernflower.zip')
-            zf.extract('fernflower.jar', bin_path)
-            zf.close()
-            os.remove('fernflower.zip')
-            print "Downloaded Fernflower successfully"
-        except:
-            print "Downloading Fernflower failed download manually from http://goo.gl/PnJHp"
-            ret = False
-    
    for lib in ['argo-2.25.jar', 'guava-12.0.1.jar', 'guava-12.0.1-sources.jar', 'asm-all-4.0.jar', 'asm-all-4.0-source.jar']:
        libF = os.path.join(mcp_path, 'lib')
        if not os.path.isdir(libF):
@@ -38,63 +28,141 @@ def download_deps(mcp_path):
                ret = False
    
    return ret
-        
-def pre_decompile(mcp_dir, fml_dir):
-    file_backup(os.path.join(mcp_dir, 'jars', 'bin'), 'minecraft.jar')
-    file_backup(os.path.join(mcp_dir, 'jars'), 'minecraft_server.jar')
+
+def config_get_section(config, section):
+    dict = {}
+    options = config.options(section)
+    for option in options:
+        try:
+            dict[option] = config.get(section, option)
+        except:
+            dict[option] = None
+    return dict
+
+def download_file(url, target, md5=None):
+    name = os.path.basename(target)
+    if os.path.isfile(target) and not md5 == None:
+        if not get_md5(target) == md5:
+            print 'Modified %s detected, removing' % name
+            os.remove(target)
    
-    client_jar = os.path.join(mcp_dir, 'jars', 'bin', 'minecraft.jar.backup')
-    server_jar = os.path.join(mcp_dir, 'jars', 'minecraft_server.jar.backup')
+    if not os.path.isfile(target):
+        try:
+            urllib.urlretrieve(url, target)
+            if not md5 == None:
+                if not get_md5(target) == md5:
+                    print 'Download of %s failed md5 check, deleting' % name
+                    os.remove(target)
+                    return False
+            print 'Downloaded %s successfully' % name
+        except Exception as e:
+            print e
+            print 'Download of %s failed, download it manually from \'%s\' to \'%s\'' % (target, url, target)
+            return False
+    else:
+        print 'File Exists: %s' % os.path.basename(target)
+    return True
    
-    if not os.path.isfile(client_jar):
-        print 'Could not find Client jar, decompile requires both client and server.'
+def download_native(url, folder, name):
+    if not os.path.exists(folder):
+        os.makedirs(folder)
+    
+    target = os.path.join(folder, name)
+    if not download_file(url + name, target):
+        return False
+    
+    zip = ZipFile(target)
+    for name in zip.namelist():
+        if not name.startswith('META-INF') and not name.endswith('/'):
+            out_file = os.path.join(folder, name)
+            if not os.path.isfile(out_file):
+                print '    Extracting %s' % name
+                out = open(out_file, 'wb')
+                out.write(zip.read(name))
+                out.flush()
+                out.close()
+    zip.close()
+    return True 
+    
+def download_minecraft(mcp_dir, fml_dir, version=None):
+    versions_file = os.path.join(fml_dir, 'mc_versions.cfg')
+    if not os.path.isfile(versions_file):
+        print 'Could not find mc_versions.cfg in FML directory.'
        sys.exit(1)
    
-    if not os.path.isfile(server_jar):
-        print 'Could not find Server jar, decompile requires both client and server.'
-        #sys.exit(1)
-        
-    md5_c = ""
-    md5_s = ""
-    with open(client_jar, 'rb') as fh:
-        md5_c = md5(fh.read()).hexdigest()
-    with open(server_jar, 'rb') as fh:
-        md5_s = md5(fh.read()).hexdigest()
-        
-    clean_c = "9cc3295931edb6339f22989fe1b612a6"
-    clean_s = "21b673f18d20cf7682b77fa8df6c195c"
+    config = ConfigParser.ConfigParser()
+    config.read(versions_file)
    
-    if not md5_c == clean_c:
-        print 'Warning, Modified Client jar detected'
-        print 'Continuing with decompile may produce unpredictable results'
-        print 'If you continue, do not come to the FML or Forge team with decompile issues.'
-        answer = raw_input('If you really want to continue, enter "Yes" ')
-        if answer.lower() not in ['yes', 'y']:
-            print 'You have not entered "Yes", aborting the decompile process'
-            sys.exit(1)
-            
-    if not md5_s == clean_s:
-        print 'Warning, Modified Server jar detected'
-        print 'Continuing with decompile may produce unpredictable results'
-        print 'If you continue, do not come to the FML or Forge team with decompile issues.'
-        answer = raw_input('If you really want to continue, enter "Yes" ')
-        if answer.lower() not in ['yes', 'y']:
-            print 'You have not entered "Yes", aborting the decompile process'
-            sys.exit(1)
+    default = config_get_section(config, 'default')
+    if version is None:
+        version = default['current_ver']
    
-def file_backup(base, file):
-    back_jar = os.path.join(base, file + '.backup')
+    
+    bin_folder = os.path.join(mcp_dir, 'jars', 'bin')
+    if not os.path.exists(bin_folder):
+        os.makedirs(bin_folder)
+        
+    failed = False
+
+    for lib in default['libraries'].split(' '):
+        failed = not download_file(default['base_url'] + lib, os.path.join(bin_folder, lib)) or failed
+    for native in default['natives'].split(' '):
+        failed = not download_native(default['base_url'], os.path.join(bin_folder, 'natives'), native) or failed
+    
+    if not config.has_section(version):
+        print 'Error: Invalid minecraft version, could not find \'%s\' in mc_versions.cfg' % version
+        sys.exit(1)
+    
+    mc_info = config_get_section(config, version)
+    
+    client_jar = os.path.join(bin_folder, 'minecraft.jar')
+    server_jar = os.path.join(mcp_dir, 'jars', 'minecraft_server.jar')
+    
+    # Remove any invalid files
+    file_backup(os.path.join(mcp_dir, 'jars', 'bin'), 'minecraft.jar', mc_info['client_md5'])
+    file_backup(os.path.join(mcp_dir, 'jars'), 'minecraft_server.jar', mc_info['server_md5'])
+        
+    failed = not download_file(mc_info['client_url'], client_jar, mc_info['client_md5']) or failed
+    failed = not download_file(mc_info['server_url'], server_jar, mc_info['server_md5']) or failed
+    
+    # Backup clean jars, or delete if corrupted
+    file_backup(os.path.join(mcp_dir, 'jars', 'bin'), 'minecraft.jar', mc_info['client_md5'])
+    file_backup(os.path.join(mcp_dir, 'jars'), 'minecraft_server.jar', mc_info['server_md5'])
+    
+    if failed:
+        print 'Something failed verifying minecraft files, see log for details.'
+        sys.exit(1)
+
+def get_md5(file):
+    if not os.path.isfile(file):
+        return ""
+    with open(file, 'rb') as fh:
+        return md5(fh.read()).hexdigest()
+
+def pre_decompile(mcp_dir, fml_dir):
+    download_minecraft(mcp_dir, fml_dir)
+    
+def file_backup(base, file, md5):
+    bck_jar = os.path.join(base, file + '.backup')
    src_jar = os.path.join(base, file)
    
-    if not os.path.isfile(src_jar) and not os.path.isfile(back_jar):
+    if not os.path.isfile(src_jar) and not os.path.isfile(bck_jar):
        return
    
-    if os.path.isfile(back_jar):
-        if os.path.isfile(src_jar):
+    if os.path.isfile(bck_jar):
+        if get_md5(bck_jar) == md5:
+            if os.path.isfile(src_jar):
+                os.remove(src_jar)
+            shutil.move(bck_jar, src_jar)
+        else:
+            os.remove(bck_jar)
+    
+    if os.path.isfile(src_jar):
+        if not get_md5(src_jar) == md5:
+            print 'Modified %s detected, removing' % os.path.basename(src_jar)
            os.remove(src_jar)
-        shutil.copy(back_jar, src_jar)
-    else:
-        shutil.copy(src_jar, back_jar)
+        else:
+            shutil.copy(src_jar, bck_jar)
        
 def post_decompile(mcp_dir, fml_dir):
    bin_dir = os.path.join(mcp_dir, 'jars', 'bin')
@@ -120,7 +188,7 @@ def reset_logger():
    log = logging.getLogger()
    while len(log.handlers) > 0:
        log.removeHandler(log.handlers[0])
-        
+
 count = 0
 def cleanup_source(path):
    path = os.path.normpath(path)
@@ -151,7 +219,7 @@ def cleanup_source(path):
        for cur_file in fnmatch.filter(filelist, '*.java'):
            src_file = os.path.normpath(os.path.join(path, cur_file))
            updatefile(src_file)
-        
+
 def setup_fml(fml_dir, mcp_dir):
    sys.path.append(mcp_dir)
    from runtime.decompile import decompile
@@ -177,41 +245,35 @@ def setup_fml(fml_dir, mcp_dir):
    def applyrg_shunt(self, side, reobf=False, applyrg_real = Commands.applyrg):
        jars = {CLIENT: self.jarclient, SERVER: self.jarserver}
        
-        binDir = os.path.join(fml_dir, 'bin')
-        if not os.path.isdir(binDir):
-            os.makedirs(binDir)
-            
+        dir_bin = os.path.join(fml_dir, 'bin')
+        if not os.path.isdir(dir_bin):
+            os.makedirs(dir_bin)
        
-        if (side == CLIENT):        
-            #Compile AccessTransformer
+        class_path = os.pathsep.join(['.', os.path.join(mcp_dir, 'lib', '*'), dir_bin])
+        dir_common = os.path.join(fml_dir, 'common')
+        dir_trans  = os.path.join(dir_common, 'cpw', 'mods', 'fml', 'common', 'asm', 'transformers')
+        cmd_compile = '"%s" -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath "{sourcepath}" -d "{outpath}" "{target}"' % self.cmdjavac
+        cmd_compile = cmd_compile.format(classpath=class_path, sourcepath=dir_common, outpath=dir_bin, target="{target}")
+        
+        if (side == CLIENT):
            self.logger.info('> Compiling AccessTransformer')
-            forkcmd = ('%s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath "{sourcepath}" -d "{outpath}" "{target}"' % self.cmdjavac).format(
-                classpath=os.pathsep.join(['.', os.path.join(mcp_dir, 'lib', '*')]), sourcepath=os.path.join(fml_dir, 'common'), outpath=os.path.join(fml_dir, 'bin'), 
-                target=os.path.join(fml_dir, 'common', 'cpw', 'mods', 'fml', 'common', 'asm', 'transformers', 'AccessTransformer.java'))
-                
-            if not runcmd(self, forkcmd, echo=False):
+            if not runcmd(self, cmd_compile.format(target=os.path.join(dir_trans, 'AccessTransformer.java')), echo=False):
                sys.exit(1)
                
            self.logger.info('> Compiling MCPMerger')
-            forkcmd = ('%s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath "{sourcepath}" -d "{outpath}" "{target}"' % self.cmdjavac).format(
-                classpath=os.pathsep.join(['.', os.path.join(mcp_dir, 'lib', '*')]), sourcepath=os.path.join(fml_dir, 'common'), outpath=os.path.join(fml_dir, 'bin'), 
-                target=os.path.join(fml_dir, 'common', 'cpw', 'mods', 'fml', 'common', 'asm', 'transformers', 'MCPMerger.java'))
-                
-            if not runcmd(self, forkcmd, echo=False):
+            if not runcmd(self, cmd_compile.format(target=os.path.join(dir_trans, 'MCPMerger.java')), echo=False):
                sys.exit(1)
            
            self.logger.info('> Running MCPMerger')
-            #Run MCPMerger
            forkcmd = ('%s -classpath "{classpath}" cpw.mods.fml.common.asm.transformers.MCPMerger "{mergecfg}" "{client}" "{server}"' % self.cmdjava).format(
-                classpath=os.pathsep.join([os.path.join(mcp_dir, 'lib', '*'), binDir]), mergecfg=os.path.join(fml_dir, 'mcp_merge.cfg'), client=jars[CLIENT], server=jars[SERVER])
+                classpath=class_path, mergecfg=os.path.join(fml_dir, 'mcp_merge.cfg'), client=jars[CLIENT], server=jars[SERVER])
                
            if not runcmd(self, forkcmd):
                sys.exit(1)
        
        self.logger.info('> Running AccessTransformer')
-        #Run AccessTransformer
        forkcmd = ('%s -classpath "{classpath}" cpw.mods.fml.common.asm.transformers.AccessTransformer "{jar}" "{fmlconfig}"' % self.cmdjava).format(
-            classpath=os.pathsep.join([os.path.join(mcp_dir, 'lib', '*'), binDir]), jar=jars[side], fmlconfig=os.path.join(fml_dir, 'common', 'fml_at.cfg'))
+            classpath=class_path, jar=jars[side], fmlconfig=os.path.join(fml_dir, 'common', 'fml_at.cfg'))
            
        forge_cfg = os.path.join(mcp_dir, 'forge', 'common', 'forge_at.cfg')
        if os.path.isfile(forge_cfg):
@@ -250,7 +312,7 @@ def setup_fml(fml_dir, mcp_dir):
        Commands.checkjars = checkjars_shunt
        #decompile -d -n -r
        #         Conf  JAD    CSV    -r    -d    -a     -n    -p     -o     -l     -g     -c     -s
-        decompile(None, False, False, True, True, False, True, False, False, False, False, False, False)
+        decompile(None, False, False, True, True, False, True, False, False, False, False, True, False)
        reset_logger()
        os.chdir(fml_dir)
        
@@ -272,9 +334,8 @@ def setup_fml(fml_dir, mcp_dir):
    os.chdir(mcp_dir)
    commands = Commands(verify=True)
    updatemd5_side(mcp_dir, commands, CLIENT)
-    updatemd5_side(mcp_dir, commands, SERVER)
    reset_logger()
-        
+    
    os.chdir(fml_dir)
    
 def updatemd5_side(mcp_dir, commands, side):
@@ -308,58 +369,74 @@ def runcmd(commands, command, echo=True):
        return False
    return True

+def get_joined_srg(mcp_dir):
+    joined = os.path.join(mcp_dir, 'conf', 'joined.srg')
+    values = {'PK:': {}, 'CL:': {}, 'FD:': {}, 'MD:': {}}
+    
+    if not os.path.isfile(joined):
+        print 'Could not read joined.srg, file not found'
+        sys.exit(1)
+    else:
+        with open(joined, 'r') as fh:
+            for line in fh:
+                pts = line.rstrip('\r\n').split(' ')
+                if pts[0] == 'MD:':
+                    values[pts[0]][pts[1] + ' ' + pts[2]] = pts[3] + ' ' + pts[4]
+                else:
+                    values[pts[0]][pts[1]] = pts[2]
+    
+    return values
+    
 def merge_client_server(mcp_dir):
    client = os.path.join(mcp_dir, 'src', 'minecraft')
-    server = os.path.join(mcp_dir, 'src', 'minecraft_server')
    shared = os.path.join(mcp_dir, 'src', 'common')
    
-    if not os.path.isdir(shared):
-        os.makedirs(shared)
+    client_jar = os.path.join(mcp_dir, 'jars', 'bin', 'minecraft.jar')
+    server_jar = os.path.join(mcp_dir, 'jars', 'minecraft_server.jar')
+    joined_srg = get_joined_srg(mcp_dir)['CL:']
    
-    if not os.path.isdir(client) or not os.path.isdir(server):
+    if not os.path.isfile(client_jar) or not os.path.isfile(server_jar):
        return
        
    if not os.path.isdir(shared):
        os.makedirs(shared)
-        
-    #Nasty hack, but these three files sometimes decompile differently, but are identical, so just take the client file
-    special_cases = ['GuiStatsComponent.java', 'HttpUtilRunnable.java', 'PlayerUsageSnooper.java', 'RConThreadClient.java', 'World.java']
-        
-    for path, _, filelist in os.walk(client, followlinks=True):
-        for cur_file in filelist:
-            f_client = os.path.normpath(os.path.join(client, path[len(client)+1:], cur_file)).replace(os.path.sep, '/')
-            f_server = os.path.normpath(os.path.join(server, path[len(client)+1:], cur_file)).replace(os.path.sep, '/')
-            f_shared = os.path.normpath(os.path.join(shared, path[len(client)+1:], cur_file)).replace(os.path.sep, '/')
+    
+    server_classes = []
            
-            if not os.path.isfile(f_client) or not os.path.isfile(f_server):
-                continue
-                
-            md5_c = ""
-            md5_s = ""
-            with open(f_client, 'rb') as fh:
-                md5_c = md5(fh.read()).hexdigest()
-            with open(f_server, 'rb') as fh:
-                md5_s = md5(fh.read()).hexdigest()
-                
-            if md5_c != md5_s and not cur_file in special_cases:
-                continue
-                
-            new_dir = os.path.join(shared, path[len(client)+1:])
+    zip = ZipFile(server_jar)
+    for i in zip.filelist:
+        if i.filename.endswith('.class'):
+            server_classes.append(i.filename[:-6])
+    
+    for cls in server_classes:
+        if cls in joined_srg.keys():
+            cls = joined_srg[cls]
+        cls += '.java'
+        
+        f_client = os.path.normpath(os.path.join(client, cls.replace('/', os.path.sep))).replace(os.path.sep, '/')
+        f_shared = os.path.normpath(os.path.join(shared, cls.replace('/', os.path.sep))).replace(os.path.sep, '/')
+        
+        if not os.path.isfile(f_client):
+            print 'Issue Merging File Not Found: ' + cls
+            continue
+            
+        if not cls.rfind('/') == -1:
+            new_dir = os.path.join(shared, cls.rsplit('/', 1)[0])
            if not os.path.isdir(new_dir):
                os.makedirs(new_dir)
-                
-            shutil.move(f_client, f_shared)
-            os.remove(f_server)
            
-    cleanDirs(server)
+        shutil.move(f_client, f_shared)
+            
    cleanDirs(client)

 def apply_fml_patches(fml_dir, mcp_dir, src_dir, copy_files=True):
    #Delete /common/cpw to get rid of the Side/SideOnly classes used in decompilation
-    cpw_dir = os.path.join(src_dir, 'common', 'cpw')
-    print 'Deleting common/cpw: ' + cpw_dir
-    if os.path.isdir(cpw_dir):
-        shutil.rmtree(cpw_dir)
+    cpw_mc_dir = os.path.join(src_dir, 'minecraft', 'cpw')
+    cpw_com_dir = os.path.join(src_dir, 'common', 'cpw')
+    if os.path.isdir(cpw_mc_dir):
+        shutil.rmtree(cpw_mc_dir)
+    if os.path.isdir(cpw_com_dir):
+        shutil.rmtree(cpw_com_dir)
        
    #patch files
    print 'Applying Forge ModLoader patches'
@@ -386,9 +463,9 @@ def finish_setup_fml(fml_dir, mcp_dir):
    from runtime.updatemcp import updatemcp
    
    os.chdir(mcp_dir)
-    updatenames(None, True, False, False)
+    updatenames(None, True, True, False)
    reset_logger()
-    updatemd5(None, True, False, False)
+    updatemd5(None, True, True, False)
    reset_logger()
    os.chdir(fml_dir)

@@ -540,6 +617,7 @@ def merge_tree(root_src_dir, root_dst_dir):
            shutil.copy(src_file, dst_dir)
            
 def setup_mcp(fml_dir, mcp_dir, dont_gen_conf=True):
+    global mcp_version
    backup = os.path.join(mcp_dir, 'runtime', 'commands.py.bck')
    runtime = os.path.join(mcp_dir, 'runtime', 'commands.py')
    patch = os.path.join(fml_dir, 'commands.patch')
@@ -585,7 +663,7 @@ def setup_mcp(fml_dir, mcp_dir, dont_gen_conf=True):
        commands_sanity_check()
    except ImportError as ex:
        print 'Could not verify commands.py patch integrity, this typically means that you are not in a clean MCP environment.'
-        print 'Download a clean version of MCP 7.20 and try again'
+        print 'Download a clean version of MCP %s and try again' % mcp_version
        print ex
        sys.exit(1)
    
@@ -643,7 +721,7 @@ def get_conf_copy(mcp_dir, fml_dir):
    common_srg = gen_merged_srg(mcp_dir, fml_dir)
    common_exc = gen_merged_exc(mcp_dir, fml_dir)
    common_map = gen_shared_searge_names(common_srg, common_exc)
-    #ToDo use common_map to merge the remaining csvs, client taking precidense, setting the common items to side '2' and editing commands.py in FML to have 'if csv_side == side || csv_side == '2''
+    
    gen_merged_csv(common_map, os.path.join(mcp_dir, 'conf', 'fields.csv'), os.path.join(fml_dir, 'conf', 'fields.csv'))
    gen_merged_csv(common_map, os.path.join(mcp_dir, 'conf', 'methods.csv'), os.path.join(fml_dir, 'conf', 'methods.csv'))
    gen_merged_csv(common_map, os.path.join(mcp_dir, 'conf', 'params.csv'), os.path.join(fml_dir, 'conf', 'params.csv'), main_key='param')
@@ -694,7 +772,7 @@ def gen_merged_srg(mcp_dir, fml_dir):
            
    #Print joined retroguard files
    if fml_dir is None:
-	return common
+        return common

    with open(os.path.join(fml_dir, 'conf', 'joined.srg'), 'wb') as f:
        for type in ['PK:', 'CL:', 'FD:', 'MD:']:
@@ -0,0 +1,19 @@
+[default]
+current_ver = 1.4.5
+base_url    = http://s3.amazonaws.com/MinecraftDownload/
+libraries   = lwjgl.jar lwjgl_util.jar jinput.jar
+natives     = windows_natives.jar macosx_natives.jar linux_natives.jar
+
+[1.4.4]
+client_url = http://assets.minecraft.net/1_4_4/minecraft.jar
+server_url = http://assets.minecraft.net/1_4_4/minecraft_server.jar
+client_md5 = 7aa46c8058cba2f38e9d2ddddcc77c72
+server_md5 = b5feed15df1db87c9aaf78dcefad513d
+mcp_ver    = 7.21
+
+[1.4.5]
+client_url = http://assets.minecraft.net/1_4_5/minecraft.jar
+server_url = http://assets.minecraft.net/1_4_5/minecraft_server.jar
+client_md5 = b15e2b2b6b4629f0d99a95b6b44412a0
+server_md5 = 250654ceae7a26ba955a30095d90a475
+mcp_ver    = 7.23
@@ -1,20 +1 @@
->pl #net/minecraft/src/IBossDisplayData
->jh #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
->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
+!beg #net/minecraft/src/CodecMus
@@ -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_)
     {
@@ -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();
@@ -1,11 +0,0 @@
--- ../src-base/common/net/minecraft/src/BlockDispenser.java
-+++ ../src-work/common/net/minecraft/src/BlockDispenser.java
-@@ -2,6 +2,8 @@
- 
- import cpw.mods.fml.common.Side;
- import cpw.mods.fml.common.asm.SideOnly;
-+import cpw.mods.fml.common.registry.GameRegistry;
-+
- import java.util.Random;
- 
- public class BlockDispenser extends BlockContainer
@@ -0,0 +1,10 @@
+--- ../src-base/common/net/minecraft/src/CallableSuspiciousClasses.java
+++ ../src-work/common/net/minecraft/src/CallableSuspiciousClasses.java
+@@ -130,6 +130,6 @@
+ 
+     public Object call()
+     {
+-        return this.func_85085_a();
+        return "FML is installed";
+     }
+ }
@@ -1,18 +0,0 @@
--- ../src-base/common/net/minecraft/src/EntityAIVillagerMate.java
-+++ ../src-work/common/net/minecraft/src/EntityAIVillagerMate.java
-@@ -1,4 +1,6 @@
- package net.minecraft.src;
-+
-+import cpw.mods.fml.common.registry.VillagerRegistry;
- 
- public class EntityAIVillagerMate extends EntityAIBase
- {
-@@ -111,7 +113,7 @@
-         this.field_75451_c.func_70873_a(6000);
-         this.field_75450_b.func_70873_a(6000);
-         var1.func_70873_a(-24000);
-        var1.func_70938_b(this.field_75450_b.func_70681_au().nextInt(5));
-+        VillagerRegistry.applyRandomTrade(var1, this.field_75450_b.func_70681_au());
-         var1.func_70012_b(this.field_75450_b.field_70165_t, this.field_75450_b.field_70163_u, this.field_75450_b.field_70161_v, 0.0F, 0.0F);
-         this.field_75448_d.func_72838_d(var1);
-         this.field_75448_d.func_72960_a(var1, (byte)12);
@@ -27,7 +27,7 @@
     }
 
     public int func_82145_z()
-@@ -1745,4 +1750,9 @@
+@@ -1755,4 +1760,9 @@
     {
         return this.func_82241_s(1);
     }
@@ -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");
@@ -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()
     {
@@ -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)
-                 {
@@ -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));
         }
@@ -44,3 +44,12 @@
         }
         else
         {
+@@ -177,7 +189,7 @@
+     public void func_85027_a(CrashReportCategory p_85027_1_)
+     {
+         p_85027_1_.func_71500_a("Name", new CallableTileEntityName(this));
+-        CrashReportCategory.func_85068_a(p_85027_1_, this.field_70329_l, this.field_70330_m, this.field_70327_n, this.field_70324_q.field_71990_ca, this.field_70325_p);
+        CrashReportCategory.func_85068_a(p_85027_1_, this.field_70329_l, this.field_70330_m, this.field_70327_n, this.field_70324_q != null ? this.field_70324_q.field_71990_ca : 0, this.field_70325_p);
+     }
+ 
+     static Map func_85028_t()
@@ -1,23 +1,22 @@
 --- ../src-base/common/net/minecraft/src/World.java
 +++ ../src-work/common/net/minecraft/src/World.java
-@@ -10,6 +10,8 @@
- import java.util.List;
- import java.util.Random;
- import java.util.Set;
-+
-+import com.google.common.collect.ImmutableList;
- 
- public abstract class World implements IBlockAccess
- {
-@@ -1693,7 +1695,6 @@
-             this.func_72847_b(var2);
+@@ -1764,13 +1764,13 @@
+             }
         }
 
-        this.field_72997_g.clear();
-         this.field_72984_F.func_76318_c("regular");
+-        this.field_72989_L = false;
+-
+         if (!this.field_73000_b.isEmpty())
+         {
+             this.field_73009_h.removeAll(this.field_73000_b);
+             this.field_73000_b.clear();
+         }
+
+        this.field_72989_L = false;
 
-         for (var1 = 0; var1 < this.field_72996_f.size(); ++var1)
-@@ -3644,7 +3645,7 @@
+         this.field_72984_F.func_76318_c("pendingTileEntities");
+ 
+@@ -3595,7 +3595,7 @@
     @SideOnly(Side.CLIENT)
     public double func_72919_O()
     {
@@ -25,4 +24,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_)
@@ -19,7 +19,7 @@
     {
@@ -528,4 +533,24 @@
     {
-         return var0.field_76110_t;
+         return p_85131_0_.field_76110_t;
     }
 +
 +    /**
@@ -45,7 +45,7 @@
     }
 
     public String func_77127_a()
-@@ -96,4 +116,69 @@
+@@ -91,4 +111,69 @@
     {
         return this.field_82748_f;
     }
@@ -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_)
     {
@@ -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()
     {
@@ -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()
     {
@@ -1,5 +1,5 @@
--- ../src-base/common/net/minecraft/src/IBossDisplayData.java
-+++ ../src-work/common/net/minecraft/src/IBossDisplayData.java
+--- ../src-base/minecraft/net/minecraft/src/IBossDisplayData.java
+++ ../src-work/minecraft/net/minecraft/src/IBossDisplayData.java
@@ -1,9 +1,5 @@
 package net.minecraft.src;
 
@@ -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 @@
             }
         }
@@ -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;
     }
@@ -59,15 +59,16 @@
         this.field_78367_h.add(p_78355_1_);
         p_78355_1_.func_76846_a();
     }
-@@ -418,15 +429,31 @@
+@@ -417,28 +428,44 @@
         {
-             var3 = (TextureFX)var2.next();
+             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();
         }
     }
 
@@ -76,11 +77,13 @@
 -        this.field_78358_g.clear();
 -        this.field_78358_g.put(p_82772_1_.field_76852_a);
 -        this.field_78358_g.position(0).limit(p_82772_1_.field_76852_a.length);
+-
+-        if (p_82772_1_.field_76850_b != p_82772_2_)
 +        Dimension dim = TextureFXManager.instance().getTextureDimensions(p_82772_1_);
 +        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();
@@ -91,10 +94,13 @@
 +        {
 +            TextureFXManager.instance().scaleTextureFXData(p_82772_1_.field_76852_a, field_78358_g, tWidth, tLen);
 +        }
- 
-         if (p_82772_1_.field_76850_b != p_82772_2_)
+
+        if (p_82772_1_.field_76848_d != p_82772_2_)
         {
-@@ -436,9 +463,11 @@
+             p_82772_1_.func_76845_a(this);
+-            p_82772_2_ = p_82772_1_.field_76850_b;
+            p_82772_2_ = p_82772_1_.field_76848_d;
+         }
 
         for (int var3 = 0; var3 < p_82772_1_.field_76849_e; ++var3)
         {
@@ -107,7 +113,7 @@
             }
         }
 
-@@ -504,8 +533,9 @@
+@@ -504,8 +531,9 @@
                 this.field_78361_b = false;
                 this.field_78363_a = false;
             }
@@ -119,7 +125,7 @@
                 var7.printStackTrace();
             }
         }
-@@ -541,8 +571,9 @@
+@@ -541,8 +569,9 @@
                 this.field_78361_b = false;
                 this.field_78363_a = false;
             }
@@ -1,79 +1,101 @@
 import os, os.path, sys
-import urllib, zipfile
 import shutil, glob, fnmatch
-import subprocess, logging, re, shlex
-import csv
+import csv, re

-print(os.getcwd())
-sys.path.append('install')
-from fml import gen_merged_srg
 ctorsigre = re.compile('<init>\((.*)\)')
 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:
-  print('Give me a file to process please')
-  sys.exit(1)
-
-if sys.argv[1]=='mcp_merge.cfg':
-  print('Fixing mcp_merge.cfg')
-  with open('mcp_merge.cfg-new','w') as nf:
-    with open(sys.argv[1]) as f:
-      for line in f:
-        parts = line.split('#')
-        target = parts[1].strip()
-        newpart = parts[0][0]+rev_common['CL:'][target]+" #"+target+'\n'
-	nf.write(newpart)
-  sys.exit(0)
-elif len(sys.argv)==1:
-  with open(sys.argv[1]+'-new','w') as nf:
-    with open(sys.argv[1]) as f:
-      for line in f:
-        parts = line.split('#')
-        if len(parts[1])<4:
-          nf.write(line)
-          continue
-        typ = parts[1][0:3]
-        if not rev_common.has_key(typ):
-          nf.write(line)
-          continue
-        name = parts[1][3:].strip()
-        action = parts[0].split(' ')
-        if name.endswith('/*'):
-          targ = rev_common['CL:']['net/minecraft/src/'+name[:-2]]
-          if typ == 'MD:':
-            wildcard = '.*()'
-          else:
-            wildcard = '.*'
-          newline = action[0]+' '+targ+wildcard+' #'+'#'.join(parts[1:])
-          nf.write(newline)
-        elif name.find('/<init>')>=0:
-          targ = rev_common['CL:']['net/minecraft/src/'+name[:name.find('/<init>')]]
-          args = '<init>('
-          armatch = ctorsigre.search(name).group(1)
-          for bit in ctorparamre.findall(armatch):
-            if len(bit[2])>0 and rev_common['CL:'].has_key(bit[2]):
-              cl = 'L'+rev_common['CL:'][bit[2]]+';'
-            else:
-              cl = bit[1]
-            args+=cl
-          args+=')V'
-          print(line.strip())
-          newline = action[0]+' '+targ+'.'+args+' #'+'#'.join(parts[1:])
-          print(newline.strip())
-          nf.write(newline)
-        else:
-          targ = rev_common[typ]['net/minecraft/src/'+name]
-          newline = action[0]+' '+targ.replace('/','.',1).replace(' ','',1)+' #'+'#'.join(parts[1:])
-          nf.write(newline)
-else:
-  typ = sys.argv[1]
-  name = sys.argv[2]
-  name = name.replace('.','/')
-  if typ.startswith('-'):
-    print(rev_common[typ[1:]][name])
-  else:
-    print(common[typ][name])
+def get_merged_info():
+    mcp_dir = os.path.join(os.getcwd(), '..')
+    joined = os.path.join(mcp_dir, 'conf', 'joined.srg')
+    values = {'PK:': {}, 'CL:': {}, 'FD:': {}, 'MD:': {}}
+    
+    if not os.path.isfile(joined):
+        sys.path.append('install')
+        from fml import gen_merged_srg
+        values = gen_merged_srg(mcp_dir, None)
+    else:
+        with open(joined, 'r') as fh:
+            for line in fh:
+                pts = line.rstrip('\r\n').split(' ')
+                if pts[0] == 'MD:':
+                    values[pts[0]][pts[1] + ' ' + pts[2]] = pts[3] + ' ' + pts[4]
+                else:
+                    values[pts[0]][pts[1]] = pts[2]
+    
+    return {t:{v.split(' ')[0]:k for k, v in m.items()} for t,m in values.items()}

+def process_file(file, srg):
+    name = os.path.basename(file)
+    print 'Processing: ' + name
+    
+    if name == 'mcp_merge.cfg':
+        with open(file + '-new','w') as nf:
+            with open(file) as f:
+                for line in f:
+                    parts = line.split('#')
+                    target = parts[1].strip()
+                    newpart = '%s%s #%s\n' % (parts[0][0], srg['CL:'][target], target)
+                    nf.write(newpart)
+    else:
+        with open(file + '-new', 'wb') as nf:
+            with open(file) as f:
+                for line in f:
+                    parts = line.split('#')
+                    
+                    if len(parts[1]) < 4:
+                        nf.write(line)
+                        continue
+                        
+                    typ = parts[1][0:3]
+                    
+                    if not srg.has_key(typ):
+                        nf.write(line)
+                        continue
+                        
+                    name = parts[1][3:].strip()
+                    name = (name if name.startswith('net/minecraft/') else 'net/minecraft/src/' + name)
+                    action = parts[0].split(' ')
+                    
+                    if name.endswith('/*'):
+                        targ = srg['CL:'][name[:-2]]
+                        wildcard = ('.*()' if typ == 'MD:' else '.*')
+                        
+                        newline = '%s %s%s #%s' % (action[0], targ, wildcard, '#'.join(parts[1:]))
+                        nf.write(newline)
+                    
+                    elif name.find('/<init>') >= 0:
+                        targ = srg['CL:'][name[:name.find('/<init>')]]
+                        args = '<init>('
+                        armatch = ctorsigre.search(name).group(1)
+                        for bit in ctorparamre.findall(armatch):
+                            if len(bit[2]) > 0 and srg['CL:'].has_key(bit[2]):
+                                cl = 'L' + srg['CL:'][bit[2]] + ';'
+                            else:
+                                cl = bit[1]
+                            args += cl 
+                        args += ')V'
+                        newline = ('%s %s.%s #%s' % (action[0], targ, args, '#'.join(parts[1:])))
+                        nf.write(newline)
+                        
+                    else:
+                        targ = srg[typ][name]
+                        args = targ.replace('/', '.', 1).replace(' ', '', 1)
+                        newline = ('%s %s #%s' % (action[0], args, '#'.join(parts[1:])))
+                        nf.write(newline)
+                    
+def main():
+    srg = get_merged_info()
+    for arg in sys.argv:
+        path = os.path.join(os.getcwd(), arg)
+        
+        if arg.endswith('_at.cfg') or arg == 'mcp_merge.cfg':
+            process_file(path, srg)
+        elif os.path.isdir(path):
+            for file in os.listdir(path):
+                if file.endswith('_at.cfg'):
+                    process_file(os.path.join(path, file), srg)
+            
+if __name__ == '__main__':
+    main()
        
@@ -0,0 +1,17 @@
+Updating FML:
+1. Grab MCP
+2. Complete the mc_versions.cfg - add a new entry and update md5s from MCP
+3. Copy joined.exc from MCP conf into FML conf.
+4. Merge other mcp configuration changes into FML conf. (generally only mcp.cfg should need changing to update md5s)
+If obfuscation changed:
+5. Run the updateasmdata.py script to refresh the ASM metadata in fml_at.cfg (only 
+6. Inspect and update mcp_merge.cfg
+7. Inspect and update fml_marker.cfg
+Always:
+8. Merge MCP mcmod.info into mcpmod.info and update the mcp.png graphic if necessary
+9. Run ant setupenvironment to try and build the FML environment
+10. Fix up any patch rejections
+11. Commit the result to git
+12. Tag git with a new version: git tag -a vx.y
+13. Update jenkins with new MCP and jars
+14. Push tags to git followed by the commit itself
Author	SHA1	Message	Date
Christian	61e4db2c3b	Merge joined.exc add update howto	2012-11-20 08:38:33 -05:00
Christian	5efc1eb34c	Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit." This reverts commit `fa567014a5`.	2012-11-20 08:27:13 -05:00
LexManos	3b3600d44f	Modified merger to just consider all server classes as common. And moved the defnition of CodecMus to the config.	2012-11-19 17:45:53 -08:00
LexManos	edcc5ca554	Forgot mcp.cfg	2012-11-19 15:47:18 -08:00
LexManos	ca79dfe298	Updated to 1.4.5b	2012-11-19 15:35:08 -08:00
LexManos	5945279b8b	Fix python error	2012-11-19 15:03:13 -08:00
LexManos	57bf64318b	Modified decompile so that we do not have to decompile the server, saves time.	2012-11-19 15:01:04 -08:00
LexManos	d9d0a46809	Cleaned up some tabs	2012-11-19 15:00:11 -08:00
LexManos	2fac644914	Change usage of ZipFile, fixes issues with Mac's default instation of python. Also cleaned the python a little bit.	2012-11-19 13:33:22 -08:00
Christian	570592b24b	Attempt to fix a possible comodification risk	2012-11-18 20:40:48 -05:00
Christian	fde94144ec	Change texturebinding to use the textureId directly rather than iconIndex to determine if it needs to rebind the texture sheet	2012-11-18 08:45:25 -05:00
Christian	f348496c10	Fix mod display list. Shouldn't be derpy anymore.	2012-11-17 23:51:14 -05:00
Christian	a5c31b5365	Fix World patch- workaround no longer required and leftovers are bad.	2012-11-17 23:44:53 -05:00
LexManos	2dc3f0ddef	Cleaned up the AT config updater, should work for any setup of the MCP workspace now.	2012-11-17 19:08:47 -08:00
Christian	fa567014a5	Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit.	2012-11-16 22:50:21 -05:00
Christian	96935bb122	Fix an NPE in TileEntity trying to generate a crash report. Make suspicious classes just return the obvious. Fix NPE for FML crash report on server. Clean up dead patches.	2012-11-16 22:50:00 -05:00
Christian	43d3042dff	Clean up a patch	2012-11-16 16:49:44 -05:00
Christian	fec221f8a6	Update FML for MC 1.4.5	2012-11-16 16:31:06 -05:00
LexManos	b0f0635eb3	Fix for ModLoader static overrides not displaying.	2012-11-15 14:08:41 -08:00
Christian	23a25131b0	Fix up derpy file name handling: closes #127 Fix up duping childmods: closes #126 FMLPreinitializationEvent now offers a getLogger() that'll return your mod a personalized logger instance	2012-11-12 17:54:21 -05:00
LexManos	a6eaa2bebc	Fix spelling issue.	2012-11-08 21:01:31 -08:00
LexManos	c6a0741379	FML setup should now download and verify all the minecraft files needed to run MCP.	2012-11-08 17:54:05 -08:00
Christian	5a1930e2d6	Small fix to some MCP metadata for pre2	2012-11-08 20:34:45 -05:00
Christian	418deba5bf	Update to MC 1.4.4	2012-11-08 17:55:20 -05:00
Christian	4ff2cff3c0	Fix bug when a modloader mod is run on a dedicated server and has a connection handler assigned to it. Hi SmartMoving! Perhaps you should try @Mod instead of BaseMod?	2012-11-04 10:57:49 -05:00
Christian	bd2123cf9d	Clean up some patch fuzz	2012-11-02 17:32:39 -04:00
Christian	c2a603c910	Update joined.exc file from latest conf	2012-11-02 17:23:54 -04:00