Update to 1.4.3

A useful tool for performing updates
FUUUUUU! Stupid ticking. STOP REGISTERING TICK HANDLERS IN YOUR CONSTRUCTORS.
2026-11-14 09:05:17 +00:00 · 2012-11-01 23:53:13 -04:00 · 2012-11-01 23:11:21 -04:00 · 2012-11-01 10:51:17 -04:00 · 2012-10-31 22:58:01 -04:00 · 2012-10-31 09:23:17 -07:00
75 changed files with 17311 additions and 15926 deletions
@@ -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>
@@ -204,8 +206,10 @@
      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch,mcp_merge.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>
@@ -43,6 +43,7 @@ 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 +110,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 +153,10 @@ public class FMLClientHandler implements IFMLSidedHandler
        {
            wrongMC = wrong;
        }
+        catch (DuplicateModsFoundException dupes)
+        {
+        	dupesFound = dupes;
+        }
        catch (MissingModsException missing)
        {
            modsMissing = missing;
@@ -181,7 +187,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 +223,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));
@@ -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);
+        }
+    }
+}
@@ -34,7 +34,7 @@ public class SpriteHelper
                SpriteHelper.toBitSet(
                "0000000000000000" +
                "0000000000110000" +
-                "0000000001100000" +
+                "0000000000100000" +
                "0000000001100000" +
                "0000000000000000" +
                "0000000000000000" +
@@ -43,10 +43,10 @@ public class SpriteHelper
                "0000000000000000" +
                "0000000000000000" +
                "0000000000000000" +
-                "0000000011111111" +
-                "0000000011111000" +
-                "0000000111111100" +
-                "0000000111111000" +
+                "0000000000011111" +
+                "0000000000000000" +
+                "0000000001111100" +
+                "0000000001111000" +
                "0000000000000000");
        spriteInfo.put("/terrain.png", slots);

@@ -57,15 +57,15 @@ public class SpriteHelper
                "0000000000000000" +
                "0000000000000000" +
                "0000000000000000" +
-                "0000001000000000" +
-                "0000001110000000" +
-                "0000001000000000" +
-                "1111101010000000" +
-                "1111101010000000" +
-                "1111101110000000" +
-                "1111111111110000" +
-                "1111111111111111" +
-                "1111111111111111" +
+                "0000000000000000" +
+                "0000000000000000" +
+                "0000000000000000" +
+                "0111100000000000" +
+                "1111100010000000" +
+                "0000101110000000" +
+                "0111000000000000" +
+                "1100001100001111" +
+                "0000000000001111" +
                "0000000000000000");
        spriteInfo.put("/gui/items.png", slots);
    }
@@ -7,6 +7,7 @@ import net.minecraft.src.Block;
 import net.minecraft.src.Entity;
 import net.minecraft.src.IBlockAccess;
 import net.minecraft.src.Render;
+import net.minecraft.src.RenderBiped;
 import net.minecraft.src.RenderBlocks;
 import net.minecraft.src.RenderManager;
 import net.minecraft.src.RenderPlayer;
@@ -26,7 +27,7 @@ public class RenderingRegistry
 {
    private static final RenderingRegistry INSTANCE = new RenderingRegistry();

-    private int nextRenderId = 32;
+    private int nextRenderId = 36;

    private Map<Integer, ISimpleBlockRenderingHandler> blockRenderers = Maps.newHashMap();

@@ -40,6 +41,7 @@ public class RenderingRegistry
    public static int addNewArmourRendererPrefix(String armor)
    {
        RenderPlayer.field_77110_j = ObjectArrays.concat(RenderPlayer.field_77110_j, armor);
+        RenderBiped.field_82424_k = RenderPlayer.field_77110_j;
        return RenderPlayer.field_77110_j.length - 1;
    }

@@ -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
     */
@@ -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
@@ -145,6 +145,7 @@ public class AccessTransformer implements IClassTransformer
    @Override
    public byte[] transform(String name, byte[] bytes)
    {
+    	if (bytes == null) { return null; }
        if (!modifiers.containsKey(name)) { return bytes; }

        ClassNode classNode = new ClassNode();
@@ -134,8 +134,9 @@ public class MCPMerger
            String line;
            while ((line = br.readLine()) != null)
            {
+		line = line.split("#")[0];
                boolean toClient = line.charAt(0) == '<';
-                line = line.substring(1);
+                line = line.substring(1).trim();
                if (toClient) copyToClient.add(line);
                else copyToServer.add(line);
            }
@@ -288,7 +289,7 @@ public class MCPMerger

        reader.accept(classNode, 0);

-        if (!classNode.name.equals("bcs")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
+        if (!classNode.name.equals("bdz")) //Special case CodecMus so I dont have to make a new patch, anyone who uses this in production code is.. bad.
        {
            if (classNode.visibleAnnotations == null) classNode.visibleAnnotations = new ArrayList<AnnotationNode>();
            classNode.visibleAnnotations.add(getSideAnn(isClientOnly));
@@ -89,6 +89,7 @@ public class MarkerTransformer implements IClassTransformer
    @Override
    public byte[] transform(String name, byte[] bytes)
    {
+    	if (bytes == null) { return null; }
        if (!markers.containsKey(name)) { return bytes; }

        ClassNode classNode = new ClassNode();
@@ -23,6 +23,8 @@ public class SideTransformer implements IClassTransformer
    @Override
    public byte[] transform(String name, byte[] bytes)
    {
+    	if (bytes == null) { return null; }
+
        ClassNode classNode = new ClassNode();
        ClassReader classReader = new ClassReader(bytes);
        classReader.accept(classNode, 0);
@@ -33,7 +35,7 @@ public class SideTransformer implements IClassTransformer
            {
                System.out.println(String.format("Attempted to load class %s for invalid side %s", classNode.name, SIDE));
            }
-            return null;
+            throw new RuntimeException(String.format("Attempted to load class %s for invalid side %s", classNode.name, SIDE));
        }

        Iterator<FieldNode> fields = classNode.fields.iterator();
@@ -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,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);
@@ -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 };
    }
 }
@@ -120,7 +120,7 @@ public class FMLRelauncher
    private Class<? super Object> setupNewClientHome(File minecraftHome)
    {
        Class<? super Object> client = ReflectionHelper.getClass(classLoader, "net.minecraft.client.Minecraft");
-        ReflectionHelper.setPrivateValue(client, null, minecraftHome, "field_71463_am", "am", "minecraftDir");
+        ReflectionHelper.setPrivateValue(client, null, minecraftHome, "field_71463_am", "an", "minecraftDir");
        return client;
    }

@@ -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
        {
@@ -188,7 +188,7 @@ public class FMLRelauncher
        if (str != null)
        {
            str = str.replace('/', File.separatorChar);
-            ReflectionHelper.setPrivateValue(mcMaster, null, new File(str), "minecraftDir", "am", "minecraftDir");
+            ReflectionHelper.setPrivateValue(mcMaster, null, new File(str), "minecraftDir", "an", "minecraftDir");
        }
        // We force minecraft to setup it's homedir very early on so we can
        // inject stuff into it
@@ -201,7 +201,7 @@ public class FMLRelauncher
        {
            // Hmmm
        }
-        File minecraftHome = ReflectionHelper.getPrivateValue(mcMaster, null, "field_71463_am", "am", "minecraftDir");
+        File minecraftHome = ReflectionHelper.getPrivateValue(mcMaster, null, "field_71463_am", "an", "minecraftDir");
        return minecraftHome;
    }

@@ -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);
        }
    }
@@ -457,8 +457,6 @@ public class RelaunchLibraryManager
        {
        	//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);
@@ -36,7 +36,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
@@ -1,71 +1,71 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public aml.a(Ljava/lang/Class;Ljava/lang/String;)V
+public anq.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
-public le.a(Ljava/lang/Class;Ljava/lang/String;I)V
-public le.a(Ljava/lang/Class;Ljava/lang/String;III)V
-# EntityList nameToClassMap and idToClassMap and classToNameMap
-public le.b
-public le.d
-public le.c
+public lu.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
+public lu.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
+public lu.b #FD:EntityList/field_75625_b #nameToClassMap
+public lu.c #FD:EntityList/field_75626_c #classToNameMap
+public lu.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
-public azb.h # textureList
-public azb.k # texturePack
-# RenderManager renderers
-public azv.o
+public bai.h #FD:RenderEngine/field_78367_h #textureList
+public bai.k #FD:RenderEngine/field_78366_k #texturePack
+# RenderManager
+public bbc.p #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public azc.*
-public azc.*()
-#RenderPlayer - make armorlist public and not final
-public-f bap.h
-#StringTranslate - make the current table and language public
-public bd.b
-public bd.d
-# TileEntityRenderer - make the list of renderers public
-public bbx.m
+public baj.* #FD:RenderBlocks/*
+public baj.*() #MD:RenderBlocks/*
+#RenderPlayer
+public-f bbw.h #FD:RenderPlayer/field_77110_j #armorlist
+#RenderBiped
+public-f bbk.k #FD:RenderBiped/field_82424_k #armorlist
+#StringTranslate
+public bm.b #FD:StringTranslate/field_74815_b
+public bm.d #FD:StringTranslate/field_74813_d
+# TileEntityRenderer
+public bde.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
-public vp.a(Ltu;[Ljava/lang/Object;)V
-public vp.b(Ltu;[Ljava/lang/Object;)V
-# WeightedRandomItem - make the "probability" public
-public kf.a
-# ItemStack - make itemId final
-#public+f tu.c
-# StatBase - Make statName public, no server side getter
-public jb.a
-# NetLoginHandler make the "complete connection" callback public so I can reset it during FML negotiation
-public ij.a(Lij;Z)Z
-# NetLoginHandler userName field
-public ij.h
+public wh.a(Lum;[Ljava/lang/Object;)V #MD:CraftingManager/func_77595_a
+public wh.b(Lum;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
+# WeightedRandomItem
+public ku.a #FD:WeightedRandomItem/field_76292_a #probability
+# ItemStack
+#public+f tv.c #FD:ItemStack/field_77993_c #itemId
+# StatBase
+public jk.a #FD:StatBase/field_75978_a #statName
+# NetLoginHandler
+public is.a(Lis;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
+public is.h #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public ig.cd()V
-public ig.cu
-# EntityAITaskEntry class -> public
-public mn
-# EntityAITasks taskList
-public mm.a
-# BlockChest isOcelotBlockingChest (a bounding box check actually)
-public ahy.n(Lxd;III)Z
+public ip.cg()V #MD:EntityPlayerMP/func_71117_bO
+public ip.cs #FD:EntityPlayerMP/field_71139_cq
+# EntityAITaskEntry
+public nd #CL:EntityAITaskEntry
+# EntityAITasks
+public nc.a #FD:EntityAITasks/field_75782_a #taskList
+# BlockChest
+public ajd.n(Lxv;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
-public lm.aS # carryoverDamage
-public lm.bn # tasks
-public lm.bF # isJumping
+public mc.aS #FD:EntityLiving/field_70736_aM #carryoverDamage
+public mc.bm #FD:EntityLiving/field_70714_bg #tasks
+public mc.bE #FD:EntityLiving/field_70703_bu #isJumping
 # EntityAIOcelotSit
-protected mz.a(Lxd;III)Z # nearestSittableBlock
-protected mz.f()Z # isblocksittable
+protected np.a(Lxv;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
+protected np.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 og.d # inLove
+public oy.d #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
-public xo.<init>(ILjava/lang/String;)V
-public xo.<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 aep
-# EntityVillager - addbuy and addsell and minmax lists
-public qc.a(Lwv;ILjava/util/Random;F)V
-public qc.b(Lwv;ILjava/util/Random;F)V
-public qc.bO
-public qc.bP
+public afl #CL:ComponentVillage
+# EntityVillager - minmax lists
+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 aul
+public avr #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
-qf 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
-ale 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
-ts 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.19",
+  "mcversion": "1.4.2",
+  "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": []
+}
+]
@@ -257,7 +257,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 +380,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 +419,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,
@@ -477,9 +471,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 +488,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 +564,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 +651,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 +684,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.
@@ -812,7 +803,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 +1098,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 +1167,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 +1219,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 +1453,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.
@@ -1627,6 +1613,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.
@@ -1865,8 +1852,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 +1879,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 +1965,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 +1997,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,
@@ -2171,13 +2159,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 +2312,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 +2712,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
@@ -3141,8 +3128,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 +3138,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 +3153,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 +3219,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 +3290,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 +3300,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,7 +3313,7 @@ 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_77491_c,timeLastSeen,2,Last time this LanServer was seen.
 field_77494_b,entityLiving,2,Used as parameter to calculate the (magic) extra damage based on enchantments of current equipped player item.
@@ -3565,12 +3550,8 @@ 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_77895_b,blockNames,2,
 field_77896_a,blockRef,2,
 field_77918_f,speckledMelonEffect,2,
@@ -3655,6 +3636,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 +4083,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 +4160,206 @@ 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_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_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_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_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,potatoe,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_82575_g,dayTime,2,Total time for this world.
+field_82577_x,theGameRules,2,
+field_82578_b,NBTTypes,2,
+field_82584_b,theNBTTagCompound,2,
+field_82587_b,theNBTTagCompound,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_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,potatoe,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,
@@ -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  = 32a654388b54d3e4bb29c1a46e7d6a12
-MD5Server  = 99f84541e184979c5b0312e9afc56ce1
+MD5Client  = 9cc3295931edb6339f22989fe1b612a6
+MD5Server  = 21b673f18d20cf7682b77fa8df6c195c

 [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           = 85000
+ParamIndex        = 6800

 [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)
@@ -124,7 +125,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 +236,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 +269,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.
@@ -395,7 +394,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 +441,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.
@@ -483,12 +481,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 +498,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 +505,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
@@ -737,7 +731,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 +746,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,
@@ -894,7 +884,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 +1003,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 +1098,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.
@@ -1481,7 +1466,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 +1480,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 +1495,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 +1544,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
@@ -1809,16 +1790,12 @@ func_74016_g,initGuiControls,2,Populate the GuiScreen controlList
 func_74019_f,getButtonDelete,2,Return buttonDelete GuiButton
 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 +1849,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 +2231,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 +2254,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.
@@ -2299,7 +2271,6 @@ 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_75366_f,findPossibleShelter,2,
 func_75382_a,hasPlayerGotBoneInHand,2,Gets if the Player has the Bone in the hand.
@@ -2705,7 +2676,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 +2696,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,
@@ -2994,7 +2964,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 +2991,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 +3025,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 +3052,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 +3089,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 +3137,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,
@@ -3256,7 +3221,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 +3300,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 +3344,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.
@@ -3715,7 +3679,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 +3690,192 @@ 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_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_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_82160_b,dropEquipment,2,Drop the equipment for this entity.
+func_82163_bD,initCreature,2,Initialize this creature.
+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,setVillager,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_82240_a,displayGUIBeacon,2,Displays the GUI for interacting with a beacon.
+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_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_82274_h,getRenderItem,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_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_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_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_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_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_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_82650_c,getFlatLayers,2,Return the list of layers on this preset.
+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_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_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_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_82736_K,getGameRules,2,Gets the GameRules instance
+func_82737_E,getTotalWorldTime,2,
+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_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_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_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_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_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_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"
@@ -41,10 +41,6 @@ p_70038_1_,par1,2
 p_70038_3_,par3,2
 p_70038_5_,par5,2
 p_70039_1_,par1NBTTagCompound,2
-p_70041_1_,par1,2
-p_70041_2_,par2,2
-p_70041_3_,par3,2
-p_70041_4_,par4,2
 p_70048_1_,par1,2
 p_70048_3_,par3,2
 p_70048_5_,par5,2
@@ -132,11 +128,6 @@ p_70227_1_,par1MovingObjectPosition,2
 p_70239_1_,par1,2
 p_70240_1_,par1,2
 p_70243_1_,par1,2
-p_70244_1_,par1,2
-p_70244_3_,par3,2
-p_70244_5_,par5,2
-p_70244_7_,par7,2
-p_70244_8_,par8,2
 p_70265_1_,par1,2
 p_70266_1_,par1,2
 p_70269_1_,par1,2
@@ -883,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
@@ -1381,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
@@ -2010,7 +1988,6 @@ p_72874_1_,par1,2
 p_72874_2_,par2,2
 p_72875_1_,par1AxisAlignedBB,2
 p_72875_2_,par2Material,2
-p_72876_10_,par10,2
 p_72876_1_,par1Entity,2
 p_72876_2_,par2,2
 p_72876_4_,par4,2
@@ -5223,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
@@ -5840,11 +5813,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
@@ -6722,13 +6690,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
@@ -7056,6 +7017,153 @@ p_82869_1_,par1EntityPlayer,2
 p_82870_1_,par1EntityPlayer,2
 p_82870_2_,par2ItemStack,2
 p_82877_1_,par1,2
+p_83011_1_,par1World,2
+p_83011_2_,par2,2
+p_83011_3_,par3,2
+p_83011_4_,par4,2
+p_83011_5_,par5,2
+p_83018_1_,par1Block,2
+p_83019_11_,par11,2
+p_83019_1_,par1,2
+p_83019_3_,par3,2
+p_83019_5_,par5,2
+p_83019_7_,par7,2
+p_83019_9_,par9,2
+p_83020_11_,par11,2
+p_83020_1_,par1,2
+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_85147_1_,par1EntityAnimal,2
+p_85147_2_,par2EntityAnimal,2
+p_85147_3_,par3EntityAnimal,2
+p_85148_1_,par1EntityAnimal,2
+p_85149_1_,par1EntityAnimal,2
+p_85149_2_,par2EntityAnimal,2
+p_85156_1_,par1EntityAIBase,2
+p_85172_1_,par1EntityPlayerMP,2
+p_85172_2_,par2Chunk,2
+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_accept_1_,par1File,2
 p_accept_2_,par2Str,2
 p_actionPerformed_1_,par1ActionEvent,2
@@ -7101,7 +7209,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
@@ -8022,7 +8129,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
@@ -8796,7 +8902,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
@@ -9864,6 +9969,55 @@ p_i5109_1_,par1Vec3Pool,2
 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_i6812_1_,par1EntityAIBreedSheep,2
+p_i6813_1_,par1EntityAnimal,2
+p_i6813_2_,par2,2
+p_i6814_1_,par1World,2
+p_i6814_2_,par2,2
+p_i6815_1_,par1Teleporter,2
+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_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	Thu Nov 01 23:59:08 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java	Fri Nov 02 00:00:40 2012
+@@ -543,9 +543,8 @@
          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 @@
+@@ -563,7 +562,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 @@
+@@ -581,8 +579,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	Thu Nov 01 23:59:09 2012
+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 02 00:06:57 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	Thu Nov 01 23:59:09 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java	Fri Nov 02 00:00:40 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	Thu Nov 01 23:59:09 2012
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 02 00:00:40 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	Thu Nov 01 23:59:09 2012
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Fri Nov 02 00:00:40 2012
+@@ -202,7 +202,7 @@
       System.exit(0);
    }
 
@@ -78,8 +99,8 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
       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
+--- minecraft\net\minecraft\src\EnumFacing.java	Thu Nov 01 23:59:10 2012
+++ minecraft_patched\net\minecraft\src\EnumFacing.java	Fri Nov 02 00:00:40 2012
@@ -15,10 +15,6 @@
    private final int field_82612_k;
    private static final EnumFacing[] field_82609_l = new EnumFacing[6];
@@ -100,30 +121,9 @@ diff -r -U 3 minecraft\net\minecraft\src\EnumFacing.java minecraft_patched\net\m
       int var1 = var0.length;
 
       for(int var2 = 0; var2 < var1; ++var2) {
-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) {
-         case 32:
-            var6 = var5;
-          case 167:
-             if(var5 < var3 - 1) {
-                ++var5;
-@@ -728,6 +726,8 @@
-                }
-             }
-             break;
-+         case 32:
-+             var6 = var5;
-          default:
-             var4 += this.func_78263_a(var8);
-             if(var7) {
 diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
--- minecraft\net\minecraft\src\IntegratedServer.java	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	Thu Nov 01 23:59:10 2012
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Fri Nov 02 00:00:40 2012
@@ -98,7 +98,7 @@
       return true;
    }
@@ -134,9 +134,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	Thu Nov 01 23:59:11 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Fri Nov 02 00:00:40 2012
+@@ -1457,7 +1457,7 @@
          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 +146,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	Thu Nov 01 23:59:12 2012
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Fri Nov 02 00:00:40 2012
@@ -11,6 +11,7 @@
       this.field_74504_a = p_i3285_1_;
    }
@@ -157,8 +157,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	Thu Nov 01 23:59:12 2012
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 02 00:00:40 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 02 00:00:17 2012
+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Fri Nov 02 00:07:35 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 02 00:00:18 2012
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Fri Nov 02 00:00:47 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 02 00:00:18 2012
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Fri Nov 02 00:00:47 2012
+@@ -203,7 +203,7 @@
       System.exit(0);
    }
 
@@ -25,8 +46,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
       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
+--- minecraft_server\net\minecraft\src\EnumFacing.java	Fri Nov 02 00:00:18 2012
+++ minecraft_server_patched\net\minecraft\src\EnumFacing.java	Fri Nov 02 00:00:47 2012
@@ -15,10 +15,6 @@
    private final int field_82612_k;
    private static final EnumFacing[] field_82609_l = new EnumFacing[6];
@@ -48,8 +69,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\EnumFacing.java minecraft_server
 
       for(int var2 = 0; var2 < var1; ++var2) {
 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 02 00:00:19 2012
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Fri Nov 02 00:00:47 2012
@@ -11,6 +11,7 @@
       this.field_74504_a = p_i3285_1_;
    }
@@ -59,8 +80,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 02 00:00:19 2012
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Fri Nov 02 00:00:47 2012
@@ -20,7 +20,8 @@
    }
 
@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.17
-ClientVersion = 1.4
-ServerVersion = 1.4
+MCPVersion = 7.20
+ClientVersion = 1.4.3
+ServerVersion = 1.4.3
@@ -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()
@@ -61,8 +61,8 @@ def pre_decompile(mcp_dir, fml_dir):
    with open(server_jar, 'rb') as fh:
        md5_s = md5(fh.read()).hexdigest()
        
-    clean_c = "32a654388b54d3e4bb29c1a46e7d6a12"
-    clean_s = "99f84541e184979c5b0312e9afc56ce1"
+    clean_c = "9cc3295931edb6339f22989fe1b612a6"
+    clean_s = "21b673f18d20cf7682b77fa8df6c195c"
    
    if not md5_c == clean_c:
        print 'Warning, Modified Client jar detected'
@@ -323,7 +323,7 @@ def merge_client_server(mcp_dir):
        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']
+    special_cases = ['GuiStatsComponent.java', 'HttpUtilRunnable.java', 'PlayerUsageSnooper.java', 'RConThreadClient.java', 'World.java']
        
    for path, _, filelist in os.walk(client, followlinks=True):
        for cur_file in filelist:
@@ -386,9 +386,9 @@ def finish_setup_fml(fml_dir, mcp_dir):
    from runtime.updatemcp import updatemcp
    
    os.chdir(mcp_dir)
-    updatenames(None, True)
+    updatenames(None, True, False, False)
    reset_logger()
-    updatemd5(None, True)
+    updatemd5(None, True, False, False)
    reset_logger()
    os.chdir(fml_dir)

@@ -585,7 +585,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 7.20 and try again'
        print ex
        sys.exit(1)
    
@@ -693,6 +693,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]):
@@ -1,20 +1,20 @@
->ot
->iy
->xc
->wz
->ang
->anl
->jm
->ue
->agy
->jn
-<fn
-<hl
-<hm
-<hn
-<ho
-<hp
-<hq
-<hr
-<hs
-<ht
+>pl #net/minecraft/src/IBossDisplayData
+>jh #net/minecraft/src/IStatStringFormat
+>xu #net/minecraft/src/ColorizerGrass
+>xr #net/minecraft/src/ColorizerFoliage
+>aom #org/bouncycastle/crypto/CipherKeyGenerator
+>aor #org/bouncycastle/crypto/KeyGenerationParameters
+>jv #net/minecraft/src/HttpUtilRunnable
+>uw #net/minecraft/src/EnumRarity
+>aid #net/minecraft/src/SaveFormatComparator
+>jw #net/minecraft/src/IDownloadSuccess
+<fw #net/minecraft/src/ThreadDedicatedServer
+<hu #net/minecraft/src/ServerGUI
+<hv #net/minecraft/src/ServerWindowAdapter
+<hw #net/minecraft/src/ServerGuiCommandListener
+<hx #net/minecraft/src/ServerGuiFocusAdapter
+<hy #net/minecraft/src/PlayerListBox
+<hz #net/minecraft/src/GuiStatsComponent
+<ia #net/minecraft/src/GuiStatsListener
+<ib #net/minecraft/src/GuiLogOutputHandler
+<ic #net/minecraft/src/GuiLogFormatter
@@ -10,7 +10,7 @@
 import net.minecraft.src.AnvilSaveConverter;
 import net.minecraft.src.AxisAlignedBB;
 import net.minecraft.src.BehaviorArrowDispense;
-@@ -385,7 +388,10 @@
+@@ -384,7 +387,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 @@
+@@ -423,6 +429,7 @@
 
                     Thread.sleep(1L);
                 }
@@ -29,7 +29,7 @@
             }
             else
             {
-@@ -487,8 +494,10 @@
+@@ -486,8 +493,10 @@
 
     public void func_71217_p()
     {
@@ -40,7 +40,7 @@
         ++this.field_71315_w;
 
         if (this.field_71295_T)
-@@ -534,6 +543,7 @@
+@@ -533,6 +542,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 @@
+@@ -559,6 +569,7 @@
                 }
 
                 this.field_71304_b.func_76320_a("tick");
 +                FMLCommonHandler.instance().onPreWorldTick(var4);
-                 var4.func_72835_b();
-                 var4.func_72939_s();
+                 CrashReport var6;
+ 
+                 try
+@@ -583,6 +594,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 @@
+@@ -1153,6 +1165,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
+ {
+@@ -227,9 +230,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());
+                 }
+             }
+         }
+@@ -242,8 +254,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);
@@ -9,16 +9,3 @@
 import java.util.Random;
 
 public class BlockDispenser extends BlockContainer
-@@ -278,7 +280,11 @@
-     {
-         float var15 = 1.1F;
-         byte var16 = 6;
-
-+        int modDispense = GameRegistry.tryDispense(p_72283_1_, p_72283_4_, p_72283_5_, p_72283_6_, p_72283_7_, p_72283_8_, p_72283_2_, p_72283_3_, p_72283_9_, p_72283_11_, p_72283_13_);
-+        if (modDispense > -1)
-+        {
-+            return modDispense;
-+        }
-         if (p_72283_2_.field_77993_c == Item.field_77704_l.field_77779_bT)
-         {
-             EntityArrow var28 = new EntityArrow(p_72283_1_, p_72283_9_, p_72283_11_, p_72283_13_);
@@ -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;
-@@ -39,6 +40,7 @@
-         this.func_71500_a("Java VM Version", new CallableJavaInfo2(this));
-         this.func_71500_a("Memory", new CallableMemoryInfo(this));
-         this.func_71500_a("JVM Flags", new CallableJVMFlags(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();
         }
@@ -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()
-@@ -1697,4 +1702,9 @@
+@@ -1745,4 +1750,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 @@
+@@ -379,6 +388,13 @@
         if (this.field_73132_a.field_70128_L)
         {
             System.out.println("Fetching addPacket for removed entity");
@@ -0,0 +1,12 @@
+--- ../src-base/common/net/minecraft/src/IBossDisplayData.java
+++ ../src-work/common/net/minecraft/src/IBossDisplayData.java
+@@ -1,9 +1,5 @@
+ package net.minecraft.src;
+ 
+-import cpw.mods.fml.common.Side;
+-import cpw.mods.fml.common.asm.SideOnly;
+-
+-@SideOnly(Side.CLIENT)
+ public interface IBossDisplayData
+ {
+     int func_70667_aM();
@@ -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");
             }
@@ -0,0 +1,54 @@
+--- ../src-base/common/net/minecraft/src/RegionFileCache.java
+++ ../src-work/common/net/minecraft/src/RegionFileCache.java
+@@ -4,8 +4,6 @@
+ import java.io.DataOutputStream;
+ import java.io.File;
+ import java.io.IOException;
+-import java.lang.ref.Reference;
+-import java.lang.ref.SoftReference;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.Map;
+@@ -18,17 +16,11 @@
+     {
+         File var3 = new File(p_76550_0_, "region");
+         File var4 = new File(var3, "r." + (p_76550_1_ >> 5) + "." + (p_76550_2_ >> 5) + ".mca");
+-        Reference var5 = (Reference)field_76553_a.get(var4);
+-        RegionFile var6;
+        RegionFile var6 = (RegionFile) field_76553_a.get(var4);
+ 
+-        if (var5 != null)
+        if (var6 != null)
+         {
+-            var6 = (RegionFile)var5.get();
+-
+-            if (var6 != null)
+-            {
+-                return var6;
+-            }
+            return var6;
+         }
+ 
+         if (!var3.exists())
+@@ -42,7 +34,7 @@
+         }
+ 
+         var6 = new RegionFile(var4);
+-        field_76553_a.put(var4, new SoftReference(var6));
+        field_76553_a.put(var4, var6);
+         return var6;
+     }
+ 
+@@ -52,11 +44,9 @@
+ 
+         while (var0.hasNext())
+         {
+-            Reference var1 = (Reference)var0.next();
+-
+             try
+             {
+-                RegionFile var2 = (RegionFile)var1.get();
+                RegionFile var2 = (RegionFile)var0.next();
+ 
+                 if (var2 != null)
+                 {
@@ -19,7 +19,7 @@
     }
 
     public void func_72364_a(WorldServer[] p_72364_1_)
-@@ -154,6 +159,7 @@
+@@ -148,6 +153,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 @@
+@@ -298,6 +304,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 @@
+@@ -323,6 +330,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,46 @@
+--- ../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
+         {
@@ -1,6 +1,23 @@
 --- ../src-base/common/net/minecraft/src/World.java
 +++ ../src-work/common/net/minecraft/src/World.java
-@@ -3473,7 +3473,7 @@
+@@ -10,6 +10,8 @@
+ import java.util.List;
+ import java.util.Random;
+ import java.util.Set;
+
+import com.google.common.collect.ImmutableList;
+ 
+ public abstract class World implements IBlockAccess
+ {
+@@ -1693,7 +1695,6 @@
+             this.func_72847_b(var2);
+         }
+ 
+-        this.field_72997_g.clear();
+         this.field_72984_F.func_76318_c("regular");
+ 
+         for (var1 = 0; var1 < this.field_72996_f.size(); ++var1)
+@@ -3644,7 +3645,7 @@
     @SideOnly(Side.CLIENT)
     public double func_72919_O()
     {
@@ -8,4 +25,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 var1)
@@ -17,9 +17,9 @@
 
     protected WorldInfo()
     {
-@@ -430,4 +435,24 @@
+@@ -528,4 +533,24 @@
     {
-         return this.field_82577_x;
+         return var0.field_76110_t;
     }
 +
 +    /**
@@ -45,7 +45,7 @@
     }
 
     public String func_77127_a()
-@@ -97,4 +117,69 @@
+@@ -96,4 +116,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 @@
+@@ -119,6 +121,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 @@
+@@ -131,6 +134,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
-@@ -311,7 +320,7 @@
+@@ -313,7 +322,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);
-@@ -356,6 +365,8 @@
+@@ -358,6 +367,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);
-@@ -384,6 +395,7 @@
+@@ -386,6 +397,7 @@
         {
             this.func_71352_k();
         }
@@ -57,7 +57,7 @@
     }
 
     private void func_71357_I() throws LWJGLException
-@@ -742,9 +754,11 @@
+@@ -744,9 +756,11 @@
 
             if (!this.field_71454_w)
             {
@@ -69,7 +69,7 @@
             }
 
             GL11.glFlush();
-@@ -1270,11 +1284,13 @@
+@@ -1272,11 +1286,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");
-@@ -1654,6 +1670,7 @@
+@@ -1698,6 +1714,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();
     }
-@@ -1908,6 +1925,12 @@
+@@ -1952,6 +1969,12 @@
 
     public static void main(String[] p_main_0_)
     {
@@ -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 @@
+@@ -609,6 +610,7 @@
 
     public void func_74303_b()
     {
@@ -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 @@
+@@ -1114,6 +1124,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 @@
+@@ -1223,6 +1238,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 @@
+@@ -1267,4 +1287,20 @@
     {
         return this.field_72555_g;
     }
@@ -1,9 +1,9 @@
 --- ../src-base/minecraft/net/minecraft/src/RenderBlocks.java
 +++ ../src-work/minecraft/net/minecraft/src/RenderBlocks.java
-@@ -134,7 +134,81 @@
-     {
+@@ -184,7 +184,81 @@
         int var5 = p_78612_1_.func_71857_b();
         p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_);
+         this.func_83018_a(p_78612_1_);
 -        return var5 == 0 ? this.func_78570_q(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 31 ? this.func_78581_r(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 4 ? this.func_78621_p(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 13 ? this.func_78584_s(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 1 ? this.func_78620_l(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 19 ? this.func_78603_m(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 23 ? this.func_78566_o(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 6 ? this.func_78614_n(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 2 ? this.func_78572_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 3 ? this.func_78590_h(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 5 ? this.func_78589_i(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 8 ? this.func_78576_j(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 7 ? this.func_78601_u(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 9 ? this.func_78586_a((BlockRail)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 10 ? this.func_78565_t((BlockStairs)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 27 ? this.func_78618_a((BlockDragonEgg)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 11 ? this.func_78582_a((BlockFence)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 32 ? this.func_82779_a((BlockWall)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 12 ? this.func_78594_e(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 29 ? this.func_78577_f(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 30 ? this.func_78619_g(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 14 ? this.func_78574_w(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 15 ? this.func_78610_x(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 16 ? this.func_78593_b(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, false) : (var5 == 17 ? this.func_78608_c(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_, true) : (var5 == 18 ? this.func_78592_a((BlockPane)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 20 ? this.func_78598_k(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 21 ? this.func_78580_a((BlockFenceGate)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 24 ? this.func_78615_a((BlockCauldron)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 33 ? this.func_82780_a((BlockFlowerPot)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 35 ? this.func_82775_a((BlockAnvil)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 25 ? this.func_78585_a((BlockBrewingStand)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 26 ? this.func_78567_v(p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 28 ? this.func_78616_a((BlockCocoa)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : (var5 == 34 ? this.func_82778_a((BlockBeacon)p_78612_1_, p_78612_2_, p_78612_3_, p_78612_4_) : false))))))))))))))))))))))))))))))))));
 +        switch (var5)
 +        {
@@ -83,8 +83,8 @@
     }
 
     public boolean func_78567_v(Block p_78567_1_, int p_78567_2_, int p_78567_3_, int p_78567_4_)
-@@ -6427,6 +6501,10 @@
-                 p_78600_1_.func_71905_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+@@ -6510,6 +6584,10 @@
+                 this.func_83020_a(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D);
                 this.func_78595_a();
             }
 +            else
@@ -94,7 +94,7 @@
         }
         else
         {
-@@ -6484,6 +6562,36 @@
+@@ -6568,6 +6646,36 @@
 
     public static boolean func_78597_b(int p_78597_0_)
     {
@@ -0,0 +1,79 @@
+import os, os.path, sys
+import urllib, zipfile
+import shutil, glob, fnmatch
+import subprocess, logging, re, shlex
+import csv
+
+print(os.getcwd())
+sys.path.append('install')
+from fml import gen_merged_srg
+ctorsigre = re.compile('<init>\((.*)\)')
+ctorparamre = re.compile('(([ZBCSIJFD]|L([\w\/]+);))')
+common = gen_merged_srg('..',None)
+rev_common = {t:{v.split(' ')[0]:k for k, v in m.items()} for t,m in common.items()}
+
+if len(sys.argv) < 1:
+  print('Give me a file to process please')
+  sys.exit(1)
+
+if sys.argv[1]=='mcp_merge.cfg':
+  print('Fixing mcp_merge.cfg')
+  with open('mcp_merge.cfg-new','w') as nf:
+    with open(sys.argv[1]) as f:
+      for line in f:
+        parts = line.split('#')
+        target = parts[1].strip()
+        newpart = parts[0][0]+rev_common['CL:'][target]+" #"+target+'\n'
+	nf.write(newpart)
+  sys.exit(0)
+elif len(sys.argv)==1:
+  with open(sys.argv[1]+'-new','w') as nf:
+    with open(sys.argv[1]) as f:
+      for line in f:
+        parts = line.split('#')
+        if len(parts[1])<4:
+          nf.write(line)
+          continue
+        typ = parts[1][0:3]
+        if not rev_common.has_key(typ):
+          nf.write(line)
+          continue
+        name = parts[1][3:].strip()
+        action = parts[0].split(' ')
+        if name.endswith('/*'):
+          targ = rev_common['CL:']['net/minecraft/src/'+name[:-2]]
+          if typ == 'MD:':
+            wildcard = '.*()'
+          else:
+            wildcard = '.*'
+          newline = action[0]+' '+targ+wildcard+' #'+'#'.join(parts[1:])
+          nf.write(newline)
+        elif name.find('/<init>')>=0:
+          targ = rev_common['CL:']['net/minecraft/src/'+name[:name.find('/<init>')]]
+          args = '<init>('
+          armatch = ctorsigre.search(name).group(1)
+          for bit in ctorparamre.findall(armatch):
+            if len(bit[2])>0 and rev_common['CL:'].has_key(bit[2]):
+              cl = 'L'+rev_common['CL:'][bit[2]]+';'
+            else:
+              cl = bit[1]
+            args+=cl
+          args+=')V'
+          print(line.strip())
+          newline = action[0]+' '+targ+'.'+args+' #'+'#'.join(parts[1:])
+          print(newline.strip())
+          nf.write(newline)
+        else:
+          targ = rev_common[typ]['net/minecraft/src/'+name]
+          newline = action[0]+' '+targ.replace('/','.',1).replace(' ','',1)+' #'+'#'.join(parts[1:])
+          nf.write(newline)
+else:
+  typ = sys.argv[1]
+  name = sys.argv[2]
+  name = name.replace('.','/')
+  if typ.startswith('-'):
+    print(rev_common[typ[1:]][name])
+  else:
+    print(common[typ][name])
+
+
Author	SHA1	Message	Date
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
Christian	6dadc1d889	Fix up references to minecraftDir in obf code	2012-10-23 18:10:06 -04:00
Christian	8a55f68a18	Update FML for Minecraft 1.4.1	2012-10-23 18:00:33 -04:00
LexManos	5645fa5847	First update to 1.4.1, patches need updating.	2012-10-23 14:44:04 -07:00
LexManos	ff0f00f64f	Add some null checks, and throw descriptive exception when SideTransformer prevents a class from loading.	2012-10-23 13:32:02 -07:00
Christian	7a34246dc9	Ship a client only class so the merge works both sides.	2012-10-21 22:50:20 -04:00
Christian	62a6b52487	Fix RenderRegistry render ID - now at 36 Fix SpriteMaps - they're running out fast! Switch to forge if you can! RenderBiped now has an armorlist- so armortypes add to it as well	2012-10-21 12:41:53 -04:00
Christian	b845cde73d	Fix up FML python script for forge	2012-10-21 08:19:36 -04:00
Christian	2c36dfbb34	Update to MCP pre 3. Fixes some weirdnesses with explosions.	2012-10-21 07:11:09 -04:00
Christian	acd880dd2a	Merge branch '1.4'	2012-10-20 18:07:22 -04:00