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 09:05:17 +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
85 changed files with 17952 additions and 16228 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">
@@ -178,6 +178,8 @@
      <fileset dir="${client.mcp.obfoutput}" includes="**/*.class" />
      <zipfileset dir="${basedir}" includes="fmlversion.properties"/>
      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
+        <zipfileset dir="${common.src.dir}" includes="mcpmod.info" />
+        <zipfileset dir="${client.src.dir}" includes="mcp.png" />
      <zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" fullpath="CREDITS-fml.txt"/>
      <zipfileset dir="${common.src.dir}" includes="*.cfg" />
      <mappedresources>
@@ -201,11 +203,13 @@
  <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" />
      <zipfileset dir="${basedir}" includes="fmlversion.properties" prefix="fml/common" />
      <zipfileset dir="${common.src.dir}" includes="*.cfg" prefix="fml/common" />
+      <zipfileset dir="${common.src.dir}" includes="mcpmod.info" prefix="fml/common" />
      <zipfileset dir="${patch.src.dir}" includes="**/*.patch" prefix="fml/patches" />
      <zipfileset dir="${fml.conf.dir}" prefix="fml/conf" />
      <mappedresources>
@@ -248,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}"/>
@@ -330,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,12 +37,14 @@ 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;
 import cpw.mods.fml.client.registry.KeyBindingRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.DummyModContainer;
+import cpw.mods.fml.common.DuplicateModsFoundException;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.IFMLSidedHandler;
@@ -109,11 +111,12 @@ public class FMLClientHandler implements IFMLSidedHandler

    private CustomModLoadingErrorDisplayException customError;

+	private DuplicateModsFoundException dupesFound;
+
    /**
-     * Called to start the whole game off from
-     * {@link MinecraftServer#startServer}
+     * Called to start the whole game off
     *
-     * @param minecraftServer
+     * @param minecraft The minecraft instance being launched
     */
    public void beginMinecraftLoading(Minecraft minecraft)
    {
@@ -151,6 +154,10 @@ public class FMLClientHandler implements IFMLSidedHandler
        {
            wrongMC = wrong;
        }
+        catch (DuplicateModsFoundException dupes)
+        {
+        	dupesFound = dupes;
+        }
        catch (MissingModsException missing)
        {
            modsMissing = missing;
@@ -181,7 +188,7 @@ public class FMLClientHandler implements IFMLSidedHandler
    @SuppressWarnings("deprecation")
    public void finishMinecraftLoading()
    {
-        if (modsMissing != null || wrongMC != null)
+        if (modsMissing != null || wrongMC != null || customError!=null || dupesFound!=null)
        {
            return;
        }
@@ -217,6 +224,10 @@ public class FMLClientHandler implements IFMLSidedHandler
        {
            client.func_71373_a(new GuiModsMissing(modsMissing));
        }
+        else if (dupesFound != null)
+        {
+        	client.func_71373_a(new GuiDupesFound(dupesFound));
+        }
        else if (customError != null)
        {
            client.func_71373_a(new GuiCustomModLoadingErrorScreen(customError));
@@ -279,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();
        }
    }

@@ -0,0 +1,44 @@
+package cpw.mods.fml.client;
+
+import java.io.File;
+import java.util.Map.Entry;
+
+import cpw.mods.fml.common.DuplicateModsFoundException;
+import cpw.mods.fml.common.MissingModsException;
+import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.versioning.ArtifactVersion;
+import net.minecraft.src.GuiErrorScreen;
+
+public class GuiDupesFound extends GuiErrorScreen
+{
+
+    private DuplicateModsFoundException dupes;
+
+    public GuiDupesFound(DuplicateModsFoundException dupes)
+    {
+        this.dupes = dupes;
+    }
+
+    @Override
+    public void func_73866_w_()
+    {
+        super.func_73866_w_();
+    }
+    @Override
+    public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
+    {
+        this.func_73873_v_();
+        int offset = Math.max(85 - dupes.dupes.size() * 10, 10);
+        this.func_73732_a(this.field_73886_k, "Forge Mod Loader has found a problem with your minecraft installation", this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=10;
+        this.func_73732_a(this.field_73886_k, "You have mod sources that are duplicate within your system", this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=10;
+        this.func_73732_a(this.field_73886_k, "Mod Id : File name", this.field_73880_f / 2, offset, 0xFFFFFF);
+        offset+=5;
+        for (Entry<ModContainer, File> mc : dupes.dupes.entries())
+        {
+            offset+=10;
+            this.func_73732_a(this.field_73886_k, String.format("%s : %s", mc.getKey().getModId(), mc.getValue().getName()), this.field_73880_f / 2, offset, 0xEEEEEE);
+        }
+    }
+}
@@ -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;
    }

@@ -169,23 +169,6 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr
    {
    }

-    /**
-     * Override if you wish to perform some action other than just dispensing the item from the dispenser
-     *
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @param xVel
-     * @param zVel
-     * @param item
-     */
-    @Override
-    public int dispenseEntity(World world, ItemStack item, Random rnd, int x, int y, int z, int xVel, int zVel, double entX, double entY, double entZ)
-    {
-        return -1;
-    }
-
    /**
     * Override if you wish to generate Nether (Hell biome) blocks
     *
@@ -299,7 +282,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr

    /**
     * Only implemented on the client side
-     * {@link #serverChat(EntityPlayer, Packet3Chat)}
+     * {@link #serverChat(NetServerHandler, String)}
     *
     * @param text
     */
@@ -69,7 +69,7 @@ public class ModLoader
    /**
     * This method is a call in hook from modified external code. Implemented elsewhere.
     *
-     * {@link GameRegistry#getFuelValue(ItemStack))}
+     * {@link GameRegistry#getFuelValue(ItemStack)}
     *
     * @param id The Item ID
     * @param metadata The Item Metadata
@@ -95,9 +95,9 @@ public class ModLoader

    /**
     * Adds a new prefix to the armor texture list
-     * 
-     * {@link RenderingRegistry#addNewArmourRendererPrefix(String))}
-     * 
+     *
+     * {@link RenderingRegistry#addNewArmourRendererPrefix(String)}
+     *
     * @param armor The new armor prefix
     * @return The new armor index
     */
@@ -126,6 +126,17 @@ public class ModLoader
    {
        ModLoaderHelper.addCommand(command);
    }
+
+    /**
+     * Add a behaviour to the dispenser
+     *
+     * @param item
+     * @param behavior
+     */
+    public static void addDispenserBehavior(Item item, IBehaviorDispenseItem behavior)
+    {
+    	BlockDispenser.field_82527_a.func_82595_a(item, behavior);
+    }
    /**
     * Add localization for the specified string
     *
@@ -173,13 +184,13 @@ public class ModLoader
    }

    /**
-     * Attempts to register a small image to be applied to a larger texture image, 
+     * Attempts to register a small image to be applied to a larger texture image,
     * typically how old ModLoader mods add custom Item/Block textures.
-     * 
+     *
     * Forge mods should use setTextureFile in Item/Block
-     * 
+     *
     * Will return the icon index it was applied to.
-     * 
+     *
     * Unimplemented on the server as it does not render textures
     *
     * @param fileToOverride The texture to apply the new image to
@@ -193,11 +204,11 @@ public class ModLoader
    }

    /**
-     * Attempts to register a small image to be applied to a larger texture image, 
+     * Attempts to register a small image to be applied to a larger texture image,
     * typically how old ModLoader mods add custom Item/Block textures.
-     * 
+     *
     * Forge mods should use setTextureFile in Item/Block
-     * 
+     *
     * Unimplemented on the server as it does not render textures
     *
     * @param path The texture to apply the new image to
@@ -563,7 +574,6 @@ public class ModLoader

    /**
     * This method is a call in hook from modified external code. Implemented elsewhere.
-     * {@link FMLNetworkHandler#handlePacket250(Packet250CustomPayload, NetworkManager, NetHandler)}
     *
     * @param packet
     */
@@ -767,7 +777,6 @@ public class ModLoader
    }
    /**
     * Send a chat message to the server
-     * {@link FMLNetworkHandler#handleChatMessage(NetHandler, Packet3Chat)}
     *
     * @param text
     */
@@ -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;
@@ -19,7 +19,7 @@
 
     def creatergcfg(self, reobf=False, keep_lvt=False, keep_generics=False, rg_update=False):
         """Create the files necessary for RetroGuard"""
-@@ -781,7 +786,8 @@
+@@ -781,13 +786,16 @@
         testlk = {CLIENT: self.testclient, SERVER: self.testserver}
 
         if not os.path.exists(os.path.join(srclk[side], os.path.normpath(testlk[side] + '.java'))):
@@ -29,7 +29,15 @@
         return True
 
     def checkbins(self, side):
-@@ -1029,6 +1035,10 @@
+         binlk = {CLIENT: self.binclient, SERVER: self.binserver}
+         testlk = {CLIENT: self.testclient, SERVER: self.testserver}
+ 
+        if side == SERVER:
+            return self.checkbins(CLIENT)
+         if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
+             return False
+         return True
+@@ -1029,6 +1037,10 @@
         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
         pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
 
@@ -40,7 +48,7 @@
         if not os.path.exists(pathbinlk[side]):
             os.makedirs(pathbinlk[side])
 
-@@ -1041,6 +1051,7 @@
+@@ -1041,6 +1053,7 @@
             all_files = True
             append_pattern = False
         pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files)
@@ -48,16 +56,16 @@
         dirs = ' '.join(pkglist)
         classpath = os.pathsep.join(cplk[side])
         forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
-@@ -1062,7 +1073,7 @@
+@@ -1062,7 +1075,7 @@
             raise
 
     def startserver(self):
 -        classpath = [self.binserver] + self.cpathserver
-+        classpath = [self.binserver, self.srcshared] + self.cpathserver
+        classpath = [self.binclient, self.srcshared] + self.cpathserver
         classpath = [os.path.join('..', p) for p in classpath]
         classpath = os.pathsep.join(classpath)
         os.chdir(self.dirjars)
-@@ -1070,7 +1081,7 @@
+@@ -1070,7 +1083,7 @@
         self.runmc(forkcmd)
 
     def startclient(self):
@@ -66,7 +74,7 @@
         classpath = [os.path.join('..', p) for p in classpath]
         classpath = os.pathsep.join(classpath)
         natives = os.path.join('..', self.dirnatives)
-@@ -1197,20 +1208,20 @@
+@@ -1197,20 +1210,20 @@
         with open(self.csvmethods, 'rb') as fh:
             methodsreader = csv.DictReader(fh)
             for row in methodsreader:
@@ -90,7 +98,7 @@
                         names['params'][row['param']] = row['name']
 
         regexps = {
-@@ -1240,6 +1251,11 @@
+@@ -1240,6 +1253,11 @@
 
         # HINT: We pathwalk the sources
         for path, _, filelist in os.walk(pathsrclk[side], followlinks=True):
@@ -102,7 +110,7 @@
             for cur_file in fnmatch.filter(filelist, '*.java'):
                 updatefile(os.path.normpath(os.path.join(path, cur_file)))
         return True
-@@ -1322,12 +1338,14 @@
+@@ -1322,12 +1340,14 @@
         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
 
         strip_comments(pathsrclk[side])
@@ -117,7 +125,7 @@
 
     def process_javadoc(self, side):
         """Add CSV descriptions to methods and fields as javadoc"""
-@@ -1336,6 +1354,21 @@
+@@ -1336,6 +1356,21 @@
         if not self.has_doc_csv:
             self.logger.warning('!! javadoc disabled due to no csvs !!')
             return False
@@ -139,7 +147,7 @@
 
         #HINT: We read the relevant CSVs
         methodsreader = csv.DictReader(open(self.csvmethods, 'r'))
-@@ -1344,13 +1377,13 @@
+@@ -1344,13 +1379,13 @@
         methods = {}
         for row in methodsreader:
             #HINT: Only include methods that have a non-empty description
@@ -155,7 +163,7 @@
                 fields[row['searge']] = row['desc'].replace('*/', '* /')
 
         regexps = {
-@@ -1422,12 +1455,13 @@
+@@ -1422,12 +1457,13 @@
 
         # HINT: We create the list of source directories based on the list of packages
         pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=True)
@@ -170,7 +178,7 @@
         if not reobf:
             md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
         else:
-@@ -1442,6 +1476,9 @@
+@@ -1442,6 +1478,9 @@
                     class_path = ''
                 else:
                     class_path += '/'
@@ -180,7 +188,7 @@
                 for class_file in fnmatch.filter(filelist, '*.class'):
                     class_name = class_path + os.path.splitext(class_file)[0]
                     bin_file = os.path.normpath(os.path.join(path, class_file))
-@@ -1594,6 +1631,9 @@
+@@ -1594,6 +1633,9 @@
                 sys.exit(1)
 
         for entry in newfiles:
@@ -190,7 +198,7 @@
             if entry[3] == 'U':
                 self.logger.info('Retrieving file from server : %s', entry[0])
                 cur_file = os.path.normpath(entry[0])
-@@ -1614,6 +1654,9 @@
+@@ -1614,6 +1656,9 @@
         md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
         outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
         src = {CLIENT: self.srcclient, SERVER: self.srcserver}
@@ -200,7 +208,7 @@
 
         # HINT: We need a table for the old md5 and the new ones
         md5table = {}
-@@ -1646,6 +1689,7 @@
+@@ -1646,6 +1691,7 @@
         # HINT: We extract the source files for the modified class files
         for in_class in trgclasses:
             src_file = os.path.normpath(os.path.join(src[side], in_class + '.java'))
@@ -208,7 +216,7 @@
             dest_file = os.path.normpath(os.path.join(outpathlk[side], in_class + '.java'))
             if os.path.isfile(src_file):
                 if not os.path.exists(os.path.dirname(dest_file)):
-@@ -1655,4 +1699,15 @@
+@@ -1655,4 +1701,15 @@
                     self.logger.info('> Outputted %s to %s', in_class.ljust(35), outpathlk[side])
                 except IOError:
                     self.logger.error('* File %s copy failed', in_class)
@@ -23,7 +23,7 @@ public @interface BukkitPluginRef
     * specification. If this is a bukkit enabled environment the field annotated by this
     * will be populated with a {@link BukkitProxy} instance if possible. This proxy will be gotten by
     * reflectively calling the "getModProxy" method on the bukkit plugin instance.
-     * @return
+     * @return The name of the plugin which we will inject into this field
     */
    String value();
 }
@@ -0,0 +1,16 @@
+package cpw.mods.fml.common;
+
+import java.io.File;
+import java.util.List;
+
+import com.google.common.collect.SetMultimap;
+
+public class DuplicateModsFoundException extends LoaderException {
+
+	public SetMultimap<ModContainer,File> dupes;
+
+	public DuplicateModsFoundException(SetMultimap<ModContainer, File> dupes) {
+		this.dupes = dupes;
+	}
+
+}
@@ -22,6 +22,7 @@ import java.util.logging.Logger;

 import net.minecraft.server.MinecraftServer;
 import net.minecraft.src.CrashReport;
+import net.minecraft.src.CrashReportCategory;
 import net.minecraft.src.DedicatedServer;
 import net.minecraft.src.Entity;
 import net.minecraft.src.EntityPlayer;
@@ -154,7 +155,7 @@ public class FMLCommonHandler
    }
    /**
     * Get the forge mod loader logging instance (goes to the forgemodloader log file)
-     * @return
+     * @return The log instance for the FML log file
     */
    public Logger getFMLLogger()
    {
@@ -228,13 +229,17 @@ public class FMLCommonHandler
        {
            Builder brd = ImmutableList.<String>builder();
            brd.add(Loader.instance().getMCVersionString());
+            brd.add(Loader.instance().getMCPVersionString());
            brd.add("FML v"+Loader.instance().getFMLVersionString());
            String forgeBranding = (String) callForgeMethod("getBrandingVersion");
            if (!Strings.isNullOrEmpty(forgeBranding))
            {
                brd.add(forgeBranding);
            }
-            brd.addAll(sidedDelegate.getAdditionalBrandingInformation());
+            if (sidedDelegate!=null)
+            {
+            	brd.addAll(sidedDelegate.getAdditionalBrandingInformation());
+            }
            try {
                Properties props=new Properties();
                props.load(getClass().getClassLoader().getResourceAsStream("fmlbranding.properties"));
@@ -382,11 +387,11 @@ public class FMLCommonHandler
        crashCallables.add(callable);
    }

-    public void enhanceCrashReport(CrashReport crashReport)
+    public void enhanceCrashReport(CrashReport crashReport, CrashReportCategory category)
    {
        for (ICrashCallable call: crashCallables)
        {
-            crashReport.func_71500_a(call.getLabel(), call);
+            category.func_71500_a(call.getLabel(), call);
        }
    }

@@ -46,7 +46,9 @@ import cpw.mods.fml.common.Mod.Metadata;
 import cpw.mods.fml.common.discovery.ASMDataTable;
 import cpw.mods.fml.common.discovery.ASMDataTable.ASMData;
 import cpw.mods.fml.common.event.FMLConstructionEvent;
+import cpw.mods.fml.common.event.FMLEvent;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
@@ -76,15 +78,16 @@ public class FMLModContainer implements ModContainer
    private DefaultArtifactVersion processedVersion;
    private boolean isNetworkMod;

-    private static final BiMap<Class<? extends FMLStateEvent>, Class<? extends Annotation>> modAnnotationTypes = ImmutableBiMap.<Class<? extends FMLStateEvent>, Class<? extends Annotation>>builder()
+    private static final BiMap<Class<? extends FMLEvent>, Class<? extends Annotation>> modAnnotationTypes = ImmutableBiMap.<Class<? extends FMLEvent>, Class<? extends Annotation>>builder()
        .put(FMLPreInitializationEvent.class, Mod.PreInit.class)
        .put(FMLInitializationEvent.class, Mod.Init.class)
        .put(FMLPostInitializationEvent.class, Mod.PostInit.class)
        .put(FMLServerStartingEvent.class, Mod.ServerStarting.class)
        .put(FMLServerStartedEvent.class, Mod.ServerStarted.class)
        .put(FMLServerStoppingEvent.class, Mod.ServerStopping.class)
+        .put(IMCEvent.class,Mod.IMCCallback.class)
        .build();
-    private static final BiMap<Class<? extends Annotation>, Class<? extends FMLStateEvent>> modTypeAnnotations = modAnnotationTypes.inverse();
+    private static final BiMap<Class<? extends Annotation>, Class<? extends FMLEvent>> modTypeAnnotations = modAnnotationTypes.inverse();
    private String annotationDependencies;
    private VersionRange minecraftAccepted;

@@ -422,7 +425,7 @@ public class FMLModContainer implements ModContainer
    }

    @Subscribe
-    public void handleModStateEvent(FMLStateEvent event)
+    public void handleModStateEvent(FMLEvent event)
    {
        Class<? extends Annotation> annotation = modAnnotationTypes.get(event.getClass());
        if (annotation == null)
@@ -19,6 +19,7 @@ import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;

 import cpw.mods.fml.common.LoaderState.ModState;
+import cpw.mods.fml.common.event.FMLEvent;
 import cpw.mods.fml.common.event.FMLLoadEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLStateEvent;
@@ -124,7 +125,7 @@ public class LoadController
    }

    @Subscribe
-    public void propogateStateMessage(FMLStateEvent stateEvent)
+    public void propogateStateMessage(FMLEvent stateEvent)
    {
        if (stateEvent instanceof FMLPreInitializationEvent)
        {
@@ -135,17 +136,20 @@ public class LoadController
            activeContainer = mc;
            String modId = mc.getModId();
            stateEvent.applyModContainer(activeContainer());
-            FMLLog.finer("Posting state event %s to mod %s", stateEvent.getEventType(), modId);
+            FMLLog.finer("Sending event %s to mod %s", stateEvent.getEventType(), modId);
            eventChannels.get(modId).post(stateEvent);
-            FMLLog.finer("State event %s delivered to mod %s", stateEvent.getEventType(), modId);
+            FMLLog.finer("Sent event %s to mod %s", stateEvent.getEventType(), modId);
            activeContainer = null;
-            if (!errors.containsKey(modId))
+            if (stateEvent instanceof FMLStateEvent)
            {
-                modStates.put(modId, stateEvent.getModState());
-            }
-            else
-            {
-                modStates.put(modId, ModState.ERRORED);
+	            if (!errors.containsKey(modId))
+	            {
+	                modStates.put(modId, ((FMLStateEvent)stateEvent).getModState());
+	            }
+	            else
+	            {
+	                modStates.put(modId, ModState.ERRORED);
+	            }
            }
        }
    }
@@ -229,4 +233,8 @@ public class LoadController
    {
        return this.state == state;
    }
+
+	boolean hasReachedState(LoaderState state) {
+		return this.state.ordinal()>=state.ordinal() && this.state!=LoaderState.ERRORED;
+	}
 }
@@ -18,6 +18,7 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -31,14 +32,17 @@ import com.google.common.base.CharMatcher;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
+import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.SetMultimap;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Multiset.Entry;
 import com.google.common.collect.Multisets;
@@ -48,6 +52,7 @@ import com.google.common.collect.TreeMultimap;

 import cpw.mods.fml.common.LoaderState.ModState;
 import cpw.mods.fml.common.discovery.ModDiscoverer;
+import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLLoadEvent;
 import cpw.mods.fml.common.functions.ModIdFunction;
 import cpw.mods.fml.common.modloader.BaseModProxy;
@@ -104,7 +109,7 @@ public class Loader
    private static String rev;
    private static String build;
    private static String mccversion;
-    private static String mcsversion;
+    private static String mcpversion;

    /**
     * The class loader we load the mods into.
@@ -133,6 +138,7 @@ public class Loader
    private File canonicalModsDir;
    private LoadController modController;
    private MinecraftDummyContainer minecraft;
+	private MCPDummyContainer mcp;

    private static File minecraftDir;
    private static List<String> injectedContainers;
@@ -154,7 +160,7 @@ public class Loader
        rev = (String) data[2];
        build = (String) data[3];
        mccversion = (String) data[4];
-        mcsversion = (String) data[5];
+        mcpversion = (String) data[5];
        minecraftDir = (File) data[6];
        injectedContainers = (List<String>)data[7];
    }
@@ -170,6 +176,7 @@ public class Loader
        }

        minecraft = new MinecraftDummyContainer(actualMCVersion);
+        mcp = new MCPDummyContainer(MetadataCollection.from(getClass().getResourceAsStream("/mcpmod.info"), "MCP").getMetadataForId("mcp", null));
    }

    /**
@@ -299,6 +306,8 @@ public class Loader
    private ModDiscoverer identifyMods()
    {
        FMLLog.fine("Building injected Mod Containers %s", injectedContainers);
+        // Add in the MCP mod container
+        mods.add(new InjectedModContainer(mcp,new File("minecraft.jar")));
        File coremod = new File(minecraftDir,"coremods");
        for (String cont : injectedContainers)
        {
@@ -341,7 +350,6 @@ public class Loader

    private void identifyDuplicates(List<ModContainer> mods)
    {
-        boolean foundDupe = false;
        TreeMultimap<ModContainer, File> dupsearch = TreeMultimap.create(new ModIdComparator(), Ordering.arbitrary());
        for (ModContainer mc : mods)
        {
@@ -352,15 +360,19 @@ public class Loader
        }

        ImmutableMultiset<ModContainer> duplist = Multisets.copyHighestCountFirst(dupsearch.keys());
+        SetMultimap<ModContainer, File> dupes = LinkedHashMultimap.create();
        for (Entry<ModContainer> e : duplist.entrySet())
        {
            if (e.getCount() > 1)
            {
                FMLLog.severe("Found a duplicate mod %s at %s", e.getElement().getModId(), dupsearch.get(e.getElement()));
-                foundDupe = true;
+                dupes.putAll(e.getElement(),dupsearch.get(e.getElement()));
            }
        }
-        if (foundDupe) { throw new LoaderException(); }
+        if (!dupes.isEmpty())
+        {
+        	throw new DuplicateModsFoundException(dupes);
+        }
    }

    /**
@@ -451,7 +463,7 @@ public class Loader
        {
            if (nonMod.isFile())
            {
-                FMLLog.severe("FML has found a non-mod file %s in your mods directory. It will now be injected into your classpath. This could severe stability issues, it should be removed if possible.", nonMod.getName());
+                FMLLog.info("FML has found a non-mod file %s in your mods directory. It will now be injected into your classpath. This could severe stability issues, it should be removed if possible.", nonMod.getName());
                try
                {
                    modClassLoader.addFile(nonMod);
@@ -638,6 +650,7 @@ public class Loader
        // Mod controller should be in the initialization state here
        modController.distributeStateMessage(LoaderState.INITIALIZATION);
        modController.transition(LoaderState.POSTINITIALIZATION);
+        modController.distributeStateMessage(FMLInterModComms.IMCEvent.class);
        modController.distributeStateMessage(LoaderState.POSTINITIALIZATION);
        modController.transition(LoaderState.AVAILABLE);
        modController.distributeStateMessage(LoaderState.AVAILABLE);
@@ -720,4 +733,12 @@ public class Loader
    {
        return minecraft;
    }
+
+	public boolean hasReachedState(LoaderState state) {
+		return modController.hasReachedState(state);
+	}
+
+	public String getMCPVersionString() {
+		return String.format("MCP v%s", mcpversion);
+	}
 }
@@ -3,6 +3,7 @@ package cpw.mods.fml.common;
 import com.google.common.base.Throwables;

 import cpw.mods.fml.common.event.FMLConstructionEvent;
+import cpw.mods.fml.common.event.FMLEvent;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@@ -59,7 +60,7 @@ public enum LoaderState
    {
        return eventClass != null;
    }
-    
+
    public FMLStateEvent getEvent(Object... eventData)
    {
        try
@@ -87,7 +88,7 @@ public enum LoaderState
        AVAILABLE("Available"),
        DISABLED("Disabled"),
        ERRORED("Errored");
-        
+
        private String label;

        private ModState(String label)
@@ -0,0 +1,14 @@
+package cpw.mods.fml.common;
+
+import com.google.common.eventbus.EventBus;
+
+public class MCPDummyContainer extends DummyModContainer {
+	public MCPDummyContainer(ModMetadata metadata) {
+		super(metadata);
+	}
+
+	@Override
+	public boolean registerBus(EventBus bus, LoadController controller) {
+		return true;
+	}
+}
@@ -18,6 +18,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;

+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+
 import net.minecraft.src.ItemBlock;

 /**
@@ -63,9 +66,40 @@ public @interface Mod
     * An optional bukkit plugin that will be injected into the bukkit plugin framework if
     * this mod is loaded into the FML framework and the bukkit coremod is present.
     * Instances of the bukkit plugin can be obtained via the {@link BukkitPluginRef} annotation on fields.
-     * @return
+     * @return The name of the plugin to load for this mod
     */
    String bukkitPlugin() default "";
+    /**
+     * Mods that this mod will <strong>not</strong> load with.
+     * An optional comma separated string of (+|-)(*|modid[@value]) which specify mods that
+     * this mod will refuse to load with, resulting in the game failing to start.
+     * Entries can be prefixed with a + for a positive exclusion assertion, or - for a negative exclusion
+     * assertion. Asterisk is the wildcard and represents <strong>all</strong> mods.
+     *
+     * The <strong>only</strong> mods that cannot be excluded are FML and MCP, trivially.
+     * Other special values:
+     * <ul>
+     * <li>+f indicates that the mod will accept a minecraft forge environment.</li>
+     * <li>-* indicates that the mod will not accept any other mods.</li>
+     * </ul>
+     *
+     * Some examples:
+     * <ul>
+     * <li><em>-*,+f,+IronChest</em>: Will run only in a minecraft forge environment with the mod IronChests.
+     * The -* forces all mods to be excluded, then the +f and +IronChest add into the "allowed list".</li>
+     * <li><em>+f,-IC2</em>: Will run in a minecraft forge environment but will <strong>not</strong> run if
+     * IndustrialCraft 2 (IC2) is loaded alongside.</li>
+     * <li><em>-*</em>: Will not run if <strong>any</strong> othe mod is loaded except MCP/FML itself.</li>
+     * </ul>
+     *
+     * If a mod is present on the excluded list, the game will stop and show an error screen. If the
+     * class containing the {@link Mod} annotation has a "getCustomErrorException" method, it will be
+     * called to retrieve a custom error message for display in this case. If two mods have a declared
+     * exclusion which is matched, the screen that is shown is indeterminate.
+     *
+     * @return A string listing modids to exclude from loading with this mod.
+     */
+    String modExclusionList() default "";
    /**
     * Mark the designated method as being called at the "pre-initialization" phase
     * @author cpw
@@ -99,7 +133,7 @@ public @interface Mod
    @Target(ElementType.METHOD)
    public @interface ServerStarting {}
    /**
-     * Mark the designated method as being called at the "post-initialization" phase
+     * Mark the designated method as being called at the "server-started" phase
     * @author cpw
     *
     */
@@ -107,13 +141,22 @@ public @interface Mod
    @Target(ElementType.METHOD)
    public @interface ServerStarted {}
    /**
-     * Mark the designated method as being called at the "post-initialization" phase
+     * Mark the designated method as being called at the "server-stopping" phase
     * @author cpw
     *
     */
    @Retention(RetentionPolicy.RUNTIME)
    @Target(ElementType.METHOD)
    public @interface ServerStopping {}
+    /**
+     * Mark the designated method as the receiver for {@link FMLInterModComms} messages
+     * Called between {@link Init} and {@link PostInit}
+     * @author cpw
+     *
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface IMCCallback {}
    /**
     * Populate the annotated field with the mod instance.
     * @author cpw
@@ -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,10 +135,16 @@ public class MCPMerger
            String line;
            while ((line = br.readLine()) != null)
            {
-                boolean toClient = line.charAt(0) == '<';
-                line = line.substring(1);
-                if (toClient) copyToClient.add(line);
-                else copyToServer.add(line);
+                line = line.split("#")[0];
+                char cmd = line.charAt(0);
+                line = line.substring(1).trim();
+                
+                switch (cmd)
+                {
+                    case '!': dontAnnotate.add(line); break;
+                    case '<': copyToClient.add(line); break;
+                    case '>': copyToServer.add(line); break; 
+                }
            }

            in.close();
@@ -224,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()})
@@ -288,7 +289,7 @@ public class MCPMerger

        reader.accept(classNode, 0);

-        if (!classNode.name.equals("bct")) //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));
@@ -1,9 +1,15 @@
 package cpw.mods.fml.common.event;

+import cpw.mods.fml.common.ModContainer;
+
 public class FMLEvent
 {
    public final String getEventType()
    {
        return getClass().getSimpleName();
    }
+
+	public void applyModContainer(ModContainer activeContainer) {
+	    // NO OP
+	}
 }
@@ -0,0 +1,92 @@
+package cpw.mods.fml.common.event;
+
+import java.util.List;
+
+import com.google.common.base.Function;
+import com.google.common.base.Functions;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableListMultimap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimaps;
+
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.LoaderState;
+import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.Mod.Init;
+import cpw.mods.fml.common.Mod.PostInit;
+
+
+/**
+ * Simple intermod communications to receive simple messages directed at you from
+ * other mods
+ *
+ * @author cpw
+ *
+ */
+public class FMLInterModComms {
+	private static ArrayListMultimap<String, IMCMessage> modMessages = ArrayListMultimap.create();
+	/**
+	 * Subscribe to this event to receive your messages (they are sent between {@link Init} and {@link PostInit})
+	 *
+	 * @author cpw
+	 *
+	 */
+	public static class IMCEvent extends FMLEvent {
+		@Override
+		public void applyModContainer(ModContainer activeContainer) {
+			currentList = ImmutableList.copyOf(modMessages.get(activeContainer.getModId()));
+		}
+		private ImmutableList<IMCMessage> currentList;
+
+		public ImmutableList<IMCMessage> getMessages()
+		{
+			return currentList;
+		}
+	}
+
+	/**
+	 * You will receive an instance of this for each message sent
+	 * @author cpw
+	 *
+	 */
+	public static final class IMCMessage {
+		/**
+		 * This is the modid of the mod that sent you the message
+		 */
+		public final String sender;
+
+		/**
+		 * This field, and {@link #value} are both at the mod's discretion
+		 */
+		public final String key;
+		/**
+		 * This field, and {@link #key} are both at the mod's discretion
+		 */
+		public final String value;
+
+		private IMCMessage(String sender, String key, String value)
+		{
+			this.key = key;
+			this.value = value;
+			this.sender = sender;
+		}
+		@Override
+		public String toString() {
+			return sender;
+		}
+	}
+
+	public static boolean sendMessage(String modId, String key, String value)
+	{
+		if (Loader.instance().activeModContainer()==null)
+		{
+			return false;
+		}
+		modMessages.put(modId, new IMCMessage(Loader.instance().activeModContainer().getModId(), key, value));
+		return Loader.isModLoaded(modId) && !Loader.instance().hasReachedState(LoaderState.POSTINITIALIZATION);
+	}
+}
@@ -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;
+    }
 }
@@ -2,7 +2,6 @@ package cpw.mods.fml.common.event;

 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.LoaderState.ModState;
-import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.Side;

 public abstract class FMLStateEvent extends FMLEvent
@@ -14,11 +13,6 @@ public abstract class FMLStateEvent extends FMLEvent

    public abstract ModState getModState();

-    public void applyModContainer(ModContainer activeContainer)
-    {
-        // NO OP
-    }
-
    public Side getSide()
    {
        return FMLCommonHandler.instance().getSide();
@@ -73,9 +73,6 @@ public interface BaseModProxy

    public abstract void onItemPickup(EntityPlayer player, ItemStack item);

-    public abstract int dispenseEntity(World world, ItemStack item, Random rnd, int x, int y, int z, int xVel, int zVel, double entX,
-            double entY, double entZ);
-
    public abstract void serverCustomPayload(NetServerHandler handler, Packet250CustomPayload packet);

    public abstract void serverChat(NetServerHandler source, String message);
@@ -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);
@@ -21,8 +21,7 @@ public class ModLoaderDispenseHelper implements IDispenserHandler
    public int dispense(int x, int y, int z, int xVelocity, int zVelocity, World world, ItemStack item, Random random, double entX, double entY,
            double entZ)
    {
-        int ret = mod.dispenseEntity(world, item, random, x, y, z, xVelocity, zVelocity, entX, entY, entZ);
-        return ret == 0 ? -1 : ret;
+    	return -1;
    }

 }
@@ -32,6 +32,7 @@ import net.minecraft.src.IAnimals;
 import net.minecraft.src.ICommand;
 import net.minecraft.src.TradeEntry;
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.ICraftingHandler;
 import cpw.mods.fml.common.IDispenseHandler;
 import cpw.mods.fml.common.IDispenserHandler;
@@ -63,7 +64,16 @@ public class ModLoaderHelper

    public static void updateStandardTicks(BaseModProxy mod, boolean enable, boolean useClock)
    {
-        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
+        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().getReversedModObjectList().get(mod);
+        if (mlmc==null)
+        {
+            mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
+        }
+        if (mlmc == null)
+        {
+            FMLLog.severe("Attempted to register ModLoader ticking for invalid BaseMod %s",mod);
+            return;
+        }
        BaseModTicker ticker = mlmc.getGameTickHandler();
        EnumSet<TickType> ticks = ticker.ticks();
        // If we're enabled we get render ticks
@@ -84,7 +94,16 @@ public class ModLoaderHelper

    public static void updateGUITicks(BaseModProxy mod, boolean enable, boolean useClock)
    {
-        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
+        ModLoaderModContainer mlmc = (ModLoaderModContainer) Loader.instance().getReversedModObjectList().get(mod);
+        if (mlmc==null)
+        {
+            mlmc = (ModLoaderModContainer) Loader.instance().activeModContainer();
+        }
+        if (mlmc == null)
+        {
+            FMLLog.severe("Attempted to register ModLoader ticking for invalid BaseMod %s",mod);
+            return;
+        }
        EnumSet<TickType> ticks = mlmc.getGUITickHandler().ticks();
        // If we're enabled and we don't want clock ticks we get render ticks
        if (enable && !useClock) {
@@ -16,7 +16,7 @@ public class FMLInjectionData
    static String rev;
    static String build;
    static String mccversion;
-    static String mcsversion;
+    static String mcpversion;
    public static List<String> containers = new ArrayList<String>();

    static void build(File mcHome, RelaunchClassLoader classLoader)
@@ -41,14 +41,14 @@ public class FMLInjectionData
        minor = properties.getProperty("fmlbuild.minor.number", "missing");
        rev = properties.getProperty("fmlbuild.revision.number", "missing");
        build = properties.getProperty("fmlbuild.build.number", "missing");
-        mccversion = properties.getProperty("fmlbuild.mcclientversion", "missing");
-        mcsversion = properties.getProperty("fmlbuild.mcserverversion", "missing");
+        mccversion = properties.getProperty("fmlbuild.mcversion", "missing");
+        mcpversion = properties.getProperty("fmlbuild.mcpversion", "missing");


    }

    public static Object[] data()
    {
-        return new Object[] { major, minor, rev, build, mccversion, mcsversion, minecraftHome, containers };
+        return new Object[] { major, minor, rev, build, mccversion, mcpversion, minecraftHome, containers };
    }
 }
@@ -147,8 +147,8 @@ public class FMLRelauncher
    {
        FMLInjectionData.build(minecraftHome, classLoader);
        FMLRelaunchLog.minecraftHome = minecraftHome;
-        FMLRelaunchLog.info("Forge Mod Loader version %s.%s.%s.%s for Minecraft client:%s, server:%s loading", FMLInjectionData.major, FMLInjectionData.minor,
-                FMLInjectionData.rev, FMLInjectionData.build, FMLInjectionData.mccversion, FMLInjectionData.mcsversion);
+        FMLRelaunchLog.info("Forge Mod Loader version %s.%s.%s.%s for Minecraft %s loading", FMLInjectionData.major, FMLInjectionData.minor,
+                FMLInjectionData.rev, FMLInjectionData.build, FMLInjectionData.mccversion, FMLInjectionData.mcpversion);

        try
        {
@@ -27,6 +27,7 @@ public class RelaunchClassLoader extends URLClassLoader

    private List<IClassTransformer> transformers;
    private Map<String, Class> cachedClasses;
+    private Set<String> invalidClasses;

    private Set<String> classLoaderExceptions = new HashSet<String>();
    private Set<String> transformerExceptions = new HashSet<String>();
@@ -37,6 +38,7 @@ public class RelaunchClassLoader extends URLClassLoader
        this.sources = new ArrayList<URL>(Arrays.asList(sources));
        this.parent = getClass().getClassLoader();
        this.cachedClasses = new HashMap<String,Class>(1000);
+        this.invalidClasses = new HashSet<String>(1000);
        this.transformers = new ArrayList<IClassTransformer>(2);
 //        ReflectionHelper.setPrivateValue(ClassLoader.class, null, this, "scl");
        Thread.currentThread().setContextClassLoader(this);
@@ -69,6 +71,10 @@ public class RelaunchClassLoader extends URLClassLoader
    @Override
    public Class<?> findClass(String name) throws ClassNotFoundException
    {
+        if (invalidClasses.contains(name))
+        {
+            throw new ClassNotFoundException(name);
+        }
        // NEI/CCC compatibility code
        if (excludedPackages.length != 0)
        {
@@ -98,9 +104,17 @@ public class RelaunchClassLoader extends URLClassLoader
        {
            if (name.startsWith(st))
            {
-                Class<?> cl = super.findClass(name);
-                cachedClasses.put(name, cl);
-                return cl;
+                try
+                {
+                    Class<?> cl = super.findClass(name);
+                    cachedClasses.put(name, cl);
+                    return cl;
+                }
+                catch (ClassNotFoundException e)
+                {
+                    invalidClasses.add(name);
+                    throw e;
+                }
            }
        }

@@ -123,6 +137,7 @@ public class RelaunchClassLoader extends URLClassLoader
        }
        catch (Throwable e)
        {
+            invalidClasses.add(name);
            throw new ClassNotFoundException(name, e);
        }
    }
@@ -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,13 +455,9 @@ public class RelaunchLibraryManager
    {
        try
        {
-        	//rootUrl.replace("%s", libFile.getPath())
            URL libDownload = new URL(String.format(rootUrl,realFilePath));
-            System.out.println("Downloading file: " + libDownload.getHost() + libDownload.getPath());
-            System.out.println("The libFile's path is " + libFile.getAbsolutePath());
-            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;
@@ -36,7 +38,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 * Handles primary communication from hooked code into the system
 *
 * The FML entry point is {@link #beginServerLoading(MinecraftServer)} called from
- * {@link DedicatedServer}
+ * {@link net.minecraft.src.DedicatedServer}
 *
 * Obfuscated code should focus on this class and other members of the "server"
 * (or "client") code
@@ -117,7 +119,7 @@ public class FMLServerHandler implements IFMLSidedHandler
    @Override
    public List<String> getAdditionalBrandingInformation()
    {
-        return null;
+        return ImmutableList.<String>of();
    }

    /* (non-Javadoc)
@@ -1,71 +1,71 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public amm.a(Ljava/lang/Class;Ljava/lang/String;)V # TileEntity/func_70306_a
+public anq.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
-public lf.a(Ljava/lang/Class;Ljava/lang/String;I)V # EntityList/func_75618_a
-public lf.a(Ljava/lang/Class;Ljava/lang/String;III)V # EntityList/func_75614_a
-public lf.b # EntityList/field_75625_b nameToClassMap
-public lf.c # EntityList/field_75626_c classToNameMap
-public lf.d # 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 azc.h # RenderEngine/field_78367_h textureList
-public azc.k # 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 azw.o # RenderManager/field_78729_o renderers
+public bbj.p #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public azd.*
-public azd.*()
+public baq.* #FD:RenderBlocks/*
+public baq.*() #MD:RenderBlocks/*
 #RenderPlayer
-public-f baq.h # RenderPlayer/field_77110_j armorlist
+public-f bcd.h #FD:RenderPlayer/field_77110_j #armorlist
 #RenderBiped
-public-f bae.k # RenderBiped/field_82424_k armorlist
+public-f bbr.k #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
-public be.b # StringTranslate/field_74815_b
-public be.d # StringTranslate/field_74813_d
+public bn.b #FD:StringTranslate/field_74815_b
+public bn.d #FD:StringTranslate/field_74813_d
 # TileEntityRenderer
-public bby.m # TileEntityRenderer/field_76966_m
+public bdl.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
-public vq.a(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77595_a
-public vq.b(Ltv;[Ljava/lang/Object;)V # CraftingManager/func_77596_b
+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 kg.a # WeightedRandomItem/field_76292_a probability
+public kv.a #FD:WeightedRandomItem/field_76292_a #probability
 # ItemStack
-#public+f tv.c # ItemStack/field_77993_c itemId
+#public+f tv.c #FD:ItemStack/field_77993_c #itemId
 # StatBase
-public jc.a # StatBase/field_75978_a statName
+public jl.a #FD:StatBase/field_75978_a #statName
 # NetLoginHandler
-public ik.a(Lik;Z)Z # NetLoginHandler/func_72531_a 'complete connection'
-public ik.h # 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 ih.cd()V # EntityPlayerMP/func_71117_bO
-public ih.cv # EntityPlayerMP/field_71139_cq
+public iq.ch()V #MD:EntityPlayerMP/func_71117_bO
+public iq.cs #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
-public mo
+public ne #CL:EntityAITaskEntry
 # EntityAITasks
-public mmn.a # EntityAITasks/field_75782_a taskList
+public nd.a #FD:EntityAITasks/field_75782_a #taskList
 # BlockChest
-public ahy.n(Lxd;III)Z # BlockChest/func_72292_n isOcelotBlockingChest
+public ajd.n(Lxv;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
-public ln.aS # EntityLiving/field_70736_aM carryoverDamage
-public ln.bn # EntityLiving/field_70714_bg tasks
-public ln.bG # 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 na.a(Lxe;III)Z # EntityAIOcelotSit/func_75398_a nearestSittableBlock
-protected na.f()Z # 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
-public b.<init>(La;)V # constructor
+public b #CL:CallableMinecraftVersion
+public b.<init>(La;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
 # EntityAnimal
-public oh.d # EntityAnimal/field_70881_d inLove
+public ox.d #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
-public xp.<init>(ILjava/lang/String;)V
-public xp.<init>(ILjava/lang/String;I)V
+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)
 # ComponentVillage
-public aeq
+public afl #CL:ComponentVillage
 # EntityVillager - minmax lists
-public qd.a(Lww;ILjava/util/Random;F)V # EntityVillager/func_70948_a addBuy
-public qd.b(Lww;ILjava/util/Random;F)V # EntityVillager/func_70949_b addSell
-public qd.bP # EntityVillager/field_70958_bB
-public qd.bQ # EntityVillager/field_70960_bC
+public qu.a(Lxn;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
+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 aum
+public avu #CL:GuiButtonMerchant
@@ -2,11 +2,11 @@
 # Only runs at runtime because it's not necessary at compile time
 # has deobf and obf mappings so it runs OK in mcp
 # entityplayer -> network/player
-qg cpw/mods/fml/common/network/Player
+qx cpw/mods/fml/common/network/Player
 net.minecraft.src.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-alf cpw/mods/fml/common/registry/BlockProxy
+amj cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.src.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-tt cpw/mods/fml/common/registry/ItemProxy
-net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy
+uk cpw/mods/fml/common/registry/ItemProxy
+net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy
@@ -0,0 +1,17 @@
+[
+{
+  "modid": "mcp",
+  "name": "Minecraft Coder Pack",
+  "description": "Modding toolkit to decompile and deobfuscate the Minecraft client and server files.",
+  "version": "7.22",
+  "mcversion": "1.4.5",
+  "logoFile": "/mcp.png",
+  "url": "http://mcp.ocean-labs.de/",
+  "updateUrl": "",
+  "authors": ["Searge", "ProfMobius", "IngisKahn", "Fesh0r", "ZeuX", "R4wk", "Others"],
+  "credits": "Made by the MCP team",
+  "parent": "",
+  "screenshots": [],
+  "dependencies": []
+}
+]
@@ -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.
@@ -257,7 +259,6 @@ field_70521_d,zPosition,2,
 field_70522_e,art,2,
 field_70523_b,xPosition,2,
 field_70524_c,yPosition,2,
-field_70525_a,direction,2,the direction the painting faces
 field_70529_d,xpOrbHealth,2,The health of this XP orb.
 field_70530_e,xpValue,2,This is how much XP this orb has.
 field_70531_b,xpOrbAge,2,The age of the XP orb in ticks.
@@ -381,15 +382,12 @@ field_70796_c,waypointY,2,
 field_70797_a,courseChangeCooldown,2,
 field_70798_h,aggroCooldown,2,Cooldown time between target loss and new target aquirement.
 field_70810_d,slimeJumpDelay,2,the time between each jump of the slime
-field_70815_f,attackStrength,2,How much damage this mob's attacks deal
 field_70827_d,carriableBlocks,2,
 field_70828_e,teleportDelay,2,Counter to delay the teleportation of an enderman towards the currently attacked target
 field_70833_d,timeSinceIgnited,2,The amount of time since the creeper was close enough to the player to ignite
 field_70834_e,lastActiveTime,2,"Time when this creeper was last in an active state (Messed up code here, probably causes creeper animation to go weird)"
-field_70836_g,defaultHeldItem,2,"The ItemStack that any PigZombie holds (a gold sword, in fact)."
 field_70837_d,angerLevel,2,Above zero if this PigZombie is Angry.
 field_70838_e,randomSoundDelay,2,A random delay until this PigZombie next makes a sound.
-field_70842_d,defaultHeldItem,2,The ItemStack that any Skeleton holds (a bow).
 field_70843_d,allySummonCooldown,2,A cooldown before this entity will search for another Silverfish to join them in battle.
 field_70847_d,heightOffset,2,Random offset used in floating behaviour
 field_70848_e,heightOffsetUpdateTime,2,ticks until heightOffset is randomized
@@ -423,14 +421,12 @@ field_70953_g,isPlaying,2,
 field_70954_d,villageObj,2,
 field_70955_e,randomTickDivider,2,
 field_70956_bz,wealth,2,
-field_70957_bA,sellingRecipeList,2,Recipes for buying things from Villagers.
 field_70958_bB,villagerStockList,2,a villagers recipe list is intialized off this list ; the 2 params are min/max amount they will trade for 1 emerald
 field_70959_by,needsInitilization,2,addDefaultEquipmentAndRecipies is called if this is true
 field_70960_bC,blacksmithSellingList,2,"Selling list of Blacksmith items. negative numbers mean 1 emerald for n items, positive numbers are n emeralds for 1 item"
 field_70961_j,timeUntilReset,2,
 field_70962_h,buyingPlayer,2,This villager's current customer.
 field_70963_i,buyingList,2,Initialises the MerchantRecipeList.java
-field_70966_a,maxHealth,2,The maximum health of the Entity.
 field_70976_f,ringBufferIndex,2,Index into the ring buffer. Incremented once per tick and restarts at 0 once it reaches the end of the buffer.
 field_70977_g,dragonPartArray,2,An array containing all body parts of this dragon
 field_70978_d,targetZ,2,
@@ -453,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.
@@ -477,9 +473,7 @@ field_71099_bE,score,2,
 field_71100_bB,foodStats,2,The player's food stats. (See class FoodStats)
 field_71101_bC,flyToggleTimer,2,"Used to tell if the player pressed jump twice. If this is at 0 and it's pressed (And they are allowed to fly, as defined in the player's movementInput) it sets this to 7. If it's pressed and it's greater than 0 enable fly."
 field_71102_ce,speedInAir,2,
-field_71103_bH,isSwinging,2,Whether the player is swinging the current item in their hand.
 field_71104_cf,fishEntity,2,"An instance of a fishing rod's hook. If this isn't null, the icon image of the fishing rod is slightly different"
-field_71105_bI,swingProgressInt,2,
 field_71106_cc,experience,2,The current amount of experience the player has within their Experience Bar.
 field_71107_bF,prevCameraYaw,2,
 field_71108_cd,speedOnGround,2,
@@ -496,7 +490,6 @@ field_71137_h,playerInventoryBeingManipulated,2,"poor mans concurency flag, lets
 field_71138_i,ping,2,
 field_71139_cq,currentWindowId,2,The currently in use window ID. Incremented every time a window is opened.
 field_71140_co,chatColours,2,
-field_71141_cp,lastActiveItems,2,"0 is the held item, 1-4 is armor ; used to detect changes in getCurrentItemOrArmor"
 field_71142_cm,renderDistance,2,must be between 3>x>15 (strictly between)
 field_71143_cn,chatVisibility,2,
 field_71144_ck,lastExperience,2,Amount of experience the client was last set to
@@ -573,7 +566,7 @@ field_71318_t,serverConfigManager,2,The ServerConfigurationManager instance.
 field_71319_s,serverPort,2,The server's port.
 field_71320_r,hostname,2,The server's hostname.
 field_71321_q,commandManager,2,
-field_71322_p,playersOnline,2,List of names of players who are online.
+field_71322_p,tickables,2,Collection of objects to update every tick. Type: List<IUpdatePlayerListBox>
 field_71323_z,canSpawnNPCs,2,
 field_71324_y,canSpawnAnimals,2,True if the server has animals turned on.
 field_71325_x,onlineMode,2,True if the server is in online mode.
@@ -660,12 +653,12 @@ field_71478_O,mainFrame,2,"Reference to the main frame, in this case, the applet
 field_71481_b,mc,2,Reference to the Minecraft object.
 field_71482_c,mcThread,2,Reference to the Minecraft main thread.
 field_71483_a,mcCanvas,2,Reference to the applet canvas.
-field_71486_a,crashReportMemoryInfo,2,Gets Memory Information for Crash Report.
-field_71488_a,crashReportJVMFlags,2,Gets additional Java Enviroment info for Crash Report.
-field_71490_a,crashReportJavaInfo,2,Gets Java Info to the Crash Report.
-field_71492_a,crashReportJavaInfo2,2,Gets Java Enviroment Info to the Crash Report.
-field_71494_a,crashReportMinecraftVersion,2,Gets the Crash Rrport current Minecraft version.
-field_71496_a,crashReportOSInfo,2,Gets OS Info for Crash Report.
+field_71486_a,theCrashReport,2,Reference to the CrashReport object.
+field_71488_a,theCrashReport,2,Reference to the CrashReport object.
+field_71490_a,theCrashReport,2,Reference to the CrashReport object.
+field_71492_a,theCrashReport,2,Reference to the CrashReport object.
+field_71494_a,theCrashReport,2,Reference to the CrashReport object.
+field_71496_a,theCrashReport,2,Reference to the CrashReport object.
 field_71510_d,crashReportFile,2,File of crash report.
 field_71511_b,cause,2,"The Throwable that is the ""cause"" for this crash and Crash Report."
 field_71512_c,crashReportSections,2,Holds the keys and values of all crash report sections.
@@ -693,7 +686,7 @@ field_71585_d,offsetsZForSide,2,gives the offset required for this axis to get t
 field_71586_b,offsetsXForSide,2,gives the offset required for this axis to get the block at that side.
 field_71587_c,offsetsYForSide,2,gives the offset required for this axis to get the block at that side.
 field_71588_a,faceToSide,2,Converts a face to a side.
-field_71743_a,minecraftServerType,2,Gets Decitated Server type.
+field_71743_a,theDecitatedServer,2,Reference to the DecitatedServer object.
 field_71748_d,connections,2,
 field_71749_b,isListening,2,Whether the network listener object is listening.
 field_71750_c,mcServer,2,Reference to the MinecraftServer object.
@@ -707,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,
@@ -812,7 +806,7 @@ field_72030_cd,blockConstructorCalled,2,set to true when Block's constructor is
 field_72031_aZ,fence,2,
 field_72032_aY,jukebox,2,
 field_72033_bA,netherBrick,2,
-field_72034_aR,button,2,
+field_72034_aR,stoneButton,2,
 field_72035_aQ,torchRedstoneActive,2,
 field_72036_aT,ice,2,
 field_72037_aS,snow,2,
@@ -1107,7 +1101,7 @@ field_72769_h,theWorld,2,
 field_72770_i,renderEngine,2,The RenderEngine instance used by RenderGlobal
 field_72771_w,glSkyList,2,OpenGL sky list
 field_72772_v,starGLCallList,2,The star GL Call list
-field_72773_u,cloudOffsetX,2,
+field_72773_u,cloudTickCounter,2,counts the cloud render updates. Used with mod to stagger some updates
 field_72774_t,occlusionEnabled,2,Is occlusion testing enabled
 field_72775_s,glOcclusionQueryBase,2,OpenGL occlusion query base
 field_72776_r,globalRenderBlocks,2,Global render blocks
@@ -1176,7 +1170,6 @@ field_73037_M,mc,2,
 field_73038_N,previousActiveChunkSet,2,
 field_73058_d,canNotSave,2,"set by CommandServerSave{all,Off,On}"
 field_73059_b,theChunkProviderServer,2,
-field_73060_c,actionsAllowed,2,"this is set related to Manager.areCommandsAllowed, but is never used is is also set back to false at the end of both functions which set it."
 field_73061_a,mcServer,2,
 field_73062_L,theEntityTracker,2,
 field_73063_M,thePlayerManager,2,
@@ -1229,9 +1222,7 @@ field_73144_s,isDataInitialized,2,set to true on first sendLocationToClients
 field_73145_r,posZ,2,
 field_73146_q,posY,2,
 field_73147_p,posX,2,
-field_73160_d,villageGen,2,
 field_73161_b,random,2,
-field_73162_c,useStructures,2,
 field_73163_a,worldObj,2,
 field_73167_f,noiseData3,2,
 field_73168_g,noiseData4,2,
@@ -1465,9 +1456,7 @@ field_73482_e,rotation,2,The item rotation.
 field_73483_b,xPosition,2,The item X position.
 field_73484_c,yPosition,2,The item Y position.
 field_73485_a,entityId,2,Unique entity ID.
-field_73486_j,itemDamage,2,The health of the item.
 field_73487_h,itemID,2,
-field_73488_i,count,2,The number of items.
 field_73490_f,velocityX,2,
 field_73491_g,velocityY,2,
 field_73492_d,yPosition,2,The Y position of the entity.
@@ -1536,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,
@@ -1627,6 +1617,7 @@ field_73745_b,height,2,Button height in pixels
 field_73746_c,xPosition,2,The x position of this control.
 field_73747_a,width,2,Button width in pixels
 field_73748_h,drawButton,2,Hides the button completely if false.
+field_73749_j,mirrored,2,"If true, then next page button will face to right, if false then next page button will face to left."
 field_73750_l,idFloat,2,Additional ID for this slider control.
 field_73751_j,sliderValue,2,The value of this slider control.
 field_73752_k,dragging,2,Is this slider control being dragged.
@@ -1758,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
@@ -1865,8 +1857,10 @@ field_74202_p,nextRecipeButtonIndex,2,
 field_74203_o,theIMerchant,2,Instance of IMerchant interface.
 field_74204_o,furnaceInventory,2,
 field_74206_w,bookModel,2,The book model used on the GUI.
+field_74207_v,theItemStack,2,
 field_74215_y,containerEnchantment,2,ContainerEnchantment object associated with this gui
 field_74216_x,rand,2,
+field_74217_o,brewingStand,2,
 field_74218_q,inventoryRows,2,"window height is calculated with this values, the more rows, the heigher"
 field_74219_p,lowerChestInventory,2,
 field_74220_o,upperChestInventory,2,
@@ -1890,12 +1884,11 @@ field_74262_d,noMoreProgress,2,
 field_74263_b,workingMessage,2,
 field_74264_c,currentProgress,2,
 field_74265_a,progressMessage,2,
-field_74266_b,lastTimeMillis,2,lastTimeMillis
 field_74267_a,mcServer,2,Reference to the MinecraftServer object.
 field_74268_a,simpleDateFormatLogFormatter,2,Date Formatter of Log/Console.
-field_74270_a,minecraftServerPlayers,2,Gets Minecraft Server players.
-field_74272_a,minecraftServerProfiler,2,Gets Minecraft Server profile.
-field_74274_a,minecraftServerIsServerModded,2,For checking if Minecraft Server is modded.
+field_74270_a,mcServer,2,Reference to the MinecraftServer object.
+field_74272_a,mcServer,2,Reference to the MinecraftServer object.
+field_74274_a,mcServer,2,Reference to the MinecraftServer object.
 field_74276_f,lastHRTime,2,"The time reported by the high-resolution clock at the last call of updateTimer(), in seconds"
 field_74277_g,lastSyncSysClock,2,"The time reported by the system clock at the last sync, in milliseconds"
 field_74278_d,timerSpeed,2,A multiplier to make the timer (and therefore the game) go faster or slower.  0.5 makes the game run at half-speed.
@@ -1977,10 +1970,10 @@ field_74385_A,enumFloat,2,
 field_74386_B,enumBoolean,2,
 field_74387_C,enumString,2,
 field_74414_a,enumOptionsMappingHelperArray,2,
-field_74416_a,minecraftModded,2,Gets if Minecraft is Modded.
+field_74416_a,mc,2,Reference to the Minecraft object.
 field_74417_a,theTcpConnection,2,
-field_74419_a,minecraftGLInfo,2,Gets Minecraft Open GL Info.
-field_74421_a,minecraftLWJGLVersion,2,Gets Minecraft LWJGL version.
+field_74419_a,mc,2,Reference to the Minecraft object.
+field_74421_a,mc,2,Reference to the Minecraft object.
 field_74422_a,mcApplet,2,Reference to the MinecraftApplet object.
 field_74438_f,shutdownReason,2,
 field_74440_d,myNetHandler,2,
@@ -2009,9 +2002,9 @@ field_74487_p,dataPackets,2,Linked list of packets awaiting sending.
 field_74488_z,sharedKeyForEncryption,2,
 field_74489_y,sendQueueByteLength,2,The length in bytes of the packets in both send queues (data and chunkData).
 field_74498_a,theTcpConnection,2,
-field_74500_a,minecraftClientProfiler,2,Gets skin of Minecraft player.
+field_74500_a,mc,2,Reference to the Minecraft object.
 field_74501_a,theTcpConnection,2,
-field_74503_a,minecraftServerType2,2,Gets Client Server type.
+field_74503_a,mc,2,Reference to the Minecraft object.
 field_74504_a,theTcpConnection,2,
 field_74511_f,pressTime,2,
 field_74512_d,keyCode,2,
@@ -2022,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,
@@ -2171,13 +2165,15 @@ field_75008_c,isLargeRoom,2,
 field_75009_a,doorType,2,
 field_75011_a,doorType,2,
 field_75013_b,roomType,2,
+field_75014_c,strongholdRoomCrossingChestContents,2,Items that could generate in the chest that is located in Stronghold Room Crossing.
 field_75015_a,doorType,2,
 field_75017_a,doorType,2,
 field_75019_b,expandsX,2,
 field_75020_c,expandsZ,2,
 field_75021_a,doorType,2,
 field_75023_b,doorType,2,
-field_75025_b,portalRoom,2,
+field_75025_b,strongholdPortalRoom,2,
+field_75027_a,strongholdPieceWeight,2,
 field_75029_a,doorType,2,
 field_75038_b,rand,2,The RNG used by the MapGen classes.
 field_75039_c,worldObj,2,This world object.
@@ -2322,12 +2318,10 @@ field_75313_b,theTarget,2,
 field_75314_a,theEntityTameable,2,
 field_75315_b,theOwnerAttacker,2,
 field_75316_a,theDefendingTameable,2,
-field_75319_g,rangedAttackID,2,The ID of this ranged attack AI. This chooses which entity is to be used as a ranged attack.
 field_75320_d,rangedAttackTime,2,A decrementing tick that spawns a ranged attack once this value reaches 0. It is then set back to the maxRangedAttackTime.
 field_75321_e,entityMoveSpeed,2,
 field_75322_b,entityHost,2,The entity the AI instance has been applied to
 field_75323_c,attackTarget,2,
-field_75324_a,worldObj,2,
 field_75325_h,maxRangedAttackTime,2,The maximum time the AI has to wait before peforming another ranged attack.
 field_75326_b,leapTarget,2,The entity that the leaper is leaping towards.
 field_75327_c,leapMotionY,2,The entity's motionY after leaping.
@@ -2724,7 +2718,6 @@ field_76176_b,sourceURL,2,
 field_76178_a,feedbackHook,2,
 field_76189_a,dirty,2,Whether this MapDataBase needs saving to disk.
 field_76190_i,mapName,2,The name of the map data nbt
-field_76195_f,randomEffect,2,"Incremented each update of the map item, used for the patchy updating map effect and the spinning player icons while in the End and Nether."
 field_76196_g,playersArrayList,2,Holds a reference to the MapInfo of the players who own a copy of the map
 field_76197_d,scale,2,
 field_76198_e,colors,2,colours
@@ -2750,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,
@@ -3141,8 +3134,8 @@ field_76967_j,playerX,2,The player's X position in this rendering context
 field_76968_k,playerY,2,The player's Y position in this rendering context
 field_76969_h,playerYaw,2,
 field_76970_i,playerPitch,2,
-field_76972_a,integratedServerIsModded,2,Gets if Client Is Modded.
-field_76974_a,minecraftServerType3,2,Gets Intergated Server type.
+field_76972_a,theIntegratedServer,2,Reference to the IntegratedServer object.
+field_76974_a,theIntegratedServer,2,Reference to the IntegratedServer object.
 field_76987_f,shadowOpaque,2,Determines the darkness of the object's shadow. Higher value makes a darker shadow.
 field_76988_d,renderBlocks,2,
 field_76989_e,shadowSize,2,
@@ -3151,8 +3144,6 @@ field_76991_a,modelBase,2,
 field_76993_a,blockRenderer,2,
 field_76998_a,modelBoat,2,instance of ModelBoat for rendering
 field_77004_a,renderBlocks,2,
-field_77006_b,renderBlocksXPOrb,2,Instance of RenderBlocks.
-field_77011_a,rand,2,RNG.
 field_77013_a,modelMinecart,2,instance of ModelMinecart for rendering
 field_77022_g,renderBlocks,2,
 field_77023_b,zLevel,2,Defines the zLevel of rendering of item on GUI.
@@ -3168,7 +3159,6 @@ field_77073_a,scale,2,Scale of the model to use
 field_77077_b,rnd,2,
 field_77078_a,endermanModel,2,The model of the enderman
 field_77084_b,modelDragon,2,An instance of the dragon model in RenderDragon
-field_77085_a,entityDragon,2,The entity instance of the dragon. Note: This is a static field in RenderDragon because there is only supposed to be one dragon
 field_77086_i,updateModelState,2,Reloads the dragon model if not equal to 4. Presumably a leftover debugging field.
 field_77092_a,scaleAmount,2,
 field_77094_a,snowmanModel,2,A reference to the Snowman model in RenderSnowMan.
@@ -3235,6 +3225,7 @@ field_77270_a,parentTexturePackGui,2,
 field_77275_b,chunkZPos,2,The Z position of this Chunk Coordinate Pair
 field_77276_a,chunkXPos,2,The X position of this Chunk Coordinate Pair
 field_77280_f,explosionSize,2,
+field_77281_g,affectedBlockPositions,2,A list of ChunkPositions of blocks affected by this explosion
 field_77282_d,explosionZ,2,
 field_77283_e,exploder,2,
 field_77284_b,explosionX,2,
@@ -3305,7 +3296,7 @@ field_77400_d,toolUses,2,Saves how much has been tool used when put into to slot
 field_77401_b,secondItemToBuy,2,Second Item the Villager buys.
 field_77402_c,itemToSell,2,Item the Villager sells.
 field_77403_a,itemToBuy,2,Item the Villager buys.
-field_77405_a,worldLvl2,2,Gets loaded Entities.
+field_77405_a,theWorld,2,Reference to the World object.
 field_77426_f,dataFile,2,A file named 'stats_' [lower case username] '.dat'
 field_77427_g,unsentTempFile,2,A file named 'stats_' [lower case username] '_unsent.tmp'
 field_77428_d,statFileWriter,2,"The StatFileWriter object, presumably used to write to the statistics files"
@@ -3315,7 +3306,7 @@ field_77435_j,oldFile,2,A file named 'stats_' [lower case username] '.old'
 field_77436_k,theSession,2,The Session object
 field_77437_h,tempFile,2,A file named 'stats_' [lower case username] '.tmp'
 field_77438_i,unsentOldFile,2,A file named 'stats_' [lower case username] '_unsent.old'
-field_77440_a,worldLvl3,2,Gets loaded Entities.
+field_77440_a,theWorld,2,Reference to the World object.
 field_77454_d,statsSyncher,2,
 field_77461_d,nameToSoundPoolEntriesMapping,2,Maps a name (can be sound/newsound/streaming/music/newmusic) to a list of SoundPoolEntry's.
 field_77462_e,allSoundPoolEntries,2,A list of all SoundPoolEntries that have been loaded.
@@ -3328,9 +3319,11 @@ field_77477_c,useMultitextureARB,2,True if the renderer supports multitextures a
 field_77478_a,defaultTexUnit,2,"An OpenGL constant corresponding to GL_TEXTURE0, used when setting data pertaining to auxiliary OpenGL texture units."
 field_77481_a,grassBuffer,2,Color buffer for grass
 field_77482_b,syncher,2,
-field_77485_a,worldLvl1,2,Gets loaded Entities.
+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.
@@ -3354,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.
@@ -3565,12 +3560,9 @@ field_77880_c,renderIndex,2,"Used on RenderPlayer to select the correspondent ar
 field_77881_a,armorType,2,"Stores the armor type: 0 is helmet, 1 is plate, 2 is legs and 3 is boots"
 field_77882_bY,maxDamageArray,2,Holds the 'base' maxDamage that each armorType have.
 field_77885_a,blockID,2,The block ID of the Block associated with this ItemBlock
-field_77886_a,theWoodBlock,2,The instance of Block.
-field_77887_a,theSmoothStoneBlock,2,Instance of the Block.
 field_77889_b,theHalfSlab,2,Instance of BlockHalfSlab.
 field_77890_c,theHalfSlab2,2,Instance of BlockHalfSlab.
-field_77892_a,theBlock,2,Instance of Block.
-field_77893_a,theBlock,2,Instance of Block.
+field_77891_a,isFullBlock,2,
 field_77895_b,blockNames,2,
 field_77896_a,blockRef,2,
 field_77918_f,speckledMelonEffect,2,
@@ -3655,6 +3647,8 @@ field_78100_b,coverLeft,2,Left cover renderer (when facing the book)
 field_78101_c,pagesRight,2,The right pages renderer (when facing the book)
 field_78102_a,coverRight,2,Right cover renderer (when facing the book)
 field_78103_a,boatSides,2,
+field_78105_b,blazeHead,2,
+field_78106_a,blazeSticks,2,The sticks that fly around the Blaze.
 field_78112_f,bipedRightArm,2,
 field_78113_g,bipedLeftArm,2,
 field_78114_d,bipedHeadwear,2,
@@ -4100,8 +4094,8 @@ field_78828_a,weightClass,2,The class of the StructureComponent to which this we
 field_78829_b,responseTime,2,Player response time to server in milliseconds
 field_78830_c,nameinLowerCase,2,Player name in lowercase.
 field_78831_a,name,2,The string value of the object
-field_78833_a,worldClientMPL1,2,Initialises the WorldClient for CallableMPL1.
-field_78835_a,worldClientMPL2,2,Initialises the WorldClient for CallableMPL2.
+field_78833_a,theWorldClient,2,Reference to the WorldClient object.
+field_78835_a,theWorldClient,2,Reference to the WorldClient object.
 field_78843_d,serverMOTD,2,(better variable name would be 'hostname') server name as displayed in the server browser's second line (grey text)
 field_78844_e,pingToServer,2,last server ping that showed up in the server browser
 field_78845_b,serverIP,2,
@@ -4177,3 +4171,217 @@ field_79029_a,outputHandler,2,Reference to the GuiLogOutputHandler.
 field_80001_f,closestPlayer,2,The closest EntityPlayer to this orb.
 field_80004_Q,updateEntityTick,2,
 field_80005_w,hideServerAddress,2,
+field_82121_b,skullRotation,2,The skull's rotation.
+field_82122_c,extraType,2,"Extra data for this skull, used as player username by player heads"
+field_82123_a,skullType,2,Entity type for this skull.
+field_82133_f,primaryEffect,2,Primary potion effect given by this beacon.
+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.
+field_82175_bq,isSwingInProgress,2,Whether an arm swing is currently in progress.
+field_82177_b,enchantmentProbability,2,An array of probabilities that determines whether a random enchantment should be added to the held item. Indexed by difficulty.
+field_82179_bU,persistenceRequired,2,Whether this entity should NOT despawn.
+field_82182_bS,equipment,2,Equipment (armor and held item) for this entity.
+field_82184_d,aiControlledByPlayer,2,AI task for player control.
+field_82189_bL,lastBuyingPlayer,2,"Last player to trade with this villager, used for aggressivity."
+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
+field_82248_d,spawnForced,2,"Whether this player's spawn point is forced, preventing execution of bed checks."
+field_82250_a,mc,2,
+field_82259_k,buttonTexture,2,Texture for this button.
+field_82260_k,beaconGui,2,Beacon GUI this button belongs to.
+field_82263_k,beaconGui,2,Beacon GUI this button belongs to.
+field_82264_k,beaconGui,2,Beacon GUI this button belongs to.
+field_82267_b,allMultiplayerOptions,2,
+field_82276_d,customizationTitle,2,
+field_82277_b,createWorldGui,2,
+field_82278_r,buttonRemoveLayer,2,
+field_82279_c,theFlatGeneratorInfo,2,
+field_82280_q,buttonEditLayer,2,
+field_82281_p,buttonAddLayer,2,
+field_82282_a,theRenderItem,2,
+field_82283_n,heightLabel,2,
+field_82284_o,createFlatWorldListSlotGui,2,
+field_82285_m,layerMaterialLabel,2,
+field_82289_B,buttonCustomize,2,GuiButton in the more world options screen.
+field_82301_b,presets,2,List of defined flat world presets.
+field_82302_c,createFlatWorldGui,2,
+field_82303_q,theTextField,2,
+field_82304_p,theButton,2,
+field_82305_a,presetIconRenderer,2,RenderItem instance used to render preset icons.
+field_82307_o,theFlatPresetsListSlot,2,
+field_82310_a,mcServer,2,Reference to the MinecraftServer object.
+field_82317_b,commandBlock,2,Command block being edited.
+field_82318_a,commandTextField,2,Text field containing the command block's command.
+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,
+field_82397_a,skullRenderer,2,
+field_82401_a,skeletonHeadModel,2,The Skeleton's head model.
+field_82424_k,bipedArmorFilenamePrefix,2,List of armor texture filenames.
+field_82446_a,renderedBatSize,2,"not actually sure this is size, is not used as of now, but the model would be recreated if the value changed and it seems a good match for a bats size"
+field_82453_b,createFlatWorldGui,2,
+field_82458_b,flatPresetsGui,2,
+field_82470_g,playingSounds,2,Identifiers of all currently playing sounds. Type: HashSet<String>
+field_82475_b,theMinecart,2,Minecart which sound is being updated.
+field_82476_c,thePlayer,2,The player that is getting the minecart sound updates.
+field_82477_a,theSoundManager,2,
+field_82483_a,itemDispenseBehaviorProvider,2,
+field_82484_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object.
+field_82490_b,mcServer,2,
+field_82491_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object.
+field_82492_b,mcServer,2,
+field_82493_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object.
+field_82494_b,mcServer,2,Reference to the MinecraftServer object.
+field_82495_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object.
+field_82496_b,mcServer,2,
+field_82497_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object.
+field_82501_b,potionStackToDispense,2,
+field_82502_c,potionDispenseBehavior,2,Reference to the BehaviorPotionDispense object.
+field_82503_b,mcServer,2,
+field_82504_b,mcServer,2,
+field_82507_n,soundLadderFootstep,2,
+field_82508_o,soundAnvilFootstep,2,
+field_82509_m,soundSnowFootstep,2,
+field_82510_ck,anvil,2,
+field_82511_ci,woodenButton,2,
+field_82512_cj,skull,2,
+field_82513_cg,carrot,2,
+field_82514_ch,potato,2,
+field_82515_ce,cobblestoneWall,2,
+field_82516_cf,flowerPot,2,
+field_82517_cc,commandBlock,2,
+field_82518_cd,beacon,2,
+field_82522_a,statuses,2,List of types/statues the Anvil can be in.
+field_82527_a,dispenseBehaviorRegistry,2,Registry for all dispense behaviors.
+field_82537_a,sensible,2,"Whether this button is sensible to arrows, used by wooden buttons."
+field_82539_a,types,2,The types of the wall.
+field_82548_a,theChunkCoordinates,2,
+field_82550_a,mcServer,2,
+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,
+field_82625_b,xPos,2,
+field_82626_c,yPos,2,
+field_82627_a,worldObj,2,
+field_82635_f,maxSpeedBoostTime,2,Maximum time the entity's speed should be boosted for.
+field_82636_d,speedBoosted,2,Whether the entity's speed is boosted.
+field_82637_e,speedBoostTime,2,"Counter for speed boosting, upon reaching maxSpeedBoostTime the speed boost will be disabled"
+field_82638_b,maxSpeed,2,
+field_82639_c,currentSpeed,2,
+field_82640_a,thisEntity,2,
+field_82641_b,rangedAttackEntityHost,2,The entity (as a RangedAttackMob) the AI instance has been applied to.
+field_82653_b,worldFeatures,2,List of world features enabled on this preset.
+field_82655_a,flatLayers,2,List of layers on this preset.
+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.
+field_82681_h,cropTypeD,2,Fourth crop type for this field.
+field_82682_h,hasWitch,2,Whether this swamp hut has a witch.
+field_82693_j,playerReputation,2,List of player reputations with this village
+field_82707_i,isAnimal,2,Whether this creature type is an animal.
+field_82717_g,anvil,2,
+field_82727_n,wither,2,
+field_82728_o,anvil,2,
+field_82729_p,fallingBlock,2,
+field_82730_x,magicDamage,2,
+field_82731_v,wither,2,The wither Potion object.
+field_82741_K,vecPool,2,The world-local pool of vectors
+field_82745_f,createdAtCloudUpdateTick,2,keeps track of how many ticks this PartiallyDestroyedBlock already exists
+field_82748_f,worldTypeId,2,ID for this world type.
+field_82755_b,isSmoking,2,whether or not this explosion spawns smoke particles
+field_82759_d,valueDouble,2,
+field_82760_b,valueBoolean,2,
+field_82761_c,valueInteger,2,
+field_82762_a,valueString,2,
+field_82771_a,theGameRules,2,
+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,potato,2,
+field_82795_bM,bakedPotato,2,
+field_82796_bJ,flowerPot,2,
+field_82797_bK,carrot,2,
+field_82798_bP,goldenCarrot,2,
+field_82799_bQ,skull,2,
+field_82800_bN,poisonousPotato,2,
+field_82801_bO,emptyMap,2,
+field_82802_bI,itemFrame,2,
+field_82805_a,theBlock,2,
+field_82807_a,skullTypes,2,
+field_82808_b,cropId,2,Block ID of the crop this seed food should place.
+field_82809_c,soilId,2,Block ID of the soil this seed food should be planted on.
+field_82811_a,hangingEntityClass,2,
+field_82822_g,gameVersion,2,Game version for this server.
+field_82823_k,hideAddress,2,Whether to hide the IP address for this server.
+field_82827_c,bossName,2,
+field_82828_a,healthScale,2,
+field_82843_f,itemFrame,2,"Item frame this stack is on, or null if not on an item frame."
+field_82852_f,outputSlot,2,Here comes out item you merged and/or renamed.
+field_82853_g,inputSlots,2,The 2slots where you put your items in that you want to merge and/or rename.
+field_82854_e,maximumCost,2,The maximum cost of repairing/renaming in the anvil.
+field_82855_n,thePlayer,2,The player that has this container open.
+field_82860_h,theWorld,2,
+field_82862_h,thePlayer,2,
+field_82864_f,beaconSlot,2,"This beacon's slot where you put in Emerald, Diamond, Gold or Iron Ingot."
+field_82866_e,theBeacon,2,
+field_82872_e,anvil,2,The anvil this slot belongs to.
+field_82875_a,theWorld,2,
+field_82876_a,beacon,2,The beacon this slot belongs to.
+field_82880_z,showCape,2,Whether to show your cape
+field_82881_y,pauseOnLostFocus,2,"Whether to pause when the game loses focus, toggled by F3+P"
+field_82882_x,advancedItemTooltips,2,"Whether to show advanced information on item tooltips, toggled by F3+H"
+field_82887_a,mc,2,
+field_82890_f,batOuterLeftWing,2,The outer left wing box of the bat model.
+field_82891_d,batLeftWing,2,The inner left wing box of the bat model.
+field_82892_e,batOuterRightWing,2,The outer right wing box of the bat model.
+field_82893_b,batBody,2,The body box of the bat model.
+field_82894_c,batRightWing,2,The inner right wing box of the bat model.
+field_82895_a,batHead,2,
+field_82896_a,skeletonHead,2,
+field_82909_b,presetName,2,Name for this preset.
+field_82910_c,presetData,2,Data for this preset.
+field_82911_a,iconId,2,ID for the item used as icon for this preset.
+field_82915_S,theWorldGenerator,2,
+field_83004_a,theCrashReport,2,
+field_83016_L,theCalendar,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  = 542621a5298659dc65f383f35170fc4c
-MD5Server  = 736ffcb0d9f36d47de96a6923ec82699
+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           = 82000
-ParamIndex        = 5000
+RGIndex           = 91000
+ParamIndex        = 7100

 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
@@ -59,6 +59,7 @@ func_70058_J,handleLavaMovement,2,Whether or not the current entity is in lava
 func_70059_ac,updateCloak,2,
 func_70060_a,moveFlying,2,Used in both water and by flying objects
 func_70061_h,unmountEntity,2,Called when a player unounts an entity.
+func_70062_b,setCurrentItemOrArmor,2,"Sets the held item, or an armor slot. Slot 0 is held item. Slot 1-4 is armor. Params: Item, slot"
 func_70063_aa,setInPortal,2,Called by portal blocks when an entity is within it.
 func_70064_a,updateFallState,2,"Takes in the distance the entity has fallen this tick and whether its on the ground to update the fall distance and deal fall damage if landing on the ground.  Args: distanceFallenThisTick, onGround"
 func_70065_x,preparePlayerToSpawn,2,Keeps moving the entity up so it isn't colliding with blocks and other requirements for this entity to be spawned (only actually used on players though its also on Entity)
@@ -75,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."
@@ -124,7 +126,6 @@ func_70240_a,setKnockbackStrength,2,Sets the amount of knockback the arrow appli
 func_70241_g,getIsCritical,2,Whether the arrow has a stream of critical hit particles flying behind it.
 func_70242_d,getDamage,2,
 func_70243_d,setIsCritical,2,Whether the arrow has a stream of critical hit particles flying behind it.
-func_70244_c,setArrowHeading,2,"Uses the provided coordinates as a heading and determines the velocity from it with the set force and random variance. Args: x, y, z, force, forceVariation"
 func_70265_b,setTimeSinceHit,2,Sets the time to count down from since the last time entity was hit.
 func_70266_a,setDamageTaken,2,Sets the damage taken from the last hit.
 func_70267_i,getForwardDirection,2,Gets the forward direction of the entity.
@@ -236,7 +237,6 @@ func_70492_c,setDamage,2,Sets the current amount of damage the minecart has take
 func_70498_d,setMinecartPowered,2,Set if this minecart is powered (Fuel > 0)
 func_70515_d,explode,2,
 func_70518_d,onValidSurface,2,checks to make sure painting can be placed there
-func_70519_a,setDirection,2,Sets the direction the painting faces.
 func_70526_d,getXpValue,2,Returns the XP value of this XP orb.
 func_70527_a,getXPSplit,2,Get xp split rate (Is called until the xp drop code in EntityLiving.onEntityUpdate is complete)
 func_70528_g,getTextureByXP,2,Returns a number from 1 to 10 based on how much XP this orb is worth. This is used by RenderXPOrb to determine what texture to use.
@@ -270,7 +270,7 @@ func_70614_a,rayTrace,2,"Performs a ray trace for the distance specified and usi
 func_70615_aA,eatGrassBonus,2,This function applies the benefits of growing back wool and faster growing up to the acting entity. (This function is used in the AIEatGrass)
 func_70616_bs,getSpeedModifier,2,"This method returns a value to be applied directly to entity speed, this factor is less than 1 when a slowdown potion effect is applied, more than 1 when a haste potion effect is applied and 2 for fleeing entities."
 func_70617_f_,isOnLadder,2,"returns true if this entity is by a ladder, false otherwise"
-func_70618_n,removePotionEffect,2,input is the potion id to remove from the current active potion effects
+func_70618_n,removePotionEffectClient,2,Remove the speified potion effect from this entity.
 func_70619_bc,updateAITasks,2,
 func_70620_b,getItemIcon,2,Gets the Icon Index of the item currently held
 func_70621_aR,getHurtSound,2,Returns the sound this mob makes when it is hurt.
@@ -338,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
@@ -379,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,
@@ -395,7 +395,7 @@ func_70873_a,setGrowingAge,2,"The age value may be negative or positive or zero.
 func_70874_b,getGrowingAge,2,"The age value may be negative or positive or zero. If it's negative, it get's incremented on each tick, if it's positive, it get's decremented each tick. Don't confuse this with EntityLiving.getAge. With a negative value the Entity is considered a child."
 func_70875_t,resetInLove,2,
 func_70876_c,procreate,2,Creates a baby animal according to the animal type of the target at the actual position and spawns 'love' particles.
-func_70877_b,isWheat,2,Checks if the parameter is an wheat item.
+func_70877_b,isBreedingItem,2,"Checks if the parameter is an item which this animal can be fed to breed it (wheat, carrots or seeds depending on the animal type)"
 func_70878_b,canMateWith,2,Returns true if the mob is currently able to mate with the specified mob.
 func_70879_a,spawnBabyAnimal,2,This function is used when two same-species animals in 'love mode' breed to generate the new baby animal.
 func_70880_s,isInLove,2,Returns if the entity is currently in 'love mode'.
@@ -442,7 +442,6 @@ func_70948_a,addMerchantItem,2,each recipie takes a random stack from villagerSt
 func_70949_b,addBlacksmithItem,2,
 func_70950_c,addDefaultEquipmentAndRecipies,2,"based on the villagers profession add items, equipment, and recipies adds par1 random items to the list of things that the villager wants to buy. (at most 1 of each wanted type is added)"
 func_70951_a,getRandomSizedStack,2,
-func_70964_e,superAttackFrom,2,"Returns a super of attackEntityFrom in EntityDragonBase, because the normal attackEntityFrom is overriden"
 func_70965_a,attackEntityFromPart,2,
 func_70967_k,setNewTarget,2,Sets a new target for the flight AI. It can be a random coordinate or a nearby player.
 func_70968_i,getDragonHealth,2,Returns the health points of the dragon.
@@ -454,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."
@@ -483,12 +482,10 @@ func_71023_q,addExperience,2,This method increases the player's current amount o
 func_71024_bL,getFoodStats,2,Returns the player's FoodStats object.
 func_71025_t,getTranslator,2,
 func_71026_bH,isPlayerFullyAsleep,2,Returns whether or not the player is asleep and the screen has fully faded.
-func_71027_c,travelToTheEnd,2,
+func_71027_c,travelToDimension,2,Teleports the entity to another dimension. Params: Dimension number to teleport to
 func_71028_bD,destroyCurrentEquippedItem,2,Destroys the currently equipped item from the player's inventory.
 func_71029_a,triggerAchievement,2,Will trigger the specified trigger.
 func_71030_a,displayGUIMerchant,2,
-func_71031_e,canPlayerEdit,2,
-func_71032_a,removeExperience,2,"Decrease the player level, used to pay levels for enchantments on items at enchanted table."
 func_71033_a,sendGameTypeToPlayer,2,
 func_71034_by,stopUsingItem,2,
 func_71035_c,addChatMessage,2,Add a chat message to the player
@@ -502,7 +499,6 @@ func_71042_a,displayGUIFurnace,2,Displays the furnace GUI for the passed in furn
 func_71043_e,canEat,2,
 func_71044_o,collideWithPlayer,2,
 func_71045_bC,getCurrentEquippedItem,2,Returns the currently being used item by the player.
-func_71046_k,getSwingSpeedModifier,2,Returns the swing speed modifier
 func_71047_c,onEnchantmentCritical,2,
 func_71048_c,displayGUIBook,2,Displays the GUI for interacting with a book.
 func_71049_a,clonePlayer,2,Copies the values from the given player into this player if boolean par2 is true. Always clones Ender Chest Inventory.
@@ -510,7 +506,6 @@ func_71050_bK,xpBarCap,2,"This method returns the cap amount of experience that
 func_71051_bG,getBedOrientationInDegrees,2,Returns the orientation of the bed in degrees.
 func_71052_bv,getItemInUseCount,2,Returns the item in use count
 func_71053_j,closeScreen,2,sets current screen to null (used on escape buttons of GUIs)
-func_71054_m,increaseLevel,2,This method increases the player's experience level by one.
 func_71055_a,getCurrentPlayerStrVsBlock,2,Returns how strong the player is against the specified block at this moment
 func_71056_a,verifyRespawnCoordinates,2,Ensure that a block enabling respawning exists at the specified coordinates and find an empty space nearby to spawn.
 func_71057_bx,getItemInUseDuration,2,gets the duration for how long the current itemInUse has been in use
@@ -523,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,
@@ -726,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())
@@ -737,7 +733,6 @@ func_71516_a,addTabCompletionOptions,2,Adds the strings available in this comman
 func_71517_b,getCommandName,2,
 func_71518_a,getCommandUsage,2,
 func_71519_b,canCommandSenderUseCommand,2,Returns true if the given command sender is allowed to use this command.
-func_71520_a,joinString,2,"Joins the given string array, starting with the given index, into a space seperated string."
 func_71521_c,getCommandSenderAsPlayer,2,Returns the given ICommandSender as a EntityPlayer or throw an exception.
 func_71522_a,notifyAdmins,2,
 func_71523_a,doesStringStartWith,2,Returns true if the given substring is exactly equal to the start of the given string (case insensitive).
@@ -753,13 +748,10 @@ func_71532_a,parseIntBounded,2,Parses an int from the given string within a spec
 func_71534_d,getSortedPossibleCommands,2,Returns a sorted list of all possible commands for the given ICommandSender.
 func_71535_c,getCommands,2,
 func_71536_c,getPlayers,2,
-func_71537_a,getTargetPlayer,2,
 func_71538_c,getListOfPlayerUsernames,2,Returns String array containing all player usernames in the server.
 func_71539_b,getGameModeFromCommand,2,Gets the Game Mode specified in the command.
-func_71540_a,getGameModeTargetPlayer,2,Returns the target player for whom the gamemode should be changed.
 func_71541_a,setGameType,2,
 func_71542_c,getAllUsernames,2,
-func_71543_a,getPlayer,2,
 func_71544_a,banIP,2,Actually does the banning work.
 func_71546_a,getProfileDump,2,
 func_71547_b,getProfilerResults,2,
@@ -781,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,
@@ -812,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"
@@ -822,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.
@@ -894,7 +886,6 @@ func_71933_m,getBlockColor,2,
 func_71934_m,getBlockHardness,2,"Returns the block hardness at a location. Args: world, x, y, z"
 func_71935_l,isCollidable,2,"Returns if this block is collidable (only used by Fire). Args: x, y, z"
 func_71936_b,isVecInsideXZBounds,2,Checks if a vector is within the X and Z bounds of the block.
-func_71937_a,onTimeChanged,2,Called when the time changes.
 func_72110_l,updatePistonState,2,handles attempts to extend or retract the piston.
 func_72111_a,canPushBlock,2,returns true if the piston can push the specified block
 func_72112_i,canExtend,2,checks to see if this piston could push the blocks in front of it.
@@ -1014,9 +1005,6 @@ func_72274_a,createNewTileEntity,2,Returns a new instance of a block's tile enti
 func_72276_j_,ejectRecord,2,Ejects the current record inside of the jukebox.
 func_72277_e,insertRecord,2,Inserts the given record into the JukeBox.
 func_72280_l,setDispenserDefaultDirection,2,sets Dispenser block direction so that the front faces an non-opaque block; chooses west to be direction if all surrounding blocks are opaque.
-func_72281_c,dispenseItem,2,dispenses an item from a randomly selected item stack from the blocks inventory into the game world.
-func_72282_a,dispenseEntityFromStack,2,
-func_72283_a,spawnEntityWithAction,2,"arrows are fired, eggs are thrown, buckets create liquid blocks ..."
 func_72285_l,setDefaultDirection,2,set a blocks direction
 func_72286_a,updateFurnaceBlockState,2,Update which block ID the furnace is using depending on whether or not it is burning
 func_72290_b_,unifyAdjacentChests,2,Turns the adjacent chests to a double chest.
@@ -1112,7 +1100,6 @@ func_72433_c,lengthVector,2,Returns the length of the vector.
 func_72434_d,getIntermediateWithZValue,2,"Returns a new vector with z value equal to the second parameter, along the line between this vector and the passed in vector, or null if not possible."
 func_72435_c,getIntermediateWithYValue,2,"Returns a new vector with y value equal to the second parameter, along the line between this vector and the passed in vector, or null if not possible."
 func_72436_e,squareDistanceTo,2,The square of the Euclidean distance between this and the specified vector.
-func_72437_a,getVec3Pool,2,
 func_72438_d,distanceTo,2,"Euclidean distance between this and the specified vector, returned as double."
 func_72439_b,setComponents,2,"Sets the x,y,z components of the vector as specified."
 func_72440_a,rotateAroundX,2,Rotates the vector around the x axis by the specified angle.
@@ -1270,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,
@@ -1279,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
@@ -1358,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
@@ -1375,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,
@@ -1415,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
@@ -1481,7 +1469,6 @@ func_72964_e,getChunkFromChunkCoords,2,"Returns back a chunk looked up by chunk
 func_72965_b,addBlockEvent,2,"Adds a block event with the given Args to the blockEventCache. During the next tick(), the block specified will have its onBlockEvent handler called with the given parameters. Args: X,Y,Z, BlockID, EventID, EventParameter"
 func_72966_v,calculateInitialSkylight,2,Called on construction of the World class to setup the initial skylight values
 func_72967_a,calculateSkylightSubtracted,2,Returns the amount of skylight subtracted for the current time
-func_72968_M,updatingLighting,2,Updates lighting. Returns true if there are more lighting updates to update
 func_72969_x,updateAllLightTypes,2,
 func_72970_h,createChunkProvider,2,Creates the chunk provider for this world. Called in the constructor. Retrieves provider from worldProvider?
 func_72972_b,getSavedLightValue,2,Returns saved light value without taking into account the time of day.  Either looks in the sky light map or block light map based on the enumSkyBlock arg.
@@ -1496,7 +1483,6 @@ func_72980_b,playSound,2,"par8 is loudness, all pars passed to minecraftInstance
 func_72981_t,getDebugLoadedEntities,2,This string is 'All: (number of loaded entities)' Viewable by press ing F3
 func_73022_a,removeAllEntities,2,also releases skins.
 func_73023_g,setBlockAndMetadataAndInvalidate,2,
-func_73024_a,getEntityByID,2,Lookup and return an Entity based on its ID
 func_73025_a,doPreChunk,2,
 func_73026_a,getEntityList,2,
 func_73027_a,addEntityToWorld,2,Add an ID to Entity mapping to entityHashSet
@@ -1512,7 +1498,6 @@ func_73044_a,saveAllChunks,2,Saves all chunks to disk while updating progress ba
 func_73045_a,getEntityByID,2,"Returns the Entity with the given ID, or null if it doesn't exist in this World."
 func_73046_m,getMinecraftServer,2,Gets the MinecraftServer.
 func_73047_i,createBonusChest,2,Creates the bonus chest in the world.
-func_73048_a,setTime,2,Sets the time on the given WorldServer
 func_73049_a,getAllTileEntityInBox,2,"pars: min x,y,z , max x,y,z"
 func_73050_b,uncheckedUpdateEntity,2,direct call to super.updateEntityWithOptionalForce
 func_73051_P,resetRainAndThunder,2,
@@ -1562,7 +1547,6 @@ func_73155_a,getPossibleCreatures,2,Returns a list of creatures of the specified
 func_73156_b,unload100OldestChunks,2,"Unloads the 100 oldest chunks from memory, due to a bug with chunkSet.add() never being called it thinks the list is always empty and will not remove any chunks."
 func_73157_c,canSave,2,Returns if the IChunkProvider supports saving.
 func_73158_c,loadChunk,2,loads or generates the chunk at the chunk location specified
-func_73159_a,generate,2,
 func_73164_a,initializeNoiseField,2,"generates a subset of the level's terrain data. Takes 7 arguments: the [empty] noise array, the position, and the size."
 func_73165_a,generateNetherTerrain,2,Generates the shape of the terrain in the nether.
 func_73166_b,replaceBlocksForBiome,2,name based on ChunkProviderGenerate
@@ -1802,23 +1786,24 @@ 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_74058_f,getLocalizedWorldName,2,Gets the localized world name
 func_74059_d,getRenameButton,2,returns the rename button
-func_74060_g,getDateFormatter,2,returns the date formatter for this gui
 func_74061_a,getDeleteWorldScreen,2,"Gets a GuiYesNo screen with the warning, buttons, etc."
 func_74062_b,getSelectedWorld,2,returns the world currently selected
 func_74063_d,getSaveName,2,returns the name of the saved game
 func_74064_e,selectWorld,2,Gets the selected world.
 func_74065_g,initButtons,2,intilize the buttons for this GUI
-func_74066_h,getLocalizedMustConvert,2,Gets the localized must convert text
-func_74067_i,getLocalizedGameMode,2,Gets the localized GameMode
 func_74068_a,getSize,2,
 func_74069_a,getSaveFileName,2,returns the file name of the specified save number
 func_74070_c,getSelectButton,2,returns the select button
@@ -1872,9 +1857,6 @@ func_74252_a,setNetClientHandler,2,Sets the NetClientHandler.
 func_74253_d,getNetClientHandler,2,Gets the NetClientHandler.
 func_74255_a,spawnNewServerThread,2,
 func_74257_b,isCancelled,2,
-func_74269_a,getPlayers,2,"Gets the current player count, maximum player count, and player entity list."
-func_74271_a,getServerProfilerEnabled,2,Gets if Server Profiler (aka Snooper) is enabled.
-func_74273_a,getServerIsModded,2,Gets if Minecraft Server is Modded.
 func_74275_a,updateTimer,2,Updates all fields of the Timer using the current time
 func_74291_a,saveScreenshot,2,Takes a screenshot and saves it to the screenshots directory. Returns the filename of the screenshot.
 func_74296_a,getOptionFloatValue,2,
@@ -2257,7 +2239,6 @@ func_75139_a,getSlot,2,
 func_75140_a,enchantItem,2,enchants the item on the table using the specified slot; also deducts XP from player
 func_75141_a,putStackInSlot,2,"args: slotID, itemStack to put in slot"
 func_75142_b,updateCraftingResults,2,Updates crafting matrix; called from onCraftMatrixChanged. Args: none
-func_75143_b,transferStackInSlot,2,Called to transfer a stack from one inventory to the other eg. when shift clicking.
 func_75144_a,slotClick,2,
 func_75145_c,canInteractWith,2,
 func_75146_a,addSlotToContainer,2,the slot is assumed empty
@@ -2281,7 +2262,6 @@ func_75209_a,decrStackSize,2,Decrease the size of the stack in slot (first int a
 func_75210_a,onCrafting,2,"the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an internal count then calls onCrafting(item)."
 func_75211_c,getStack,2,Helper fnct to get the stack in the slot.
 func_75212_b,getBackgroundIconIndex,2,Returns the icon index on items.png that is used as background image of the slot.
-func_75213_b,onPickupFromSlot,2,Called when the player picks up an item from an inventory slot
 func_75214_a,isItemValid,2,Check if the stack is a valid item for this slot. Always true beside for the armor slots.
 func_75215_d,putStack,2,Helper method to put a stack in the slot.
 func_75216_d,getHasStack,2,Returns if this slot contains a stack.
@@ -2289,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."
@@ -2299,8 +2280,8 @@ func_75252_g,isContinuous,2,Returns whether the task requires multiple updates o
 func_75253_b,continueExecuting,2,Returns whether an in-progress EntityAIBase should continue executing
 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_75317_f,doRangedAttack,2,Performs a ranged attack according to the AI's rangedAttackID.
 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.
@@ -2535,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.
@@ -2663,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.
@@ -2705,7 +2688,7 @@ func_76340_b,getSecond,2,Get the second Object in the Tuple
 func_76341_a,getFirst,2,Get the first Object in the Tuple
 func_76345_d,getHungerDamage,2,How much satiate(food) is consumed by this DamageSource
 func_76346_g,getEntity,2,
-func_76347_k,fireDamage,2,Returns true if the damage is fire based.
+func_76347_k,isFireDamage,2,Returns true if the damage is fire based.
 func_76348_h,setDamageBypassesArmor,2,
 func_76349_b,setProjectile,2,Define the damage type as projectile based.
 func_76352_a,isProjectile,2,Returns true if the damage is projectile based.
@@ -2725,7 +2708,6 @@ func_76365_a,causePlayerDamage,2,returns an EntityDamageSource of type player
 func_76388_g,getEffectiveness,2,
 func_76389_a,getDurationString,2,
 func_76390_b,setPotionName,2,Set the potion name.
-func_76391_h,setPotionUnusable,2,
 func_76392_e,getStatusIconIndex,2,Returns the index for the icon to display when the potion is active.
 func_76393_a,getName,2,returns the name of the potion
 func_76394_a,performEffect,2,
@@ -2788,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"
@@ -2994,7 +2976,6 @@ func_77014_a,doRenderItem,2,Renders the item
 func_77015_a,renderItemIntoGUI,2,Renders the item's icon or block into the UI at the specified position.
 func_77016_a,renderTexturedQuad,2,"Adds a textured quad to the tesselator at the specified position with the specified texture coords, width and height.  Args: x, y, u, v, width, height"
 func_77017_a,renderQuad,2,"Adds a quad to the tesselator at the specified position with the set width and height and color.  Args: tessellator, x, y, width, height, color"
-func_77019_a,drawItemIntoGui,2,
 func_77021_b,renderItemOverlayIntoGUI,2,Renders the item's overlay information. Examples being stack count or damage on top of the item's image at the specified position.
 func_77028_a,doRenderLightningBolt,2,Actually renders the lightning bolt. This method is called through the doRender method.
 func_77029_c,renderEquippedItems,2,
@@ -3022,7 +3003,6 @@ func_77053_a,shouldVillagerRenderPass,2,Determines wether Villager Render pass o
 func_77054_a,renderVillager,2,
 func_77055_a,passVillagerSpecialRender,2,Passes the Villager special render.
 func_77057_a,getTailRotation,2,
-func_77058_a,renderWolf,2,
 func_77059_a,renderCow,2,
 func_77060_a,updateCreeperScale,2,Updates creeper scale in prerender callback
 func_77062_a,renderCreeperPassModel,2,A method used to render a creeper's powered form as a pass model.
@@ -3057,9 +3037,7 @@ func_77102_a,rotatePlayer,2,Rotates the player if the player is sleeping. This m
 func_77103_a,renderName,2,Used to render a player's name above their head
 func_77104_b,renderPlayerScale,2,
 func_77105_b,renderPlayerSleep,2,Renders player with sleeping offset if sleeping
-func_77106_b,drawFirstPersonHand,2,
 func_77107_a,setArmorModel,2,"Set the specified armor model as the player model. Args: player, armorSlot, partialTick"
-func_77112_a,doRenderSheep,2,
 func_77113_a,setWoolColorAndRender,2,
 func_77114_a,renderLivingMooshroom,2,
 func_77115_a,renderMooshroomEquippedItems,2,
@@ -3086,7 +3064,6 @@ func_77146_a,getByID,2,"Returns the game type with the specified ID, or SURVIVAL
 func_77147_a,configurePlayerCapabilities,2,Configures the player capabilities based on the game type
 func_77148_a,getID,2,Returns the ID of this game type
 func_77149_b,getName,2,Returns the name of this game type
-func_77150_c,isAdventure,2,Returns true if this is the ADVENTURE game type
 func_77158_f,getHardcoreEnabled,2,"Returns true if hardcore mode is enabled, otherwise false"
 func_77159_a,enableBonusChest,2,Enables the bonus chest.
 func_77160_d,getSeed,2,Returns the seed for the world.
@@ -3124,6 +3101,7 @@ func_77218_a,isSelected,2,returns true if the element passed in is currently sel
 func_77219_a,actionPerformed,2,
 func_77220_a,registerScrollButtons,2,Registers the IDs that can be used for the scrollbar's buttons.
 func_77221_c,drawBackground,2,
+func_77225_g,getScrollBarX,2,
 func_77226_h,bindAmountScrolled,2,stop the thing from scrolling out of bounds
 func_77271_a,getChunkPosition,2,
 func_77272_a,chunkXZ2Int,2,converts a chunk coordinate pair to an integer (suitable for hashing)
@@ -3171,7 +3149,6 @@ func_77373_a,loadSoundSettings,2,Used for loading sound settings from GameSettin
 func_77374_b,addStreaming,2,Adds an audio file to the streaming SoundPool.
 func_77390_a,readFromTags,2,
 func_77391_b,hasSameItemsAs,2,checks first and second ItemToBuy ID's and count. Calls hasSameIDs
-func_77392_e,getToolUses,2,
 func_77393_a,hasSameIDsAs,2,checks if both the first and second ItemToBuy IDs are the same
 func_77394_a,getItemToBuy,2,Gets the itemToBuy.
 func_77395_g,writeToTags,2,
@@ -3199,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"
@@ -3210,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.
@@ -3231,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.
@@ -3244,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
@@ -3256,7 +3240,6 @@ func_77586_a,addRecipes,2,Adds the tool recipes to the CraftingManager.
 func_77589_a,addRecipes,2,Adds the crafting recipes to the CraftingManager.
 func_77590_a,addRecipes,2,Adds the ingot recipes to the CraftingManager.
 func_77592_b,getRecipeList,2,returns the List<> of all recipes
-func_77593_a,findMatchingRecipe,2,
 func_77594_a,getInstance,2,Returns the static instance of this class
 func_77595_a,addRecipe,2,Adds a recipe. See spreadsheet on first page for details.
 func_77596_b,addShapelessRecipe,2,
@@ -3336,6 +3319,7 @@ func_77845_h,isWolfsFavoriteMeat,2,Whether wolves like this food (true for raw a
 func_77846_g,getSaturationModifier,2,gets the saturationModifier of the ItemFood
 func_77847_f,getHealAmount,2,
 func_77848_i,setAlwaysEdible,2,"Set the field 'alwaysEdible' to true, and make the food edible even if the player don't need to eat."
+func_77861_e,getToolMaterialName,2,Return the name for this tool's material.
 func_77869_a,placeDoorBlock,2,
 func_77871_c,createMapDataPacket,2,returns null if no update is to be sent
 func_77872_a,updateMapData,2,
@@ -3379,11 +3363,10 @@ func_77961_a,hitEntity,2,Calls the corresponding fct in di
 func_77962_s,hasEffect,2,
 func_77963_c,readFromNBT,2,Read the stack fields from a NBT object.
 func_77964_b,setItemDamage,2,Sets the item damage of the ItemStack.
-func_77965_c,isStackEqual,2,
 func_77966_a,addEnchantment,2,Adds an enchantment with a desired level on the ItemStack.
 func_77967_a,getStrVsBlock,2,Returns the strength of the stack against a given block.
-func_77968_r,getItemNameandInformation,2,"gets a list of strings representing the item name and successive extra data, eg Enchantments and potion effects"
 func_77969_a,isItemEqual,2,compares ItemStack argument to the instance ItemStack; returns true if the Items contained in both ItemStacks are equal
+func_77970_a,areItemStackTagsEqual,2,
 func_77971_a,getDamageVsEntity,2,Returns the damage against a given entity.
 func_77972_a,damageItem,2,Damages the item in the ItemStack
 func_77973_b,getItem,2,Returns the object corresponding to the stack.
@@ -3396,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,
@@ -3679,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,
@@ -3715,7 +3700,6 @@ func_78913_a,setPosition,2,Sets a new position for the renderer and setting it u
 func_78914_f,markDirty,2,Marks the current renderer data as dirty and needing to be updated.
 func_78944_a,doCompare,2,
 func_78946_a,sortByDistanceToEntity,2,Sorts the two world renderers according to their distance to a given entity.
-func_79000_a,addToOnlinePlayerList,2,Adds a player's name to the list of online players.
 func_79001_a,getTexturePack,2,
 func_79003_a,initGUI,2,Sets up the server GUI
 func_79004_a,getDedicatedServer,2,
@@ -3727,3 +3711,236 @@ 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
+func_82169_q,getCurrentArmor,2,
+func_82170_o,removePotionEffect,2,Remove the specified potion effect from this entity.
+func_82171_bF,canBeSteered,2,"returns true if all the conditions for steering the entity are met. For pigs, this is true if it is being ridden by a player and the player is holding a carrot-on-a-stick"
+func_82183_n,getAIControlledByPlayer,2,Return the AI task for player control.
+func_82185_r,setCollarColor,2,Set this wolf's collar color.
+func_82186_bH,getCollarColor,2,Return this wolf's collar color.
+func_82193_c,getAttackStrength,2,Returns the amount of damage a mob should deal.
+func_82196_d,attackEntityWithRangedAttack,2,Attack the specified entity using a ranged attack.
+func_82197_f,setAggressive,2,Set whether this witch is aggressive at an entity.
+func_82198_m,getAggressive,2,Return whether this witch is aggressive at an entity.
+func_82201_a,setSkeletonType,2,Set this skeleton's type.
+func_82202_m,getSkeletonType,2,Return this skeleton's type.
+func_82203_t,getWatchedTargetId,2,"Returns the target entity ID if present, or -1 if not @param par1 The target offset, should be from 0-2"
+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,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.
+func_82357_ak,getSpawnProtectionSize,2,Return the spawn protection area's size.
+func_82358_a,isUsernameIndex,2,Return whether the specified command parameter index is a username parameter.
+func_82362_a,getRequiredPermissionLevel,2,Return the required permission level for this command.
+func_82364_d,getDifficultyForName,2,Return the difficulty value for the specified string.
+func_82366_d,getGameRules,2,Return the game rule set this command should be able to manipulate.
+func_82369_d,getAllOnlineUsernames,2,Return all usernames currently connected to the server.
+func_82370_a,getUsernameIndex,2,Return a command's first parameter index containing a valid username.
+func_82371_e,getDistanceSquaredToChunkCoordinates,2,Return the squared distance between this coordinates and the ChunkCoordinates given as argument.
+func_82394_a,renderTileEntitySkullAt,2,Render a skull tile entity.
+func_82398_a,renderTileEntityBeaconAt,2,Render a beacon tile entity.
+func_82403_a,renderFrameItemAsBlock,2,Render the item frame's item as a block.
+func_82406_b,renderItemAndEffectIntoGUI,2,"Render the item's icon or block into the GUI, including the glint effect."
+func_82448_a,transferEntityToWorld,2,Transfers an entity from a world to another world.
+func_82449_a,findPlayers,2,Find all players in a specified range and narrowing down by other parameters
+func_82460_a,updateSoundLocation,2,Updates the sound associated with the entity with that entity's position and velocity. Args: the entity
+func_82461_f,resumeAllSounds,2,Resumes playing all currently playing sounds (after pauseAllSounds)
+func_82462_a,updateSoundLocation,2,"Updates the sound associated with soundEntity with the position and velocity of trackEntity. Args: soundEntity, trackEntity"
+func_82463_b,setEntitySoundPitch,2,"Sets the pitch of the sound associated with the given entity, if one is playing. Args: the entity, the pitch"
+func_82464_d,stopAllSounds,2,Stops all currently playing sounds
+func_82465_b,isEntitySoundPlaying,2,"Returns true if a sound is currently associated with the given entity, or false otherwise."
+func_82466_e,pauseAllSounds,2,Pauses all currently playing sounds
+func_82467_a,playEntitySound,2,"If a sound is already playing from the given entity, update the position and velocity of that sound to match the entity. Otherwise, start playing a sound from that entity. Args: The sound name, the entity, the volume, the pitch, unknown flag"
+func_82468_a,setEntitySoundVolume,2,"Sets the volume of the sound associated with the given entity, if one is playing. The volume is scaled by the global sound volume. Args: the entity, the volume (from 0 to 1)"
+func_82469_c,stopEntitySound,2,Stops playing the sound associated with the given entity
+func_82482_a,dispense,2,Dispenses the specified ItemStack from a dispenser.
+func_82485_a,playDispenseSound,2,Play the dispense sound from the specified block.
+func_82487_b,dispenseStack,2,"Dispense the specified stack, play the dispense sound and spawn particles."
+func_82489_a,spawnDispenseParticles,2,Order clients to display dispense particles from the specified block and facing.
+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,
+func_82616_c,getZ,2,
+func_82617_b,getY,2,
+func_82618_k,getWorld,2,
+func_82621_f,getZInt,2,
+func_82622_e,getYInt,2,
+func_82623_d,getXInt,2,
+func_82632_g,boostSpeed,2,Boost the entity's movement speed.
+func_82633_h,isControlledByPlayer,2,Return whether the entity is being controlled by a player.
+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
+func_82687_d,isPlayerReputationTooLow,2,Return whether this player has a too low reputation with this village.
+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,
+func_82789_a,getIsRepairable,2,Return whether this item is repairable in an anvil.
+func_82790_a,getColorFromItemStack,2,
+func_82810_a,createHangingEntity,2,Create the hanging entity associated to this item.
+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.
+func_82837_s,hasDisplayName,2,Returns true if the itemstack has a display name
+func_82838_A,getRepairCost,2,"Get this stack's repair cost, or 0 if no repair cost is defined."
+func_82839_y,isOnItemFrame,2,Return whether this stack is on an item frame.
+func_82840_a,getTooltip,2,Return a list of strings containing information about the item
+func_82841_c,setRepairCost,2,Set this stack's repair cost.
+func_82842_a,setItemFrame,2,Set the item frame this stack is on.
+func_82844_f,getToolCraftingMaterial,2,"Return the crafting material for this tool material, used to determine the item that can be used to repair a tool with an anvil"
+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
+func_82883_a,getUnicodeFlag,2,Get unicodeFlag controlling whether strings should be rendered with Unicode fonts instead of the default.png font.
+func_82889_a,getBatSize,2,"not actually sure this is size, is not used as of now, but the model would be recreated if the value changed and it seems a good match for a bats size"
+func_83005_z,getBlockBoundsMinZ,2,returns the block bounderies minZ value
+func_83006_A,getBlockBoundsMaxZ,2,returns the block bounderies maxZ value
+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
@@ -874,14 +874,6 @@ p_71908_2_,par2World,2
 p_71908_3_,par3,2
 p_71908_4_,par4,2
 p_71908_5_,par5,2
-p_71909_1_,par1World,2
-p_71909_2_,par2,2
-p_71909_3_,par3,2
-p_71909_4_,par4,2
-p_71909_5_,par5,2
-p_71909_6_,par6,2
-p_71909_7_,par7,2
-p_71909_8_,par8,2
 p_71910_1_,par1,2
 p_71910_2_,par2Random,2
 p_71911_1_,par1World,2
@@ -1372,11 +1364,6 @@ p_72276_1_,par1World,2
 p_72276_2_,par2,2
 p_72276_3_,par3,2
 p_72276_4_,par4,2
-p_72277_1_,par1World,2
-p_72277_2_,par2,2
-p_72277_3_,par3,2
-p_72277_4_,par4,2
-p_72277_5_,par5,2
 p_72280_1_,par1World,2
 p_72280_2_,par2,2
 p_72280_3_,par3,2
@@ -5213,20 +5200,16 @@ p_77147_1_,par1PlayerCapabilities,2
 p_77161_0_,par0,2
 p_77175_1_,par1NextTickListEntry,2
 p_77176_1_,par1,2
-p_77184_1_,par1World,2
-p_77184_2_,par2Entity,2
-p_77184_3_,par3,2
-p_77184_5_,par5,2
-p_77184_7_,par7,2
-p_77184_9_,par9,2
-p_77185_1_,par1World,2
-p_77185_2_,par2Entity,2
-p_77185_3_,par3,2
-p_77185_5_,par5,2
-p_77185_7_,par7,2
-p_77185_9_,par9,2
-p_77186_1_,par1World,2
-p_77186_2_,par2Entity,2
+p_77184_1_,par1Entity,2
+p_77184_2_,par2,2
+p_77184_4_,par4,2
+p_77184_6_,par6,2
+p_77184_8_,par8,2
+p_77185_1_,par1Entity,2
+p_77185_2_,par2,2
+p_77185_4_,par4,2
+p_77185_6_,par6,2
+p_77185_8_,par8,2
 p_77188_0_,par0EntityLiving,2
 p_77188_1_,par1World,2
 p_77188_2_,par2,2
@@ -5459,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
@@ -5830,11 +5811,6 @@ p_78279_4_,par4,2
 p_78279_5_,par5,2
 p_78280_1_,par1Str,2
 p_78280_2_,par2,2
-p_78281_1_,par1Str,2
-p_78281_2_,par2,2
-p_78281_3_,par3,2
-p_78281_4_,par4,2
-p_78281_5_,par5,2
 p_78282_0_,par0Str,2
 p_78283_1_,par1Str,2
 p_78319_1_,par1EntityPlayer,2
@@ -6712,13 +6688,6 @@ p_82438_2_,par2,2
 p_82439_1_,par1EntityPlayer,2
 p_82439_2_,par2,2
 p_82439_3_,par3,2
-p_82440_1_,par1EntityPlayer,2
-p_82440_2_,par2,2
-p_82440_3_,par3,2
-p_82440_4_,par4,2
-p_82440_5_,par5,2
-p_82440_6_,par6,2
-p_82440_7_,par7,2
 p_82441_1_,par1EntityPlayer,2
 p_82442_1_,par1EntityBat,2
 p_82442_2_,par2,2
@@ -7046,11 +7015,6 @@ p_82869_1_,par1EntityPlayer,2
 p_82870_1_,par1EntityPlayer,2
 p_82870_2_,par2ItemStack,2
 p_82877_1_,par1,2
-p_83010_1_,par1World,2
-p_83010_2_,par2,2
-p_83010_3_,par3,2
-p_83010_4_,par4,2
-p_83010_5_,par5,2
 p_83011_1_,par1World,2
 p_83011_2_,par2,2
 p_83011_3_,par3,2
@@ -7069,6 +7033,144 @@ p_83020_3_,par3,2
 p_83020_5_,par5,2
 p_83020_7_,par7,2
 p_83020_9_,par9,2
+p_85027_1_,par1CrashReportCategory,2
+p_85029_1_,par1CrashReportCategory,2
+p_85030_1_,par1Str,2
+p_85030_2_,par2,2
+p_85030_3_,par3,2
+p_85031_1_,par1Entity,2
+p_85034_1_,par1,2
+p_85039_1_,par1,2
+p_85040_1_,par1,2
+p_85041_1_,par1,2
+p_85041_2_,par2,2
+p_85041_3_,par3,2
+p_85041_4_,par4,2
+p_85044_1_,par1ItemStack,2
+p_85044_2_,par2,2
+p_85044_3_,par3,2
+p_85055_0_,par0Throwable,2
+p_85055_1_,par1Str,2
+p_85057_1_,par1Str,2
+p_85057_2_,par2,2
+p_85058_1_,par1Str,2
+p_85068_0_,par0CrashReportCategory,2
+p_85068_1_,par1,2
+p_85068_2_,par2,2
+p_85068_3_,par3,2
+p_85068_4_,par4,2
+p_85068_5_,par5,2
+p_85069_1_,par1StackTraceElement,2
+p_85069_2_,par2StackTraceElement,2
+p_85070_1_,par1,2
+p_85071_0_,par0,2
+p_85071_1_,par1,2
+p_85071_2_,par2,2
+p_85072_1_,par1StringBuilder,2
+p_85073_1_,par1,2
+p_85074_0_,par0,2
+p_85074_2_,par2,2
+p_85074_4_,par4,2
+p_85081_1_,par1Class,2
+p_85081_2_,par2Class,2
+p_85093_1_,par1EntityLiving,2
+p_85093_2_,par2,2
+p_85094_1_,par1Entity,2
+p_85094_2_,par2,2
+p_85094_4_,par4,2
+p_85094_6_,par6,2
+p_85094_8_,par8,2
+p_85094_9_,par9,2
+p_85096_1_,par1BlockAnvil,2
+p_85096_2_,par2,2
+p_85096_3_,par3,2
+p_85096_4_,par4,2
+p_85096_5_,par5,2
+p_85102_10_,par10,2
+p_85102_1_,par1EntityPlayer,2
+p_85102_2_,par2Str,2
+p_85102_3_,par3,2
+p_85102_5_,par5,2
+p_85102_7_,par7,2
+p_85102_9_,par9,2
+p_85103_1_,par1Explosion,2
+p_85104_1_,par1World,2
+p_85104_2_,par2,2
+p_85104_3_,par3,2
+p_85104_4_,par4,2
+p_85104_5_,par5,2
+p_85104_6_,par6,2
+p_85104_7_,par7,2
+p_85104_8_,par8,2
+p_85104_9_,par9,2
+p_85105_1_,par1World,2
+p_85105_2_,par2,2
+p_85105_3_,par3,2
+p_85105_4_,par4,2
+p_85105_5_,par5,2
+p_85106_1_,par1World,2
+p_85106_2_,par2,2
+p_85106_3_,par3,2
+p_85106_4_,par4,2
+p_85106_5_,par5ItemStack,2
+p_85107_1_,par1,2
+p_85116_0_,par0WorldInfo,2
+p_85117_0_,par0WorldInfo,2
+p_85118_1_,par1CrashReportCategory,2
+p_85119_0_,par0WorldInfo,2
+p_85120_0_,par0WorldInfo,2
+p_85121_0_,par0WorldInfo,2
+p_85122_0_,par0WorldInfo,2
+p_85123_0_,par0WorldInfo,2
+p_85124_0_,par0WorldInfo,2
+p_85125_0_,par0WorldInfo,2
+p_85126_0_,par0WorldInfo,2
+p_85127_0_,par0WorldInfo,2
+p_85128_0_,par0WorldInfo,2
+p_85129_0_,par0WorldInfo,2
+p_85130_0_,par0WorldInfo,2
+p_85131_0_,par0WorldInfo,2
+p_85132_0_,par0WorldInfo,2
+p_85133_0_,par0WorldInfo,2
+p_85156_1_,par1EntityAIBase,2
+p_85172_1_,par1EntityPlayerMP,2
+p_85172_2_,par2Chunk,2
+p_85173_1_,par1EntityPlayer,2
+p_85173_2_,par2Str,2
+p_85173_3_,par3,2
+p_85173_4_,par4,2
+p_85174_1_,par1,2
+p_85174_2_,par2,2
+p_85174_3_,par3,2
+p_85175_1_,par1,2
+p_85175_2_,par2,2
+p_85175_3_,par3,2
+p_85181_1_,par1Random,2
+p_85182_1_,par1,2
+p_85182_2_,par2,2
+p_85182_3_,par3,2
+p_85187_1_,par1Str,2
+p_85187_2_,par2,2
+p_85187_3_,par3,2
+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
@@ -7114,7 +7216,6 @@ p_i3013_5_,par5,2
 p_i3013_6_,par6,2
 p_i3014_1_,par1Str,2
 p_i3014_2_,par2Str,2
-p_i3015_1_,par1Component,2
 p_i3016_1_,par1Minecraft,2
 p_i3017_1_,par1Minecraft,2
 p_i3018_1_,par1Minecraft,2
@@ -8035,7 +8136,6 @@ p_i3369_1_,par1Str,2
 p_i3369_2_,par2ICommandSender,2
 p_i3372_1_,par1MinecraftServer,2
 p_i3373_1_,par1MinecraftServer,2
-p_i3374_1_,par1MinecraftServer,2
 p_i3375_1_,par1File,2
 p_i3376_1_,par1MinecraftServer,2
 p_i3377_1_,par1File,2
@@ -8809,7 +8909,6 @@ p_i3727_3_,par3,2
 p_i3727_5_,par5,2
 p_i3727_7_,par7,2
 p_i3727_9_,par9,2
-p_i3728_1_,par1World,2
 p_i3729_1_,par1World,2
 p_i3730_1_,par1World,2
 p_i3731_1_,par1ISaveHandler,2
@@ -9878,6 +9977,63 @@ p_i5109_2_,par2,2
 p_i5109_4_,par4,2
 p_i5109_6_,par6,2
 p_i6000_1_,par1CrashReport,2
+p_i6800_1_,par1Component,2
+p_i6800_2_,par2GameSettings,2
+p_i6801_1_,par1RenderGlobal,2
+p_i6801_2_,par2,2
+p_i6801_4_,par4,2
+p_i6801_6_,par6,2
+p_i6802_1_,par1CallableSuspiciousClasses,2
+p_i6803_1_,par1CrashReport,2
+p_i6804_1_,par1CrashReport,2
+p_i6805_1_,par1,2
+p_i6806_1_,par1,2
+p_i6807_1_,par1,2
+p_i6807_2_,par2,2
+p_i6807_3_,par3,2
+p_i6808_1_,par1Str,2
+p_i6808_2_,par2Obj,2
+p_i6809_1_,par1CrashReport,2
+p_i6809_2_,par2Str,2
+p_i6810_1_,par1DedicatedServer,2
+p_i6811_1_,par1Entity,2
+p_i6814_1_,par1World,2
+p_i6814_2_,par2,2
+p_i6815_1_,par1Teleporter,2
+p_i6815_2_,par2,2
+p_i6815_3_,par3,2
+p_i6815_4_,par4,2
+p_i6815_5_,par5,2
+p_i6816_1_,par1WorldServer,2
+p_i6817_1_,par1MapGenStructure,2
+p_i6817_2_,par2,2
+p_i6817_3_,par3,2
+p_i6818_1_,par1MapGenStructure,2
+p_i6818_2_,par2,2
+p_i6818_3_,par3,2
+p_i6819_1_,par1MapGenStructure,2
+p_i6820_1_,par1WorldInfo,2
+p_i6821_1_,par1WorldInfo,2
+p_i6822_1_,par1WorldInfo,2
+p_i6823_1_,par1WorldInfo,2
+p_i6824_1_,par1WorldInfo,2
+p_i6825_1_,par1WorldInfo,2
+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	Sat Oct 20 04:10:42 2012
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Sat Oct 20 04:20:32 2012
-@@ -541,9 +541,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;
-@@ -561,7 +560,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) {
             ;
-@@ -579,8 +577,6 @@
+@@ -584,8 +582,6 @@
             this.func_71405_e();
          }
 
@@ -29,9 +29,30 @@ 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	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() {
+       StringBuilder var1 = new StringBuilder();
+-      Field var2 = ClassLoader.class.getDeclaredField("classes");
+-      var2.setAccessible(true);
+-      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
+      ArrayList var3;
+      try {
+	     Field var2 = ClassLoader.class.getDeclaredField("classes");
+	     var2.setAccessible(true);
+	     var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
+      } catch(Exception ex) {
+    	 return "";
+      }
+       boolean var4 = true;
+       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	Sat Oct 20 04:10:43 2012
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Sat Oct 20 04:17:33 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;
 
@@ -52,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	Sat Oct 20 04:10:43 2012
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Oct 20 04:16:45 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 {
@@ -66,9 +87,9 @@ 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	Sat Oct 20 04:10:43 2012
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Oct 20 04:16:25 2012
-@@ -194,7 +194,7 @@
+--- 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);
    }
 
@@ -77,42 +98,37 @@ 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	Sat Oct 20 04:10:44 2012
-+++ minecraft_patched\net\minecraft\src\EnumFacing.java	Sat Oct 20 04:15:54 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	Sat Oct 20 04:10:44 2012
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sat Oct 20 04:21:56 2012
-@@ -713,8 +713,6 @@
-       for(boolean var7 = false; var5 < var3; ++var5) {
-          char var8 = p_78259_1_.charAt(var5);
-          switch(var8) {
+--- 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;
-@@ -728,6 +726,8 @@
+@@ -626,6 +624,8 @@
                }
             }
             break;
@@ -122,8 +138,8 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
             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	Sat Oct 20 04:10:44 2012
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Oct 20 04:15:39 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	Sat Oct 20 04:10:45 2012
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Oct 20 04:15:23 2012
-@@ -1443,7 +1443,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	Sat Oct 20 04:10:45 2012
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sat Oct 20 04:22:25 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	Sat Oct 20 04:10:45 2012
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Oct 20 04:23:05 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,27 @@
+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 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() {
+       StringBuilder var1 = new StringBuilder();
+-      Field var2 = ClassLoader.class.getDeclaredField("classes");
+-      var2.setAccessible(true);
+-      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
+      ArrayList var3;
+      try {
+         Field var2 = ClassLoader.class.getDeclaredField("classes");
+         var2.setAccessible(true);
+         var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
+      } catch(Exception ex) {
+    	 return "";
+      }
+       boolean var4 = true;
+       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	Sat Oct 20 04:11:53 2012
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Oct 20 04:14:21 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 {
@@ -13,9 +34,9 @@ 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	Sat Oct 20 04:11:53 2012
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sat Oct 20 04:13:58 2012
-@@ -195,7 +195,7 @@
+--- 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);
    }
 
@@ -24,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	Sat Oct 20 04:11:53 2012
-+++ minecraft_server_patched\net\minecraft\src\EnumFacing.java	Sat Oct 20 04:13:22 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	Sat Oct 20 04:11:54 2012
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sat Oct 20 04:18:38 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_;
    }
@@ -59,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	Sat Oct 20 04:11:54 2012
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Oct 20 04:19:13 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.18
-ClientVersion = 1.4.1
-ServerVersion = 1.4.1
+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>
@@ -53,10 +53,9 @@ def main():
      f.write("%s=%s\n" %("fmlbuild.revision.number",rev))
      f.write("%s=%s\n" %("fmlbuild.githash",githash))
      f.write("%s=%s\n" %("fmlbuild.mcpversion",mcpversion))
-      f.write("%s=%s\n" %("fmlbuild.mcclientversion",mcclientversion))
-      f.write("%s=%s\n" %("fmlbuild.mcserverversion",mcserverversion))
+      f.write("%s=%s\n" %("fmlbuild.mcversion",mcclientversion))

-    print("Version information: FML %s.%s.%s using MCP %s for c:%s, s:%s" % (major, minor, rev, mcpversion, mcclientversion, mcserverversion))
+    print("Version information: FML %s.%s.%s using MCP %s for minecraft %s" % (major, minor, rev, mcpversion, mcclientversion))
    
 if __name__ == '__main__':
    main()
@@ -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 = "542621a5298659dc65f383f35170fc4c"
-    clean_s = "736ffcb0d9f36d47de96a6923ec82699"
+    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']
-        
-    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.17 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')
@@ -693,6 +771,9 @@ def gen_merged_srg(mcp_dir, fml_dir):
            common[type][key] = value #+ ' #S'
            
    #Print joined retroguard files
+    if fml_dir is None:
+        return common
+
    with open(os.path.join(fml_dir, 'conf', 'joined.srg'), 'wb') as f:
        for type in ['PK:', 'CL:', 'FD:', 'MD:']:
            for key in sorted(common[type]):
@@ -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 @@
->ou
->iZ
->xD
->xa
->anh
->anm
->jn
->uf
->agz
->jo
-<fo
-<hm
-<hn
-<ho
-<hp
-<hq
-<hr
-<hs
-<ht
-<hu
+!beg #net/minecraft/src/CodecMus
@@ -10,7 +10,7 @@
 import net.minecraft.src.AnvilSaveConverter;
 import net.minecraft.src.AxisAlignedBB;
 import net.minecraft.src.BehaviorArrowDispense;
-@@ -385,7 +388,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)
                 {
-@@ -424,6 +430,7 @@
+@@ -421,6 +427,7 @@
 
                     Thread.sleep(1L);
                 }
@@ -29,7 +29,7 @@
             }
             else
             {
-@@ -487,8 +494,10 @@
+@@ -484,8 +491,10 @@
 
     public void func_71217_p()
     {
@@ -40,7 +40,7 @@
         ++this.field_71315_w;
 
         if (this.field_71295_T)
-@@ -534,6 +543,7 @@
+@@ -531,6 +540,7 @@
 
         this.field_71304_b.func_76319_b();
         this.field_71304_b.func_76319_b();
@@ -48,18 +48,23 @@
     }
 
     public void func_71190_q()
-@@ -560,8 +570,10 @@
+@@ -558,6 +568,7 @@
                 }
 
                 this.field_71304_b.func_76320_a("tick");
 +                FMLCommonHandler.instance().onPreWorldTick(var4);
-                 var4.func_72835_b();
-                 var4.func_72939_s();
+                 CrashReport var6;
+ 
+                 try
+@@ -582,6 +593,7 @@
+                     throw new ReportedException(var6);
+                 }
+ 
 +                FMLCommonHandler.instance().onPostWorldTick(var4);
                 this.field_71304_b.func_76319_b();
                 this.field_71304_b.func_76320_a("tracker");
                 var4.func_73039_n().func_72788_a();
-@@ -1149,6 +1161,12 @@
+@@ -1150,6 +1162,12 @@
     @SideOnly(Side.SERVER)
     public static void main(String[] p_main_0_)
     {
@@ -0,0 +1,54 @@
+--- ../src-base/common/net/minecraft/src/AnvilChunkLoader.java
+++ ../src-work/common/net/minecraft/src/AnvilChunkLoader.java
+@@ -9,6 +9,9 @@
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Set;
+import java.util.logging.Level;
+
+import cpw.mods.fml.common.FMLLog;
+ 
+ public class AnvilChunkLoader implements IThreadedFileIO, IChunkLoader
+ {
+@@ -223,9 +226,18 @@
+                 p_75820_1_.field_76644_m = true;
+                 var10 = new NBTTagCompound();
+ 
+-                if (var19.func_70039_c(var10))
+-                {
+-                    var15.func_74742_a(var10);
+                try
+                {
+                    if (var19.func_70039_c(var10))
+                    {
+                        var15.func_74742_a(var10);
+                    }
+                }
+                catch (Exception e)
+                {
+                    FMLLog.log(Level.SEVERE, e,
+                            "An Entity type %s has thrown an exception trying to write state. It will not persist. Report this to the mod author",
+                            var19.getClass().getName());
+                 }
+             }
+         }
+@@ -238,8 +250,17 @@
+         {
+             TileEntity var21 = (TileEntity)var17.next();
+             var10 = new NBTTagCompound();
+-            var21.func_70310_b(var10);
+-            var16.func_74742_a(var10);
+            try
+            {
+                var21.func_70310_b(var10);
+                var16.func_74742_a(var10);
+            }
+            catch (Exception e)
+            {
+                FMLLog.log(Level.SEVERE, e,
+                        "A TileEntity type %s has throw an exception trying to write state. It will not persist. Report this to the mod author",
+                        var21.getClass().getName());
+            }
+         }
+ 
+         p_75820_3_.func_74782_a("TileEntities", var16);
@@ -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";
+     }
+ }
@@ -9,7 +9,7 @@
 
 public class ChunkProviderServer implements IChunkProvider
 {
-@@ -182,6 +184,7 @@
+@@ -194,6 +196,7 @@
             if (this.field_73246_d != null)
             {
                 this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_);
@@ -7,11 +7,11 @@
 import cpw.mods.fml.common.Side;
 import cpw.mods.fml.common.asm.SideOnly;
 import java.io.File;
-@@ -40,6 +41,7 @@
-         this.func_71500_a("Memory", new CallableMemoryInfo(this));
-         this.func_71500_a("JVM Flags", new CallableJVMFlags(this));
-         this.func_71500_a("AABB Pool Size", new CallableCrashMemoryReport(this));
-+        FMLCommonHandler.instance().enhanceCrashReport(this);
+@@ -43,6 +44,7 @@
+         this.field_85061_c.func_71500_a("AABB Pool Size", new CallableCrashMemoryReport(this));
+         this.field_85061_c.func_71500_a("Suspicious classes", new CallableSuspiciousClasses(this));
+         this.field_85061_c.func_71500_a("IntCache", new CallableIntCache(this));
+        FMLCommonHandler.instance().enhanceCrashReport(this, this.field_85061_c);
     }
 
-     public void func_71500_a(String p_71500_1_, Callable p_71500_2_)
+     public String func_71501_a()
@@ -16,7 +16,7 @@
         field_71306_a.info("Loading properties");
         this.field_71340_o = new PropertyManager(new File("server.properties"));
 
-@@ -101,6 +104,7 @@
+@@ -111,6 +114,7 @@
             field_71306_a.warning("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
         }
 
@@ -24,7 +24,7 @@
         this.func_71210_a(new DedicatedPlayerList(this));
         long var4 = System.nanoTime();
 
-@@ -161,7 +165,7 @@
+@@ -171,7 +175,7 @@
             this.field_71339_n = new RConThreadMain(this);
             this.field_71339_n.func_72602_a();
         }
@@ -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);
@@ -9,12 +9,12 @@
 
 public class EntityItem extends Entity
 {
-@@ -232,6 +234,8 @@
+@@ -245,6 +247,8 @@
                     p_70100_1_.func_71029_a(AchievementList.field_76027_z);
                 }
 
 +                GameRegistry.onPickupNotification(p_70100_1_, this);
 +
-                 this.field_70170_p.func_72956_a(this, "random.pop", 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F);
+                 this.func_85030_a("random.pop", 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F);
                 p_70100_1_.func_71001_a(this, var2);
 
@@ -0,0 +1,44 @@
+--- ../src-base/common/net/minecraft/src/EntityList.java
+++ ../src-work/common/net/minecraft/src/EntityList.java
+@@ -3,6 +3,9 @@
+ import java.util.HashMap;
+ import java.util.LinkedHashMap;
+ import java.util.Map;
+import java.util.logging.Level;
+
+import cpw.mods.fml.common.FMLLog;
+ 
+ public class EntityList
+ {
+@@ -52,10 +55,10 @@
+     public static Entity func_75615_a(NBTTagCompound p_75615_0_, World p_75615_1_)
+     {
+         Entity var2 = null;
+-
+        Class var3 = null;
+         try
+         {
+-            Class var3 = (Class)field_75625_b.get(p_75615_0_.func_74779_i("id"));
+            var3 = (Class)field_75625_b.get(p_75615_0_.func_74779_i("id"));
+ 
+             if (var3 != null)
+             {
+@@ -69,7 +72,17 @@
+ 
+         if (var2 != null)
+         {
+-            var2.func_70020_e(p_75615_0_);
+            try
+            {
+                var2.func_70020_e(p_75615_0_);
+            }
+            catch (Exception e)
+            {
+                FMLLog.log(Level.SEVERE, e,
+                        "An Entity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
+                        p_75615_0_.func_74779_i("id"), var3.getName());
+                var2 = null;
+            }
+         }
+         else
+         {
@@ -27,7 +27,7 @@
     }
 
     public int func_82145_z()
-@@ -1700,4 +1705,9 @@
+@@ -1755,4 +1760,9 @@
     {
         return this.func_82241_s(1);
     }
@@ -1,6 +1,6 @@
 --- ../src-base/common/net/minecraft/src/EntitySlime.java
 +++ ../src-work/common/net/minecraft/src/EntitySlime.java
-@@ -224,7 +224,7 @@
+@@ -231,7 +231,7 @@
     {
         Chunk var1 = this.field_70170_p.func_72938_d(MathHelper.func_76128_c(this.field_70165_t), MathHelper.func_76128_c(this.field_70161_v));
 
@@ -9,7 +9,7 @@
 
 public class EntityTrackerEntry
 {
-@@ -293,6 +295,13 @@
+@@ -304,6 +306,13 @@
                     this.field_73138_k = this.field_73132_a.field_70181_x;
                     this.field_73135_l = this.field_73132_a.field_70179_y;
 
@@ -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));
-@@ -368,6 +377,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,5 +1,5 @@
--- ../src-base/minecraft/net/minecraft/src/MemoryConnection.java
-+++ ../src-work/minecraft/net/minecraft/src/MemoryConnection.java
+--- ../src-base/common/net/minecraft/src/MemoryConnection.java
+++ ../src-work/common/net/minecraft/src/MemoryConnection.java
@@ -8,6 +8,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
@@ -7,9 +7,9 @@
 +
 +import cpw.mods.fml.common.network.FMLNetworkHandler;
 
- @SideOnly(Side.CLIENT)
 public class MemoryConnection implements INetworkManager
-@@ -70,6 +72,7 @@
+ {
+@@ -71,6 +73,7 @@
         if (this.field_74441_e && this.field_74442_b.isEmpty())
         {
             this.field_74440_d.func_72515_a(this.field_74438_f, this.field_74439_g);
@@ -9,7 +9,7 @@
 import net.minecraft.server.MinecraftServer;
 
 public class NetServerHandler extends NetHandler
-@@ -587,6 +589,7 @@
+@@ -576,6 +578,7 @@
 
     public void func_72481_a(Packet3Chat p_72481_1_)
     {
@@ -17,7 +17,7 @@
         if (this.field_72574_e.func_71126_v() == 2)
         {
             this.func_72567_b(new Packet3Chat("Cannot send chat message."));
-@@ -952,6 +955,11 @@
+@@ -941,6 +944,11 @@
     }
 
     public void func_72501_a(Packet250CustomPayload p_72501_1_)
@@ -29,7 +29,7 @@
     {
         DataInputStream var2;
         ItemStack var3;
-@@ -1114,4 +1122,17 @@
+@@ -1105,4 +1113,17 @@
             }
         }
     }
@@ -9,11 +9,11 @@
 import net.minecraft.server.MinecraftServer;
 
 public abstract class NetworkListenThread
-@@ -43,6 +45,7 @@
-             }
-             catch (Exception var4)
-             {
-+                FMLLog.log(Level.SEVERE, var4, "A critical server error occured handling a packet, kicking %s", var2);
-                 field_71751_a.log(Level.WARNING, "Failed to handle packet: " + var4, var4);
+@@ -49,6 +51,7 @@
+                     throw new ReportedException(var4);
+                 }
+ 
+                FMLLog.log(Level.SEVERE, var5, "A critical server error occured handling a packet, kicking %s", var2.getPlayer().field_70157_k);
+                 field_71751_a.log(Level.WARNING, "Failed to handle packet for " + var2.field_72574_e.func_70023_ak() + "/" + var2.field_72574_e.func_71114_r() + ": " + var5, var5);
                 var2.func_72565_c("Internal server error");
             }
@@ -19,7 +19,7 @@
     }
 
     public void func_72364_a(WorldServer[] p_72364_1_)
-@@ -154,6 +159,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_);
-@@ -304,6 +310,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;
     }
 
-@@ -329,6 +336,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));
         }
@@ -11,7 +11,7 @@
                 catch (Exception var6)
                 {
                     var3.func_72527_a("Internal server error");
-+                    FMLLog.log(Level.SEVERE, var6, "Error handling login related packet - connection from %s refused", var3.field_72543_h);
-                     field_71777_a.log(Level.WARNING, "Failed to handle packet: " + var6, var6);
+                    FMLLog.log(Level.SEVERE, var6, "Error handling login related packet - connection from %s refused", var3.func_72528_e());
+                     field_71777_a.log(Level.WARNING, "Failed to handle packet for " + var3.func_72528_e() + ": " + var6, var6);
                 }
 
@@ -1,6 +1,6 @@
 --- ../src-base/common/net/minecraft/src/TcpConnection.java
 +++ ../src-work/common/net/minecraft/src/TcpConnection.java
-@@ -16,6 +16,8 @@
+@@ -17,6 +17,8 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.crypto.SecretKey;
@@ -9,7 +9,7 @@
 
 public class TcpConnection implements INetworkManager
 {
-@@ -377,6 +379,7 @@
+@@ -387,6 +389,7 @@
         if (this.field_74472_n && this.field_74473_o.isEmpty())
         {
             this.field_74485_r.func_72515_a(this.field_74481_v, this.field_74480_w);
@@ -0,0 +1,55 @@
+--- ../src-base/common/net/minecraft/src/TileEntity.java
+++ ../src-work/common/net/minecraft/src/TileEntity.java
+@@ -1,9 +1,11 @@
+ package net.minecraft.src;
+ 
+import cpw.mods.fml.common.FMLLog;
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
+ import java.util.HashMap;
+ import java.util.Map;
+import java.util.logging.Level;
+ 
+ public class TileEntity
+ {
+@@ -75,10 +77,10 @@
+     public static TileEntity func_70317_c(NBTTagCompound p_70317_0_)
+     {
+         TileEntity var1 = null;
+-
+        Class var2 = null;
+         try
+         {
+-            Class var2 = (Class)field_70326_a.get(p_70317_0_.func_74779_i("id"));
+            var2 = (Class)field_70326_a.get(p_70317_0_.func_74779_i("id"));
+ 
+             if (var2 != null)
+             {
+@@ -92,7 +94,17 @@
+ 
+         if (var1 != null)
+         {
+-            var1.func_70307_a(p_70317_0_);
+            try
+            {
+                var1.func_70307_a(p_70317_0_);
+            }
+            catch (Exception e)
+            {
+                FMLLog.log(Level.SEVERE, e,
+                        "A TileEntity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
+                        p_70317_0_.func_74779_i("id"), var2.getName());
+                var1 = null;
+            }
+         }
+         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,6 +1,22 @@
 --- ../src-base/common/net/minecraft/src/World.java
 +++ ../src-work/common/net/minecraft/src/World.java
-@@ -3475,7 +3475,7 @@
+@@ -1764,13 +1764,13 @@
+             }
+         }
+ 
+-        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;
+ 
+         this.field_72984_F.func_76318_c("pendingTileEntities");
+ 
+@@ -3595,7 +3595,7 @@
     @SideOnly(Side.CLIENT)
     public double func_72919_O()
     {
@@ -8,4 +24,4 @@
 +        return this.field_72986_A.func_76067_t().getHorizon(this);
     }
 
-     public CrashReport func_72914_a(CrashReport p_72914_1_)
+     public CrashReportCategory func_72914_a(CrashReport p_72914_1_)
@@ -17,9 +17,9 @@
 
     protected WorldInfo()
     {
-@@ -430,4 +435,24 @@
+@@ -528,4 +533,24 @@
     {
-         return this.field_82577_x;
+         return p_85131_0_.field_76110_t;
     }
 +
 +    /**
@@ -45,7 +45,7 @@
     }
 
     public String func_77127_a()
-@@ -97,4 +117,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;
-@@ -118,6 +120,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;
-@@ -130,6 +133,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
-@@ -312,7 +321,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);
-@@ -357,6 +366,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);
-@@ -385,6 +396,7 @@
+@@ -389,6 +400,7 @@
         {
             this.func_71352_k();
         }
@@ -57,7 +57,7 @@
     }
 
     private void func_71357_I() throws LWJGLException
-@@ -743,9 +755,11 @@
+@@ -747,9 +759,11 @@
 
             if (!this.field_71454_w)
             {
@@ -69,7 +69,7 @@
             }
 
             GL11.glFlush();
-@@ -1271,11 +1285,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");
-@@ -1672,6 +1688,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();
     }
-@@ -1926,6 +1943,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;
-@@ -596,6 +597,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);
     }
 
-@@ -1105,6 +1115,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);
-@@ -1214,6 +1229,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");
-@@ -1258,4 +1278,20 @@
+@@ -1261,4 +1281,20 @@
     {
         return this.field_72555_g;
     }
@@ -83,7 +83,7 @@
     }
 
     public boolean func_78567_v(Block p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_)
-@@ -6478,6 +6552,10 @@
+@@ -6510,6 +6584,10 @@
                 this.func_83020_a(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
                 this.func_78595_a();
             }
@@ -94,7 +94,7 @@
         }
         else
         {
-@@ -6536,6 +6614,36 @@
+@@ -6568,6 +6646,36 @@
 
     public static boolean func_78597_b(int p_78597_0_)
     {
@@ -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;
             }
@@ -0,0 +1,101 @@
+import os, os.path, sys
+import shutil, glob, fnmatch
+import csv, re
+
+ctorsigre = re.compile('<init>\((.*)\)')
+ctorparamre = re.compile('(([ZBCSIJFD]|L([\w\/]+);))')
+
+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
Christian	db12af48fa	Update to 1.4.3	2012-11-01 23:53:13 -04:00
Christian	a0f574a0ac	A useful tool for performing updates	2012-11-01 23:11:21 -04:00
Christian	8356fe9a7b	FUUUUUU! Stupid ticking. STOP REGISTERING TICK HANDLERS IN YOUR CONSTRUCTORS. I'm looking at you Rei's!	2012-11-01 10:51:17 -04:00
Christian	6edce8b5f4	Patch a file handle leak in RegionFileCache handling when under memory pressure.	2012-10-31 22:58:01 -04:00
LexManos	ca2bbe0b5f	Update MCP mapings again, yay bad syncs.	2012-10-31 09:23:17 -07:00
LexManos	c8941a7faa	Updated MCP mapings.	2012-10-31 07:40:53 -07:00
LexManos	5e20c03736	StartServer is now useable in merged code base.	2012-10-31 07:40:40 -07:00
Christian	b19e882aab	Remove some debug, closes #123	2012-10-30 21:53:08 -04:00
Christian	9d7d32a1b5	Fix up tick management outside of mod loading phases for ModLoader mods.	2012-10-30 21:47:06 -04:00
Christian	d512539554	Negatively cache failed class lookups, should help with @SideOnly performance issues.	2012-10-30 21:17:17 -04:00
Christian	a3a93f3387	Fix some whitespace issues, handle possibly bugged entities as well	2012-10-30 09:13:18 -04:00
Christian	a7eb5dc773	Vanilla/mod bug fixes: CME on entity processing, TileEntity resetting chunk on save/load.	2012-10-29 17:41:08 -04:00
Christian	b23081df78	Support for ModLoader 1.4.2. Good job Risu!	2012-10-28 23:55:58 -04:00
Christian	66db4ec46e	Add in an exclusion list tag for @Mod. The backend code isn't yet implemented, but shows the basic idea.	2012-10-27 15:13:28 -04:00
Christian	8bd98c3a2d	Fix a small problem with the new MCP container- it can cause NPEs. Nice.	2012-10-26 07:55:23 -04:00
Christian	34cc42d3cb	Fix up some javadoc complaints	2012-10-25 16:18:42 -04:00
Christian	09eade4623	Update build - include MCP information in the source pack	2012-10-25 10:00:34 -04:00
Christian	9bfe7df373	MCP deserves lots of credit. So here it is.	2012-10-25 09:02:49 -04:00
Christian	8006b774bf	Fix instantiation bug	2012-10-24 21:58:36 -04:00
Christian	7cc91cfb0c	Simple InterMod comms. Send a message using FMLInterModComms.sendMessage(). Receive messages through an @IMCCallback	2012-10-24 16:39:55 -04:00
Christian	24d72852e7	Update for MC 1.4.2	2012-10-24 15:12:06 -04:00
Christian	cedf3d55d5	Duplicate Mod display screen.	2012-10-24 09:41:46 -04:00
Christian	d915f39996	Fix typo in access transformer	2012-10-23 21:21:28 -04:00
Christian	346691c298	Fix the merge for forge	2012-10-23 18:36:05 -04:00