Update for minecraft 1.5.2

Suggested fix for issue 221

client/cpw/mods/fml/client/CopySubimageTextureHelper.java

@@ -0,0 +1,30 @@
+package cpw.mods.fml.client;
+
+import java.nio.ByteBuffer;
+
+import org.lwjgl.opengl.GL11;
+
+import net.minecraft.client.renderer.texture.Texture;
+import net.minecraft.client.renderer.texture.TextureStitched;
+
+public class CopySubimageTextureHelper extends TextureHelper {
+    @Override
+    public void doTextureCopy(Texture atlas, Texture source, int atlasX, int atlasY)
+    {
+        if (atlas.func_94282_c() == -1)
+        {
+            return;
+        }
+        atlas.func_94277_a(0);
+        ByteBuffer buffer = source.func_94273_h();
+        buffer.position(0);
+        GL11.glTexSubImage2D(GL11.GL_TEXTURE_2D, 0, atlasX, atlasY, source.func_94275_d(), source.func_94276_e(), GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, buffer);
+    }
+
+    @Override
+    public void doTextureUpload(TextureStitched source)
+    {
+        // NO OP for copysubimage
+    }
+
+}

client/cpw/mods/fml/client/FMLClientHandler.java

@@ -528,4 +528,15 @@ public class FMLClientHandler implements IFMLSidedHandler
         // Show error screen
         warnIDMismatch(s, false);
     }
+
+    /**
+     * Is this GUI type open?
+     *
+     * @param gui The type of GUI to test for
+     * @return if a GUI of this type is open
+     */
+    public boolean isGUIOpen(Class<? extends GuiScreen> gui)
+    {
+        return client.field_71462_r != null && client.field_71462_r.getClass().equals(gui);
+    }
 }

client/cpw/mods/fml/client/GuiIdMismatchScreen.java

@@ -5,7 +5,7 @@
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * 
+ *
  * Contributors:
  *     cpw - implementation
  */
@@ -37,13 +37,13 @@ public class GuiIdMismatchScreen extends GuiYesNo {
         field_73942_a = this;
         for (Entry<Integer, ItemData> entry : idDifferences.entriesOnlyOnLeft().entrySet())
         {
-            missingIds.add(String.format("ID %d (ModID: %s, type %s) is missing", entry.getValue().getItemId(), entry.getValue().getModId(), entry.getValue().getItemType()));
+            missingIds.add(String.format("ID %d from Mod %s is missing", entry.getValue().getItemId(), entry.getValue().getModId(), entry.getValue().getItemType()));
         }
         for (Entry<Integer, ValueDifference<ItemData>> entry : idDifferences.entriesDiffering().entrySet())
         {
             ItemData world = entry.getValue().leftValue();
             ItemData game = entry.getValue().rightValue();
-            mismatchedIds.add(String.format("ID %d is mismatched. World: (ModID: %s, type %s, ordinal %d) Game (ModID: %s, type %s, ordinal %d)", world.getItemId(), world.getModId(), world.getItemType(), world.getOrdinal(), game.getModId(), game.getItemType(), game.getOrdinal()));
+            mismatchedIds.add(String.format("ID %d is mismatched between world and game", world.getItemId()));
         }
         this.allowContinue = allowContinue;
     }
@@ -62,33 +62,40 @@ public class GuiIdMismatchScreen extends GuiYesNo {
         {
             field_73887_h.remove(0);
         }
-        int offset = Math.max(85 - missingIds.size() * 10 + mismatchedIds.size() * 30, 10);
-        this.func_73732_a(this.field_73886_k, "Forge Mod Loader has found world ID mismatches", this.field_73880_f / 2, offset, 0xFFFFFF);
-        offset += 10;
+        int offset = Math.max(85 - (missingIds.size() + mismatchedIds.size()) * 10, 30);
+        this.func_73732_a(this.field_73886_k, "Forge Mod Loader has found ID mismatches", this.field_73880_f / 2, 10, 0xFFFFFF);
+        this.func_73732_a(this.field_73886_k, "Complete details are in the log file", this.field_73880_f / 2, 20, 0xFFFFFF);
+        int maxLines = 20;
         for (String s: missingIds) {
             this.func_73732_a(this.field_73886_k, s, this.field_73880_f / 2, offset, 0xEEEEEE);
             offset += 10;
+            maxLines --;
+            if (maxLines < 0) break;
+            if (offset >= this.field_73881_g - 30) break;
         }
-        for (String s: mismatchedIds) {
-            this.func_73732_a(this.field_73886_k, s, this.field_73880_f / 2, offset, 0xEEEEEE);
-            offset += 10;
+        if (maxLines > 0 && offset < this.field_73881_g - 30)
+        {
+            for (String s: mismatchedIds) {
+                this.func_73732_a(this.field_73886_k, s, this.field_73880_f / 2, offset, 0xEEEEEE);
+                offset += 10;
+                maxLines --;
+                if (maxLines < 0) break;
+                if (offset >= this.field_73881_g - 30) break;
+            }
         }
-        offset += 10;
         if (allowContinue)
         {
-            this.func_73732_a(this.field_73886_k, "Do you wish to continue loading?", this.field_73880_f / 2, offset, 0xFFFFFF);
-            offset += 10;
+            this.func_73732_a(this.field_73886_k, "Do you wish to continue loading?", this.field_73880_f / 2, this.field_73881_g - 30, 0xFFFFFF);
         }
         else
         {
-            this.func_73732_a(this.field_73886_k, "You cannot connect to this server", this.field_73880_f / 2, offset, 0xFFFFFF);
-            offset += 10;
+            this.func_73732_a(this.field_73886_k, "You cannot connect to this server", this.field_73880_f / 2, this.field_73881_g - 30, 0xFFFFFF);
         }
         // super.super. Grrr
         for (int var4 = 0; var4 < this.field_73887_h.size(); ++var4)
         {
             GuiButton var5 = (GuiButton)this.field_73887_h.get(var4);
-            var5.field_73743_d = Math.min(offset + 10, this.field_73881_g - 20);
+            var5.field_73743_d = this.field_73881_g - 20;
             if (!allowContinue)
             {
                 var5.field_73746_c = this.field_73880_f / 2 - 75;

client/cpw/mods/fml/client/GuiModsMissing.java

@@ -5,7 +5,7 @@
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * 
+ *
  * Contributors:
  *     cpw - implementation
  */
@@ -15,6 +15,7 @@ package cpw.mods.fml.client;
 import net.minecraft.client.gui.GuiErrorScreen;
 import cpw.mods.fml.common.MissingModsException;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
+import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
 
 public class GuiModsMissing extends GuiErrorScreen
 {
@@ -43,6 +44,15 @@ public class GuiModsMissing extends GuiErrorScreen
         for (ArtifactVersion v : modsMissing.missingMods)
         {
             offset+=10;
+            if (v instanceof DefaultArtifactVersion)
+            {
+                DefaultArtifactVersion dav =  (DefaultArtifactVersion)v;
+                if (dav.getRange() != null && dav.getRange().isUnboundedAbove())
+                {
+                    this.func_73732_a(this.field_73886_k, String.format("%s : minimum version required is %s", v.getLabel(), dav.getRange().getLowerBoundString()), this.field_73880_f / 2, offset, 0xEEEEEE);
+                    continue;
+                }
+            }
             this.func_73732_a(this.field_73886_k, String.format("%s : %s", v.getLabel(), v.getRangeString()), this.field_73880_f / 2, offset, 0xEEEEEE);
         }
         offset+=20;

client/cpw/mods/fml/client/OpenGL43TextureHelper.java

@@ -0,0 +1,29 @@
+package cpw.mods.fml.client;
+
+import org.lwjgl.opengl.GL11;
+
+import net.minecraft.client.renderer.texture.Texture;
+import net.minecraft.client.renderer.texture.TextureStitched;
+
+public class OpenGL43TextureHelper extends TextureHelper {
+
+    public OpenGL43TextureHelper()
+    {
+//        GL43.
+//        glCopyMethod = Class.forName("org.lwjgl.OpenGL")
+    }
+    @Override
+    public void doTextureCopy(Texture atlas, Texture source, int atlasX, int atlasY)
+    {
+//        System.out.printf("Src: %d Targ: %d, Coords %d %d %d %d\n", source.func_94282_c(), atlas.func_94282_c(), atlasX, atlasY, source.func_94275_d(), source.func_94276_e());
+//        GL43.glCopyImageSubData(source.func_94282_c(), GL11.GL_TEXTURE_2D, 0, 0, 0, 0, atlas.func_94282_c(), GL11.GL_TEXTURE_2D, 0, atlasX, atlasY, 0, source.func_94275_d(), source.func_94276_e(), 1);
+//        System.out.printf("Err: %x\n", GL11.glGetError());
+    }
+
+    @Override
+    public void doTextureUpload(TextureStitched source)
+    {
+//        source.createAndUploadTextures();
+    }
+
+}

client/cpw/mods/fml/client/TextureFXManager.java

@@ -20,8 +20,13 @@ import java.util.Map;
 
 import javax.imageio.ImageIO;
 
+import org.lwjgl.opengl.ContextCapabilities;
+import org.lwjgl.opengl.GLContext;
+
 import com.google.common.collect.Maps;
 
+import cpw.mods.fml.common.FMLLog;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderEngine;
 
@@ -34,6 +39,8 @@ public class TextureFXManager
     private Map<Integer,TextureHolder> texturesById = Maps.newHashMap();
     private Map<String, TextureHolder> texturesByName = Maps.newHashMap();
 
+    private TextureHelper helper;
+
     void setClient(Minecraft client)
     {
         this.client = client;
@@ -102,4 +109,35 @@ public class TextureFXManager
     {
         return texturesByName.containsKey(texture) ? new Dimension(texturesByName.get(texture).x, texturesByName.get(texture).y) : new Dimension(1,1);
     }
+
+
+    public TextureHelper getHelper()
+    {
+        if (helper == null)
+        {
+            ContextCapabilities capabilities = GLContext.getCapabilities();
+            boolean has43 = false;
+            try
+            {
+                has43 = capabilities.getClass().getField("GL_ARB_copy_image").getBoolean(capabilities);
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace();
+                // NOOP - LWJGL needs updating
+                FMLLog.info("Forge Mod Loader has detected an older LWJGL version, new advanced texture animation features are disabled");
+            }
+//            if (has43 && Boolean.parseBoolean(System.getProperty("fml.useGL43","true")))
+//            {
+//                FMLLog.info("Using the new OpenGL 4.3 advanced capability for animations");
+//                helper = new OpenGL43TextureHelper();
+//            }
+//            else
+            {
+                FMLLog.info("Not using advanced OpenGL 4.3 advanced capability for animations : OpenGL 4.3 is %s", has43 ? "available" : "not available");
+                helper = new CopySubimageTextureHelper();
+            }
+        }
+        return helper;
+    }
 }

client/cpw/mods/fml/client/TextureHelper.java

@@ -0,0 +1,70 @@
+package cpw.mods.fml.client;
+
+import java.nio.ByteBuffer;
+import java.util.List;
+
+import net.minecraft.client.renderer.texture.Texture;
+import net.minecraft.client.renderer.texture.TextureStitched;
+
+public abstract class TextureHelper {
+
+    /**
+     * Copy the texture from the source to the atlas at the specified position
+     *
+     * This will use the devised GL helper to do either GL-side copy or a subimage upload
+     *
+     * @param atlas The atlas texture we're copying into
+     * @param source The source texture we're copying from (complete)
+     * @param atlasX The X position on the atlas
+     * @param atlasY The Y position on the atlas
+     */
+    public abstract void doTextureCopy(Texture atlas, Texture source, int atlasX, int atlasY);
+
+    /**
+     * Upload the texture to the GPU for GL side copying operations
+     * This may be a no-op depending on the active implementation.
+     *
+     * @param source The texture to upload
+     */
+    public abstract void doTextureUpload(TextureStitched source);
+
+    /**
+     * Rotate the texture so that it doesn't need a rotational transform applied each tick
+     *
+     * @param texture The texture to rotate
+     * @param buffer The buffer for the texture
+     */
+    public void rotateTexture(Texture texture, ByteBuffer buffer)
+    {
+        ByteBuffer bytebuffer = buffer;
+        buffer.position(0);
+        ByteBuffer other = ByteBuffer.allocateDirect(buffer.capacity());
+        other.position(0);
+
+        int texHeight = texture.func_94276_e();
+        int texWidth = texture.func_94275_d();
+
+        for (int row = 0; row < texHeight; ++row)
+        {
+            int targCol = texHeight - row - 1;
+            int srcRowOffset = row * texWidth;
+
+            for (int col = 0; col < texWidth; ++col)
+            {
+                int targIndex = col * texHeight + targCol;
+                int srcIndex = srcRowOffset + col;
+
+                srcIndex <<=2;
+                targIndex <<=2;
+
+                other.put(targIndex + 0, bytebuffer.get(srcIndex + 0));
+                other.put(targIndex + 1, bytebuffer.get(srcIndex + 1));
+                other.put(targIndex + 2, bytebuffer.get(srcIndex + 2));
+                other.put(targIndex + 3, bytebuffer.get(srcIndex + 3));
+            }
+        }
+        buffer.position(0);
+        buffer.put(other);
+    }
+
+}

client/net/minecraft/src/FMLRenderAccessLibrary.java

@@ -20,6 +20,7 @@ import java.util.logging.Logger;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.RenderEngine;
+import net.minecraft.client.renderer.texture.Texture;
 import net.minecraft.client.texturepacks.ITexturePack;
 import net.minecraft.world.IBlockAccess;
 
@@ -70,4 +71,9 @@ public class FMLRenderAccessLibrary
     {
         return RenderingRegistry.instance().renderItemAsFull3DBlock(modelId);
     }
+
+    public static void doTextureCopy(Texture atlas, Texture source, int targetX, int targetY)
+    {
+        TextureFXManager.instance().getHelper().doTextureCopy(atlas, source, targetX, targetY);        
+    }
 }

client/net/minecraft/src/ModLoader.java

@@ -541,7 +541,7 @@ public class ModLoader
     @SideOnly(CLIENT)
     public static boolean isGUIOpen(Class<? extends GuiScreen> gui)
     {
-        return FMLClientHandler.instance().getClient().field_71462_r != null && FMLClientHandler.instance().getClient().field_71462_r.equals(gui);
+        return FMLClientHandler.instance().isGUIOpen(gui);
     }
 
     /**
@@ -810,14 +810,12 @@ public class ModLoader
     @Deprecated
     public static void serverChat(String text)
     {
-        //TODO
     }
 
     @Deprecated
     @SideOnly(CLIENT)
     public static void serverLogin(NetClientHandler handler, Packet1Login loginPacket)
     {
-        //TODO
     }
 
     public static void serverSendPacket(NetServerHandler handler, Packet packet)

commands.patch

@@ -18,7 +18,70 @@
  
  class Commands(object):
      """Contains the commands and initialisation for a full mcp run"""
-@@ -796,6 +800,8 @@
+@@ -194,6 +198,7 @@
+                 sys.exit(1)
+ 
+         self.checkjava()
++        self.checkscala()
+         self.readcommands(verify, no_patch=no_patch)
+ 
+     def checkcommand(self, name, command, java=False, single_line=False, check_return=True, error=True):
+@@ -230,6 +235,8 @@
+             self.checkcommand('java', '%s -version' % self.cmdjava)
+             self.checkcommand('javac', '%s -version' % self.cmdjavac)
+             self.checkcommand('javac runtime', '%s -J-version' % self.cmdjavac)
++            if self.cmdscalac: self.checkcommand('scalac', '%s -version' % self.cmdscalac)
++            if self.cmdscalac: self.checkcommand('scalac runtime', '%s -J-version' % self.cmdscalac)
+             self.checkcommand('retroguard', '%s --version' % self.retroguard, java=True)
+ 
+         self.exceptor = os.path.normpath(self.config.get('COMMANDS', 'Exceptor'))
+@@ -350,6 +357,8 @@
+         self.cmdfernflower = self.config.get('COMMANDS', 'CmdFernflower', raw=1) % (self.cmdjava, self.fernflower)
+         self.cmdexceptor = self.config.get('COMMANDS', 'CmdExceptor', raw=1) % (self.cmdjava, self.exceptor)
+         self.cmdrecomp = self.config.get('COMMANDS', 'CmdRecomp', raw=1) % self.cmdjavac
++        if self.cmdscalac: self.cmdrecompscalac = self.config.get('COMMANDS', 'CmdRecompScalac', raw=1) % self.cmdscalac
++        else: self.cmdrecompscalac = None
+         self.cmdstartsrv = self.config.get('COMMANDS', 'CmdStartSrv', raw=1) % self.cmdjava
+         self.cmdstartclt = self.config.get('COMMANDS', 'CmdStartClt', raw=1) % self.cmdjava
+ 
+@@ -753,6 +762,36 @@
+         self.cmdjavac = '"%s"' % os.path.join(results[0], 'javac')
+         self.cmdjava = '"%s"' % os.path.join(results[0], 'java')
+ 
++    def checkscala(self):
++        results = []
++        if not results:
++            try:
++				# TODO:  Verify at least version 2.10
++                self.runcmd('scalac -version', quiet=True)
++                results.append('')
++            except (CalledProcessError, OSError):
++				pass
++        if not results: # Stupid windows...
++            try:
++                # TODO:  Verify at least version 2.10
++                self.runcmd('scalac.bat -version', quiet=True)
++                results.append('')
++            except (CalledProcessError, OSError):
++                pass
++        try:
++        	self.runcmd('scala -target:jvm-1.6 -version', quiet=True)
++        	results.append('')
++        except (CalledProcessError, OSError):
++        	self.logger.info('"scala" does not support jvm-1.6 target, it is out of date. Ignoring')
++        	results = []
++        	self.cmdscalac = None
++        else:
++		    if not results:
++		        self.logger.warning('"scalac" is not found on the PATH.  Scala files will not be recompiled')
++		        self.cmdscalac = None
++		    else:
++		        self.cmdscalac = '"%s"' % os.path.join(results[0], 'scalac')
++
+     def checkjars(self, side):
+         jarlk = {CLIENT: self.jarclient, SERVER: self.jarserver}
+         md5jarlk = {CLIENT: self.md5jarclt, SERVER: self.md5jarsrv}
+@@ -798,6 +837,8 @@
          binlk = {CLIENT: self.binclient, SERVER: self.binserver}
          testlk = {CLIENT: self.testclient, SERVER: self.testserver}
  
@@ -27,17 +90,56 @@
          if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
              return False
          return True
-@@ -1037,6 +1043,9 @@
+@@ -1038,6 +1079,9 @@
+         pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
          pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
          pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
- 
++        
 +        if side == SERVER: #Warn about server because FML recombines it into client
 +            self.logger.info('Server side recompiling might be skipped, this is normal, do not complain to FML/Forge team about server side.')
-+        
+ 
          if not os.path.exists(pathbinlk[side]):
              os.makedirs(pathbinlk[side])
- 
-@@ -1070,7 +1079,7 @@
+@@ -1051,6 +1095,29 @@
+             all_files = True
+             append_pattern = False
+         pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files)
++        if self.cmdrecompscalac: # Compile scala before java as scala scans java files, but not vice-versa
++            pkglistscala = pkglist[:]
++            pkglistscala.extend(filterdirs(pathsrclk[side], '*.scala', append_pattern=append_pattern, all_files=all_files))
++            dirs = ' '.join(pkglistscala)
++            classpath = os.pathsep.join(cplk[side])
++            forkcmd = self.cmdrecompscalac.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], pkgs=dirs)
++            try:
++                self.runcmd(forkcmd, log_file=pathlog[side])
++            except CalledProcessError as ex:
++                self.logger.error('')
++                self.logger.error('== ERRORS FOUND in SCALA CODE ==')
++                self.logger.error('')
++                for line in ex.output.splitlines():
++                    if line.strip():
++                        if line.find("jvm-1.6") != -1:
++                            self.logger.error(' === Your scala version is out of date, update to at least 2.10.0 ===')
++                        if line[0] != '[' and line[0:4] != 'Note':
++                            self.logger.error(line)
++                            if '^' in line:
++                                self.logger.error('')
++                self.logger.error('================================')
++                self.logger.error('')
++                raise
+         dirs = ' '.join(pkglist)
+         classpath = os.pathsep.join(cplk[side])
+         forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
+@@ -1059,7 +1126,7 @@
+             self.runcmd(forkcmd, log_file=pathlog[side])
+         except CalledProcessError as ex:
+             self.logger.error('')
+-            self.logger.error('== ERRORS FOUND ==')
++            self.logger.error('== ERRORS FOUND in JAVA CODE ==')
+             self.logger.error('')
+             for line in ex.output.splitlines():
+                 if line.strip():
+@@ -1072,7 +1139,7 @@
              raise
  
      def startserver(self):
@@ -46,7 +148,7 @@
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          os.chdir(self.dirjars)
-@@ -1078,7 +1087,7 @@
+@@ -1080,7 +1147,7 @@
          self.runmc(forkcmd)
  
      def startclient(self):
@@ -55,7 +157,7 @@
          classpath = [os.path.join('..', p) for p in classpath]
          classpath = os.pathsep.join(classpath)
          natives = os.path.join('..', self.dirnatives)
-@@ -1205,20 +1214,20 @@
+@@ -1207,20 +1274,20 @@
          with open(self.csvmethods, 'rb') as fh:
              methodsreader = csv.DictReader(fh)
              for row in methodsreader:
@@ -79,7 +181,7 @@
                          names['params'][row['param']] = row['name']
  
          regexps = {
-@@ -1352,13 +1361,13 @@
+@@ -1354,13 +1421,13 @@
          methods = {}
          for row in methodsreader:
              #HINT: Only include methods that have a non-empty description
@@ -95,7 +197,7 @@
                  fields[row['searge']] = row['desc'].replace('*/', '* /')
  
          regexps = {
-@@ -1435,7 +1444,7 @@
+@@ -1437,7 +1504,7 @@
          self.runcmd(forkcmd)
          return True
  
@@ -104,7 +206,7 @@
          if not reobf:
              md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
          else:
-@@ -1450,6 +1459,9 @@
+@@ -1452,6 +1519,9 @@
                      class_path = ''
                  else:
                      class_path += '/'
@@ -114,7 +216,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))
-@@ -1546,6 +1558,8 @@
+@@ -1548,6 +1618,8 @@
          if not os.path.exists(outpathlk[side]):
              os.makedirs(outpathlk[side])
  
@@ -123,7 +225,7 @@
          # HINT: We extract the modified class files
          with closing(zipfile.ZipFile(jarlk[side])) as zipjar:
              for in_class in trgclasses:
-@@ -1559,6 +1573,23 @@
+@@ -1561,6 +1633,23 @@
                      out_class = out_class.replace(self.nullpkg, '')
                      if out_class[0] == '/':
                          out_class = out_class[1:]
@@ -147,7 +249,7 @@
                  try:
                      zipjar.extract(out_class, outpathlk[side])
                      self.logger.info('> Outputted %s to %s as %s', in_class.ljust(35), outpathlk[side], out_class)
-@@ -1605,6 +1636,9 @@
+@@ -1607,6 +1696,9 @@
                  sys.exit(1)
  
          for entry in newfiles:
@@ -157,7 +259,7 @@
              if entry[3] == 'U':
                  self.logger.info('Retrieving file from server : %s', entry[0])
                  cur_file = os.path.normpath(entry[0])
-@@ -1625,6 +1659,9 @@
+@@ -1627,6 +1719,9 @@
          md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
          outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
          src = {CLIENT: self.srcclient, SERVER: self.srcserver}

common/cpw/mods/fml/common/FMLCommonHandler.java

@@ -5,7 +5,7 @@
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * 
+ *
  * Contributors:
  *     cpw - implementation
  */
@@ -38,6 +38,7 @@ import net.minecraft.world.World;
 import net.minecraft.world.storage.SaveHandler;
 import net.minecraft.world.storage.WorldInfo;
 
+import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
@@ -244,12 +245,9 @@ public class FMLCommonHandler
             {
             	brd.addAll(sidedDelegate.getAdditionalBrandingInformation());
             }
-            try {
-                Properties props=new Properties();
-                props.load(getClass().getClassLoader().getResourceAsStream("fmlbranding.properties"));
-                brd.add(props.getProperty("fmlbranding"));
-            } catch (Exception ex) {
-                // Ignore - no branding file found
+            if (Loader.instance().getFMLBrandingProperties().containsKey("fmlbranding"))
+            {
+                brd.add(Loader.instance().getFMLBrandingProperties().get("fmlbranding"));
             }
             int tModCount = Loader.instance().getModList().size();
             int aModCount = Loader.instance().getActiveModList().size();
@@ -469,4 +467,20 @@ public class FMLCommonHandler
     {
         Loader.instance().serverStopped();
     }
+
+    public String getModName()
+    {
+        List<String> modNames = Lists.newArrayListWithExpectedSize(3);
+        modNames.add("fml");
+        if (!noForge)
+        {
+            modNames.add("forge");
+        }
+
+        if (Loader.instance().getFMLBrandingProperties().containsKey("snooperbranding"))
+        {
+            modNames.add(Loader.instance().getFMLBrandingProperties().get("snooperbranding"));
+        }
+        return Joiner.on(',').join(modNames);
+    }
 }

common/cpw/mods/fml/common/FMLModContainer.java

@@ -108,34 +108,13 @@ public class FMLModContainer implements ModContainer
     private String modLanguage;
     private ILanguageAdapter languageAdapter;
 
-    public static interface ILanguageAdapter {
-        public Object getNewInstance(FMLModContainer container, Class<?> objectClass, ClassLoader classLoader) throws Exception;
-    }
-
-    public static class ScalaAdapter implements ILanguageAdapter {
-        @Override
-        public Object getNewInstance(FMLModContainer container, Class<?> scalaObjectClass, ClassLoader classLoader) throws Exception
-        {
-            System.out.println("Scala class : "+ scalaObjectClass);
-            Class<?> sObjectClass = Class.forName(scalaObjectClass.getName()+"$",true,classLoader);
-            return sObjectClass.getField("MODULE$").get(null);
-        }
-    }
-
-    public static class JavaAdapter implements ILanguageAdapter {
-        @Override
-        public Object getNewInstance(FMLModContainer container, Class<?> objectClass, ClassLoader classLoader) throws Exception
-        {
-            return objectClass.newInstance();
-        }
-    }
     public FMLModContainer(String className, File modSource, Map<String,Object> modDescriptor)
     {
         this.className = className;
         this.source = modSource;
         this.descriptor = modDescriptor;
         this.modLanguage = (String) modDescriptor.get("modLanguage");
-        this.languageAdapter = "scala".equals(modLanguage) ? new ScalaAdapter() : new JavaAdapter();
+        this.languageAdapter = "scala".equals(modLanguage) ? new ILanguageAdapter.ScalaAdapter() : new ILanguageAdapter.JavaAdapter();
     }
 
     private ILanguageAdapter getLanguageAdapter()
@@ -489,7 +468,7 @@ public class FMLModContainer implements ModContainer
             {
                 eventBus.post(new FMLFingerprintViolationEvent(source.isDirectory(), source, ImmutableSet.copyOf(this.sourceFingerprints), expectedFingerprint));
             }
-            ProxyInjector.inject(this, event.getASMHarvestedData(), FMLCommonHandler.instance().getSide());
+            ProxyInjector.inject(this, event.getASMHarvestedData(), FMLCommonHandler.instance().getSide(), getLanguageAdapter());
             processFieldAnnotations(event.getASMHarvestedData());
         }
         catch (Throwable e)
@@ -560,4 +539,10 @@ public class FMLModContainer implements ModContainer
     {
         return certificate;
     }
+
+    @Override
+    public String toString()
+    {
+        return "FMLMod:"+getModId()+"{"+getVersion()+"}";
+    }
 }

common/cpw/mods/fml/common/ILanguageAdapter.java

@@ -0,0 +1,52 @@
+package cpw.mods.fml.common;
+
+import java.lang.reflect.Field;
+
+public interface ILanguageAdapter {
+    public Object getNewInstance(FMLModContainer container, Class<?> objectClass, ClassLoader classLoader) throws Exception;
+    public boolean supportsStatics();
+    public void setProxy(Field target, Class<?> proxyTarget, Object proxy) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException;
+
+    public static class ScalaAdapter implements ILanguageAdapter {
+        @Override
+        public Object getNewInstance(FMLModContainer container, Class<?> scalaObjectClass, ClassLoader classLoader) throws Exception
+        {
+            Class<?> sObjectClass = Class.forName(scalaObjectClass.getName()+"$",true,classLoader);
+            return sObjectClass.getField("MODULE$").get(null);
+        }
+
+        @Override
+        public boolean supportsStatics()
+        {
+            return false;
+        }
+
+        @Override
+        public void setProxy(Field target, Class<?> proxyTarget, Object proxy) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException, SecurityException
+        {
+            Field field = proxyTarget.getField("INSTANCE");
+            Object scalaObject = field.get(null);
+            target.set(scalaObject, proxy);
+        }
+    }
+    public static class JavaAdapter implements ILanguageAdapter {
+        @Override
+        public Object getNewInstance(FMLModContainer container, Class<?> objectClass, ClassLoader classLoader) throws Exception
+        {
+            return objectClass.newInstance();
+        }
+
+        @Override
+        public boolean supportsStatics()
+        {
+            return true;
+        }
+
+        @Override
+        public void setProxy(Field target, Class<?> proxyTarget, Object proxy) throws IllegalArgumentException, IllegalAccessException, NoSuchFieldException,
+                SecurityException
+        {
+            target.set(null, proxy);
+        }
+    }
+}

common/cpw/mods/fml/common/LoadController.java

@@ -216,7 +216,7 @@ public class LoadController
     {
         for (ModContainer mc : loader.getModList())
         {
-            ret.append("\n\t").append(mc.getModId()).append(" [").append(mc.getName()).append("] (").append(mc.getSource().getName()).append(") ");
+            ret.append("\n\t").append(mc.getModId()).append("{").append(mc.getVersion()).append("} [").append(mc.getName()).append("] (").append(mc.getSource().getName()).append(") ");
             Joiner.on("->"). appendTo(ret, modStates.get(mc.getModId()));
         }
     }

common/cpw/mods/fml/common/Loader.java

@@ -13,6 +13,7 @@
 package cpw.mods.fml.common;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -26,15 +27,20 @@ import java.util.concurrent.Callable;
 import java.util.logging.Level;
 
 import net.minecraft.crash.CallableMinecraftVersion;
+import net.minecraft.item.ItemStack;
 
 import com.google.common.base.CharMatcher;
+import com.google.common.base.Charsets;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
+import com.google.common.base.Joiner.MapJoiner;
 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.ImmutableListMultimap;
+import com.google.common.collect.ImmutableListMultimap.Builder;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.common.collect.Iterables;
@@ -47,7 +53,9 @@ import com.google.common.collect.Multiset.Entry;
 import com.google.common.collect.Multisets;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets.SetView;
+import com.google.common.collect.Table;
 import com.google.common.collect.TreeMultimap;
+import com.google.common.io.Files;
 
 import cpw.mods.fml.common.LoaderState.ModState;
 import cpw.mods.fml.common.discovery.ModDiscoverer;
@@ -144,6 +152,7 @@ public class Loader
     private static File minecraftDir;
     private static List<String> injectedContainers;
     private File loggingProperties;
+    private ImmutableMap<String, String> fmlBrandingProperties;
 
     public static Loader instance()
     {
@@ -686,6 +695,8 @@ public class Loader
         modController.distributeStateMessage(LoaderState.POSTINITIALIZATION);
         modController.transition(LoaderState.AVAILABLE);
         modController.distributeStateMessage(LoaderState.AVAILABLE);
+        // Dump the custom registry data map, if necessary
+        GameData.dumpRegistry(minecraftDir);
         FMLLog.info("Forge Mod Loader has successfully loaded %d mod%s", mods.size(), mods.size()==1 ? "" : "s");
     }
 
@@ -810,4 +821,22 @@ public class Loader
         }
         return true;
     }
+
+    public Map<String,String> getFMLBrandingProperties()
+    {
+        if (fmlBrandingProperties == null)
+        {
+            Properties loaded = new Properties();
+            try
+            {
+                loaded.load(getClass().getClassLoader().getResourceAsStream("fmlbranding.properties"));
+            }
+            catch (Exception e)
+            {
+                // File not found - ignore
+            }
+            fmlBrandingProperties = Maps.fromProperties(loaded);
+        }
+        return fmlBrandingProperties;
+    }
 }

common/cpw/mods/fml/common/ProxyInjector.java

@@ -5,7 +5,7 @@
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * 
+ *
  * Contributors:
  *     cpw - implementation
  */
@@ -27,7 +27,7 @@ import cpw.mods.fml.relauncher.Side;
  */
 public class ProxyInjector
 {
-    public static void inject(ModContainer mod, ASMDataTable data, Side side)
+    public static void inject(ModContainer mod, ASMDataTable data, Side side, ILanguageAdapter languageAdapter)
     {
         FMLLog.fine("Attempting to inject @SidedProxy classes into %s", mod.getModId());
         Set<ASMData> targets = data.getAnnotationsFor(mod).get(SidedProxy.class.getName());
@@ -49,7 +49,7 @@ public class ProxyInjector
                 String targetType = side.isClient() ? target.getAnnotation(SidedProxy.class).clientSide() : target.getAnnotation(SidedProxy.class).serverSide();
                 Object proxy=Class.forName(targetType, true, mcl).newInstance();
 
-                if ((target.getModifiers() & Modifier.STATIC) == 0 )
+                if (languageAdapter.supportsStatics() && (target.getModifiers() & Modifier.STATIC) == 0 )
                 {
                     FMLLog.severe("Attempted to load a proxy type %s into %s.%s, but the field is not static", targetType, targ.getClassName(), targ.getObjectName());
                     throw new LoaderException();
@@ -59,7 +59,7 @@ public class ProxyInjector
                     FMLLog.severe("Attempted to load a proxy type %s into %s.%s, but the types don't match", targetType, targ.getClassName(), targ.getObjectName());
                     throw new LoaderException();
                 }
-                target.set(null, proxy);
+                languageAdapter.setProxy(target, proxyTarget, proxy);
             }
             catch (Exception e)
             {

common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java

@@ -39,6 +39,7 @@ import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -49,6 +50,8 @@ import com.google.common.io.InputSupplier;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
 import cpw.mods.fml.relauncher.RelaunchClassLoader;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldNode;
 
 public class FMLDeobfuscatingRemapper extends Remapper {
     public static final FMLDeobfuscatingRemapper INSTANCE = new FMLDeobfuscatingRemapper();
@@ -125,7 +128,8 @@ public class FMLDeobfuscatingRemapper extends Remapper {
 
     public boolean isRemappedClass(String className)
     {
-        return classNameBiMap.containsKey(className) || mcpNameBiMap.containsKey(className);
+        className = className.replace('.', '/');
+        return classNameBiMap.containsKey(className) || mcpNameBiMap.containsKey(className) || (!classNameBiMap.isEmpty() && className.indexOf('/') == -1);
     }
 
     private void parseField(String[] parts)
@@ -141,7 +145,46 @@ public class FMLDeobfuscatingRemapper extends Remapper {
         {
             rawFieldMaps.put(cl, Maps.<String,String>newHashMap());
         }
-        rawFieldMaps.get(cl).put(oldName, newName);
+        rawFieldMaps.get(cl).put(oldName + ":" + getFieldType(cl, oldName), newName);
+        rawFieldMaps.get(cl).put(oldName + ":null", newName);
+    }
+
+    /*
+     * Cache the field descriptions for classes so we don't repeatedly reload the same data again and again
+     */
+    private Map<String,Map<String,String>> fieldDescriptions = Maps.newHashMap();
+
+    private String getFieldType(String owner, String name)
+    {
+        if (fieldDescriptions.containsKey(owner))
+        {
+            return fieldDescriptions.get(owner).get(name);
+        }
+        synchronized (fieldDescriptions)
+        {
+            try
+            {
+                byte[] classBytes = classLoader.getClassBytes(owner);
+                if (classBytes == null)
+                {
+                    return null;
+                }
+                ClassReader cr = new ClassReader(classBytes);
+                ClassNode classNode = new ClassNode();
+                cr.accept(classNode, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
+                Map<String,String> resMap = Maps.newHashMap();
+                for (FieldNode fieldNode : (List<FieldNode>) classNode.fields) {
+                    resMap.put(fieldNode.name, fieldNode.desc);
+                }
+                fieldDescriptions.put(owner, resMap);
+                return resMap.get(name);
+            }
+            catch (IOException e)
+            {
+                FMLLog.log(Level.SEVERE,e, "A critical exception occured reading a class file %s", owner);
+            }
+            return null;
+        }
     }
 
     private void parseClass(Builder<String, String> builder, String[] parts)
@@ -180,7 +223,7 @@ public class FMLDeobfuscatingRemapper extends Remapper {
             return name;
         }
         Map<String, String> fieldMap = getFieldMap(owner);
-        return fieldMap!=null && fieldMap.containsKey(name) ? fieldMap.get(name) : name;
+        return fieldMap!=null && fieldMap.containsKey(name+":"+desc) ? fieldMap.get(name+":"+desc) : name;
     }
 
     @Override

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

@@ -40,6 +40,7 @@ import com.google.common.eventbus.Subscribe;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.ILanguageAdapter;
 import cpw.mods.fml.common.LoadController;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.LoaderException;
@@ -496,7 +497,7 @@ public class ModLoaderModContainer implements ModContainer
             {
                 dummyHandler.setBaseMod(mod);
             }
-            ProxyInjector.inject(this, event.getASMHarvestedData(), FMLCommonHandler.instance().getSide());
+            ProxyInjector.inject(this, event.getASMHarvestedData(), FMLCommonHandler.instance().getSide(), new ILanguageAdapter.JavaAdapter());
         }
         catch (Exception e)
         {

common/cpw/mods/fml/common/registry/GameData.java

@@ -25,11 +25,17 @@ import java.util.logging.Level;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSand;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
+import com.google.common.base.Charsets;
 import com.google.common.base.Function;
+import com.google.common.base.Joiner;
 import com.google.common.base.Throwables;
+import com.google.common.base.Joiner.MapJoiner;
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableTable;
 import com.google.common.collect.ImmutableTable.Builder;
@@ -40,6 +46,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Table;
 import com.google.common.collect.Table.Cell;
+import com.google.common.io.Files;
 
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
@@ -54,6 +61,7 @@ public class GameData {
     private static boolean shouldContinue = true;
     private static boolean isSaveValid = true;
     private static ImmutableTable<String, String, Integer> modObjectTable;
+    private static Table<String, String, ItemStack> customItemStacks = HashBasedTable.create();
     private static Map<String,String> ignoredMods;
 
     private static boolean isModIgnoredForIdValidation(String modId)
@@ -277,7 +285,7 @@ public class GameData {
     }
     static Item findItem(String modId, String name)
     {
-        if (modObjectTable == null)
+        if (modObjectTable == null || !modObjectTable.contains(modId, name))
         {
             return null;
         }
@@ -293,10 +301,65 @@ public class GameData {
         }
 
         Integer blockId = modObjectTable.get(modId, name);
-        if (blockId >= Block.field_71973_m.length)
+        if (blockId == null || blockId >= Block.field_71973_m.length)
         {
             return null;
         }
         return Block.field_71973_m[blockId];
     }
+
+    static ItemStack findItemStack(String modId, String name)
+    {
+        ItemStack is = customItemStacks.get(modId, name);
+        if (is == null)
+        {
+            Item i = findItem(modId, name);
+            if (i != null)
+            {
+                is = new ItemStack(i, 0 ,0);
+            }
+        }
+        if (is == null)
+        {
+            Block b = findBlock(modId, name);
+            if (b != null)
+            {
+                is = new ItemStack(b, 0, Short.MAX_VALUE);
+            }
+        }
+        return is;
+    }
+
+    static void registerCustomItemStack(String name, ItemStack itemStack)
+    {
+        customItemStacks.put(Loader.instance().activeModContainer().getModId(), name, itemStack);
+    }
+
+    public static void dumpRegistry(File minecraftDir)
+    {
+        if (customItemStacks == null)
+        {
+            return;
+        }
+        if (Boolean.valueOf(System.getProperty("fml.dumpRegistry", "false")).booleanValue())
+        {
+            ImmutableListMultimap.Builder<String, String> builder = ImmutableListMultimap.builder();
+            for (String modId : customItemStacks.rowKeySet())
+            {
+                builder.putAll(modId, customItemStacks.row(modId).keySet());
+            }
+
+            File f = new File(minecraftDir, "itemStackRegistry.csv");
+            MapJoiner mapJoiner = Joiner.on("\n").withKeyValueSeparator(",");
+            try
+            {
+                Files.write(mapJoiner.join(builder.build().entries()), f, Charsets.UTF_8);
+                FMLLog.log(Level.INFO, "Dumped item registry data to %s", f.getAbsolutePath());
+            }
+            catch (IOException e)
+            {
+                FMLLog.log(Level.SEVERE, e, "Failed to write registry data to %s", f.getAbsolutePath());
+            }
+        }
+    }
 }

common/cpw/mods/fml/common/registry/GameRegistry.java

@@ -221,7 +221,7 @@ public class GameRegistry
             }
             catch (NoSuchMethodException e)
             {
-                itemCtor = itemclass.getConstructor(int.class, Block.class);
+                itemCtor = itemclass.getConstructor(int.class, net.minecraft.block.Block.class);
                 i = itemCtor.newInstance(blockItemId, block);
             }
             GameRegistry.registerItem(i,name, modId);
@@ -275,7 +275,7 @@ public class GameRegistry
     public static void registerTileEntityWithAlternatives(Class<? extends TileEntity> tileEntityClass, String id, String... alternatives)
     {
         TileEntity.func_70306_a(tileEntityClass, id);
-        Map<String,Class> teMappings = ObfuscationReflectionHelper.getPrivateValue(TileEntity.class, null, "field_70326_a", "a");
+        Map<String,Class> teMappings = ObfuscationReflectionHelper.getPrivateValue(TileEntity.class, null, "field_" + "70326_a", "field_70326_a", "a");
         for (String s: alternatives)
         {
             if (!teMappings.containsKey(s))
@@ -394,4 +394,40 @@ public class GameRegistry
     {
         return GameData.findItem(modId, name);
     }
+
+	/**
+	 * Manually register a custom item stack with FML for later tracking. It is automatically scoped with the active modid
+	 *
+	 * @param name The name to register it under
+	 * @param itemStack The itemstack to register
+	 */
+	public static void registerCustomItemStack(String name, ItemStack itemStack)
+	{
+	    GameData.registerCustomItemStack(name, itemStack);
+	}
+	/**
+	 * Lookup an itemstack based on mod and name. It will create "default" itemstacks from blocks and items if no
+	 * explicit itemstack is found.
+	 *
+	 * If it is built from a block, the metadata is by default the "wildcard" value.
+	 *
+	 * Custom itemstacks can be dumped from minecraft by setting the system property fml.dumpRegistry to true
+	 * (-Dfml.dumpRegistry=true on the command line will work)
+	 *
+	 * @param modId The modid of the stack owner
+	 * @param name The name of the stack
+	 * @param stackSize The size of the stack returned
+	 * @return The custom itemstack or null if no such itemstack was found
+	 */
+	public static ItemStack findItemStack(String modId, String name, int stackSize)
+	{
+	    ItemStack foundStack = GameData.findItemStack(modId, name);
+	    if (foundStack != null)
+	    {
+            ItemStack is = foundStack.func_77946_l();
+    	    is.field_77994_a = Math.min(stackSize, is.func_77976_d());
+    	    return is;
+	    }
+	    return null;
+	}
 }

common/cpw/mods/fml/common/versioning/DefaultArtifactVersion.java

@@ -5,7 +5,7 @@
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * 
+ *
  * Contributors:
  *     cpw - implementation
  */
@@ -98,4 +98,9 @@ public class DefaultArtifactVersion implements ArtifactVersion
     {
         return label == null ? comparableVersion.toString() : label + ( unbounded ? "" : "@" + range);
     }
+
+    public VersionRange getRange()
+    {
+        return range;
+    }
 }

common/cpw/mods/fml/common/versioning/VersionRange.java

@@ -5,7 +5,7 @@
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * 
+ *
  * Contributors:
  *     cpw - implementation
  */
@@ -549,4 +549,15 @@ public class VersionRange
         hash = 31 * hash + ( restrictions == null ? 0 : restrictions.hashCode() );
         return hash;
     }
+
+    public boolean isUnboundedAbove()
+    {
+        return restrictions.size() == 1 && restrictions.get(0).getUpperBound() == null && !restrictions.get(0).isUpperBoundInclusive();
+    }
+
+    public String getLowerBoundString()
+    {
+        return restrictions.size() == 1 ? restrictions.get(0).getLowerBound().getVersionString() : "";
+    }
+
 }

common/cpw/mods/fml/relauncher/FMLRelaunchLog.java

@@ -113,7 +113,7 @@ public class FMLRelaunchLog
                 // Are we longer than just the line separator?
                 int lastIdx = -1;
                 int idx = currentMessage.indexOf("\n",lastIdx+1);
-                while (idx > 0)
+                while (idx >= 0)
                 {
                     log.log(Level.INFO, currentMessage.substring(lastIdx+1,idx));
                     lastIdx = idx;

common/cpw/mods/fml/relauncher/RelaunchClassLoader.java

@@ -13,8 +13,11 @@
 package cpw.mods.fml.relauncher;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.JarURLConnection;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -61,6 +64,8 @@ public class RelaunchClassLoader extends URLClassLoader
 
     private static final boolean DEBUG_CLASSLOADING = Boolean.parseBoolean(System.getProperty("fml.debugClassLoading", "false"));
     private static final boolean DEBUG_CLASSLOADING_FINER = DEBUG_CLASSLOADING && Boolean.parseBoolean(System.getProperty("fml.debugClassLoadingFiner", "false"));
+    private static final boolean DEBUG_CLASSLOADING_SAVE = DEBUG_CLASSLOADING && Boolean.parseBoolean(System.getProperty("fml.debugClassLoadingSave", "false"));
+    private static File temp_folder = null;
 
     public RelaunchClassLoader(URL[] sources)
     {
@@ -87,6 +92,27 @@ public class RelaunchClassLoader extends URLClassLoader
         addTransformerExclusion("com.google.common.");
         addTransformerExclusion("org.bouncycastle.");
         addTransformerExclusion("cpw.mods.fml.common.asm.transformers.deobf.");
+
+        if (DEBUG_CLASSLOADING_SAVE)
+        {
+            int x = 1;
+            temp_folder = new File(FMLRelaunchLog.minecraftHome, "CLASSLOADER_TEMP");
+            while(temp_folder.exists() && x <= 10)
+            {
+                temp_folder = new File(FMLRelaunchLog.minecraftHome, "CLASSLOADER_TEMP" + x++);
+            }
+            
+            if (temp_folder.exists())
+            {
+                FMLRelaunchLog.info("DEBUG_CLASSLOADING_SAVE enabled,  but 10 temp directories already exist, clean them and try again.");
+                temp_folder = null;
+            }
+            else
+            {
+                FMLRelaunchLog.info("DEBUG_CLASSLOADING_SAVE Enabled, saving all classes to \"%s\"", temp_folder.getAbsolutePath().replace('\\',  '/'));
+                temp_folder.mkdirs();
+            }
+        }
     }
 
     public void registerTransformer(String transformerClassName)
@@ -197,6 +223,7 @@ public class RelaunchClassLoader extends URLClassLoader
             }
             byte[] basicClass = getClassBytes(untransformedName);
             byte[] transformedClass = runTransformers(untransformedName, transformedName, basicClass);
+            saveTransformedClass(transformedClass, transformedName);
             Class<?> cl = defineClass(transformedName, transformedClass, 0, transformedClass.length, (urlConnection == null ? null : new CodeSource(urlConnection.getURL(), signers)));
             cachedClasses.put(transformedName, cl);
             return cl;
@@ -212,6 +239,39 @@ public class RelaunchClassLoader extends URLClassLoader
         }
     }
 
+    private void saveTransformedClass(byte[] data, String transformedName)
+    {
+        if (!DEBUG_CLASSLOADING_SAVE || temp_folder == null)
+        {
+            return;
+        }
+
+        File outFile = new File(temp_folder, transformedName.replace('.', File.separatorChar) + ".class");
+        File outDir = outFile.getParentFile();
+
+        if (!outDir.exists())
+        {
+            outDir.mkdirs();
+        }
+
+        if (outFile.exists())
+        {
+            outFile.delete();
+        }
+
+        try
+        {
+            FMLRelaunchLog.fine("Saving transformed class \"%s\" to \"%s\"", transformedName, outFile.getAbsolutePath().replace('\\',  '/'));
+            OutputStream output = new FileOutputStream(outFile);
+            output.write(data);
+            output.close();
+        }
+        catch(IOException ex)
+        {
+            FMLRelaunchLog.log(Level.WARNING, ex, "Could not save transformed class \"%s\"", transformedName);
+        }
+    }
+
     private String untransformName(String name)
     {
         if (renameTransformer != null)

common/fml_at.cfg

@@ -9,21 +9,21 @@ public mv.c #FD:EntityList/field_75626_c #classToNameMap
 public mv.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
 #public bba.h #FD:RenderEngine/field_78367_h #textureList # -- MISSING MAPPING # -- MISSING MAPPING
-public bgf.g #FD:RenderEngine/field_78366_k #texturePack
+public bge.g #FD:RenderEngine/field_78366_k #texturePack
 # RenderManager
-public bgz.q #FD:RenderManager/field_78729_o #renderers
+public bgy.q #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public bgg.* #FD:RenderBlocks/*
-public bgg.*() #MD:RenderBlocks/*
+public bgf.* #FD:RenderBlocks/*
+public bgf.*() #MD:RenderBlocks/*
 #RenderPlayer
-public-f bhu.h #FD:RenderPlayer/field_77110_j #armorlist
+public-f bht.h #FD:RenderPlayer/field_77110_j #armorlist
 #RenderBiped
-public-f bhh.k #FD:RenderBiped/field_82424_k #armorlist
+public-f bhg.k #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
 public bp.b #FD:StringTranslate/field_74815_b
 public bp.e #FD:StringTranslate/field_74813_d
 # TileEntityRenderer
-public bje.m #FD:TileEntityRenderer/field_76966_m
+public bjd.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
 public yk.a(Lwm;[Ljava/lang/Object;)Lyn; #MD:CraftingManager/func_92103_a
 public yk.b(Lwm;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
@@ -37,7 +37,7 @@ public ka.a #FD:StatBase/field_75978_a #statName
 public jf.a(Ljf;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
 public jf.g #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public jc.cr()V #MD:EntityPlayerMP/func_71117_bO
+public jc.ct()V #MD:EntityPlayerMP/func_71117_bO
 public jc.cu #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
 public oo #CL:EntityAITaskEntry

conf/fields.csv

@@ -1,6 +1,11 @@
 searge,name,side,desc
+field_100000_e,spawnChances,2,Chances for slimes to spawn in swamps for every moon phase.
+field_100001_o,doneBtn,2,"""Done"" button for the GUI."
+field_100002_d,cancelBtn,2,
+field_100003_c,doneBtn,2,
 field_100010_b,iconArray,2,
-field_70009_b,chatBuffer,2,
+field_100013_f,isPotionDurationMax,2,"True if potion effect duration is at maximum, false otherwise."
+field_70009_b,buffer,2,RCon string buffer for log.
 field_70010_a,consoleBuffer,2,only ever used by MinecraftServer.executeCommand
 field_70116_cv,serverPosZ,2,
 field_70117_cu,serverPosY,2,
@@ -137,6 +142,7 @@ field_70272_f,boatZ,2,
 field_70273_g,boatYaw,2,
 field_70274_d,boatX,2,
 field_70275_e,boatY,2,
+field_70276_b,speedMultiplier,2,
 field_70277_c,boatPosRotationIncrements,2,
 field_70278_an,velocityZ,2,
 field_70280_j,velocityY,2,
@@ -257,7 +263,7 @@ field_70546_d,particleAge,2,
 field_70547_e,particleMaxAge,2,
 field_70548_b,particleTextureJitterX,2,
 field_70549_c,particleTextureJitterY,2,
-field_70550_a,particleTextureIndex,2,
+field_70550_a,particleIcon,2,The icon field from which the given particle pulls its texture.
 field_70551_j,particleBlue,2,"The blue amount of color. Used as a percentage, 1.0 = 255 and 0.0 = 0."
 field_70552_h,particleRed,2,"The red amount of color. Used as a percentage, 1.0 = 255 and 0.0 = 0."
 field_70553_i,particleGreen,2,"The green amount of color. Used as a percentage, 1.0 = 255 and 0.0 = 0."
@@ -340,7 +346,7 @@ field_70749_g,lookHelper,2,
 field_70750_az,texture,2,the path for the texture of this entityLiving
 field_70751_d,lastAttackingEntity,2,
 field_70752_e,potionsNeedUpdate,2,Whether the DataWatcher needs to be updated with the active potions
-field_70754_ba,limbSwing,2,Only relevant when legYaw is not 0(the entity is moving). Influences where in its swing legs and arms currently are.
+field_70754_ba,limbSwing,2,Only relevant when limbYaw is not 0(the entity is moving). Influences where in its swing legs and arms currently are.
 field_70755_b,entityLivingToAttack,2,"is only being set, has no uses as of MC 1.1"
 field_70756_c,revengeTimer,2,
 field_70757_a,livingSoundTime,2,Number of ticks since this EntityLiving last produced its sound
@@ -383,8 +389,12 @@ field_70855_f,attackTimer,2,
 field_70856_g,holdRoseTick,2,
 field_70857_d,villageObj,2,
 field_70858_e,homeCheckTimer,2,"deincrements, and a distance-to-home check is done at 0"
+field_70859_f,squidYaw,2,
+field_70860_g,prevSquidYaw,2,
+field_70861_d,squidPitch,2,
+field_70862_e,prevSquidPitch,2,
 field_70863_bz,randomMotionSpeed,2,
-field_70865_by,lastTentacleAngle,2,the last calculated angle of the tentacles in radians
+field_70865_by,prevTentacleAngle,2,the last calculated angle of the tentacles in radians
 field_70866_j,tentacleAngle,2,angle of the tentacles in radians
 field_70869_bD,randomMotionVecY,2,
 field_70870_bE,randomMotionVecZ,2,
@@ -659,17 +669,18 @@ field_71572_b,posY,2,the y coordinate
 field_71573_c,posZ,2,the z coordinate
 field_71574_a,posX,2,
 field_71576_a,theReportedExceptionCrashReport,2,Instance of CrashReport.
-field_71577_f,enderEyeMetaToDirection,2,
-field_71579_d,vineGrowth,2,
-field_71580_e,footInvisibleFaceRemap,2,
+field_71577_f,rotateRight,2,Maps a direction to that to the right of it.
+field_71578_g,rotateLeft,2,Maps a direction to that to the left of it.
+field_71579_d,facingToDirection,2,Maps a Facing value (3D) to a Direction value (2D).
+field_71580_e,rotateOpposite,2,Maps a direction to that opposite of it.
 field_71581_b,offsetZ,2,
-field_71582_c,headInvisibleFace,2,
+field_71582_c,directionToFacing,2,Maps a Direction value (2D) to a Facing value (3D).
 field_71583_a,offsetX,2,
 field_71584_h,bedDirection,2,
 field_71585_d,offsetsZForSide,2,gives the offset required for this axis to get the block at that side.
 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_71588_a,oppositeSide,2,Converts a side to the opposite side. This is the same as XOR'ing it with 1.
 field_71589_f,bc_pbe_sha512,2,
 field_71590_g,bc_pbe_sha224,2,
 field_71591_d,bc_pbe_sha256,2,
@@ -976,7 +987,7 @@ field_72041_aW,blockClay,2,
 field_72042_aI,signWall,2,
 field_72043_aJ,lever,2,
 field_72044_aK,pressurePlateStone,2,
-field_72045_aL,doorSteel,2,
+field_72045_aL,doorIron,2,
 field_72046_aM,pressurePlatePlanks,2,
 field_72047_aN,oreRedstone,2,
 field_72048_aO,oreRedstoneGlowing,2,
@@ -1013,7 +1024,7 @@ field_72079_ak,stoneSingleSlab,2,stoneSingleSlab
 field_72080_bM,redstoneLampActive,2,
 field_72081_al,brick,2,
 field_72082_bJ,whiteStone,2,The rock found in The End.
-field_72083_ai,blockSteel,2,
+field_72083_ai,blockIron,2,
 field_72084_bK,dragonEgg,2,
 field_72085_aj,stoneDoubleSlab,2,stoneDoubleSlab
 field_72086_bP,cocoaPlant,2,
@@ -1175,7 +1186,7 @@ field_72588_q,lastPosZ,2,The last known z position for this connection.
 field_72589_p,lastPosY,2,The last known y position for this connection.
 field_72590_a,loginHandler,2,The login handler that spawned this thread.
 field_72595_f,requestIdAsString,2,The request ID stored as a String
-field_72596_d,requestId,2,A client-provided request ID associated with this query
+field_72596_d,requestId,2,A client-provided request ID associated with this query.
 field_72597_e,challengeValue,2,A unique string of bytes used to verify client auth
 field_72598_b,timestamp,2,The creation timestamp for this auth
 field_72599_c,randomChallenge,2,A random challenge
@@ -1270,7 +1281,7 @@ field_72781_x,glSkyList2,2,OpenGL sky list 2
 field_72782_b,theWorldServer,2,The WorldServer object.
 field_72783_a,mcServer,2,Reference to the MinecraftServer object.
 field_72792_d,entityViewDistance,2,
-field_72793_b,trackedEntities,2,
+field_72793_b,trackedEntities,2,"List of tracked entities, used for iteration operations on tracked entities."
 field_72794_c,trackedEntityIDs,2,
 field_72795_a,theWorld,2,
 field_72814_d,hasExtendedLevels,2,set by !chunk.getAreLevelsEmpty
@@ -1454,7 +1465,7 @@ field_73261_d,locationOfBlockChange,2,
 field_73262_e,numberOfTilesToUpdate,2,
 field_73263_b,playersInChunk,2,
 field_73264_c,chunkLocation,2,note: this is final
-field_73265_a,myManager,2,
+field_73265_a,thePlayerManager,2,
 field_73286_b,clientPacketIdList,2,List of the client's packet IDs.
 field_73287_r,isChunkDataPacket,2,"Only true for Packet51MapChunk, Packet52MultiBlockChange, Packet53BlockChange and Packet59ComplexEntity. Used to separate them into a different send queue."
 field_73288_c,serverPacketIdList,2,List of the server's packet IDs.
@@ -1632,6 +1643,7 @@ field_73513_e,zPosition,2,The player's Z position.
 field_73514_b,name,2,The player's name.
 field_73515_c,xPosition,2,The player's X position.
 field_73516_a,entityId,2,"The entity ID, in this case it's the player ID."
+field_73517_j,metadataWatchableObjects,2,
 field_73518_h,currentItem,2,The current item the player is holding.
 field_73519_i,metadata,2,
 field_73520_f,speedY,2,Not sent if the thrower entity ID is 0. The speed of this fireball along the Y axis.
@@ -1706,11 +1718,14 @@ field_73603_i,temp,2,A temporary storage for the compressed chunk data byte arra
 field_73604_b,targetEntity,2,The entity the player is interacting with
 field_73605_c,isLeftClick,2,Seems to be true when the player is pointing at an entity and left-clicking and false when right-clicking.
 field_73606_a,playerEntityId,2,The entity of the player (ignored by the server)
+field_73610_f,playerVelocityX,2,X velocity of the player being pushed by the explosion
+field_73611_g,playerVelocityY,2,Y velocity of the player being pushed by the explosion
 field_73612_d,explosionSize,2,
 field_73613_e,chunkPositionRecords,2,
 field_73614_b,explosionY,2,
 field_73615_c,explosionZ,2,
 field_73616_a,explosionX,2,
+field_73617_h,playerVelocityZ,2,Z velocity of the player being pushed by the explosion
 field_73618_b,eventType,2,"0: Invalid bed, 1: Rain starts, 2: Rain stops, 3: Game mode changed."
 field_73619_c,gameMode,2,"When reason==3, the game mode to set.  See EnumGameType for a list of values."
 field_73620_a,clientMessage,2,The client prints clientMessage[eventType] to chat when this packet is received.
@@ -2874,6 +2889,7 @@ field_76168_c,capacity,2,the maximum amount of elements in the hash (probably 3/
 field_76169_a,hashArray,2,the array of all elements in the hash
 field_76171_a,texturePacks,2,
 field_76172_a,parent,2,
+field_76173_f,maxFileSize,2,
 field_76174_d,destinationFile,2,
 field_76175_e,downloadSuccess,2,
 field_76176_b,sourceURL,2,
@@ -3292,7 +3308,6 @@ field_77022_g,itemRenderBlocks,2,
 field_77023_b,zLevel,2,Defines the zLevel of rendering of item on GUI.
 field_77024_a,renderWithColor,2,
 field_77025_h,random,2,The RNG used in RenderItem (for bobbing itemstacks on the ground)
-field_77027_a,itemIconIndex,2,"Have the icon index (in items.png) that will be used to render the image. Currently, eggs and snowballs uses this classes."
 field_77045_g,mainModel,2,
 field_77046_h,renderPassModel,2,The model to be used during the render passes.
 field_77050_a,ironGolemModel,2,Iron Golem's Model.
@@ -3532,14 +3547,14 @@ field_77685_T,wheat,2,
 field_77686_W,plateLeather,2,
 field_77687_V,helmetLeather,2,
 field_77688_Q,hoeDiamond,2,
-field_77689_P,hoeSteel,2,
+field_77689_P,hoeIron,2,
 field_77690_S,seeds,2,
 field_77691_R,hoeGold,2,
 field_77692_Y,bootsLeather,2,
 field_77693_X,legsLeather,2,
 field_77694_Z,helmetChain,2,
-field_77695_f,shovelSteel,2,
-field_77696_g,pickaxeSteel,2,
+field_77695_f,shovelIron,2,
+field_77696_g,pickaxeIron,2,
 field_77697_d,itemRand,2,The RNG used by the Item subclasses.
 field_77698_e,itemsList,2,A 32000 elements Item array.
 field_77699_b,maxDamage,2,Maximum damage an item can handle.
@@ -3551,7 +3566,7 @@ field_77704_l,arrow,2,
 field_77705_m,coal,2,
 field_77706_j,appleRed,2,
 field_77707_k,bow,2,
-field_77708_h,axeSteel,2,
+field_77708_h,axeIron,2,
 field_77709_i,flintAndSteel,2,
 field_77710_w,shovelStone,2,
 field_77711_v,swordStone,2,
@@ -3559,7 +3574,7 @@ field_77712_u,axeWood,2,
 field_77713_t,pickaxeWood,2,
 field_77714_s,shovelWood,2,
 field_77715_r,swordWood,2,
-field_77716_q,swordSteel,2,
+field_77716_q,swordIron,2,
 field_77717_p,ingotGold,2,
 field_77718_z,swordDiamond,2,
 field_77719_y,axeStone,2,
@@ -3609,7 +3624,7 @@ field_77762_aN,minecartCrate,2,
 field_77763_aO,minecartPowered,2,
 field_77764_aP,egg,2,
 field_77765_aA,saddle,2,
-field_77766_aB,doorSteel,2,
+field_77766_aB,doorIron,2,
 field_77767_aC,redstone,2,
 field_77768_aD,snowball,2,
 field_77769_aE,boat,2,
@@ -3634,7 +3649,7 @@ field_77787_bX,hasSubtypes,2,"Some items (like dyes) have multiple subtypes on s
 field_77788_aw,bucketEmpty,2,
 field_77789_bW,bFull3D,2,"If true, render the object in full 3D, like weapons and tools."
 field_77790_av,doorWood,2,
-field_77791_bV,iconIndex,2,Icon index in the icons table.
+field_77791_bV,itemIcon,2,Icon index in the icons table.
 field_77792_au,sign,2,
 field_77793_bL,recordChirp,2,
 field_77794_ak,bootsDiamond,2,
@@ -3655,19 +3670,19 @@ field_77808_an,legsGold,2,
 field_77809_bD,expBottle,2,Bottle o' Enchanting. Drops between 1 and 3 experience orbs when thrown.
 field_77810_ac,bootsChain,2,
 field_77811_bE,fireballCharge,2,Fire Charge. When used in a dispenser it fires a fireball similiar to a Ghast's.
-field_77812_ad,helmetSteel,2,
+field_77812_ad,helmetIron,2,
 field_77813_bB,speckledMelon,2,
 field_77814_aa,plateChain,2,
 field_77815_bC,monsterPlacer,2,
 field_77816_ab,legsChain,2,
 field_77817_bH,emerald,2,
-field_77818_ag,bootsSteel,2,
+field_77818_ag,bootsIron,2,
 field_77819_bI,record13,2,
 field_77820_ah,helmetDiamond,2,
 field_77821_bF,writableBook,2,
-field_77822_ae,plateSteel,2,
+field_77822_ae,plateIron,2,
 field_77823_bG,writtenBook,2,
-field_77824_af,legsSteel,2,
+field_77824_af,legsIron,2,
 field_77826_b,toolMaterial,2,
 field_77827_a,weaponDamage,2,
 field_77830_a,spawnID,2,The ID of the block the reed will spawn when used from inventory bar.
@@ -4097,28 +4112,16 @@ field_78634_H,aoLightValueScratchXYPP,2,Used as a scratch variable for ambient o
 field_78635_I,aoLightValueScratchYZPP,2,Used as a scratch variable for ambient occlusion between the top face and the west face.
 field_78636_J,aoLightValueScratchXYZPPP,2,Used as a scratch variable for ambient occlusion on the south/top/west corner.
 field_78637_K,aoLightValueScratchXZNN,2,Used as a scratch variable for ambient occlusion between the north face and the east face.
-field_78638_aI,aoGrassXYZPCP,2,"Grass flag for ambient occlusion on Positive X, Center Y, and Positive Z"
 field_78639_U,aoBrightnessXYZNNP,2,Ambient occlusion brightness XYZNNP
-field_78640_aJ,aoGrassXYZNCP,2,"Grass flag for ambient occlusion on Negative X, Center Y, and Positive Z"
 field_78641_T,aoBrightnessXYNN,2,Ambient occlusion brightness XYNN
-field_78642_aK,aoGrassXYZPCN,2,"Grass flag for ambient occlusion on Positive X, Center Y, and Negative Z"
 field_78643_W,aoBrightnessYZNP,2,Ambient occlusion brightness YZNP
-field_78644_aL,aoGrassXYZCNN,2,"Grass flag for ambient occlusion on Center X, Negative Y, and Negative Z"
 field_78645_V,aoBrightnessYZNN,2,Ambient occlusion brightness YZNN
-field_78646_aM,aoGrassXYZPNC,2,"Grass flag for ambient occlusion on Positive X, Negative Y, and Center Z"
-field_78647_aN,aoGrassXYZNNC,2,"Grass flag for ambient occlusion on Negative X, Negative Y, and center Z"
-field_78648_aO,aoGrassXYZCNP,2,"Grass flag for ambient occlusion on Center X, Negative Y, and Positive Z"
 field_78649_S,aoBrightnessXYZNNN,2,Ambient occlusion brightness XYZNNN
 field_78650_aA,colorBlueBottomLeft,2,Blue color value for the bottom left corner
 field_78651_aB,colorBlueBottomRight,2,Blue color value for the bottom right corner
 field_78652_aC,colorBlueTopRight,2,Blue color value for the top right corner
-field_78653_aD,aoGrassXYZCPN,2,"Grass flag for ambient occlusion on Center X, Positive Y, and Negative Z"
-field_78654_aE,aoGrassXYZPPC,2,"Grass flag for ambient occlusion on Positive X, Positive Y, and Center Z"
 field_78655_Y,aoBrightnessXYPN,2,Ambient occlusion brightness XYPN
-field_78656_aF,aoGrassXYZNPC,2,"Grass flag for ambient occlusion on Negative X, Positive Y, and Center Z"
 field_78657_X,aoBrightnessXYZPNN,2,Ambient occlusion brightness XYZPNN
-field_78658_aG,aoGrassXYZCPP,2,"Grass flag for ambient occlusion on Center X, Positive Y, and Positive Z"
-field_78659_aH,aoGrassXYZNCN,2,"Grass flag for ambient occlusion on Negative X, Center Y, and Negative Z"
 field_78660_Z,aoBrightnessXYZPNP,2,Ambient occlusion brightness XYZPNP
 field_78661_f,renderAllFaces,2,"If true, renders all faces on all blocks rather than using the logic in Block.shouldSideBeRendered.  Unused."
 field_78662_g,uvRotateEast,2,
@@ -4130,9 +4133,7 @@ field_78667_b,fancyGrass,2,Fancy grass side matching biome
 field_78668_c,useInventoryTint,2,
 field_78669_a,blockAccess,2,The IBlockAccess used by this instance of RenderBlocks
 field_78670_at,colorRedBottomRight,2,Red color value for the bottom right corner
-field_78671_n,lightValueOwn,2,Light value of the block itself
 field_78672_as,colorRedBottomLeft,2,Red color value for the bottom left corner
-field_78673_o,aoLightValueXNeg,2,Light value one block less in x axis
 field_78674_ar,colorRedTopLeft,2,Red color value for the top left corner
 field_78675_l,uvRotateBottom,2,
 field_78676_aq,brightnessTopRight,2,Brightness top right
@@ -4152,15 +4153,9 @@ field_78689_v,aoLightValueScratchXYNN,2,Used as a scratch variable for ambient o
 field_78690_ai,aoBrightnessXZNN,2,Ambient occlusion brightness XZNN
 field_78691_u,aoLightValueScratchXYZNNN,2,Used as a scratch variable for ambient occlusion on the north/bottom/east corner.
 field_78692_aj,aoBrightnessXZPN,2,Ambient occlusion brightness XZPN
-field_78693_t,aoLightValueZPos,2,Light value one block more in z axis
 field_78694_ao,brightnessBottomLeft,2,Brightness bottom left
-field_78695_s,aoLightValueYPos,2,Light value one block more in y axis
 field_78696_ap,brightnessBottomRight,2,Brightness bottom right
-field_78697_r,aoLightValueXPos,2,Light value one block more in x axis
-field_78698_am,aoType,2,"Ambient occlusion type (0=simple, 1=complex)"
-field_78699_q,aoLightValueZNeg,2,Light value one block more in z axis
 field_78700_an,brightnessTopLeft,2,Brightness top left
-field_78701_p,aoLightValueYNeg,2,Light value one block more in y axis
 field_78702_ac,aoBrightnessXYZNPP,2,Ambient occlusion brightness XYZNPP
 field_78703_ad,aoBrightnessYZPN,2,Ambient occlusion brightness YZPN
 field_78704_aa,aoBrightnessXYZNPN,2,Ambient occlusion brightness XYZNPN
@@ -4316,6 +4311,8 @@ field_82135_d,isBeaconActive,2,
 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_82151_R,distanceWalkedOnStepModified,2,
+field_82152_aq,teleportDirection,2,
 field_82153_h,timeInPortal,2,
 field_82155_f,isAnvil,2,
 field_82156_g,fallHurtMax,2,Maximum amount of damage dealt to entities hit by falling block
@@ -4329,6 +4326,7 @@ field_82176_d,armorProbability,2,Probability to get armor
 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_82178_c,armorEnchantmentProbability,2,Probability to get enchanted armor
 field_82179_bU,persistenceRequired,2,Whether this entity should NOT despawn.
+field_82180_bT,previousEquipment,2,"The equipment this mob was previously wearing, used for syncing."
 field_82181_as,pickUpLootProability,2,Probability to pick up loot
 field_82182_bS,equipment,2,Equipment (armor and held item) for this entity.
 field_82184_d,aiControlledByPlayer,2,AI task for player control.
@@ -4424,6 +4422,9 @@ 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_82559_a,readSuccessfully,2,"Always 1, unless readByte threw an exception."
+field_82561_f,disableRelativeVolume,2,
+field_82562_a,worldAge,2,World age in ticks.
 field_82564_f,showCape,2,
 field_82575_g,totalTime,2,Total time for this world.
 field_82576_c,generatorOptions,2,
@@ -4512,6 +4513,7 @@ 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_82818_l,goldenCarrotEffect,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_82826_b,statusBarLength,2,
@@ -4580,6 +4582,8 @@ field_85080_a,blockID,2,
 field_85082_a,theSuspiciousClasses,2,
 field_85084_a,theCrashReport,2,
 field_85086_a,theCrashReport,2,
+field_85087_d,lastUpdateTime,2,The worldtime at which this PortalPosition was last verified
+field_85088_e,teleporterInstance,2,The teleporter to which this PortalPosition applies
 field_85098_d,globalRenderer,2,
 field_85109_a,worldInfoInstance,2,
 field_85111_a,worldInfoInstance,2,
@@ -4598,6 +4602,8 @@ field_85168_c,theMapStructureGenerator,2,
 field_85171_a,theDedicatedServer,2,
 field_85180_cf,recordWait,2,
 field_85185_A,touchscreen,2,
+field_85190_d,destinationCoordinateKeys,2,A list of valid keys for the destinationCoordainteCache. These are based on the X & Z of the players initial location.
+field_85191_c,destinationCoordinateCache,2,Stores successful portal placement locations for rapid lookup.
 field_85192_a,worldServerInstance,2,
 field_90017_e,isMacOs,2,
 field_90018_r,isRightMouseClick,2,Used when touchscreen is enabled
@@ -4612,10 +4618,15 @@ field_90051_a,theMinecraft,2,
 field_90053_a,theMinecraft,2,
 field_90055_a,theMinecraft,2,
 field_92014_j,explosionStrength,2,The explosion radius of spawned fireballs.
+field_92016_l,highlightingItemStack,2,The ItemStack that is currently being highlighted
+field_92017_k,remainingHighlightTicks,2,Remaining ticks the item highlight should be visible
 field_92039_az,fireworkExplosions,2,
 field_92055_b,lifetime,2,The lifetime of the firework in ticks. When the age reaches the lifetime the firework explodes.
 field_92056_a,fireworkAge,2,The age of the firework in ticks.
 field_92061_d,isChristmas,2,"If true, chests will be rendered with the Christmas present textures."
+field_92076_h,skyLightSent,2,"Whether or not the chunk data contains a light nibble array. This is true in the main world, false in the end + nether."
+field_92077_h,pitch,2,The pitch in steps of 2p/256
+field_92078_i,yaw,2,The yaw in steps of 2p/256
 field_92086_a,isBlank,2,When isBlank is true the DataWatcher is not watching any objects
 field_92091_k,thorns,2,
 field_92104_bU,firework,2,
@@ -4624,12 +4635,19 @@ field_92106_bV,fireworkCharge,2,
 field_92117_D,heldItemTooltips,2,
 field_92118_B,overrideWidth,2,
 field_92119_C,overrideHeight,2,
+field_94050_c,customName,2,
 field_94054_b,particleTextureIndexX,2,
 field_94055_c,particleTextureIndexY,2,
 field_94084_b,tntPlacedBy,2,
+field_94102_c,entityName,2,
 field_94106_a,minecartTNTFuse,2,
+field_94109_b,pushZ,2,
+field_94110_c,fuel,2,
+field_94111_a,pushX,2,
+field_94112_b,dropContentsWhenDead,2,"When set to true, the minecart will drop all items when setDead() is called. When false (such as when travelling dimensions) it preserves its contents."
 field_94113_a,minecartContainerItems,2,
 field_94123_d,inventoryName,2,The name that is displayed if the hopper was renamed
+field_94124_b,hopperItemStacks,2,
 field_94141_F,destroyBlockIcons,2,
 field_94153_n,boundTexture,2,
 field_94154_l,textureMapBlocks,2,
@@ -4699,8 +4717,8 @@ field_94299_k,textureWrap,2,
 field_94300_h,textureTarget,2,
 field_94301_i,textureMinFilter,2,
 field_94302_r,textureData,2,
-field_94303_q,textureCreated,2,
-field_94304_p,autoCreate,2,
+field_94303_q,textureNotModified,2,False if the texture has been modified since it was last uploaded to the GPU.
+field_94304_p,autoCreate,2,"Uninitialized boolean. If true, the texture is re-uploaded every time it's modified. If false, every tick after it's been modified at least once in that tick."
 field_94313_f,maxHeight,2,
 field_94314_g,forcePowerOf2,2,
 field_94315_d,currentHeight,2,
@@ -4713,7 +4731,7 @@ field_94322_k,atlasTexture,2,
 field_94323_h,maxTileDimension,2,Max size (width or height) of a single tile
 field_94336_cN,blockIcon,2,
 field_94337_cv,railActivator,2,
-field_94338_cu,stairCompactNetherQuartz,2,
+field_94338_cu,stairsNetherQuartz,2,
 field_94339_ct,blockNetherQuartz,2,
 field_94340_cs,hopperBlock,2,
 field_94341_cq,blockRedstone,2,
@@ -4725,6 +4743,8 @@ field_94346_cn,redstoneComparatorIdle,2,
 field_94347_ck,chestTrapped,2,
 field_94348_cl,pressurePlateGold,2,
 field_94349_a,iconArray,2,
+field_94356_a,pressurePlateIconName,2,
+field_94357_a,maxItemsWeighted,2,The maximum number of items the plate weights.
 field_94359_b,theIcon,2,
 field_94362_b,theIcon,2,
 field_94363_a,iconArray,2,
@@ -4733,7 +4753,16 @@ field_94365_a,iconArray,2,
 field_94366_b,iconArray,2,
 field_94367_a,grassTypes,2,
 field_94369_b,theIcon,2,
+field_94371_c,saplingIcon,2,
 field_94372_b,iconArray,2,
+field_94376_b,cauldronTopIcon,2,
+field_94377_c,cauldronBottomIcon,2,
+field_94379_b,cactusBottomIcon,2,
+field_94380_a,cactusTopIcon,2,
+field_94381_b,cakeBottomIcon,2,
+field_94383_a,cakeTopIcon,2,
+field_94384_b,workbenchIconFront,2,
+field_94385_a,workbenchIconTop,2,
 field_94386_b,woodTextureTypes,2,
 field_94387_c,iconArray,2,
 field_94388_cO,tree_top,2,
@@ -4751,19 +4780,49 @@ field_94420_a,quartzBlockTypes,2,
 field_94423_a,theIcon,2,
 field_94425_a,theIcon,2,
 field_94428_c,iconArray,2,
+field_94430_b,breakableBlockIcon,2,
+field_94431_cO,anvilIconNames,2,
 field_94432_cP,iconArray,2,
 field_94433_b,theIcon,2,
 field_94435_b,iconSnowSide,2,
 field_94436_c,iconGrassSideOverlay,2,
 field_94437_a,iconGrassTop,2,
 field_94439_c,iconArray,2,
+field_94443_a,isTrapped,2,Determines whether of not the chest is trapped.
 field_94445_a,iconArray,2,
 field_94447_a,theIcon,2,
 field_94449_b,theIcon,2,
 field_94450_a,theIcon,2,
+field_94454_cO,hopperInsideIcon,2,
+field_94455_b,hopperIcon,2,
+field_94456_c,hopperTopIcon,2,
+field_94458_cO,furnaceIconTop,2,
+field_94459_cP,furnaceIconFront,2,
+field_94462_cO,furnaceFrontIcon,2,
+field_94463_c,furnaceTopIcon,2,
+field_94465_b,doorTypeForIcon,2,Used for pointing at icon names.
 field_94466_c,iconArray,2,
+field_94467_a,doorIconNames,2,
 field_94469_b,iconArray,2,
-field_94582_cb,tntMinecart,2,
+field_94470_a,cocoaIcons,2,
+field_94471_cO,bedTopIcons,2,
+field_94473_c,bedSideIcons,2,
+field_94497_cO,topIcon,2,Top icon of piston depends on (either sticky or normal)
+field_94498_b,innerTopIcon,2,Only visible when piston is extended
+field_94499_c,bottomIcon,2,Bottom side texture
+field_94500_e,useProvidedWindowTitle,2,"If false, the client will look up a string like ""window.minecart"". If true, the client uses what the server provides."
+field_94512_f,isStraightRail,2,
+field_94513_g,railChunkPosition,2,The chunk position the rail is at.
+field_94514_d,railY,2,
+field_94515_e,railZ,2,
+field_94516_b,logicWorld,2,
+field_94517_c,railX,2,
+field_94518_a,theRail,2,
+field_94557_a,selectAnything,2,
+field_94582_cb,minecartTnt,2,
+field_94583_ca,netherQuartz,2,
+field_94584_bZ,netherrackBrick,2,
+field_94585_bY,comparator,2,
 field_94593_a,theIcon,2,
 field_94596_a,theIcon,2,
 field_94598_a,theIcon,2,
@@ -4772,6 +4831,9 @@ field_94601_a,bowPullIconNameArray,2,
 field_94610_a,theTileEntity,2,
 field_94612_a,theTileEntity,2,
 field_96093_i,entityUniqueID,2,
+field_96105_c,commandSenderName,2,"The name of command sender (usually username, but possibly ""Rcon"")"
+field_96106_a,succesCount,2,
+field_96113_a,isBlocked,2,Whether this hopper minecart is being blocked by an activator rail.
 field_96291_i,pointedEntityLiving,2,
 field_96442_D,worldScoreboard,2,
 field_96452_b,flipU,2,
@@ -4784,29 +4846,82 @@ field_96462_b,potionItemStack,2,
 field_96463_c,dispenserPotionBehavior,2,
 field_96464_b,defaultDispenserItemBehavior,2,
 field_96469_cy,dropper,2,
+field_96474_cR,dropperDefaultBehaviour,2,
+field_96480_b,scoreName,2,The unique name for the scoreboard to be displayed.
+field_96481_a,scoreboardPosition,2,"The position of the scoreboard. 0 = list, 1 = sidebar, 2 = belowName."
+field_96482_b,objectiveDisplayName,2,
+field_96483_c,change,2,"0 to create scoreboard, 1 to remove scoreboard, 2 to update display text."
+field_96484_a,objectiveName,2,
+field_96485_d,updateOrRemove,2,0 to create/update an item. 1 to remove an item.
+field_96486_b,scoreName,2,The unique name for the scoreboard to be updated. Only sent when updateOrRemove does not equal 1.
+field_96487_c,value,2,The score to be displayed next to the entry. Only sent when Update/Remove does not equal 1.
+field_96488_a,itemName,2,An unique name to be displayed in the list.
+field_96489_f,mode,2,If 0 then the team is created. If 1 then the team is removed. If 2 the team team information is updated. If 3 then new players are added to the team. If 4 then players are removed from the team.
+field_96491_d,teamSuffix,2,Only if mode = 0 or 2. Displayed after the players' name that are part of this team.
+field_96492_e,playerNames,2,Only if mode = 0 or 3 or 4. Players to be added/remove from the team.
+field_96493_b,teamDisplayName,2,Only if mode = 0 or 2.
+field_96494_c,teamPrefix,2,Only if mode = 0 or 2. Displayed before the players' name that are part of this team.
+field_96495_a,teamName,2,A unique name for the team.
+field_96540_f,teamMemberships,2,Map of usernames to ScorePlayerTeam objects.
+field_96545_a,scoreObjectives,2,Map of objective names to ScoreObjective objects.
 field_96564_a,theEntity,2,
+field_96566_b,selectInventories,2,
 field_96569_b,theEntityTracker,2,
-field_96600_cc,hopperMinecart,2,
+field_96600_cc,minecartHopper,2,
 field_96601_a,theBlock,2,
 field_96602_b,dispenserMinecartBehavior,2,
 field_96633_b,playerInventory,2,
 field_96634_a,theItemStack,2,
 field_96656_b,theScoreboard,2,
+field_96676_c,membershipSet,2,A set of all team member usernames.
+field_96677_a,theScoreboard,2,
+field_96683_d,displayName,2,
+field_96684_b,name,2,
 field_96685_c,objectiveCriteria,2,The ScoreObjectiveCriteria for this objetive
 field_96686_a,theScoreboard,2,
 field_96691_E,chatScale,2,
 field_96692_F,chatWidth,2,
 field_96693_G,chatHeightUnfocused,2,
 field_96694_H,chatHeightFocused,2,
+field_98040_a,mobSpawnerLogic,2,Mob spawner logic for this spawner minecart.
+field_98044_b,transferTicker,2,
+field_98048_c,transferCooldown,2,
 field_98051_e,fallingBlockTileEntityData,2,
 field_98130_m,serverLogAgent,2,
 field_98151_a,theTexture,2,
+field_98181_L,worldLogAgent,2,The log agent for this world.
 field_98189_n,partialRenderBounds,2,
+field_98203_f,offsetY,2,This is added to the Y position after being multiplied by random.nextGaussian()
+field_98204_g,offsetZ,2,This is added to the Z position after being multiplied by random.nextGaussian()
+field_98205_d,posZ,2,Z position of the particle.
+field_98206_e,offsetX,2,This is added to the X position after being multiplied by random.nextGaussian()
+field_98207_b,posX,2,X position of the particle.
+field_98208_c,posY,2,Y position of the particle.
+field_98209_a,particleName,2,The name of the particle to create. A list can be found at https://gist.github.com/thinkofdeath/5110835
+field_98210_h,speed,2,The speed of each particle.
+field_98211_i,quantity,2,The number of particles to create.
+field_98212_g,friendlyFire,2,Only if mode = 0 or 2.
 field_98219_c,entityAvoiderAI,2,
+field_98223_c,minecartName,2,
 field_98226_b,theNetServerHandler,2,
 field_98227_a,thePacket,2,
+field_98239_d,loggerPrefix,2,
+field_98240_b,logFile,2,
+field_98241_c,loggerName,2,
+field_98242_a,serverLogger,2,
 field_98244_b,theNetServerHandler,2,
 field_98245_a,thePacket,2,
+field_98282_f,randomMinecart,2,
+field_98283_g,minSpawnDelay,2,
+field_98285_e,minecartToSpawn,2,List of minecart to spawn.
+field_98286_b,spawnDelay,2,The delay to spawn.
 field_98288_a,mobID,2,
+field_98289_l,activatingRangeFromPlayer,2,The distance from which a player activates the spawner.
+field_98290_m,spawnRange,2,The range coefficient for spawning entities around.
+field_98292_k,maxNearbyEntities,2,
+field_98293_h,maxSpawnDelay,2,
+field_98294_i,spawnCount,2,A counter for spawn tries.
+field_98295_a,mobSpawnerEntity,2,The mob spawner we deal with
+field_98296_a,spawnerMinecart,2,The spawner minecart using this mob spawner logic.
 field_98303_au,AMBIENT_OCCLUSIONS,2,
 field_98307_f,fontTextureName,2,

conf/joined.exc

@@ -167,6 +167,7 @@ net/minecraft/client/Minecraft.func_71404_a(Lnet/minecraft/src/CrashReport;)V=|p
 net/minecraft/client/Minecraft.func_71409_c(Ljava/lang/String;)Z=|p_71409_1_
 net/minecraft/client/Minecraft.main([Ljava/lang/String;)V=|p_main_0_
 net/minecraft/server/MinecraftServer.<init>(Ljava/io/File;)V=|p_i3375_1_
+net/minecraft/server/MinecraftServer.func_104055_i(Z)V=|p_104055_1_
 net/minecraft/server/MinecraftServer.func_70000_a(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_70000_1_
 net/minecraft/server/MinecraftServer.func_70001_b(Lnet/minecraft/src/PlayerUsageSnooper;)V=|p_70001_1_
 net/minecraft/server/MinecraftServer.func_70003_b(ILjava/lang/String;)Z=|p_70003_1_,p_70003_2_
@@ -867,6 +868,7 @@ net/minecraft/src/BlockFurnace.func_71861_g(Lnet/minecraft/src/World;III)V=|p_71
 net/minecraft/src/BlockFurnace.func_71862_a(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71862_1_,p_71862_2_,p_71862_3_,p_71862_4_,p_71862_5_
 net/minecraft/src/BlockFurnace.func_71885_a(ILjava/util/Random;I)I=|p_71885_1_,p_71885_2_,p_71885_3_
 net/minecraft/src/BlockFurnace.func_71903_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z=|p_71903_1_,p_71903_2_,p_71903_3_,p_71903_4_,p_71903_5_,p_71903_6_,p_71903_7_,p_71903_8_,p_71903_9_
+net/minecraft/src/BlockFurnace.func_71922_a(Lnet/minecraft/src/World;III)I=|p_71922_1_,p_71922_2_,p_71922_3_,p_71922_4_
 net/minecraft/src/BlockFurnace.func_72274_a(Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity;=|p_72274_1_
 net/minecraft/src/BlockFurnace.func_72285_l(Lnet/minecraft/src/World;III)V=|p_72285_1_,p_72285_2_,p_72285_3_,p_72285_4_
 net/minecraft/src/BlockFurnace.func_72286_a(ZLnet/minecraft/src/World;III)V=|p_72286_0_,p_72286_1_,p_72286_2_,p_72286_3_,p_72286_4_
@@ -3874,7 +3876,7 @@ net/minecraft/src/GuiCommandBlock.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73
 net/minecraft/src/GuiCommandBlock.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiCommandBlock.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiCommandBlock.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
-net/minecraft/src/GuiConfirmOpenLink.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;I)V=|p_i3102_1_,p_i3102_2_,p_i3102_3_
+net/minecraft/src/GuiConfirmOpenLink.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;IZ)V=|p_i23004_1_,p_i23004_2_,p_i23004_3_,p_i23004_4_
 net/minecraft/src/GuiConfirmOpenLink.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiConfirmOpenLink.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
 net/minecraft/src/GuiConnecting.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/client/Minecraft;Ljava/lang/String;I)V=|p_i11014_1_,p_i11014_2_,p_i11014_3_,p_i11014_4_
@@ -4025,6 +4027,26 @@ net/minecraft/src/GuiLogOutputHandler.<init>(Ljavax/swing/JTextArea;)V=|p_i4102_
 net/minecraft/src/GuiLogOutputHandler.close()V=|
 net/minecraft/src/GuiLogOutputHandler.flush()V=|
 net/minecraft/src/GuiLogOutputHandler.publish(Ljava/util/logging/LogRecord;)V=|p_publish_1_
+net/minecraft/src/GuiMainMenu.func_104004_a(Lnet/minecraft/src/GuiMainMenu;)Ljava/lang/Object;=|p_104004_0_
+net/minecraft/src/GuiMainMenu.func_104005_a(Lnet/minecraft/src/GuiMainMenu;Ljava/lang/String;)Ljava/lang/String;=|p_104005_0_,p_104005_1_
+net/minecraft/src/GuiMainMenu.func_104006_a(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104006_0_,p_104006_1_
+net/minecraft/src/GuiMainMenu.func_104007_d(Lnet/minecraft/src/GuiMainMenu;)Lnet/minecraft/src/FontRenderer;=|p_104007_0_
+net/minecraft/src/GuiMainMenu.func_104008_c(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104008_0_,p_104008_1_
+net/minecraft/src/GuiMainMenu.func_104009_d(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104009_0_,p_104009_1_
+net/minecraft/src/GuiMainMenu.func_98059_a(Z)Z=|p_98059_0_
+net/minecraft/src/GuiMainMenu.func_104011_e(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104011_0_,p_104011_1_
+net/minecraft/src/GuiMainMenu.func_104012_f(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104012_0_,p_104012_1_
+net/minecraft/src/GuiMainMenu.func_104013_b(Lnet/minecraft/src/GuiMainMenu;Ljava/lang/String;)Ljava/lang/String;=|p_104013_0_,p_104013_1_
+net/minecraft/src/GuiMainMenu.func_104014_b(Lnet/minecraft/src/GuiMainMenu;I)I=|p_104014_0_,p_104014_1_
+net/minecraft/src/GuiMainMenu.func_104015_f(Lnet/minecraft/src/GuiMainMenu;)I=|p_104015_0_
+net/minecraft/src/GuiMainMenu.func_104016_e(Lnet/minecraft/src/GuiMainMenu;)I=|p_104016_0_
+net/minecraft/src/GuiMainMenu.func_98058_a(Lnet/minecraft/src/GuiMainMenu;)Lnet/minecraft/client/Minecraft;=|p_98058_0_
+net/minecraft/src/GuiMainMenu.func_104018_h(Lnet/minecraft/src/GuiMainMenu;)I=|p_104018_0_
+net/minecraft/src/GuiMainMenu.func_104019_g(Lnet/minecraft/src/GuiMainMenu;)Ljava/util/List;=|p_104019_0_
+net/minecraft/src/GuiMainMenu.func_104020_i(Lnet/minecraft/src/GuiMainMenu;)I=|p_104020_0_
+net/minecraft/src/GuiMainMenu.func_98061_a(Lnet/minecraft/src/GuiMainMenu;Lnet/minecraft/src/StringTranslate;II)V=|p_98061_0_,p_98061_1_,p_98061_2_,p_98061_3_
+net/minecraft/src/GuiMainMenu.func_104022_c(Lnet/minecraft/src/GuiMainMenu;)Lnet/minecraft/src/FontRenderer;=|p_104022_0_
+net/minecraft/src/GuiMainMenu.func_104023_b(Lnet/minecraft/src/GuiMainMenu;)Ljava/lang/String;=|p_104023_0_
 net/minecraft/src/GuiMainMenu.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiMainMenu.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiMainMenu.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
@@ -4036,10 +4058,7 @@ net/minecraft/src/GuiMainMenu.func_73970_b(IIF)V=|p_73970_1_,p_73970_2_,p_73970_
 net/minecraft/src/GuiMainMenu.func_73971_c(IIF)V=|p_73971_1_,p_73971_2_,p_73971_3_
 net/minecraft/src/GuiMainMenu.func_73972_b(IILnet/minecraft/src/StringTranslate;)V=|p_73972_1_,p_73972_2_,p_73972_3_
 net/minecraft/src/GuiMainMenu.func_96137_a(Lnet/minecraft/src/StringTranslate;II)V=|p_96137_1_,p_96137_2_,p_96137_3_
-net/minecraft/src/GuiMainMenu.func_98058_a(Lnet/minecraft/src/GuiMainMenu;)Lnet/minecraft/client/Minecraft;=|p_98058_0_
-net/minecraft/src/GuiMainMenu.func_98059_a(Z)Z=|p_98059_0_
 net/minecraft/src/GuiMainMenu.func_98060_b(Lnet/minecraft/src/StringTranslate;II)V=|p_98060_1_,p_98060_2_,p_98060_3_
-net/minecraft/src/GuiMainMenu.func_98061_a(Lnet/minecraft/src/GuiMainMenu;Lnet/minecraft/src/StringTranslate;II)V=|p_98061_0_,p_98061_1_,p_98061_2_,p_98061_3_
 net/minecraft/src/GuiMemoryErrorScreen.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiMemoryErrorScreen.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiMemoryErrorScreen.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
@@ -4149,19 +4168,13 @@ net/minecraft/src/GuiScreenConfigureWorld.func_96274_a(Lnet/minecraft/src/GuiScr
 net/minecraft/src/GuiScreenConfirmation.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V=|p_i10019_1_,p_i10019_2_,p_i10019_3_,p_i10019_4_,p_i10019_5_
 net/minecraft/src/GuiScreenConfirmation.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenCreateOnlineWorld.<init>(Lnet/minecraft/src/GuiScreen;)V=|p_i10010_1_
+net/minecraft/src/GuiScreenCreateOnlineWorld.func_96246_c(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_96246_0_
+net/minecraft/src/GuiScreenCreateOnlineWorld.func_96247_b(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/src/GuiScreen;=|p_96247_0_
 net/minecraft/src/GuiScreenCreateOnlineWorld.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenCreateOnlineWorld.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
 net/minecraft/src/GuiScreenCreateOnlineWorld.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiScreenCreateOnlineWorld.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_96246_c(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_96246_0_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_96247_b(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/src/GuiScreen;=|p_96247_0_
 net/minecraft/src/GuiScreenCreateOnlineWorld.func_96248_a(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_96248_0_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_96251_a(Lnet/minecraft/src/Location;Ljava/lang/String;Ljava/lang/String;)V=|p_96251_1_,p_96251_2_,p_96251_3_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_98099_d(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_98099_0_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_98100_a(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Lnet/minecraft/src/Location;)Lnet/minecraft/src/Location;=|p_98100_0_,p_98100_1_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_98101_b(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/src/Location;=|p_98101_0_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_98102_a(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Ljava/util/List;)Ljava/util/List;=|p_98102_0_,p_98102_1_
-net/minecraft/src/GuiScreenCreateOnlineWorld.func_98103_c(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Ljava/util/List;=|p_98103_0_
 net/minecraft/src/GuiScreenDemo.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenDemo.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
 net/minecraft/src/GuiScreenDisconnectedOnline.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V=|p_i11007_1_,p_i11007_2_,p_i11007_3_,p_i11007_4_
@@ -4186,18 +4199,27 @@ net/minecraft/src/GuiScreenLongRunningTask.func_73875_a(Lnet/minecraft/src/GuiBu
 net/minecraft/src/GuiScreenLongRunningTask.func_96209_a(Ljava/lang/String;)V=|p_96209_1_
 net/minecraft/src/GuiScreenLongRunningTask.func_96210_b(Ljava/lang/String;)V=|p_96210_1_
 net/minecraft/src/GuiScreenOnlineServers.<init>(Lnet/minecraft/src/GuiScreen;)V=|p_i10007_1_
-net/minecraft/src/GuiScreenOnlineServers.func_101000_n(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_101000_0_
+net/minecraft/src/GuiScreenOnlineServers.func_98079_k(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98079_0_
 net/minecraft/src/GuiScreenOnlineServers.func_101001_e(IIII)V=|p_101001_1_,p_101001_2_,p_101001_3_,p_101001_4_
-net/minecraft/src/GuiScreenOnlineServers.func_101002_a(Lnet/minecraft/src/GuiScreenOnlineServers;Lnet/minecraft/src/McoServer;)V=java/io/IOException|p_101002_0_,p_101002_1_
-net/minecraft/src/GuiScreenOnlineServers.func_101003_a(Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V=|p_101003_0_,p_101003_1_,p_101003_2_,p_101003_3_,p_101003_4_
-net/minecraft/src/GuiScreenOnlineServers.func_101004_o(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_101004_0_
-net/minecraft/src/GuiScreenOnlineServers.func_101005_j(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_101005_0_
 net/minecraft/src/GuiScreenOnlineServers.func_101006_d(IIII)V=|p_101006_1_,p_101006_2_,p_101006_3_,p_101006_4_
 net/minecraft/src/GuiScreenOnlineServers.func_101008_c(IIII)V=|p_101008_1_,p_101008_2_,p_101008_3_,p_101008_4_
 net/minecraft/src/GuiScreenOnlineServers.func_101009_c(Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V=|p_101009_0_,p_101009_1_,p_101009_2_,p_101009_3_,p_101009_4_
-net/minecraft/src/GuiScreenOnlineServers.func_101011_a(Lnet/minecraft/src/GuiScreenOnlineServers;Ljava/lang/String;)Ljava/lang/String;=|p_101011_0_,p_101011_1_
 net/minecraft/src/GuiScreenOnlineServers.func_101012_b(Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V=|p_101012_0_,p_101012_1_,p_101012_2_,p_101012_3_,p_101012_4_
 net/minecraft/src/GuiScreenOnlineServers.func_102018_a(J)V=|p_102018_1_
+net/minecraft/src/GuiScreenOnlineServers.func_101011_a(Lnet/minecraft/src/GuiScreenOnlineServers;Ljava/lang/String;)Ljava/lang/String;=|p_101011_0_,p_101011_1_
+net/minecraft/src/GuiScreenOnlineServers.func_98074_m(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98074_0_
+net/minecraft/src/GuiScreenOnlineServers.func_98087_l(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98087_0_
+net/minecraft/src/GuiScreenOnlineServers.func_101004_o(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_101004_0_
+net/minecraft/src/GuiScreenOnlineServers.func_104030_a(Lnet/minecraft/src/GuiScreenOnlineServers;IIIII)V=|p_104030_0_,p_104030_1_,p_104030_2_,p_104030_3_,p_104030_4_,p_104030_5_
+net/minecraft/src/GuiScreenOnlineServers.func_104031_c(Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V=|p_104031_0_,p_104031_1_,p_104031_2_,p_104031_3_,p_104031_4_
+net/minecraft/src/GuiScreenOnlineServers.func_104032_j(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_104032_0_
+net/minecraft/src/GuiScreenOnlineServers.func_101000_n(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_101000_0_
+net/minecraft/src/GuiScreenOnlineServers.func_101002_a(Lnet/minecraft/src/GuiScreenOnlineServers;Lnet/minecraft/src/McoServer;)V=java/io/IOException|p_101002_0_,p_101002_1_
+net/minecraft/src/GuiScreenOnlineServers.func_98091_h(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_98091_0_
+net/minecraft/src/GuiScreenOnlineServers.func_104038_i(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_104038_0_
+net/minecraft/src/GuiScreenOnlineServers.func_104039_b(IIIII)V=|p_104039_1_,p_104039_2_,p_104039_3_,p_104039_4_,p_104039_5_
+net/minecraft/src/GuiScreenOnlineServers.func_98084_i(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98084_0_
+net/minecraft/src/GuiScreenOnlineServers.func_101005_j(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_101005_0_
 net/minecraft/src/GuiScreenOnlineServers.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenOnlineServers.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiScreenOnlineServers.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
@@ -4207,19 +4229,17 @@ net/minecraft/src/GuiScreenOnlineServers.func_96165_a(Ljava/lang/String;II)V=|p_
 net/minecraft/src/GuiScreenOnlineServers.func_96174_a(Lnet/minecraft/src/McoServer;)V=java/io/IOException|p_96174_1_
 net/minecraft/src/GuiScreenOnlineServers.func_96177_a(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_96177_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98072_d(Lnet/minecraft/src/GuiScreenOnlineServers;)I=|p_98072_0_
-net/minecraft/src/GuiScreenOnlineServers.func_98074_m(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98074_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98075_b(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_98075_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98076_f(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_98076_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98078_c(Lnet/minecraft/src/GuiScreenOnlineServers;I)V=|p_98078_0_,p_98078_1_
-net/minecraft/src/GuiScreenOnlineServers.func_98079_k(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98079_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98081_a(Lnet/minecraft/src/GuiScreenOnlineServers;I)I=|p_98081_0_,p_98081_1_
-net/minecraft/src/GuiScreenOnlineServers.func_98084_i(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98084_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98086_a(J)Lnet/minecraft/src/McoServer;=|p_98086_1_
-net/minecraft/src/GuiScreenOnlineServers.func_98087_l(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98087_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98089_b(Lnet/minecraft/src/GuiScreenOnlineServers;I)I=|p_98089_0_,p_98089_1_
-net/minecraft/src/GuiScreenOnlineServers.func_98091_h(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98091_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98092_g(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/GuiButton;=|p_98092_0_
 net/minecraft/src/GuiScreenOnlineServers.func_98094_c(Lnet/minecraft/src/GuiScreenOnlineServers;)Ljava/util/List;=|p_98094_0_
+net/minecraft/src/GuiScreenOnlineServersSubscreen.<init>(IIII)V=|p_i23000_1_,p_i23000_2_,p_i23000_3_,p_i23000_4_
+net/minecraft/src/GuiScreenOnlineServersSubscreen.func_104069_a(Lnet/minecraft/src/GuiButton;)V=|p_104069_1_
+net/minecraft/src/GuiScreenOnlineServersSubscreen.func_104071_a(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/FontRenderer;)V=|p_104071_1_,p_104071_2_
 net/minecraft/src/GuiScreenResetWorld.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/McoServer;)V=|p_i10003_1_,p_i10003_2_
 net/minecraft/src/GuiScreenResetWorld.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenResetWorld.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
@@ -4227,16 +4247,14 @@ net/minecraft/src/GuiScreenResetWorld.func_73869_a(CI)V=|p_73869_1_,p_73869_2_
 net/minecraft/src/GuiScreenResetWorld.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
 net/minecraft/src/GuiScreenResetWorld.func_96147_b(Lnet/minecraft/src/GuiScreenResetWorld;)Lnet/minecraft/client/Minecraft;=|p_96147_0_
 net/minecraft/src/GuiScreenResetWorld.func_96148_a(Lnet/minecraft/src/GuiScreenResetWorld;)Lnet/minecraft/src/GuiScreen;=|p_96148_0_
-net/minecraft/src/GuiScreenSelectLocation.<init>(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Ljava/util/List;Lnet/minecraft/src/Location;Ljava/lang/String;Ljava/lang/String;)V=|p_i10005_1_,p_i10005_2_,p_i10005_3_,p_i10005_4_,p_i10005_5_
+net/minecraft/src/GuiScreenSelectLocation.<init>(Lnet/minecraft/client/Minecraft;IIIII)V=|p_i23001_1_,p_i23001_2_,p_i23001_3_,p_i23001_4_,p_i23001_5_,p_i23001_6_
+net/minecraft/src/GuiScreenSelectLocation.func_104083_b(IIII)V=|p_104083_1_,p_104083_2_,p_104083_3_,p_104083_4_
+net/minecraft/src/GuiScreenSelectLocation.func_104084_a(IIII)V=|p_104084_1_,p_104084_2_,p_104084_3_,p_104084_4_
+net/minecraft/src/GuiScreenSelectLocation.func_104087_b(II)V=|p_104087_1_,p_104087_2_
+net/minecraft/src/GuiScreenSelectLocation.func_104088_a(IILnet/minecraft/src/Tessellator;)V=|p_104088_1_,p_104088_2_,p_104088_3_
+net/minecraft/src/GuiScreenSelectLocation.func_104089_a(II)V=|p_104089_1_,p_104089_2_
 net/minecraft/src/GuiScreenSelectLocation.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenSelectLocation.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
-net/minecraft/src/GuiScreenSelectLocation.func_96230_c(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/GuiSmallButton;=|p_96230_0_
-net/minecraft/src/GuiScreenSelectLocation.func_96231_e(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/FontRenderer;=|p_96231_0_
-net/minecraft/src/GuiScreenSelectLocation.func_96232_a(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/client/Minecraft;=|p_96232_0_
-net/minecraft/src/GuiScreenSelectLocation.func_96233_d(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/Location;=|p_96233_0_
-net/minecraft/src/GuiScreenSelectLocation.func_96234_a(Lnet/minecraft/src/GuiScreenSelectLocation;Lnet/minecraft/src/Location;)Lnet/minecraft/src/Location;=|p_96234_0_,p_96234_1_
-net/minecraft/src/GuiScreenSelectLocation.func_96235_f(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/FontRenderer;=|p_96235_0_
-net/minecraft/src/GuiScreenSelectLocation.func_96236_b(Lnet/minecraft/src/GuiScreenSelectLocation;)Ljava/util/List;=|p_96236_0_
 net/minecraft/src/GuiScreenServerList.<init>(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/ServerData;)V=|p_i3066_1_,p_i3066_2_
 net/minecraft/src/GuiScreenServerList.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiScreenServerList.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_
@@ -4297,6 +4315,7 @@ net/minecraft/src/GuiSlotLanguage.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiSlotLanguage.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiSlotLanguage.func_77218_a(I)Z=|p_77218_1_
 net/minecraft/src/GuiSlotOnlineServerList.<init>(Lnet/minecraft/src/GuiScreenOnlineServers;)V=|p_i10004_1_
+net/minecraft/src/GuiSlotOnlineServerList.func_104086_b(I)Z=|p_104086_1_
 net/minecraft/src/GuiSlotOnlineServerList.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
 net/minecraft/src/GuiSlotOnlineServerList.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
 net/minecraft/src/GuiSlotOnlineServerList.func_77218_a(I)Z=|p_77218_1_
@@ -4436,6 +4455,7 @@ net/minecraft/src/GuiYesNo.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String
 net/minecraft/src/GuiYesNo.<init>(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V=|p_i3048_1_,p_i3048_2_,p_i3048_3_,p_i3048_4_,p_i3048_5_,p_i3048_6_
 net/minecraft/src/GuiYesNo.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_
 net/minecraft/src/GuiYesNo.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_
+net/minecraft/src/HttpUtil.func_104145_a(Ljava/net/URL;)Ljava/lang/String;=java/io/IOException|p_104145_0_
 net/minecraft/src/HttpUtil.func_76179_a(Ljava/util/Map;)Ljava/lang/String;=|p_76179_0_
 net/minecraft/src/HttpUtil.func_76180_a(Lnet/minecraft/src/ILogAgent;Ljava/net/URL;Ljava/lang/String;Z)Ljava/lang/String;=|p_76180_0_,p_76180_1_,p_76180_2_,p_76180_3_
 net/minecraft/src/HttpUtil.func_76181_a()I=java/io/IOException|
@@ -4936,9 +4956,6 @@ net/minecraft/src/LoadingScreenRenderer.func_73719_c(Ljava/lang/String;)V=|p_737
 net/minecraft/src/LoadingScreenRenderer.func_73720_a(Ljava/lang/String;)V=|p_73720_1_
 net/minecraft/src/LoadingScreenRenderer.func_73721_b(Ljava/lang/String;)V=|p_73721_1_
 net/minecraft/src/LoadingScreenRenderer.func_73722_d(Ljava/lang/String;)V=|p_73722_1_
-net/minecraft/src/Location.func_98167_a(Largo/jdom/JsonNode;)Lnet/minecraft/src/Location;=|p_98167_0_
-net/minecraft/src/Location.func_98168_a(Largo/jdom/JsonNode;Ljava/lang/String;)Lnet/minecraft/src/Location;=|p_98168_0_,p_98168_1_
-net/minecraft/src/Locations.func_98174_a(Ljava/lang/String;)Lnet/minecraft/src/Locations;=|p_98174_0_
 net/minecraft/src/LogAgent.<init>(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=|p_i11036_1_,p_i11036_2_,p_i11036_3_
 net/minecraft/src/LogAgent.func_98076_a()Ljava/util/logging/Logger;=|
 net/minecraft/src/LogAgent.func_98230_d(Ljava/lang/String;)V=|p_98230_1_
@@ -5059,7 +5076,7 @@ net/minecraft/src/MathHelper.func_82716_a(Ljava/util/Random;DD)D=|p_82716_0_,p_8
 net/minecraft/src/McoClient.<init>(Lnet/minecraft/src/Session;)V=|p_i20001_1_
 net/minecraft/src/McoClient.func_96374_a(J)Lnet/minecraft/src/McoServerAddress;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96374_1_
 net/minecraft/src/McoClient.func_96375_b()Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException|
-net/minecraft/src/McoClient.func_96376_d(J)Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96376_1_
+net/minecraft/src/McoClient.func_96376_d(JLjava/lang/String;)Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96376_1_,p_96376_3_
 net/minecraft/src/McoClient.func_96377_a(Lnet/minecraft/src/Request;)Ljava/lang/String;=net/minecraft/src/ExceptionMcoService|p_96377_1_
 net/minecraft/src/McoClient.func_96378_c(J)Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96378_1_
 net/minecraft/src/McoClient.func_96379_c()I=net/minecraft/src/ExceptionMcoService|
@@ -5067,9 +5084,8 @@ net/minecraft/src/McoClient.func_96380_a(Ljava/lang/String;)Ljava/lang/String;=j
 net/minecraft/src/McoClient.func_96381_a(JLjava/lang/String;)V=net/minecraft/src/ExceptionMcoService|p_96381_1_,p_96381_3_
 net/minecraft/src/McoClient.func_96382_a()Lnet/minecraft/src/ValueObjectList;=net/minecraft/src/ExceptionMcoService|
 net/minecraft/src/McoClient.func_96383_b(J)Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96383_1_
-net/minecraft/src/McoClient.func_96384_a(JLjava/lang/String;Ljava/lang/String;)V=net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96384_1_,p_96384_3_,p_96384_4_
-net/minecraft/src/McoClient.func_96385_d()Lnet/minecraft/src/Locations;=net/minecraft/src/ExceptionMcoService,java/io/IOException|
-net/minecraft/src/McoClient.func_96386_a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=java/io/IOException,net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96386_1_,p_96386_2_,p_96386_3_
+net/minecraft/src/McoClient.func_96384_a(JLjava/lang/String;Ljava/lang/String;II)V=net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96384_1_,p_96384_3_,p_96384_4_,p_96384_5_,p_96384_6_
+net/minecraft/src/McoClient.func_96386_a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96386_1_,p_96386_2_,p_96386_3_,p_96386_4_
 net/minecraft/src/McoClient.func_96387_b(JLjava/lang/String;)Lnet/minecraft/src/McoServer;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96387_1_,p_96387_3_
 net/minecraft/src/McoClient.func_98176_a(J)Lnet/minecraft/src/McoServer;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_98176_1_
 net/minecraft/src/McoClient.func_98177_f(J)Lnet/minecraft/src/ValueObjectSubscription;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_98177_1_
@@ -6594,6 +6610,7 @@ net/minecraft/src/RenderZombie.func_82430_a(Lnet/minecraft/src/EntityZombie;FFF)
 net/minecraft/src/ReportedException.<init>(Lnet/minecraft/src/CrashReport;)V=|p_i3253_1_
 net/minecraft/src/Request.<init>(Ljava/lang/String;II)V=|p_i10026_1_,p_i10026_2_,p_i10026_3_
 net/minecraft/src/Request.func_100006_a(Ljava/lang/String;Ljava/lang/String;)V=|p_100006_1_,p_100006_2_
+net/minecraft/src/Request.func_104064_a(Ljava/lang/String;Ljava/lang/String;II)Lnet/minecraft/src/Request;=|p_104064_0_,p_104064_1_,p_104064_2_,p_104064_3_
 net/minecraft/src/Request.func_96352_a(Ljava/io/InputStream;)Ljava/lang/String;=java/io/IOException|p_96352_1_
 net/minecraft/src/Request.func_96353_a(Ljava/lang/String;Ljava/lang/String;II)Lnet/minecraft/src/Request;=|p_96353_0_,p_96353_1_,p_96353_2_,p_96353_3_
 net/minecraft/src/Request.func_96355_b(Ljava/lang/String;)Lnet/minecraft/src/Request;=|p_96355_0_
@@ -6604,6 +6621,7 @@ net/minecraft/src/RequestDelete.<init>(Ljava/lang/String;II)V=|p_i10031_1_,p_i10
 net/minecraft/src/RequestGet.<init>(Ljava/lang/String;II)V=|p_i10030_1_,p_i10030_2_,p_i10030_3_
 net/minecraft/src/RequestPost.<init>(Ljava/lang/String;[BII)V=|p_i10027_1_,p_i10027_2_,p_i10027_3_,p_i10027_4_
 net/minecraft/src/RequestPut.<init>(Ljava/lang/String;[BII)V=|p_i10029_1_,p_i10029_2_,p_i10029_3_,p_i10029_4_
+net/minecraft/src/RunnableTitleScreen.<init>(Lnet/minecraft/src/GuiMainMenu;)V=|p_i23005_1_
 net/minecraft/src/SaveFormatComparator.<init>(Ljava/lang/String;Ljava/lang/String;JJLnet/minecraft/src/EnumGameType;ZZZ)V=|p_i3917_1_,p_i3917_2_,p_i3917_3_,p_i3917_5_,p_i3917_7_,p_i3917_8_,p_i3917_9_,p_i3917_10_
 net/minecraft/src/SaveFormatComparator.compareTo(Ljava/lang/Object;)I=|p_compareTo_1_
 net/minecraft/src/SaveFormatComparator.func_75787_a(Lnet/minecraft/src/SaveFormatComparator;)I=|p_75787_1_
@@ -6705,10 +6723,6 @@ net/minecraft/src/SelectionListInvited.func_96609_a(I)Z=|p_96609_1_
 net/minecraft/src/SelectionListInvited.func_96610_a(IIIILnet/minecraft/src/Tessellator;)V=|p_96610_1_,p_96610_2_,p_96610_3_,p_96610_4_,p_96610_5_
 net/minecraft/src/SelectionListInvited.func_96615_a(IZ)V=|p_96615_1_,p_96615_2_
 net/minecraft/src/SelectionListInvited.func_98263_b(IIIILnet/minecraft/src/Tessellator;)V=|p_98263_1_,p_98263_2_,p_98263_3_,p_98263_4_,p_98263_5_
-net/minecraft/src/SelectionListLocation.<init>(Lnet/minecraft/src/GuiScreenSelectLocation;)V=|p_i10002_1_
-net/minecraft/src/SelectionListLocation.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_
-net/minecraft/src/SelectionListLocation.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_
-net/minecraft/src/SelectionListLocation.func_77218_a(I)Z=|p_77218_1_
 net/minecraft/src/ServerAddress.<init>(Ljava/lang/String;I)V=|p_i3096_1_,p_i3096_2_
 net/minecraft/src/ServerAddress.func_78860_a(Ljava/lang/String;)Lnet/minecraft/src/ServerAddress;=|p_78860_0_
 net/minecraft/src/ServerAddress.func_78862_a(Ljava/lang/String;I)I=|p_78862_0_,p_78862_1_
@@ -7074,8 +7088,8 @@ net/minecraft/src/TaskOnlineConnect.func_96580_a(Lnet/minecraft/src/TaskOnlineCo
 net/minecraft/src/TaskOnlineConnect.func_96582_a(Ljava/lang/String;I)V=|p_96582_1_,p_96582_2_
 net/minecraft/src/TaskOnlineConnect.func_96583_a(Lnet/minecraft/src/TaskOnlineConnect;Lnet/minecraft/src/NetClientHandler;)Lnet/minecraft/src/NetClientHandler;=|p_96583_0_,p_96583_1_
 net/minecraft/src/TaskOnlineConnect.func_98172_a(Lnet/minecraft/src/TaskOnlineConnect;)Lnet/minecraft/src/GuiScreen;=|p_98172_0_
-net/minecraft/src/TaskResetWorld.<init>(Lnet/minecraft/src/GuiScreenResetWorld;J)V=|p_i10011_1_,p_i10011_2_
-net/minecraft/src/TaskWorldCreation.<init>(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=|p_i10017_1_,p_i10017_2_,p_i10017_3_,p_i10017_4_
+net/minecraft/src/TaskResetWorld.<init>(Lnet/minecraft/src/GuiScreenResetWorld;JLjava/lang/String;)V=|p_i23002_1_,p_i23002_2_,p_i23002_4_
+net/minecraft/src/TaskWorldCreation.<init>(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=|p_i23003_1_,p_i23003_2_,p_i23003_3_,p_i23003_4_,p_i23003_5_
 net/minecraft/src/TcpConnection.<init>(Lnet/minecraft/src/ILogAgent;Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException|p_i11026_1_,p_i11026_2_,p_i11026_3_,p_i11026_4_
 net/minecraft/src/TcpConnection.<init>(Lnet/minecraft/src/ILogAgent;Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;Ljava/security/PrivateKey;)V=java/io/IOException|p_i11027_1_,p_i11027_2_,p_i11027_3_,p_i11027_4_,p_i11027_5_
 net/minecraft/src/TcpConnection.func_74424_a(Ljava/lang/String;[Ljava/lang/Object;)V=|p_74424_1_,p_74424_2_
@@ -7122,6 +7136,7 @@ net/minecraft/src/Tessellator.func_78386_a(FFF)V=|p_78386_1_,p_78386_2_,p_78386_
 net/minecraft/src/Texture.<init>(Ljava/lang/String;IIIIIIII)V=|p_i11021_1_,p_i11021_2_,p_i11021_3_,p_i11021_4_,p_i11021_5_,p_i11021_6_,p_i11021_7_,p_i11021_8_,p_i11021_9_
 net/minecraft/src/Texture.<init>(Ljava/lang/String;IIIIIIIILjava/awt/image/BufferedImage;)V=|p_i11023_1_,p_i11023_2_,p_i11023_3_,p_i11023_4_,p_i11023_5_,p_i11023_6_,p_i11023_7_,p_i11023_8_,p_i11023_9_,p_i11023_10_
 net/minecraft/src/Texture.<init>(Ljava/lang/String;IIIIIIILjava/awt/image/BufferedImage;)V=|p_i11022_1_,p_i11022_2_,p_i11022_3_,p_i11022_4_,p_i11022_5_,p_i11022_6_,p_i11022_7_,p_i11022_8_,p_i11022_9_
+net/minecraft/src/Texture.func_104062_b(IILnet/minecraft/src/Texture;)V=|p_104062_1_,p_104062_2_,p_104062_3_
 net/minecraft/src/Texture.func_94272_a(Lnet/minecraft/src/Rect2i;I)V=|p_94272_1_,p_94272_2_
 net/minecraft/src/Texture.func_94277_a(I)V=|p_94277_1_
 net/minecraft/src/Texture.func_94278_a(Ljava/awt/image/BufferedImage;)V=|p_94278_1_
@@ -7181,7 +7196,6 @@ net/minecraft/src/TexturedQuad.func_78236_a(Lnet/minecraft/src/Tessellator;F)V=|
 net/minecraft/src/ThreadClientSleep.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;)V=|p_i3019_1_,p_i3019_2_
 net/minecraft/src/ThreadConnectToOnlineServer.<init>(Lnet/minecraft/src/GuiSlotOnlineServerList;Lnet/minecraft/src/McoServer;)V=|p_i10009_1_,p_i10009_2_
 net/minecraft/src/ThreadConnectToServer.<init>(Lnet/minecraft/src/GuiConnecting;Ljava/lang/String;I)V=|p_i3110_1_,p_i3110_2_,p_i3110_3_
-net/minecraft/src/ThreadCreateOnlineWorldScreen.<init>(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)V=|p_i11008_1_
 net/minecraft/src/ThreadDedicatedServer.<init>(Lnet/minecraft/src/DedicatedServer;)V=|p_i11000_1_
 net/minecraft/src/ThreadDedicatedServer.run()V=|
 net/minecraft/src/ThreadDownloadImage.<init>(Lnet/minecraft/src/ThreadDownloadImageData;Ljava/lang/String;Lnet/minecraft/src/IImageBuffer;)V=|p_i5000_1_,p_i5000_2_,p_i5000_3_
@@ -7541,7 +7555,6 @@ net/minecraft/src/World.func_72900_e(Lnet/minecraft/src/Entity;)V=|p_72900_1_
 net/minecraft/src/World.func_72901_a(Lnet/minecraft/src/Vec3;Lnet/minecraft/src/Vec3;Z)Lnet/minecraft/src/MovingObjectPosition;=|p_72901_1_,p_72901_2_,p_72901_3_
 net/minecraft/src/World.func_72902_n(III)V=|p_72902_1_,p_72902_2_,p_72902_3_
 net/minecraft/src/World.func_72904_c(IIIIII)Z=|p_72904_1_,p_72904_2_,p_72904_3_,p_72904_4_,p_72904_5_,p_72904_6_
-net/minecraft/src/World.func_72906_B()V=net/minecraft/src/MinecraftException|
 net/minecraft/src/World.func_72907_a(Ljava/lang/Class;)I=|p_72907_1_
 net/minecraft/src/World.func_72908_a(DDDLjava/lang/String;FF)V=|p_72908_1_,p_72908_3_,p_72908_5_,p_72908_7_,p_72908_8_,p_72908_9_
 net/minecraft/src/World.func_72909_d(IIIIII)V=|p_72909_1_,p_72909_2_,p_72909_3_,p_72909_4_,p_72909_5_,p_72909_6_
@@ -7600,6 +7613,7 @@ net/minecraft/src/World.func_72980_b(DDDLjava/lang/String;FFZ)V=|p_72980_1_,p_72
 net/minecraft/src/World.func_82733_a(Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Lnet/minecraft/src/IEntitySelector;)Ljava/util/List;=|p_82733_1_,p_82733_2_,p_82733_3_
 net/minecraft/src/World.func_82734_g(II)I=|p_82734_1_,p_82734_2_
 net/minecraft/src/World.func_82735_a(Lnet/minecraft/src/EntityMinecart;)Lnet/minecraft/src/IUpdatePlayerListBox;=|p_82735_1_
+net/minecraft/src/World.func_72906_B()V=net/minecraft/src/MinecraftException|
 net/minecraft/src/World.func_82738_a(J)V=|p_82738_1_
 net/minecraft/src/World.func_82739_e(IIIII)V=|p_82739_1_,p_82739_2_,p_82739_3_,p_82739_4_,p_82739_5_
 net/minecraft/src/World.func_82740_a(IIIIII)V=|p_82740_1_,p_82740_2_,p_82740_3_,p_82740_4_,p_82740_5_,p_82740_6_

conf/mcp.cfg

@@ -38,8 +38,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  = 5c1219d869b87d233de3033688ec7567
-MD5Server  = 9d31b969c3f197a1d40381d5620717ea
+MD5Client  = 6897c3287fb971c9f362eb3ab20f5ddd
+MD5Server  = c4e1bf89e834bd3670c7bf8f13874bc6
 
 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -125,8 +125,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           = 102000
-ParamIndex        = 22000
+RGIndex           = 104000
+ParamIndex        = 23000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
@@ -153,5 +153,6 @@ CmdJadretro   = %s -jar %s {targetdir}
 CmdFernflower = %s -Xmx512M -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
 CmdExceptor   = %s -jar %s {input} {output} {conf} {log}
 CmdRecomp     = %s -encoding UTF-8 -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
+CmdRecompScalac = %s -encoding UTF-8 -deprecation -target:jvm-1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
 CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
 CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start

conf/methods.csv

@@ -1,5 +1,14 @@
 searge,name,side,desc
+func_100008_d,isDurationMax,2,"Returns true if duration is at maximum, false otherwise."
 func_100009_j_,getFacing,2,
+func_100011_g,getIsPotionDurationMax,2,
+func_100012_b,setPotionDurationMax,2,Toggle the isPotionDurationMax field.
+func_100015_a,isKeyDown,2,Returns whether the specified key binding is currently being pressed.
+func_102007_a,canInsertItem,2,"Returns true if automation can insert the given item in the given slot from the given side. Args: Slot, item, side"
+func_102008_b,canExtractItem,2,"Returns true if automation can extract the given item in the given slot from the given side. Args: Slot, item, side"
+func_102013_b,canExtractItemFromInventory,2,
+func_102026_a,isBlockTopFacingSurfaceSolid,2,"Performs check to see if the block is a normal, solid block, or if the metadata of the block indicates that its facing puts its solid side upwards. (inverted stairs, for example)"
+func_102028_d,isSplashPotionEffect,2,
 func_70000_a,addServerStatsToSnooper,2,
 func_70001_b,addServerTypeToSnooper,2,
 func_70002_Q,isSnooperEnabled,2,Returns whether snooping is enabled or not.
@@ -447,7 +456,7 @@ func_70950_c,addDefaultEquipmentAndRecipies,2,"based on the villagers profession
 func_70951_a,getRandomSizedStack,2,
 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.
+func_70968_i,getBossHealth,2,Returns the health points of the dragon.
 func_70969_j,updateDragonEnderCrystal,2,Updates the state of the enderdragon's current endercrystal.
 func_70970_a,collideWithEntities,2,Pushes all entities inside the list away from the enderdragon.
 func_70971_b,attackEntitiesInList,2,"Attacks all entities inside this list, dealing 5 hearts of damage."
@@ -629,7 +638,7 @@ func_71267_a,saveAllWorlds,2,par1 indicates if a log message should be output.
 func_71268_U,getCanSpawnAnimals,2,
 func_71269_o,setTexturePack,2,
 func_71270_I,getFolderName,2,
-func_71272_O,deleteWorldAndStopServer,2,WARNING : directly calls  getActiveAnvilConverter().deleteWorldDirectory(theWorldServer[0].getSaveHandler().getSaveDirectoryName());
+func_71272_O,deleteWorldAndStopServer,2,WARNING : directly calls  getActiveAnvilConverter().deleteWorldDirectory(theWorldServer[0].getSaveHandler().getWorldDirectoryName());
 func_71273_Y,getMOTD,2,
 func_71274_v,getServerMOTD,2,Returns the server message of the day
 func_71275_y,getMaxPlayers,2,Returns the maximum number of players allowed on the server.
@@ -792,7 +801,6 @@ func_71764_a,addPendingConnection,2,
 func_71765_d,getMyPort,2,
 func_71766_a,processPendingConnections,2,
 func_71767_c,getInetAddress,2,
-func_71770_b,isLocalHost,2,
 func_71779_a,getIV,2,
 func_71780_b,getParameters,2,
 func_71783_a,getKey,2,
@@ -832,7 +840,7 @@ func_71854_d,canBlockStay,2,Can this block stay at this position.  Similar to ca
 func_71855_c,isProvidingStrongPower,2,"Returns true if the block is emitting direct/strong redstone power on the specified side. Args: World, X, Y, Z, side. Note that the side is reversed - eg it is 1 (up) when checking the bottom of the block."
 func_71856_s_,getRenderBlockPass,2,Returns which pass should this block be rendered on. 0 for solids and 1 for alpha
 func_71857_b,getRenderType,2,The type of render function that is called for this block
-func_71858_a,getBlockTextureFromSideAndMetadata,2,"From the specified side and block metadata retrieves the blocks texture. Args: side, metadata"
+func_71858_a,getIcon,2,"From the specified side and block metadata retrieves the blocks texture. Args: side, metadata"
 func_71859_p_,tickRate,2,How many world ticks before ticking
 func_71860_a,onBlockPlacedBy,2,Called when the block is placed in the world.
 func_71861_g,onBlockAdded,2,"Called whenever the block is added into the world. Args: world, x, y, z"
@@ -1353,10 +1361,10 @@ func_72825_h,getTopSolidOrLiquidBlock,2,"Finds the highest block on the x, z coo
 func_72826_c,getCelestialAngle,2,calls calculateCelestialAngle
 func_72827_u,getProviderName,2,"Returns the name of the current chunk provider, by calling chunkprovider.makeString()"
 func_72828_b,unloadEntities,2,Adds a list of entities to be unloaded on the next pass of World.updateEntities()
-func_72829_c,isAABBNonEmpty,2,Returns true if there are any blocks in the region constrained by an AxisAlignedBB
+func_72829_c,checkBlockCollision,2,Returns true if there are any blocks in the region constrained by an AxisAlignedBB
 func_72830_b,isAABBInMaterial,2,checks if the given AABB is in the material given. Used while swimming.
 func_72831_a,rayTraceBlocks_do_do,2,
-func_72832_d,setBlock,2,"Sets the block ID and metadata at a given location. Args: X, Y, Z, new block ID, new metadata, flags. Flag 0x02 will trigger a block update both on server and on client, flag 0x04, if used with 0x02, will prevent a block update on client worlds. Flag 0x01 will pass the original block ID when notifying adjacent blocks, otherwise it will pass 0."
+func_72832_d,setBlock,2,"Sets the block ID and metadata at a given location. Args: X, Y, Z, new block ID, new metadata, flags. Flag 1 will cause a block update. Flag 2 will send the change to clients (you almost always want this). Flag 4 prevents the block from being re-rendered, if this is a client world. Flags can be added together."
 func_72833_a,getSkyColor,2,Calculates the color for the skybox
 func_72834_c,canBlockFreeze,2,"checks to see if a given block is both water, and cold enough to freeze - if the par4 boolean is set, this will only return true if there is a non-water block immediately adjacent to the specified block"
 func_72835_b,tick,2,Runs a single tick for the world
@@ -1364,7 +1372,7 @@ func_72836_a,scheduleBlockUpdate,2,Schedules a tick to a block with a delay (Mos
 func_72837_a,setBlockTileEntity,2,"Sets the TileEntity for a given block in X, Y, Z coordinates"
 func_72838_d,spawnEntityInWorld,2,Called to place all entities as part of a world
 func_72839_b,getEntitiesWithinAABBExcludingEntity,2,"Will get all entities within the specified AABB excluding the one passed into it. Args: entityToExclude, aabb"
-func_72840_a,getAllCollidingBoundingBoxes,2,calculates and returns a list of colliding bounding boxes within a given AABB
+func_72840_a,getCollidingBlockBounds,2,calculates and returns a list of colliding bounding boxes within a given AABB
 func_72841_b,getUniqueDataId,2,Returns an unique new data id from the MapStorage for the given prefix and saves the idCounts map to the 'idcounts' file.
 func_72842_a,getBlockDensity,2,"Gets the percentage of real blocks within within a bounding box, along a specified vector."
 func_72843_D,setRandomSeed,2,puts the World Random seed to a specific state dependant on the inputs
@@ -1379,7 +1387,7 @@ func_72851_f,notifyBlockChange,2,"The block type change and need to notify other
 func_72852_a,addTileEntity,2,
 func_72853_d,getMoonPhase,2,
 func_72854_c,updateAllPlayersSleepingFlag,2,Updates the flag that indicates whether or not all players in the world are sleeping.
-func_72855_b,checkIfAABBIsClear,2,"Returns true if there are no solid, live entities in the specified AxisAlignedBB"
+func_72855_b,checkNoEntityCollision,2,"Returns true if there are no solid, live entities in the specified AxisAlignedBB"
 func_72856_b,getClosestVulnerablePlayerToEntity,2,"Returns the closest vulnerable player to this entity within the given radius, or null if none is found"
 func_72857_a,findNearestEntityWithinAABB,2,
 func_72858_w,canSnowAt,2,Tests whether or not snow can be placed at a given location
@@ -1436,7 +1444,7 @@ func_72913_w,toggleRain,2,
 func_72914_a,addWorldInfoToCrashReport,2,Adds some basic stats of the world to the given crash report.
 func_72915_b,setLightValue,2,"Sets the light value either into the sky map or block map depending on if enumSkyBlock is set to sky or block. Args: enumSkyBlock, x, y, z, lightValue"
 func_72916_c,chunkExists,2,"Returns whether a chunk exists at chunk coordinates x, y"
-func_72917_a,checkIfAABBIsClearExcludingEntity,2,"Returns true if there are no solid, live entities in the specified AxisAlignedBB, excluding the given entity"
+func_72917_a,checkNoEntityCollision,2,"Returns true if there are no solid, live entities in the specified AxisAlignedBB, excluding the given entity"
 func_72918_a,handleMaterialAcceleration,2,handles the acceleration of an object whilst in water. Not sure if it is used elsewhere.
 func_72919_O,getHorizon,2,Returns horizon height for use in rendering the sky.
 func_72920_a,getPendingBlockUpdates,2,
@@ -1502,6 +1510,7 @@ func_73025_a,doPreChunk,2,
 func_73026_a,getEntityList,2,
 func_73027_a,addEntityToWorld,2,Add an ID to Entity mapping to entityHashSet
 func_73028_b,removeEntityFromWorld,2,
+func_73029_E,doVoidFogParticles,2,
 func_73030_b,getEntitySpawnQueue,2,
 func_73031_a,invalidateBlockReceiveRegion,2,"Invalidates an AABB region of blocks from the receive queue, in the event that the block has been modified client-side in the intervening 80 receive ticks."
 func_73039_n,getEntityTracker,2,Gets the EntityTracker
@@ -1647,6 +1656,7 @@ func_73463_g,getChatVisibility,2,
 func_73473_d,getText,2,
 func_73475_d,getIsServer,2,Get whether this is a server
 func_73489_c,getMetadata,2,
+func_73509_c,getWatchedMetadata,2,
 func_73568_g,getEffectY,2,
 func_73569_h,getEffectZ,2,
 func_73570_d,getSoundName,2,
@@ -1657,7 +1667,11 @@ func_73580_b,getChunkPosZ,2,
 func_73581_d,getNumberOfChunkInPacket,2,
 func_73582_a,getChunkPosX,2,
 func_73583_c,getChunkCompressedData,2,
+func_73593_d,getCompressedChunkData,2,
 func_73594_a,getMapChunkData,2,
+func_73607_d,getPlayerVelocityX,2,Gets the X velocity of the player being pushed by the explosion.
+func_73608_g,getPlayerVelocityZ,2,Gets the Z velocity of the player being pushed by the explosion.
+func_73609_f,getPlayerVelocityY,2,Gets the Y velocity of the player being pushed by the explosion.
 func_73660_a,update,2,Updates the JList with a new model.
 func_73665_c,getPropertiesFile,2,Returns this PropertyManager's file object used for property saving.
 func_73666_a,logMessageAndSave,2,logs an info message then calls saveSettingsToFile Yes this appears to be a potential stack overflow - these 2 functions call each other repeatdly if an exception occurs.
@@ -1788,6 +1802,7 @@ func_73879_b,mouseMovedOrUp,2,"Called when the mouse is moved or a mouse button
 func_73892_a,getSentHistory,2,"input is relative and is applied directly to the sentHistoryCursor so -1 is the previous message, 1 is the next message from the current cursor position"
 func_73895_u_,completePlayerName,2,Autocompletes player name
 func_73906_g,wakeEntity,2,Wakes the entity from the bed
+func_73907_g,getLeftBorder,2,Gets the distance from the left border of the window to left border of the controls screen
 func_73912_g,makeUseableName,2,"Makes a the name for a world save folder based on your world name, replacing specific characters for _s and appending -s to the end until a free name is available."
 func_73914_h,updateButtonText,2,
 func_73945_e,copyLinkToClipboard,2,Copies the link to the system clipboard.
@@ -2456,12 +2471,12 @@ func_75756_e,getSaveHandler,2,returns null if no saveHandler is relevent (eg. SM
 func_75757_d,loadWorldInfo,2,Loads and returns the world info
 func_75758_b,getMapFileFromName,2,Gets the file location of the given map
 func_75759_a,flush,2,"Called to flush all changes to disk, waiting for them to complete."
-func_75760_g,getSaveDirectoryName,2,Returns the name of the directory where world information is saved.
+func_75760_g,getWorldDirectoryName,2,Returns the name of the directory where world information is saved.
 func_75761_a,saveWorldInfo,2,Saves the passed in world info.
 func_75762_c,checkSessionLock,2,Checks the session lock to prevent save collisions
 func_75763_a,getChunkLoader,2,Returns the chunk loader with the provided world provider
 func_75764_a,getPlayerData,2,Gets the player data for the given playername as a NBTTagCompound.
-func_75765_b,getSaveDirectory,2,gets the File object corresponding to the base directory of this save (saves/404 for a save called 404 etc)
+func_75765_b,getWorldDirectory,2,Gets the File object corresponding to the base directory of this world.
 func_75766_h,setSessionLock,2,Creates a session lock file for this process
 func_75773_a,canContinue,2,Determine if a specific AI Task should continue being executed.
 func_75774_a,onUpdateTasks,2,
@@ -2500,6 +2515,7 @@ func_75820_a,writeChunkToNBT,2,"Writes the Chunk passed as an argument to the NB
 func_75821_a,writeChunkNBTTags,2,
 func_75822_a,checkedReadChunkFromNBT,2,Wraps readChunkFromNBT. Checks the coordinates and several NBT tags.
 func_75823_a,readChunkFromNBT,2,Reads the data stored in the passed NBTTagCompound and creates a Chunk with that data in the passed World. Returns the created Chunk.
+func_75824_a,addChunkToPending,2,
 func_75829_a,distanceTo,2,Returns the linear distance to another path point
 func_75830_a,makeHash,2,
 func_75831_a,isAssigned,2,Returns true if this point has already been assigned to a path
@@ -2553,6 +2569,7 @@ func_75904_a,getInts,2,"Returns a list of integer values generated by this layer
 func_75905_a,initWorldGenSeed,2,Initialize layer's local worldGenSeed based on its own baseSeed and the world's global seed (passed in as an argument).
 func_75912_b,choose,2,randomly choose between the four args
 func_75913_a,choose,2,randomly choose between the two args
+func_75915_a,magnify,2,"Magnify a layer. Parms are seed adjustment, layer, number of times to magnify"
 func_75916_b,modeOrRandom,2,returns the mode (most frequently occuring number) or a random number from the 4 integers provided
 func_75917_a,choose,2,Chooses one of the two inputs randomly.
 func_75918_d,initCraftableStats,2,Initializes statistics related to craftable items. Is only called after both block and item stats have been initialized.
@@ -2643,7 +2660,7 @@ func_76126_a,sin,2,sin looked up in a table
 func_76127_a,average,2,
 func_76128_c,floor_double,2,Returns the greatest integer less than or equal to the double argument
 func_76129_c,sqrt_float,2,
-func_76130_a,abs_int,2,
+func_76130_a,abs_int,2,Returns the unsigned value of an int.
 func_76131_a,clamp_float,2,"Returns the value of the first parameter, clamped to be within the lower and upper limits given by the second and third parameters"
 func_76132_a,abs_max,2,Maximum of the absolute value of two numbers.
 func_76133_a,sqrt_double,2,
@@ -3348,6 +3365,7 @@ func_77832_l,getEffects,2,Returns a list of potion effects for the specified ite
 func_77833_h,isEffectInstant,2,
 func_77834_f,getEffects,2,Returns a list of effects for the specified potion damage value.
 func_77840_a,spawnCreature,2,"Spawns the creature specified by the egg's type in the location specified by the last three parameters. Parameters: world, entityID, x, y, z."
+func_77842_f,getMaterialName,2,"Returns the name of the material this tool is made from as it is declared in EnumToolMaterial (meaning diamond would return ""EMERALD"")"
 func_77844_a,setPotionEffect,2,"sets a potion effect on the item. Args: int potionId, int duration (will be multiplied by 20), int amplifier, float probability of effect happening"
 func_77845_h,isWolfsFavoriteMeat,2,Whether wolves like this food (true for raw and cooked porkchop).
 func_77846_g,getSaturationModifier,2,gets the saturationModifier of the ItemFood
@@ -3584,7 +3602,7 @@ func_78569_d,renderBlockCactusImpl,2,Render block cactus implementation
 func_78570_q,renderStandardBlock,2,Renders a standard cube block at the given coordinates
 func_78571_c,renderPistonRodEW,2,Render piston rod east/west
 func_78572_c,renderBlockTorch,2,Renders a torch block at the given coordinates
-func_78573_e,renderNorthFace,2,"Renders the given texture to the north (x-negative) face of the block.  Args: block, x, y, z, texture"
+func_78573_e,renderFaceXNeg,2,"Renders the given texture to the west (x-negative) face of the block.  Args: block, x, y, z, texture"
 func_78574_w,renderBlockBed,2,render a bed at the given coordinates
 func_78575_a,renderBlockStemSmall,2,Render block stem small
 func_78576_j,renderBlockLadder,2,Renders a ladder block at the given coordinates
@@ -3616,24 +3634,24 @@ func_78601_u,renderBlockDoor,2,Renders a door block at the given coordinates
 func_78602_a,getAoBrightness,2,Get ambient occlusion brightness
 func_78603_m,renderBlockStem,2,Render block stem
 func_78604_a,renderBlockUsingTexture,2,Renders a block using the given texture instead of the block's own default texture
-func_78605_f,renderSouthFace,2,"Renders the given texture to the south (x-positive) face of the block.  Args: block, x, y, z, texture"
+func_78605_f,renderFaceXPos,2,"Renders the given texture to the east (x-positive) face of the block.  Args: block, x, y, z, texture"
 func_78606_a,renderBlockStemBig,2,Render block stem big
 func_78607_b,renderPistonRodSN,2,Render piston rod south/north
 func_78608_c,renderPistonExtension,2,renders the pushing part of a piston
 func_78609_c,renderStandardBlockWithColorMultiplier,2,"Renders a standard cube block at the given coordinates, with a given color ratio.  Args: block, x, y, z, r, g, b"
 func_78610_x,renderBlockRepeater,2,render a redstone repeater at the given coordinates
-func_78611_c,renderEastFace,2,"Renders the given texture to the east (z-negative) face of the block.  Args: block, x, y, z, texture"
+func_78611_c,renderFaceZNeg,2,"Renders the given texture to the north (z-negative) face of the block.  Args: block, x, y, z, texture"
 func_78612_b,renderBlockByRenderType,2,Renders the block at the given coordinates using the block's rendering type
-func_78613_a,renderBottomFace,2,"Renders the given texture to the bottom face of the block. Args: block, x, y, z, texture"
+func_78613_a,renderFaceYNeg,2,"Renders the given texture to the bottom face of the block. Args: block, x, y, z, texture"
 func_78614_n,renderBlockCrops,2,Render block crops
 func_78615_a,renderBlockCauldron,2,Render block cauldron
 func_78616_a,renderBlockCocoa,2,Renders a Cocoa block at the given coordinates
-func_78617_b,renderTopFace,2,"Renders the given texture to the top face of the block. Args: block, x, y, z, texture"
+func_78617_b,renderFaceYPos,2,"Renders the given texture to the top face of the block. Args: block, x, y, z, texture"
 func_78618_a,renderBlockDragonEgg,2,
 func_78619_g,renderBlockTripWire,2,Renders a trip wire block at the given coordinates
 func_78620_l,renderCrossedSquares,2,"Renders any block requiring croseed squares such as reeds, flowers, and mushrooms"
 func_78621_p,renderBlockFluids,2,Renders a block based on the BlockFluids class at the given coordinates
-func_78622_d,renderWestFace,2,"Renders the given texture to the west (z-positive) face of the block.  Args: block, x, y, z, texture"
+func_78622_d,renderFaceZPos,2,"Renders the given texture to the south (z-positive) face of the block.  Args: block, x, y, z, texture"
 func_78623_a,renderTorchAtAngle,2,"Renders a torch at the given coordinates, with the base slanting at the given delta"
 func_78713_a,getEntityRenderObject,2,
 func_78714_a,getDistanceToCamera,2,
@@ -3765,11 +3783,12 @@ func_82130_k,getLevels,2,Return the levels of this beacon's pyramid.
 func_82131_u,updateState,2,Checks if the Beacon has a valid pyramid underneath and direct sunlight above
 func_82132_j,getSecondaryEffect,2,Return the secondary potion effect given by this beacon.
 func_82141_a,copyDataFrom,2,"Copies important data from another entity to this entity. Used when teleporting entities between worlds, as this actually deletes the teleporting entity and re-creates it on the other side. Params: Entity to copy from, unused (always true)"
-func_82142_c,setHasActivePotion,2,
+func_82142_c,setInvisible,2,
 func_82144_au,doesEntityNotTriggerPressurePlate,2,Return whether this entity should NOT trigger a pressure plate or a tripwire.
 func_82145_z,getMaxInPortalTime,2,Return the amount of time this entity should stay in a portal before being transported.
 func_82147_ab,getPortalCooldown,2,Return the amount of cooldown before this entity can use a portal again.
-func_82150_aj,getHasActivePotion,2,
+func_82148_at,getTeleportDirection,2,
+func_82150_aj,isInvisible,2,
 func_82154_e,setIsAnvil,2,
 func_82159_b,getArmorPosition,2,
 func_82160_b,dropEquipment,2,Drop the equipment for this entity.
@@ -3812,6 +3831,8 @@ func_82244_d,displayGUIAnvil,2,Displays the GUI for interacting with an anvil.
 func_82245_bX,isSpawnForced,2,
 func_82246_f,canCurrentToolHarvestBlock,2,"Returns true if the item the player is holding can harvest the block at the given coords. Args: x, y, z."
 func_82247_a,canPlayerEdit,2,
+func_82265_c,setEnabled,2,
+func_82266_h,setDisabledTextColour,2,
 func_82273_a,setFlatGeneratorInfo,2,
 func_82274_h,getRenderItem,2,
 func_82275_e,getFlatGeneratorInfo,2,
@@ -3840,6 +3861,7 @@ 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_82363_b,parseDouble,2,Parses a double from the given string or throws an exception if it's not a double.
 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.
@@ -3873,7 +3895,7 @@ func_82463_b,setEntitySoundPitch,2,"Sets the pitch of the sound associated with
 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_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. Setting the last flag to true will prevent other sounds from overriding this one. Args: The sound name, the entity, the volume, the pitch, priority"
 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.
@@ -3882,6 +3904,7 @@ func_82486_a,doDispense,2,
 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_82505_u_,isFlowerPot,2,Returns true only if block is flowerPot
 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_82524_c,isRedstoneRepeaterBlockID,2,
@@ -3895,6 +3918,8 @@ 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_82543_e,isBlockStairsID,2,Checks if supplied ID is one of a BlockStairs
 func_82547_a,comparePlayers,2,Compare the position of two players.
+func_82558_j,getWalkSpeed,2,
+func_82560_d,getRelativeVolumeDisabled,2,
 func_82563_j,getShowCape,2,
 func_82571_y,getGeneratorOptions,2,
 func_82572_b,incrementTotalWorldTime,2,
@@ -4029,6 +4054,7 @@ func_82877_b,setPlayerWalkSpeed,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_83003_a,getMemoryReport,2,Returns a string with allocated and used memory.
 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
@@ -4058,6 +4084,7 @@ func_85057_a,makeCategoryDepth,2,Creates a CrashReportCategory for the given sta
 func_85058_a,makeCategory,2,Creates a CrashReportCategory
 func_85062_a,callBlockDataValue,2,
 func_85064_a,callBlockLocationInfo,2,
+func_85071_a,getLocationInfo,2,"Returns a string with world information on location.Args:x,y,z"
 func_85079_a,callBlockType,2,
 func_85085_a,callSuspiciousClasses,2,
 func_85093_e,renderArrowsStuckInEntity,2,"renders arrows the Entity has been attacked with, attached to it"
@@ -4096,6 +4123,8 @@ func_85145_a,callTileEntityName,2,
 func_85151_d,getLowerChestInventory,2,Return this chest container's lower chest inventory.
 func_85154_a,callEntityType,2,
 func_85156_a,removeTask,2,removes the indicated task from the entity's AI tasks.
+func_85157_q,isAlwaysHarvested,2,Check to see if we can harvest it in any case.
+func_85158_p,setAlwaysHarvested,2,Set as harvestable in any case.
 func_85160_a,callStructureType,2,
 func_85162_a,callChunkPositionHash,2,
 func_85170_a,callServerType,2,
@@ -4103,8 +4132,10 @@ func_85173_a,playSoundToNearExcept,2,Plays sound to all near players except the
 func_85175_e,blockGetRenderType,2,Returns the render type of the block at the given coordinate.
 func_85176_s,getDefaultTeleporter,2,
 func_85181_a,getRandomModelBox,2,
+func_85182_a,sameToolAndBlock,2,
 func_85187_a,drawString,2,"Draws the specified string. Args: string, x, y, color, dropShadow"
 func_85188_a,makePortal,2,
+func_85189_a,removeStalePortalLocations,2,called periodically to remove out-of-date portal locations from the cache list. Argument par1 is a WorldServer.getTotalWorldTime() value.
 func_90010_a,isPartOfLargeChest,2,Return whether the given inventory is part of this large chest.
 func_90011_a,createChild,2,
 func_90019_g,applyRenderColor,2,Creates a new EntityDiggingFX with the block render color applied to the base particle color
@@ -4128,16 +4159,47 @@ func_92058_a,setEntityItemStack,2,Sets the ItemStack for this entity
 func_92059_d,getEntityItem,2,"Returns the ItemStack corresponding to the Entity (Note: if no item exists, will log an error but still return an ItemStack containing Block.stone)"
 func_92062_k,sendChatMsg,2,Sends the given string to every player as chat message.
 func_92085_d,getIsBlank,2,
+func_92087_a,causeThornsDamage,2,Returns the EntityDamageSource of the Thorns enchantment
+func_92089_a,canApply,2,
+func_92097_a,negateDamage,2,"Used by ItemStack.attemptDamageItem. Randomly determines if a point of damage should be negated using the enchantment level (par1). If the ItemStack is Armor then there is a flat 60% chance for damage to be negated no matter the enchantment level, otherwise there is a 1-(par/1) chance for damage to be negated."
 func_92103_a,addRecipe,2,
 func_94041_b,isStackValidForSlot,2,Returns true if automation is allowed to insert the given stack (ignoring stack size) into the given slot.
 func_94042_c,isInvNameLocalized,2,"If this returns false, the inventory name will be used as an unlocalized name, and translated into the player's language. Otherwise it will be used directly."
+func_94049_a,setCustomName,2,
+func_94052_a,setParticleIcon,2,
 func_94053_h,nextTextureIndexX,2,
+func_94064_a,displayGUIHopper,2,
 func_94065_a,drawTexturedModelRectFromIcon,2,
-func_94127_c,getStartInventorySide,2,Get the start of the side inventory.
-func_94128_d,getSizeInventorySide,2,Get the size of the side inventory.
+func_94083_c,getTntPlacedBy,2,returns null or the entityliving it was placed or ignited by
+func_94085_r,getDefaultDisplayTileOffset,2,
+func_94086_l,setDisplayTileOffset,2,
+func_94087_l,getMinecartType,2,
+func_94089_m,getDisplayTile,2,
+func_94090_a,createMinecart,2,"Creates a new minecart of the specified type in the specified location in the given world. par0World - world to create the minecart in, double par1,par3,par5 represent x,y,z respectively. int par7 specifies the type: 1 for MinecartChest, 2 for MinecartFurnace, 3 for MinecartTNT, 4 for MinecartMobSpawner, 5 for MinecartHopper and 0 for a standard empty minecart"
+func_94091_a,updateOnTrack,2,
+func_94092_k,setDisplayTileData,2,
+func_94093_n,getDefaultDisplayTile,2,
+func_94094_j,setDisplayTile,2,
+func_94095_a,killMinecart,2,
+func_94096_e,setHasDisplayTile,2,
+func_94097_p,getDefaultDisplayTileData,2,
+func_94098_o,getDisplayTileData,2,
+func_94099_q,getDisplayTileOffset,2,
+func_94100_s,hasDisplayTile,2,
+func_94101_h,applyDrag,2,
+func_94103_c,explodeCart,2,Makes the minecart explode.
+func_94105_c,ignite,2,Ignites this TNT cart.
+func_94107_f,setMinecartPowered,2,
+func_94108_c,isMinecartPowered,2,
+func_94114_a,areItemStacksEqualItem,2,
+func_94116_j,insertItemToInventory,2,Inserts one item from the hopper into the inventory the hopper is pointing at.
+func_94117_a,insertStack,2,"Inserts a stack into an inventory. Args: Inventory, stack, side. Returns leftover items."
+func_94119_v,getOutputInventory,2,Gets the inventory the hopper is pointing at.
+func_94128_d,getAccessibleSlotsFromSide,2,Returns an array containing the indices of the slots that can be accessed by automation on the given side of this block.
 func_94140_a,registerDestroyBlockIcons,2,
 func_94143_a,updateIcons,2,
-func_94148_a,renderItemStack,2,
+func_94144_a,renderBlockInMinecart,2,Renders the block that is inside the minecart.
+func_94148_a,renderItemOverlayIntoGUI,2,
 func_94149_a,renderIcon,2,
 func_94152_c,refreshTextureMaps,2,
 func_94156_a,intersection,2,
@@ -4208,7 +4270,7 @@ func_94280_f,getTextureName,2,
 func_94281_a,copyFrom,2,
 func_94282_c,getGlTextureId,2,
 func_94284_b,getTextureId,2,
-func_94285_g,createTexture,2,
+func_94285_g,uploadTexture,2,
 func_94305_f,doStitch,2,
 func_94306_e,getTexture,2,
 func_94308_a,getCeilPowerOf2,2,Returns power of 2 >= the specified value
@@ -4216,13 +4278,37 @@ func_94309_g,getStichSlots,2,
 func_94310_b,allocateSlot,2,Attempts to find space for specified tile
 func_94311_c,expandAndAllocateSlot,2,Expand stitched texture in order to make space for specified tile
 func_94312_a,addStitchHolder,2,
+func_94327_t_,getItemIconName,2,Gets the icon name of the ItemBlock corresponding to this block. Used by hoppers.
 func_94328_b_,getComparatorInputOverride,2,"If hasComparatorInputOverride returns true, the return value from this is used instead of the redstone signal strength when this block inputs to a comparator."
 func_94329_b,isAssociatedBlockID,2,Static version of isAssociatedBlockID.
 func_94330_A,getUnlocalizedName2,2,Returns the unlocalized name without the tile. prefix. Caution: client-only.
 func_94331_a,canPlaceBlockOnSide,2,
 func_94332_a,registerIcons,2,"When this method is called, your block should register all the icons it needs with the given IconRegister. This is the only chance you get to register icons."
 func_94334_h,isAssociatedBlockID,2,"Returns true if the given block ID is equivalent to this one. Example: redstoneTorchOn matches itself and redstoneTorchOff, and vice versa. Most blocks only match themselves."
+func_94350_c,getPowerSupply,2,Argument is metadata. Returns power level (0-15)
+func_94351_d,getPlateState,2,Returns the current state of the pressure plate. Returns a value between 0 and 15 based on the number of items on it.
+func_94352_a,getSensitiveAABB,2,
+func_94355_d,getMetaFromWeight,2,Argument is weight (0-15). Return the metadata to be set because of it.
 func_94434_o,getIconSideOverlay,2,
+func_94442_h_,getInventory,2,"Gets the inventory of the chest at the specified coords, accounting for blocks or ocelots on top of the chest, and double chests."
+func_94444_j_,updateLightLevel,2,
+func_94446_i,getBeaconIcon,2,
+func_94448_e,getBrewingStandIcon,2,
+func_94451_c,getDirectionFromMetadata,2,
+func_94452_d,getIsBlockNotPoweredFromMetadata,2,
+func_94453_b,getHopperIcon,2,
+func_94501_a,getRailLogic,2,
+func_94502_a,isMinecartTrack,2,
+func_94503_c,canConnectFrom,2,
+func_94504_a,setBasicRail,2,
+func_94505_a,getNumberOfAdjacentTracks,2,
+func_94506_c,connectToNeighbor,2,
+func_94507_b,canConnectTo,2,
+func_94508_a,isRailChunkPositionCorrect,2,Checks if the rail is at the chunk position it is expected to be.
+func_94509_b,refreshConnectedTracks,2,
+func_94510_b,isPartOfTrack,2,
+func_94520_b,containsTranslateKey,2,
+func_94526_b,calcRedstoneFromInventory,2,
 func_94539_a,setExplosionSource,2,
 func_94540_d,setExplosion,2,
 func_94541_c,isExplosion,2,
@@ -4231,13 +4317,53 @@ func_94572_D,getStrongestIndirectPower,2,
 func_94573_a,isBlockTickScheduled,2,"Returns true if the given block will receive a scheduled tick in the future. Args: X, Y, Z, blockID"
 func_94574_k,getIndirectPowerOutput,2,"Returns the indirect signal strength being outputted by the given block in the *opposite* of the given direction. Args: X, Y, Z, direction"
 func_94575_c,setBlock,2,"Sets a block and notifies relevant systems with the block change  Args: x, y, z, blockID"
+func_94576_a,getEntitiesWithinAABBExcludingEntity,2,
 func_94577_B,getBlockPowerInput,2,"Returns the highest redstone signal strength powering the given block. Args: X, Y, Z."
 func_94578_a,destroyBlock,2,"Destroys a block and optionally drops items. Args: X, Y, Z, dropItems"
-func_94581_a,updateIcons,2,
+func_94581_a,registerIcons,2,
+func_94599_c,getItemIconForUseDuration,2,"used to cycle through icons based on their used duration, i.e. for the bow"
 func_94608_d,getItemSpriteNumber,2,
 func_94609_a,callTileEntityID,2,
 func_94611_a,callTileEntityDataInfo,2,
 func_94901_k,getSpriteNumber,2,"Returns 0 for /terrain.png, 1 for /gui/items.png"
+func_96090_ax,getTranslatedEntityName,2,Returns the translated name of the entity.
+func_96095_a,onActivatorRailPass,2,Called every tick the minecart is on an activator rail.
+func_96096_ay,isIgnited,2,Returns true if the TNT minecart is ignited.
+func_96104_c,setCommandSenderName,2,Sets the name of the command sender
+func_96107_aA,getXPos,2,Gets the world X position for this hopper entity.
+func_96108_aC,getZPos,2,Gets the world Z position for this hopper entity.
+func_96109_aB,getYPos,2,Gets the world Y position for this hopper entity.
+func_96110_f,setBlocked,2,Set whether this hopper minecart is being blocked by an activator rail.
+func_96111_ay,getBlocked,2,Get whether this hopper minecart is being blocked by an activator rail.
+func_96115_a,setInventoryName,2,
+func_96116_a,suckItemsIntoHopper,2,Sucks one item into the given hopper from an inventory or EntityItem above it.
+func_96117_b,getInventoryAtLocation,2,Gets an inventory at the given location to extract items into or take items from. Can find either a tile entity or regular entity implementing IInventory.
+func_96118_b,getInventoryAboveHopper,2,"Looks for anything, that can hold items (like chests, furnaces, etc.) one block above the given hopper."
+func_96123_co,getWorldScoreboard,2,
+func_96124_cp,getTeam,2,
+func_96125_a,displayGUIHopperMinecart,2,
+func_96334_d,getScoreboardFromWorldServer,2,
+func_96335_a,getScoreObjectivesList,2,"If the parameter is true, does not return read-only entries."
+func_96336_d,getObjectivesList,2,Handler for the 'scoreboard objectives list' command.
+func_96337_e,removeObjective,2,Handler for the 'scoreboard objectives remove' command.
+func_96338_a,getTeam,2,Returns the ScorePlayerTeam for the given team name.
+func_96339_l,setPlayerScore,2,Handler for the 'scoreboard players [add|remove|set]' commands.
+func_96340_c,addTeam,2,Handler for the 'scoreboard teams add' command.
+func_96341_k,listPlayers,2,Handler for the 'scoreboard players list' command.
+func_96342_g,joinTeam,2,Handler for the 'scoreboard teams join' command.
+func_96343_e,removeTeam,2,Handler for the 'scoreboard teams remove' command.
+func_96344_f,getTeamList,2,Handler for the 'scoreboard teams list' command.
+func_96345_a,getScoreObjective,2,"User-safe version of Scoreboard.getObjective, does checks against the objective not being found and whether it's read-only or not. If true, the second parameter makes the function throw an exception if the objective is read-only."
+func_96346_i,emptyTeam,2,Handler for the 'scoreboard teams empty' command.
+func_96347_j,setObjectivesDisplay,2,Handler for the 'scoreboard objectives setdisplay' command.
+func_96348_d,setTeamOption,2,Handler for the 'scoreboard teams option' command.
+func_96349_h,leaveTeam,2,Handler for the 'scoreboard teams leave' command.
+func_96350_b,addObjective,2,Handler for the 'scoreboard objectives add' command.
+func_96351_m,resetPlayerScore,2,Handler for the 'scoreboard players reset' command.
+func_96435_a,handleSetPlayerTeam,2,Handle a set player team packet.
+func_96436_a,handleSetObjective,2,Handle a set objective packet.
+func_96437_a,handleSetScore,2,Handle a set score packet.
+func_96438_a,handleSetDisplayObjective,2,Handle a set display objective packet.
 func_96439_d,notifyBlocksOfNeighborChange,2,"Calls notifyBlockOfNeighborChange on adjacent blocks, except the one on the given side. Args: X, Y, Z, changingBlockID, side"
 func_96441_U,getScoreboard,2,
 func_96444_a,mixAoBrightness,2,
@@ -4247,33 +4373,84 @@ func_96447_a,renderBlockHopperMetadata,2,
 func_96448_c,getMissingIcon,2,
 func_96455_e,getMissingIcon,2,
 func_96468_q_,hasComparatorInputOverride,2,"If this returns true, then comparators facing away from this block will use the value from getComparatorInputOverride instead of the actual redstone signal strength."
+func_96471_k,updateMetadata,2,Updates the Metadata to include if the Hopper gets powered by Redstone or not
+func_96472_a,getBehaviorForItemStack,2,Returns the behavior for the given ItemStack.
+func_96475_a_,getTileEntityComparator,2,Returns the blockTileEntity at given coordinates.
+func_96477_c,markOrGrowMarked,2,
+func_96478_d,setBlockBoundsForSnowDepth,2,"calls setBlockBounds based on the depth of the snow. Int is any values 0x0-0x7, usually this blocks metadata."
+func_96509_i,getPlayersTeam,2,Gets the ScorePlayerTeam object for the given username.
+func_96512_b,removePlayerFromTeam,2,Removes the given username from the given ScorePlayerTeam. If the player is not on the team then an IllegalStateException is thrown.
+func_96514_c,getScoreObjectives,2,
+func_96517_b,getObjectiveDisplaySlot,2,"Returns 'list' for 0, 'sidebar' for 1, 'belowName for 2, otherwise null."
+func_96518_b,getObjective,2,Returns a ScoreObjective for the objective name
+func_96526_d,getObjectiveNames,2,
+func_96537_j,getObjectiveDisplaySlotNumber,2,"Returns 0 for (case-insensitive) 'list', 1 for 'sidebar', 2 for 'belowName', otherwise -1."
 func_96556_a,callServerMemoryStats,2,
 func_96557_a,callServerProfiler,2,
 func_96559_d,getFrontOffsetY,2,
 func_96563_a,callEntityName,2,
+func_96631_a,attemptDamageItem,2,"Attempts to damage the ItemStack with par1 amount of damage, If the ItemStack has the Unbreaking enchantment there is a chance for each point of damage to be negated. Returns true if it takes more damage than getMaxDamage(). Returns false otherwise or if the ItemStack can't be damaged or if all points of damage are negated."
 func_96632_a,callItemDisplayName,2,
+func_96637_b,isReadOnly,2,
+func_96670_d,getMembershipCollection,2,
+func_96678_d,getDisplayName,2,
+func_96679_b,getName,2,
+func_96680_c,getCriteria,2,
+func_96681_a,setDisplayName,2,
+func_96682_a,getScoreboard,2,
 func_98033_al,getLogAgent,2,
+func_98035_c,addNotRiddenEntityID,2,
+func_98042_n,setTransferTicker,2,"Sets the transfer ticker, used to determine the delay between transfers."
+func_98043_aE,canTransfer,2,Returns whether the hopper cart can currently transfer an item.
+func_98046_c,setTransferCooldown,2,
+func_98047_l,isCoolingDown,2,
 func_98052_bS,canPickUpLoot,2,
 func_98053_h,setCanPickUpLoot,2,
+func_98076_a,getServerLogger,2,
 func_98145_a,createEmptyTexture,2,
 func_98146_d,getBasename,2,"Strips directory and file extension from the specified path, returning only the filename"
 func_98147_a,hasAnimationTxt,2,Returns true if specified texture pack contains animation data for the specified texture file
+func_98152_d,getAllUsernames,2,
+func_98179_a,computeLightValue,2,
 func_98180_V,getWorldLogAgent,2,
+func_98182_a,handleWorldParticles,2,Handle a world particles packet.
 func_98184_a,setupTextureExt,2,
 func_98185_a,resetBoundTexture,2,
 func_98186_a,colorToAnaglyph,2,
 func_98187_b,bindTexture,2,
+func_98194_g,getPositionY,2,Gets the Y position of the particle.
+func_98195_d,getParticleName,2,
+func_98196_i,getOffsetX,2,This is added to the X position after being multiplied by random.nextGaussian()
+func_98197_l,getSpeed,2,Gets the speed of the particles.
+func_98198_h,getPositionZ,2,Gets the Z position of the particle.
+func_98199_k,getOffsetZ,2,This is added to the Z position after being multiplied by random.nextGaussian()
+func_98200_f,getPositionX,2,Gets the X position of the particle.
+func_98201_j,getOffsetY,2,This is added to the Y position after being multiplied by random.nextGaussian()
+func_98202_m,getQuantity,2,Gets the number of particles to create.
+func_98213_d,getHopperTile,2,
 func_98225_a,getPacketClass,2,
+func_98230_d,logFine,2,
+func_98231_b,logWarningFormatted,2,
+func_98232_c,logSevere,2,
 func_98233_a,logInfo,2,
+func_98234_c,logSevereException,2,
+func_98235_b,logWarningException,2,
 func_98236_b,logWarning,2,
+func_98238_b,setupLogger,2,Sets up the logger for usage.
 func_98243_a,callPacketID,2,
 func_98266_d,getSpawnerZ,2,
+func_98268_b,setDelayToMin,2,"Sets the delay to minDelay if parameter given is 1, else return false."
+func_98269_i,getRandomMinecart,2,
+func_98270_a,readFromNBT,2,
 func_98271_a,getSpawnerWorld,2,
 func_98272_a,setMobID,2,
 func_98274_c,getSpawnerY,2,
 func_98275_b,getSpawnerX,2,
+func_98276_e,getEntityNameToSpawn,2,Gets the entity name that should be spawned.
+func_98277_a,setRandomMinecart,2,
 func_98278_g,updateSpawner,2,
 func_98279_f,canRun,2,Returns true if there's a player close enough to this mob spawner to activate it.
+func_98280_b,writeToNBT,2,
 func_98304_a,readFontData,2,
 func_98305_c,readFontTexture,2,
 func_98306_d,readGlyphSizes,2,

conf/packages.csv

@@ -1,4 +1,6 @@
 class,package
+GuiScreenOnlineServersSubscreen,net/minecraft/client/gui
+RunnableTitleScreen,net/minecraft/client/gui
 Block,net/minecraft/block
 BlockAnvil,net/minecraft/block
 BlockBasePressurePlate,net/minecraft/block
@@ -245,13 +247,11 @@ ScaledResolution,net/minecraft/client/gui
 ScreenChatOptions,net/minecraft/client/gui
 SelectionListBase,net/minecraft/client/gui
 SelectionListInvited,net/minecraft/client/gui
-SelectionListLocation,net/minecraft/client/gui
 TaskLongRunning,net/minecraft/client/gui
 TaskOnlineConnect,net/minecraft/client/gui
 TaskResetWorld,net/minecraft/client/gui
 TaskWorldCreation,net/minecraft/client/gui
 ThreadConnectToOnlineServer,net/minecraft/client/gui
-ThreadCreateOnlineWorldScreen,net/minecraft/client/gui
 ThreadOnlineConnect,net/minecraft/client/gui
 ThreadOnlineScreen,net/minecraft/client/gui
 ThreadPollServers,net/minecraft/client/gui
@@ -285,8 +285,6 @@ SlotCreativeInventory,net/minecraft/client/gui/inventory
 ExceptionMcoHttp,net/minecraft/client/mco
 ExceptionMcoService,net/minecraft/client/mco
 ExceptionRetryCall,net/minecraft/client/mco
-Location,net/minecraft/client/mco
-Locations,net/minecraft/client/mco
 McoClient,net/minecraft/client/mco
 McoOption,net/minecraft/client/mco
 McoOptionNone,net/minecraft/client/mco

conf/params.csv

@@ -10,15 +10,6 @@ p_101001_1_,par1,2
 p_101001_2_,par2,2
 p_101001_3_,par3,2
 p_101001_4_,par4,2
-p_101002_0_,par0GuiScreenOnlineServers,2
-p_101002_1_,par1McoServer,2
-p_101003_0_,par0GuiScreenOnlineServers,2
-p_101003_1_,par1,2
-p_101003_2_,par2,2
-p_101003_3_,par3,2
-p_101003_4_,par4,2
-p_101004_0_,par0GuiScreenOnlineServers,2
-p_101005_0_,par0GuiScreenOnlineServers,2
 p_101006_1_,par1,2
 p_101006_2_,par2,2
 p_101006_3_,par3,2
@@ -32,8 +23,6 @@ p_101009_1_,par1,2
 p_101009_2_,par2,2
 p_101009_3_,par3,2
 p_101009_4_,par4,2
-p_101011_0_,par0GuiScreenOnlineServers,2
-p_101011_1_,par1Str,2
 p_101012_0_,par0GuiScreenOnlineServers,2
 p_101012_1_,par1,2
 p_101012_2_,par2,2
@@ -78,6 +67,96 @@ p_102027_4_,par4,2
 p_102027_5_,par5,2
 p_102027_6_,par6,2
 p_102027_7_,par7,2
+p_104004_0_,par0GuiMainMenu,2
+p_104005_0_,par0GuiMainMenu,2
+p_104005_1_,par1Str,2
+p_104006_0_,par0GuiMainMenu,2
+p_104006_1_,par1,2
+p_104007_0_,par0GuiMainMenu,2
+p_104008_0_,par0GuiMainMenu,2
+p_104008_1_,par1,2
+p_104009_0_,par0GuiMainMenu,2
+p_104009_1_,par1,2
+p_104010_0_,par0,2
+p_104011_0_,par0GuiMainMenu,2
+p_104011_1_,par1,2
+p_104012_0_,par0GuiMainMenu,2
+p_104012_1_,par1,2
+p_104013_0_,par0GuiMainMenu,2
+p_104013_1_,par1Str,2
+p_104014_0_,par0GuiMainMenu,2
+p_104014_1_,par1,2
+p_104015_0_,par0GuiMainMenu,2
+p_104016_0_,par0GuiMainMenu,2
+p_104017_0_,par0GuiMainMenu,2
+p_104018_0_,par0GuiMainMenu,2
+p_104019_0_,par0GuiMainMenu,2
+p_104020_0_,par0GuiMainMenu,2
+p_104021_0_,par0GuiMainMenu,2
+p_104021_1_,par1StringTranslate,2
+p_104021_2_,par2,2
+p_104021_3_,par3,2
+p_104022_0_,par0GuiMainMenu,2
+p_104023_0_,par0GuiMainMenu,2
+p_104026_0_,par0GuiScreenOnlineServers,2
+p_104026_1_,par1Str,2
+p_104027_0_,par0GuiScreenOnlineServers,2
+p_104028_0_,par0GuiScreenOnlineServers,2
+p_104029_0_,par0GuiScreenOnlineServers,2
+p_104030_0_,par0GuiScreenOnlineServers,2
+p_104030_1_,par1,2
+p_104030_2_,par2,2
+p_104030_3_,par3,2
+p_104030_4_,par4,2
+p_104030_5_,par5,2
+p_104031_0_,par0GuiScreenOnlineServers,2
+p_104031_1_,par1,2
+p_104031_2_,par2,2
+p_104031_3_,par3,2
+p_104031_4_,par4,2
+p_104032_0_,par0GuiScreenOnlineServers,2
+p_104033_0_,par0GuiScreenOnlineServers,2
+p_104034_0_,par0GuiScreenOnlineServers,2
+p_104034_1_,par1McoServer,2
+p_104036_0_,par0GuiScreenOnlineServers,2
+p_104038_0_,par0GuiScreenOnlineServers,2
+p_104039_1_,par1,2
+p_104039_2_,par2,2
+p_104039_3_,par3,2
+p_104039_4_,par4,2
+p_104039_5_,par5,2
+p_104040_0_,par0GuiScreenOnlineServers,2
+p_104043_0_,par0GuiScreenOnlineServers,2
+p_104047_0_,par0GuiScreenCreateOnlineWorld,2
+p_104048_0_,par0GuiScreenCreateOnlineWorld,2
+p_104055_1_,par1,2
+p_104062_1_,par1,2
+p_104062_2_,par2,2
+p_104062_3_,par3Texture,2
+p_104064_0_,par0Str,2
+p_104064_1_,par1Str,2
+p_104064_2_,par2,2
+p_104064_3_,par3,2
+p_104069_1_,par1GuiButton,2
+p_104071_1_,par1GuiScreen,2
+p_104071_2_,par2FontRenderer,2
+p_104083_1_,par1,2
+p_104083_2_,par2,2
+p_104083_3_,par3,2
+p_104083_4_,par4,2
+p_104084_1_,par1,2
+p_104084_2_,par2,2
+p_104084_3_,par3,2
+p_104084_4_,par4,2
+p_104086_1_,par1,2
+p_104087_1_,par1,2
+p_104087_2_,par2,2
+p_104088_1_,par1,2
+p_104088_2_,par2,2
+p_104088_3_,par3Tessellator,2
+p_104089_1_,par1,2
+p_104089_2_,par2,2
+p_104145_0_,par0URL,2
 p_70000_1_,par1PlayerUsageSnooper,2
 p_70001_1_,par1PlayerUsageSnooper,2
 p_70003_1_,par1,2
@@ -7661,20 +7740,7 @@ p_96174_1_,par1McoServer,2
 p_96177_0_,par0GuiScreenOnlineServers,2
 p_96209_1_,par1Str,2
 p_96210_1_,par1Str,2
-p_96230_0_,par0GuiScreenSelectLocation,2
-p_96231_0_,par0GuiScreenSelectLocation,2
-p_96232_0_,par0GuiScreenSelectLocation,2
-p_96233_0_,par0GuiScreenSelectLocation,2
-p_96234_0_,par0GuiScreenSelectLocation,2
-p_96234_1_,par1Location,2
-p_96235_0_,par0GuiScreenSelectLocation,2
-p_96236_0_,par0GuiScreenSelectLocation,2
-p_96246_0_,par0GuiScreenCreateOnlineWorld,2
-p_96247_0_,par0GuiScreenCreateOnlineWorld,2
 p_96248_0_,par0GuiScreenCreateOnlineWorld,2
-p_96251_1_,par1Location,2
-p_96251_2_,par2Str,2
-p_96251_3_,par3Str,2
 p_96263_0_,par0GuiScreenConfigureWorld,2
 p_96264_1_,par1,2
 p_96265_0_,par0GuiScreenConfigureWorld,2
@@ -7763,6 +7829,7 @@ p_96363_0_,par0Str,2
 p_96363_1_,par1Str,2
 p_96374_1_,par1,2
 p_96376_1_,par1,2
+p_96376_3_,par3Str,2
 p_96377_1_,par1Request,2
 p_96378_1_,par1,2
 p_96380_1_,par1Str,2
@@ -7772,9 +7839,12 @@ p_96383_1_,par1,2
 p_96384_1_,par1,2
 p_96384_3_,par3Str,2
 p_96384_4_,par4Str,2
+p_96384_5_,par5,2
+p_96384_6_,par6,2
 p_96386_1_,par1Str,2
 p_96386_2_,par2Str,2
 p_96386_3_,par3Str,2
+p_96386_4_,par4Str,2
 p_96387_1_,par1,2
 p_96387_3_,par3Str,2
 p_96394_0_,par0Field,2
@@ -7961,43 +8031,25 @@ p_98046_1_,par1,2
 p_98053_1_,par1,2
 p_98054_1_,par1,2
 p_98055_1_,par1,2
-p_98058_0_,par0GuiMainMenu,2
-p_98059_0_,par0,2
 p_98060_1_,par1StringTranslate,2
 p_98060_2_,par2,2
 p_98060_3_,par3,2
-p_98061_0_,par0GuiMainMenu,2
-p_98061_1_,par1StringTranslate,2
-p_98061_2_,par2,2
-p_98061_3_,par3,2
 p_98062_1_,par1,2
 p_98063_1_,par1,2
 p_98072_0_,par0GuiScreenOnlineServers,2
-p_98074_0_,par0GuiScreenOnlineServers,2
 p_98075_0_,par0GuiScreenOnlineServers,2
 p_98076_0_,par0GuiScreenOnlineServers,2
 p_98078_0_,par0GuiScreenOnlineServers,2
 p_98078_1_,par1,2
-p_98079_0_,par0GuiScreenOnlineServers,2
 p_98081_0_,par0GuiScreenOnlineServers,2
 p_98081_1_,par1,2
-p_98084_0_,par0GuiScreenOnlineServers,2
 p_98086_1_,par1,2
-p_98087_0_,par0GuiScreenOnlineServers,2
 p_98089_0_,par0GuiScreenOnlineServers,2
 p_98089_1_,par1,2
-p_98091_0_,par0GuiScreenOnlineServers,2
 p_98092_0_,par0GuiScreenOnlineServers,2
 p_98094_0_,par0GuiScreenOnlineServers,2
 p_98096_0_,par0GuiConnecting,2
 p_98097_0_,par0GuiConnecting,2
-p_98099_0_,par0GuiScreenCreateOnlineWorld,2
-p_98100_0_,par0GuiScreenCreateOnlineWorld,2
-p_98100_1_,par1Location,2
-p_98101_0_,par0GuiScreenCreateOnlineWorld,2
-p_98102_0_,par0GuiScreenCreateOnlineWorld,2
-p_98102_1_,par1List,2
-p_98103_0_,par0GuiScreenCreateOnlineWorld,2
 p_98137_1_,par1Str,2
 p_98137_2_,par2,2
 p_98138_1_,par1Str,2
@@ -8025,12 +8077,8 @@ p_98162_0_,par0Str,2
 p_98163_0_,par0JsonNode,2
 p_98164_0_,par0List,2
 p_98165_0_,par0Str,2
-p_98167_0_,par0JsonNode,2
-p_98168_0_,par0JsonNode,2
-p_98168_1_,par1Str,2
 p_98169_0_,par0Str,2
 p_98172_0_,par0TaskOnlineConnect,2
-p_98174_0_,par0Str,2
 p_98176_1_,par1,2
 p_98177_1_,par1,2
 p_98179_1_,par1,2
@@ -8125,11 +8173,9 @@ p_i10003_1_,par1,2
 p_i10003_2_,par2,2
 p_i10004_1_,par1,2
 p_i10004_2_,par2,2
-p_i10005_1_,par1,2
-p_i10005_2_,par2,2
+p_i10005_1_,par1ScorePlayerTeam,2
+p_i10005_2_,par2Collection,2
 p_i10005_3_,par3,2
-p_i10005_4_,par4Str,2
-p_i10005_5_,par5Str,2
 p_i10006_1_,par1,2
 p_i10006_2_,par2,2
 p_i10007_1_,par1,2
@@ -8139,8 +8185,6 @@ p_i10008_3_,par3TaskLongRunning,2
 p_i10009_1_,par1GuiSlotOnlineServerList,2
 p_i10009_2_,par2McoServer,2
 p_i10010_1_,par1GuiScreen,2
-p_i10011_1_,par1GuiScreenResetWorld,2
-p_i10011_2_,par2,2
 p_i10012_1_,par1Minecraft,2
 p_i10012_2_,par2,2
 p_i10012_3_,par3,2
@@ -8152,10 +8196,6 @@ p_i10013_2_,par2GuiScreen,2
 p_i10013_3_,par3McoServer,2
 p_i10014_1_,par1GuiScreen,2
 p_i10014_2_,par2McoServer,2
-p_i10017_1_,par1GuiScreenCreateOnlineWorld,2
-p_i10017_2_,par2Str,2
-p_i10017_3_,par3Str,2
-p_i10017_4_,par4Str,2
 p_i10018_1_,par1TaskOnlineConnect,2
 p_i10018_2_,par2Str,2
 p_i10018_3_,par3,2
@@ -8257,7 +8297,6 @@ p_i11007_1_,par1GuiScreen,2
 p_i11007_2_,par2Str,2
 p_i11007_3_,par3Str,2
 p_i11007_4_,par4ArrayOfObj,2
-p_i11008_1_,par1GuiScreenCreateOnlineWorld,2
 p_i11011_1_,par1GuiScreenOnlineServers,2
 p_i11012_1_,par1Minecraft,2
 p_i11012_2_,par2Str,2
@@ -8417,6 +8456,29 @@ p_i22009_5_,par5,2
 p_i22009_6_,par6,2
 p_i22009_7_,par7,2
 p_i22009_8_,par8,2
+p_i23000_1_,par1,2
+p_i23000_2_,par2,2
+p_i23000_3_,par3,2
+p_i23000_4_,par4,2
+p_i23001_1_,par1Minecraft,2
+p_i23001_2_,par2,2
+p_i23001_3_,par3,2
+p_i23001_4_,par4,2
+p_i23001_5_,par5,2
+p_i23001_6_,par6,2
+p_i23002_1_,par1GuiScreenResetWorld,2
+p_i23002_2_,par2,2
+p_i23002_4_,par4Str,2
+p_i23003_1_,par1GuiScreenCreateOnlineWorld,2
+p_i23003_2_,par2Str,2
+p_i23003_3_,par3Str,2
+p_i23003_4_,par4Str,2
+p_i23003_5_,par5Str,2
+p_i23004_1_,par1GuiScreen,2
+p_i23004_2_,par2Str,2
+p_i23004_3_,par3,2
+p_i23004_4_,par4,2
+p_i23005_1_,par1GuiMainMenu,2
 p_i3000_1_,par1File,2
 p_i3000_2_,par2Minecraft,2
 p_i3001_1_,par1Map,2
@@ -8622,9 +8684,6 @@ p_i3101_1_,par1Minecraft,2
 p_i3101_2_,par2World,2
 p_i3101_3_,par3Session,2
 p_i3101_4_,par4NetClientHandler,2
-p_i3102_1_,par1GuiScreen,2
-p_i3102_2_,par2Str,2
-p_i3102_3_,par3,2
 p_i3103_1_,par1Minecraft,2
 p_i3103_2_,par2Str,2
 p_i3103_3_,par3,2

conf/patches/minecraft_ff.patch

@@ -1,7 +1,7 @@
 diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
---- minecraft\net\minecraft\client\Minecraft.java	Tue Mar 19 21:24:34 2013
-+++ minecraft_patched\net\minecraft\client\Minecraft.java	Tue Mar 19 21:26:27 2013
-@@ -531,9 +531,8 @@
+--- minecraft\net\minecraft\client\Minecraft.java	Sat Apr 27 01:53:03 2013
++++ minecraft_patched\net\minecraft\client\Minecraft.java	Sat Apr 27 01:55:19 2013
+@@ -532,9 +532,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;
-@@ -551,7 +550,6 @@
+@@ -552,7 +551,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) {
              ;
-@@ -569,8 +567,6 @@
+@@ -570,8 +568,6 @@
              this.func_71405_e();
           }
  
@@ -30,8 +30,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
  
     private void func_71411_J() {
 diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Sat Apr 27 01:53:04 2013
++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Apr 27 01:55:19 2013
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() {
@@ -51,8 +51,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraf
        boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
        HashMap var6 = new HashMap();
 diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
---- minecraft\net\minecraft\src\CodecMus.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\CodecMus.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\CodecMus.java	Sat Apr 27 01:53:04 2013
++++ minecraft_patched\net\minecraft\src\CodecMus.java	Sat Apr 27 01:55:19 2013
 @@ -1,5 +1,6 @@
  package net.minecraft.src;
  
@@ -73,8 +73,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
     }
  }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Apr 27 01:53:04 2013
++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Apr 27 01:55:19 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -87,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	Tue Mar 19 21:24:35 2013
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Tue Mar 19 21:26:27 2013
-@@ -206,7 +206,7 @@
+--- minecraft\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:53:04 2013
++++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:55:19 2013
+@@ -207,7 +207,7 @@
        System.exit(0);
     }
  
@@ -99,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\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
---- minecraft\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:24:36 2013
-+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\EnumChatFormatting.java	Sat Apr 27 01:53:05 2013
++++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Sat Apr 27 01:55:19 2013
 @@ -38,7 +38,7 @@
     private final String field_96304_B;
  
@@ -111,8 +111,8 @@ diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patch
  
     private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) {
 diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
---- minecraft\net\minecraft\src\FontRenderer.java	Tue Mar 19 21:24:36 2013
-+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\FontRenderer.java	Sat Apr 27 01:53:05 2013
++++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sat Apr 27 01:55:19 2013
 @@ -621,8 +621,6 @@
           case 10:
              --var5;
@@ -132,8 +132,8 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
              var4 += this.func_78263_a(var8);
              if(var7) {
 diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
---- minecraft\net\minecraft\src\IntegratedServer.java	Tue Mar 19 21:24:37 2013
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\IntegratedServer.java	Sat Apr 27 01:53:05 2013
++++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Apr 27 01:55:19 2013
 @@ -101,7 +101,7 @@
        return true;
     }
@@ -144,8 +144,8 @@ 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\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java
---- minecraft\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\RConThreadClient.java	Sat Apr 27 01:53:07 2013
++++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Sat Apr 27 01:55:19 2013
 @@ -32,8 +32,8 @@
     }
  
@@ -186,8 +186,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched
  
     private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
 diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java
---- minecraft\net\minecraft\src\RenderBlocks.java	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\RenderBlocks.java	Sat Apr 27 01:53:07 2013
++++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sat Apr 27 01:55:19 2013
 @@ -1951,16 +1951,16 @@
        float var25 = (float)(p_78589_2_ + 1);
        float var26 = (float)(p_78589_4_ + 0);
@@ -219,8 +219,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net
           var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94212_f(), (double)var8.func_94206_g());
           var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94209_e(), (double)var8.func_94206_g());
 diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
---- minecraft\net\minecraft\src\RenderGlobal.java	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\RenderGlobal.java	Sat Apr 27 01:53:07 2013
++++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sat Apr 27 01:55:19 2013
 @@ -1449,7 +1449,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_;
@@ -231,8 +231,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	Tue Mar 19 21:24:38 2013
-+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Sat Apr 27 01:53:07 2013
++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sat Apr 27 01:55:19 2013
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -242,8 +242,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	Tue Mar 19 21:24:39 2013
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Mar 19 21:26:27 2013
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sat Apr 27 01:53:07 2013
++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Apr 27 01:55:19 2013
 @@ -20,7 +20,8 @@
     }
  

conf/patches/minecraft_server_ff.patch

@@ -1,6 +1,6 @@
 diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java
---- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:25:52 2013
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Sat Apr 27 01:54:18 2013
++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Apr 27 01:56:15 2013
 @@ -21,9 +21,14 @@
  
     public String func_85085_a() {
@@ -20,8 +20,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java m
        boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
        HashMap var6 = new HashMap();
 diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
---- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:25:52 2013
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Apr 27 01:54:19 2013
++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Apr 27 01:56:15 2013
 @@ -11,6 +11,10 @@
  
  public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@@ -34,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	Tue Mar 19 21:25:53 2013
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Tue Mar 19 21:26:37 2013
-@@ -207,7 +207,7 @@
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:54:19 2013
++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:56:15 2013
+@@ -208,7 +208,7 @@
        System.exit(0);
     }
  
@@ -46,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\EnumChatFormatting.java minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java
---- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:25:53 2013
-+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Sat Apr 27 01:54:20 2013
++++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Sat Apr 27 01:56:15 2013
 @@ -38,7 +38,7 @@
     private final String field_96304_B;
  
@@ -58,8 +58,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraf
  
     private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) {
 diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_server_patched\net\minecraft\src\MemoryConnection.java
---- minecraft_server\net\minecraft\src\MemoryConnection.java	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\MemoryConnection.java	Sat Apr 27 01:54:20 2013
++++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Sat Apr 27 01:56:15 2013
 @@ -2,6 +2,8 @@
  
  import java.net.InetSocketAddress;
@@ -91,8 +91,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_
        this.field_74440_d = p_74425_1_;
     }
 diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
---- minecraft_server\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\RConThreadClient.java	Sat Apr 27 01:54:20 2013
++++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Sat Apr 27 01:56:15 2013
 @@ -32,8 +32,8 @@
     }
  
@@ -133,8 +133,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_
  
     private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException {
 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	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Sat Apr 27 01:54:21 2013
++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sat Apr 27 01:56:15 2013
 @@ -11,6 +11,7 @@
        this.field_74504_a = p_i3285_1_;
     }
@@ -144,8 +144,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	Tue Mar 19 21:25:54 2013
-+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Tue Mar 19 21:26:37 2013
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sat Apr 27 01:54:21 2013
++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Apr 27 01:56:15 2013
 @@ -20,7 +20,8 @@
     }
  

conf/version.cfg

@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.44
-ClientVersion = 1.5.1
-ServerVersion = 1.5.1
+MCPVersion = 7.51
+ClientVersion = 1.5.2
+ServerVersion = 1.5.2

install/eclipse/Minecraft/.classpath

@@ -22,5 +22,6 @@
 	<classpathentry kind="lib" path="lib/bcprov-debug-jdk15on-148.jar" sourcepath="lib/bcprov-jdk15on-148-src.zip"/>
 	<classpathentry kind="lib" path="lib/asm-debug-all-4.1.jar" sourcepath="lib/asm-4.1-bin.zip"/>
 	<classpathentry kind="lib" path="lib/guava-14.0-rc3.jar" sourcepath="lib/guava-14.0-rc3-sources.jar"/>
+	<classpathentry kind="lib" path="lib/scala-library.jar" sourcepath="lib/scala-library.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

install/fml.py

@@ -12,7 +12,7 @@ mcp_version = '7.42'
 
 def download_deps(mcp_path):
     ret = True
-    for lib in ['argo-3.2-src.jar','guava-14.0-rc3.jar','asm-4.1.tar.gz','asm-debug-all-4.1.jar','bcprov-debug-jdk15on-148.jar','bcprov-jdk15on-148-src.zip','guava-14.0-rc3-sources.jar']:
+    for lib in ['argo-3.2-src.jar','guava-14.0-rc3.jar','asm-4.1.tar.gz','asm-debug-all-4.1.jar','bcprov-debug-jdk15on-148.jar','bcprov-jdk15on-148-src.zip','guava-14.0-rc3-sources.jar', 'scala-library.jar']:
         libF = os.path.join(mcp_path, 'lib')
         if not os.path.isdir(libF):
             os.makedirs(libF)
@@ -264,7 +264,9 @@ def setup_fml(fml_dir, mcp_dir, disable_at=False, disable_merge=False, enable_se
         class_path = os.pathsep.join(['.', os.path.join(mcp_dir, 'lib', '*'), dir_bin])
         dir_common = os.path.join(fml_dir, 'common')
         dir_trans  = os.path.join(dir_common, 'cpw', 'mods', 'fml', 'common', 'asm', 'transformers')
-        cmd_compile = '"%s" -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath "{sourcepath}" -d "{outpath}" "{target}"' % self.cmdjavac
+        java = self.cmdjava.translate(None, '"')
+        javac = self.cmdjavac.translate(None, '"')
+        cmd_compile = '"%s" -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath "{sourcepath}" -d "{outpath}" "{target}"' % javac
         cmd_compile = cmd_compile.format(classpath=class_path, sourcepath=dir_common, outpath=dir_bin, target="{target}")
         
         if compile_tools:
@@ -281,7 +283,7 @@ def setup_fml(fml_dir, mcp_dir, disable_at=False, disable_merge=False, enable_se
         if side == CLIENT:
             if not disable_merge:
                 self.logger.info('> Running MCPMerger')
-                forkcmd = ('"%s" -classpath "{classpath}" cpw.mods.fml.common.asm.transformers.MCPMerger "{mergecfg}" "{client}" "{server}"' % self.cmdjava).format(
+                forkcmd = ('"%s" -classpath "{classpath}" cpw.mods.fml.common.asm.transformers.MCPMerger "{mergecfg}" "{client}" "{server}"' % java).format(
                     classpath=class_path, mergecfg=os.path.join(fml_dir, 'mcp_merge.cfg'), client=jars[CLIENT], server=jars[SERVER])
                     
                 if not runcmd(self, forkcmd):
@@ -291,7 +293,7 @@ def setup_fml(fml_dir, mcp_dir, disable_at=False, disable_merge=False, enable_se
         
         if not disable_at:
             self.logger.info('> Running AccessTransformer')
-            forkcmd = ('"%s" -classpath "{classpath}" cpw.mods.fml.common.asm.transformers.AccessTransformer "{jar}" "{fmlconfig}"' % self.cmdjava).format(
+            forkcmd = ('"%s" -classpath "{classpath}" cpw.mods.fml.common.asm.transformers.AccessTransformer "{jar}" "{fmlconfig}"' % java).format(
                 classpath=class_path, jar=jars[side], fmlconfig=os.path.join(fml_dir, 'common', 'fml_at.cfg'))
                 
             forge_cfg = os.path.join(fml_dir, '..', 'common', 'forge_at.cfg')

mc_versions.cfg

@@ -1,5 +1,5 @@
 [default]
-current_ver = 1.5.1
+current_ver = 1.5.2
 base_url    = http://s3.amazonaws.com/MinecraftDownload/
 libraries   = lwjgl.jar lwjgl_util.jar jinput.jar
 natives     = windows_natives.jar macosx_natives.jar linux_natives.jar
@@ -82,6 +82,15 @@ server_url = http://assets.minecraft.net/1_5_1/minecraft_server.jar
 client_md5 = 5c1219d869b87d233de3033688ec7567
 server_md5 = 9d31b969c3f197a1d40381d5620717ea
 mcp_ver    = 7.44
-mcp_url    = http://files.minecraftforge.net/mcpmirror/mcp744.zip
+mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp744.zip
 mcp_md5    = 0b9047820bbcb7da32c5e18f60212832
 
+[1.5.2]
+client_url = http://s3.amazonaws.com/Minecraft.Download/versions/1.5.2/1.5.2.jar
+server_url = http://s3.amazonaws.com/Minecraft.Download/versions/1.5.2/minecraft_server.1.5.2.jar
+client_md5 = 6897c3287fb971c9f362eb3ab20f5ddd
+server_md5 = c4e1bf89e834bd3670c7bf8f13874bc6
+mcp_ver    = 7.44
+mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp751.zip
+mcp_md5    = 593238c1cc71f76c94738ff6a014d1a2
+

mcp_merge.cfg

@@ -1 +1 @@
-!bjz #net/minecraft/src/CodecMus
+!bjy #net/minecraft/src/CodecMus

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

@@ -1,10 +1,17 @@
 --- ../src-base/minecraft/net/minecraft/client/ClientBrandRetriever.java
 +++ ../src-work/minecraft/net/minecraft/client/ClientBrandRetriever.java
-@@ -8,6 +8,6 @@
+@@ -1,5 +1,6 @@
+ package net.minecraft.client;
+ 
++import cpw.mods.fml.common.FMLCommonHandler;
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
+ 
+@@ -8,6 +9,6 @@
  {
      public static String getClientModName()
      {
 -        return "vanilla";
-+        return "fml";
++        return FMLCommonHandler.instance().getModName();
      }
  }

patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch

@@ -8,25 +8,17 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.awt.image.BufferedImage;
-@@ -11,6 +13,7 @@
- import java.util.ArrayList;
- import java.util.Calendar;
- import java.util.Date;
-+import java.util.List;
- import java.util.Random;
- import net.minecraft.client.Minecraft;
- import net.minecraft.client.renderer.Tessellator;
-@@ -22,6 +25,9 @@
- import net.minecraft.world.storage.WorldInfo;
+@@ -24,6 +26,9 @@
  import org.lwjgl.opengl.GL11;
  import org.lwjgl.util.glu.GLU;
-+
+ 
 +import com.google.common.base.Strings;
 +import com.google.common.collect.Lists;
- 
++
  @SideOnly(Side.CLIENT)
  public class GuiMainMenu extends GuiScreen
-@@ -45,6 +51,8 @@
+ {
+@@ -48,6 +53,8 @@
      private int field_92020_v;
      private int field_92019_w;
  
@@ -35,7 +27,7 @@
      public GuiMainMenu()
      {
          BufferedReader bufferedreader = null;
-@@ -143,6 +151,9 @@
+@@ -165,6 +172,9 @@
          {
              this.func_73969_a(i, 24, stringtranslate);
          }
@@ -45,7 +37,7 @@
  
          this.func_96137_a(stringtranslate, i, 24);
  
-@@ -197,7 +208,14 @@
+@@ -211,7 +221,14 @@
  
      private void func_98060_b(StringTranslate p_98060_1_, int p_98060_2_, int p_98060_3_)
      {
@@ -61,7 +53,7 @@
      }
  
      private void func_73969_a(int p_73969_1_, int p_73969_2_, StringTranslate p_73969_3_)
-@@ -249,6 +267,11 @@
+@@ -263,6 +280,11 @@
          if (p_73875_1_.field_73741_f == 4)
          {
              this.field_73882_e.func_71400_g();
@@ -73,7 +65,7 @@
          }
  
          if (p_73875_1_.field_73741_f == 11)
-@@ -487,7 +510,16 @@
+@@ -501,7 +523,16 @@
              s = s + " Demo";
          }
  

patches/minecraft/net/minecraft/client/renderer/texture/Texture.java.patch

@@ -0,0 +1,63 @@
+--- ../src-base/minecraft/net/minecraft/client/renderer/texture/Texture.java
++++ ../src-work/minecraft/net/minecraft/client/renderer/texture/Texture.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.client.renderer.texture;
+ 
++import cpw.mods.fml.client.TextureFXManager;
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
+ import java.awt.image.BufferedImage;
+@@ -9,6 +10,8 @@
+ import javax.imageio.ImageIO;
+ import net.minecraft.client.Minecraft;
+ import net.minecraft.client.renderer.OpenGlHelper;
++import net.minecraft.src.FMLRenderAccessLibrary;
++
+ import org.lwjgl.opengl.GL11;
+ import org.lwjgl.opengl.GL12;
+ 
+@@ -206,6 +209,12 @@
+     {
+         if (this.field_94300_h != 32879)
+         {
++            if (field_94303_q && !p_94281_4_)
++            {
++                FMLRenderAccessLibrary.doTextureCopy(this, p_94281_3_, p_94281_1_, p_94281_2_);
++                return;
++            }
++
+             ByteBuffer bytebuffer = p_94281_3_.func_94273_h();
+             this.field_94302_r.position(0);
+             bytebuffer.position(0);
+@@ -218,7 +227,7 @@
+ 
+                 if (p_94281_4_)
+                 {
+-                    l = p_94281_2_ + (p_94281_3_.func_94276_e() - k);
++                    l = p_94281_1_ + (p_94281_3_.func_94276_e() - k - 1); //BUGFIX: targetY -> targetX and -1
+                 }
+ 
+                 for (int k1 = 0; k1 < p_94281_3_.func_94275_d(); ++k1)
+@@ -228,7 +237,7 @@
+ 
+                     if (p_94281_4_)
+                     {
+-                        l1 = p_94281_1_ + k1 * this.field_94289_d * 4 + l * 4;
++                        l1 = (p_94281_2_ + k1) * this.field_94289_d * 4 + l * 4; //BUGFIX: targetX -> targetY and parens
+                     }
+ 
+                     this.field_94302_r.put(l1 + 0, bytebuffer.get(i2 + 0));
+@@ -378,4 +387,13 @@
+     {
+         return this.field_94302_r;
+     }
++
++    public void createAndUploadTexture()
++    {
++        this.field_94293_a = GL11.glGenTextures();
++        GL11.glBindTexture(this.field_94300_h, this.field_94293_a);
++        System.out.printf("Buffer %s %x %d is %s\n",field_94297_m, field_94300_h, field_94293_a, field_94302_r);
++        field_94302_r.position(field_94302_r.limit());
++        func_94285_g();
++    }
+ }

patches/minecraft/net/minecraft/client/renderer/texture/TextureClock.java.patch

@@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureClock.java
++++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureClock.java
+@@ -66,7 +66,7 @@
+         if (i != this.field_94222_f)
+         {
+             this.field_94222_f = i;
+-            this.field_94228_a.func_94281_a(this.field_94224_d, this.field_94225_e, (Texture)this.field_94226_b.get(this.field_94222_f), this.field_94227_c);
++            this.field_94228_a.func_94281_a(this.field_94224_d, this.field_94225_e, (Texture)this.field_94226_b.get(this.field_94222_f), false); //FML: We rotate the textures in init.
+         }
+     }
+ }

patches/minecraft/net/minecraft/client/renderer/texture/TextureCompass.java.patch

@@ -0,0 +1,11 @@
+--- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureCompass.java
++++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureCompass.java
+@@ -94,7 +94,7 @@
+         if (i != this.field_94222_f)
+         {
+             this.field_94222_f = i;
+-            this.field_94228_a.func_94281_a(this.field_94224_d, this.field_94225_e, (Texture)this.field_94226_b.get(this.field_94222_f), this.field_94227_c);
++            this.field_94228_a.func_94281_a(this.field_94224_d, this.field_94225_e, (Texture)this.field_94226_b.get(this.field_94222_f), false); //FML: We rotate the textures in init.
+         }
+     }
+ }

patches/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java.patch

@@ -0,0 +1,34 @@
+--- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java
++++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureStitched.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.client.renderer.texture;
+ 
++import cpw.mods.fml.client.TextureFXManager;
+ import cpw.mods.fml.relauncher.Side;
+ import cpw.mods.fml.relauncher.SideOnly;
+ import java.io.BufferedReader;
+@@ -56,6 +57,11 @@
+         this.field_94230_o = (float)(p_94218_4_ + p_94218_6_) / (float)p_94218_1_.func_94276_e() - f1;
+         this.field_94238_p = (float)p_94218_5_ / 16.0F;
+         this.field_94237_q = (float)p_94218_6_ / 16.0F;
++        TextureFXManager.instance().getHelper().doTextureUpload(this);
++        if (this.field_94227_c)
++        {
++            TextureFXManager.instance().getHelper().rotateTexture(this.field_94228_a, this.field_94228_a.func_94273_h());
++        }
+     }
+ 
+     public void func_94217_a(TextureStitched p_94217_1_)
+@@ -198,4 +204,12 @@
+             this.field_94236_i = arraylist;
+         }
+     }
++
++    public void createAndUploadTextures()
++    {
++        for (Texture t : ((List<Texture>)field_94226_b))
++        {
++            t.createAndUploadTexture();
++        }
++    }
+ }

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

@@ -9,7 +9,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.awt.GraphicsEnvironment;
-@@ -351,7 +354,11 @@
+@@ -352,7 +355,11 @@
          {
              if (this.func_71197_b())
              {
@@ -21,7 +21,7 @@
  
                  for (long j = 0L; this.field_71317_u; this.field_71296_Q = true)
                  {
-@@ -390,6 +397,7 @@
+@@ -391,6 +398,7 @@
  
                      Thread.sleep(1L);
                  }
@@ -29,7 +29,7 @@
              }
              else
              {
-@@ -398,6 +406,10 @@
+@@ -399,6 +407,10 @@
          }
          catch (Throwable throwable)
          {
@@ -40,7 +40,7 @@
              throwable.printStackTrace();
              this.func_98033_al().func_98234_c("Encountered an unexpected exception " + throwable.getClass().getSimpleName(), throwable);
              CrashReport crashreport = null;
-@@ -428,6 +440,10 @@
+@@ -429,6 +441,10 @@
          {
              try
              {
@@ -51,7 +51,7 @@
                  this.func_71260_j();
                  this.field_71316_v = true;
              }
-@@ -437,6 +453,7 @@
+@@ -438,6 +454,7 @@
              }
              finally
              {
@@ -59,7 +59,7 @@
                  this.func_71240_o();
              }
          }
-@@ -453,8 +470,10 @@
+@@ -454,8 +471,10 @@
  
      public void func_71217_p()
      {
@@ -70,7 +70,7 @@
          ++this.field_71315_w;
  
          if (this.field_71295_T)
-@@ -500,6 +519,7 @@
+@@ -501,6 +520,7 @@
  
          this.field_71304_b.func_76319_b();
          this.field_71304_b.func_76319_b();
@@ -78,7 +78,7 @@
      }
  
      public void func_71190_q()
-@@ -527,6 +547,7 @@
+@@ -528,6 +548,7 @@
                  }
  
                  this.field_71304_b.func_76320_a("tick");
@@ -86,7 +86,7 @@
                  CrashReport crashreport;
  
                  try
-@@ -551,6 +572,7 @@
+@@ -552,6 +573,7 @@
                      throw new ReportedException(crashreport);
                  }
  
@@ -94,16 +94,16 @@
                  this.field_71304_b.func_76319_b();
                  this.field_71304_b.func_76320_a("tracker");
                  worldserver.func_73039_n().func_72788_a();
-@@ -678,7 +700,7 @@
+@@ -679,7 +701,7 @@
  
      public String getServerModName()
      {
 -        return "vanilla";
-+        return "fml";
++        return FMLCommonHandler.instance().getModName();
      }
  
      public CrashReport func_71230_b(CrashReport p_71230_1_)
-@@ -1126,6 +1148,13 @@
+@@ -1137,6 +1159,13 @@
      @SideOnly(Side.SERVER)
      public static void main(String[] p_main_0_)
      {

patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -16,7 +16,7 @@
          this.func_98033_al().func_98233_a("Loading properties");
          this.field_71340_o = new PropertyManager(new File("server.properties"), this.func_98033_al());
  
-@@ -130,6 +133,8 @@
+@@ -131,6 +134,8 @@
              this.func_98033_al().func_98236_b("While this makes the game possible to play without internet access, it also opens up the ability for hackers to connect with any username they choose.");
              this.func_98033_al().func_98236_b("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
          }
@@ -25,7 +25,7 @@
  
          this.func_71210_a(new DedicatedPlayerList(this));
          long j = System.nanoTime();
-@@ -172,6 +177,7 @@
+@@ -173,6 +178,7 @@
          this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16);
          this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256));
          this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z()));
@@ -33,7 +33,7 @@
          this.func_98033_al().func_98233_a("Preparing level \"" + this.func_71270_I() + "\"");
          this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
          long i1 = System.nanoTime() - j;
-@@ -192,7 +198,7 @@
+@@ -193,7 +199,7 @@
              this.field_71339_n.func_72602_a();
          }
  

patches/minecraft/net/minecraft/world/World.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/world/World.java
 +++ ../src-work/minecraft/net/minecraft/world/World.java
-@@ -1805,13 +1805,14 @@
+@@ -1806,13 +1806,14 @@
              }
          }
  
@@ -16,7 +16,7 @@
  
          this.field_72984_F.func_76318_c("pendingTileEntities");
  
-@@ -3639,7 +3640,7 @@
+@@ -3640,7 +3641,7 @@
      @SideOnly(Side.CLIENT)
      public double func_72919_O()
      {

patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java.patch

@@ -11,7 +11,7 @@
  import net.minecraft.entity.Entity;
  import net.minecraft.entity.EntityList;
  import net.minecraft.nbt.CompressedStreamTools;
-@@ -246,10 +250,19 @@
+@@ -252,10 +256,19 @@
                  Entity entity = (Entity)iterator.next();
                  nbttagcompound1 = new NBTTagCompound();
  
@@ -35,7 +35,7 @@
                  }
              }
          }
-@@ -262,8 +275,17 @@
+@@ -268,8 +281,17 @@
          {
              TileEntity tileentity = (TileEntity)iterator.next();
              nbttagcompound1 = new NBTTagCompound();