Functional client @ 1.6.1

Tweak commands patch
1.6.1
2026-11-14 09:05:17 +00:00 · 2013-06-30 21:02:23 -04:00 · 2013-06-30 19:33:47 -04:00 · 2013-06-30 16:50:30 -04:00 · 2013-06-30 13:20:46 -04:00 · 2013-06-30 13:17:20 -04:00
40 changed files with 34098 additions and 36781 deletions
@@ -30,9 +30,13 @@
      <isset property="env.WORKSPACE" />
    </condition>
    <property name="fml.python.dir" location="${basedir}/python" />
+    <property name="fml.lzma.dir" location="${basedir}/lzmabin" />
    <condition property="python.exe" value="${fml.python.dir}/python_fml" else="python">
      <os family="Windows" />
    </condition>
+    <condition property="lzma.exe" value="${fml.lzma.dir}/xz.exe" else="xz">
+      <os family="Windows" />
+    </condition>
    <condition property="mcp.exists">
      <available file="${mcp.home}/runtime/commands.py" />
    </condition>
@@ -150,7 +154,7 @@
    </jar>
    <antcall target="signjar" />
    <zip update="true" destfile="${basedir}/target/${universal.jarname}.zip">
-      <zipfileset dir="${basedir}/binpatch" prefix="binpatch" includes="**/*.binpatch"/>
+      <fileset dir="${basedir}" includes="binpatches.pack.lzma,deobfuscation_data-${version.minecraft}.lzma"/>
      <fileset dir="${client.mcp.obfoutput}" includes="*.class" />
      <zipfileset dir="${basedir}" includes="fmlversion.properties" />
      <zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
@@ -216,7 +220,8 @@
        <globmapper from="packaged.srg" to="deobfuscation_data-${version.minecraft}" />
      </mappedresources>
    </copy>
-    <exec executable="lzma">
+    <exec executable="${lzma.exe}">
+      <arg line="--format=lzma"/>
      <arg line="build-tmp-deobf/deobfuscation_data-${version.minecraft}"/>
      <arg line="-v"/>
    </exec>
@@ -381,28 +386,42 @@
    <signjar alias="FML" jar="${basedir}/target/${universal.jarname}.zip" keypass="${sign.KEYPASS}" keystore="${env.JENKINS_HOME}/${sign.KEYSTORE}" storepass="${sign.STOREPASS}" verbose="true" />
  </target>
  <target name="makebinpatches" depends="buildenvsetup,makeversion">
+    <path id="diffset.libs">
+      <pathelement path="${mcp.home}/jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar"/>
+      <pathelement path="${mcp.home}/jars/libraries/org/ow2/asm/asm-all/4.1/asm-all-4.1.jar"/>
+      <pathelement path="${mcp.home}/jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
+      <pathelement path="${mcp.obfoutput}/minecraft"/>
+    </path>
    <delete dir="${basedir}/binpatch" verbose="true"/>
-    <java classname="cpw.mods.fml.common.patcher.GenDiffSet">
-      <classpath>
-        <pathelement path="${mcp.obfoutput}/minecraft"/>
-        <fileset dir="${mcp.home}/lib" includes="guava-14.0-rc3.jar,asm-debug-all-4.1.jar"/>
-      </classpath>
+    <java classname="cpw.mods.fml.common.patcher.GenDiffSet" classpathref="diffset.libs">
      <arg path="${mcp.home}/jars/versions/${version.minecraft}/${version.minecraft}.jar.backup"/>
      <arg path="${mcp.obfoutput}/minecraft"/>
      <arg path="${basedir}/deobfuscation_data-${version.minecraft}.lzma"/>
      <arg path="${basedir}/binpatch/client"/>
      <arg value="false"/>
    </java>
-    <java classname="cpw.mods.fml.common.patcher.GenDiffSet">
-      <classpath>
-        <pathelement path="${mcp.obfoutput}/minecraft"/>
-        <fileset dir="${mcp.home}/lib" includes="guava-14.0-rc3.jar,asm-debug-all-4.1.jar"/>
-      </classpath>
+    <java classname="cpw.mods.fml.common.patcher.GenDiffSet"  classpathref="diffset.libs">
      <arg path="${mcp.home}/jars/minecraft_server.${version.minecraft}.jar.backup"/>
      <arg path="${mcp.obfoutput}/minecraft"/>
      <arg path="${basedir}/deobfuscation_data-${version.minecraft}.lzma"/>
      <arg path="${basedir}/binpatch/server"/>
      <arg value="true"/>
    </java>
+    <mkdir dir="binpatch-tmp"/>
+    <zip destfile="binpatch-tmp/binpatches.jar" basedir="${basedir}">
+      <include name="binpatch/**/*.binpatch"/>
+    </zip>
+    <apply executable="pack200">
+      <arg line="--no-gzip"/>
+      <arg line="binpatch-tmp/binpatches.pack"/>
+      <fileset dir="binpatch-tmp" includes="binpatches.jar"/>
+    </apply>
+    <apply executable="${lzma.exe}">
+      <arg line="--format=lzma"/>
+      <arg line="-v"/>
+      <fileset dir="binpatch-tmp" includes="binpatches.pack"/>
+    </apply>
+    <move file="binpatch-tmp/binpatches.pack.lzma" todir="${basedir}"/>
+    <delete dir="binpatch-tmp" failonerror="false"/>
  </target>
 </project>
@@ -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
 */
@@ -21,6 +21,7 @@ public class GuiCustomModLoadingErrorScreen extends GuiErrorScreen
    private CustomModLoadingErrorDisplayException customException;
    public GuiCustomModLoadingErrorScreen(CustomModLoadingErrorDisplayException customException)
    {
+        super(null,null);
        this.customException = customException;
    }
    @Override
@@ -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
 */
@@ -29,6 +29,7 @@ public class GuiDupesFound extends GuiErrorScreen

    public GuiDupesFound(DuplicateModsFoundException dupes)
    {
+        super(null,null);
        this.dupes = dupes;
    }

@@ -24,6 +24,7 @@ public class GuiModsMissing extends GuiErrorScreen

    public GuiModsMissing(MissingModsException modsMissing)
    {
+        super(null,null);
        this.modsMissing = modsMissing;
    }

@@ -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
 */
@@ -22,6 +22,7 @@ public class GuiWrongMinecraft extends GuiErrorScreen
    private WrongMinecraftVersionException wrongMC;
    public GuiWrongMinecraft(WrongMinecraftVersionException wrongMC)
    {
+        super(null,null);
        this.wrongMC = wrongMC;
    }
    @Override
@@ -1,6 +1,6 @@
 --- commands.py
 +++ commands.py
-@@ -142,6 +142,8 @@
+@@ -139,6 +139,8 @@
             fieldnames = csvreader.fieldnames
     return set(fieldnames)
 
@@ -9,7 +9,7 @@
 
 class Commands(object):
     """Contains the commands and initialisation for a full mcp run"""
-@@ -980,6 +982,8 @@
+@@ -943,6 +945,8 @@
         binlk = {CLIENT: self.binclient, SERVER: self.binserver}
         testlk = {CLIENT: self.testclient, SERVER: self.testserver}
 
@@ -18,7 +18,7 @@
         if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
             return False
         return True
-@@ -1311,6 +1315,9 @@
+@@ -1274,6 +1278,9 @@
         pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
         pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
@@ -28,7 +28,7 @@
 
         if not os.path.exists(pathbinlk[side]):
             os.makedirs(pathbinlk[side])
-@@ -1368,7 +1375,7 @@
+@@ -1331,7 +1338,7 @@
             raise
 
     def startserver(self):
@@ -37,7 +37,7 @@
         classpath = [os.path.join('..', p) for p in classpath]
         classpath = os.pathsep.join(classpath)
         os.chdir(self.dirjars)
-@@ -1376,7 +1383,7 @@
+@@ -1339,7 +1346,7 @@
         self.runmc(forkcmd)
 
     def startclient(self):
@@ -46,7 +46,7 @@
         classpath = [os.path.join('..', p) for p in classpath]
         classpath = os.pathsep.join(classpath)
         natives = os.path.join('..', self.dirnatives)
-@@ -1733,7 +1740,7 @@
+@@ -1696,7 +1703,7 @@
         self.runcmd(forkcmd)
         return True
 
@@ -55,7 +55,7 @@
         if not reobf:
             md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
         else:
-@@ -1748,6 +1755,9 @@
+@@ -1711,6 +1718,9 @@
                     class_path = ''
                 else:
                     class_path += '/'
@@ -65,7 +65,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))
-@@ -1920,6 +1930,9 @@
+@@ -1883,6 +1893,9 @@
                 sys.exit(1)
 
         for entry in newfiles:
@@ -75,7 +75,7 @@
             if entry[3] == 'U':
                 self.logger.info('Retrieving file from server : %s', entry[0])
                 cur_file = os.path.normpath(entry[0])
-@@ -1940,6 +1953,9 @@
+@@ -1903,6 +1916,9 @@
         md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
         outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
         src = {CLIENT: self.srcclient, SERVER: self.srcserver}
@@ -468,7 +468,7 @@ public class FMLCommonHandler
        MinecraftServer server = getMinecraftServerInstance();
        Loader.instance().serverStopped();
        // FORCE the internal server to stop: hello optifine workaround!
-        ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, false, "field_71316_v", "u", "serverStopped");
+        if (server!=null) ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, false, "field_71316_v", "u", "serverStopped");
    }

    public String getModName()
@@ -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
 */
@@ -150,7 +150,7 @@ public class MCPMerger
                line = line.split("#")[0];
                char cmd = line.charAt(0);
                line = line.substring(1).trim();
-                
+
                switch (cmd)
                {
                    case '!': dontAnnotate.add(line); break;
@@ -347,7 +347,7 @@ public class MCPMerger
            }

            String entryName = entry.getName();
-            
+
            boolean filtered = false;
            for (String filter : dontProcess)
            {
@@ -357,7 +357,7 @@ public class MCPMerger
                    break;
                }
            }
-            
+
            if (filtered || !entryName.endsWith(".class") || entryName.startsWith("."))
            {
                ZipEntry newEntry = new ZipEntry(entry.getName());
@@ -47,6 +47,7 @@ public class FMLTweaker implements ITweaker {
        classLoader.addTransformerExclusion("cpw.mods.fml.repackage.");
        classLoader.addTransformerExclusion("cpw.mods.fml.relauncher.");
        classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers.");
+        classLoader.addClassLoaderExclusion("LZMA.");
        FMLLaunchHandler.configureForClientLaunch(classLoader, this);
    }

@@ -1,8 +1,11 @@
 package cpw.mods.fml.common.patcher;

+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.security.CodeSource;
 import java.util.Collections;
@@ -10,9 +13,14 @@ import java.util.List;
 import java.util.Locale;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Pack200;
 import java.util.logging.Level;
 import java.util.regex.Pattern;

+import LZMA.LzmaInputStream;
+
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
@@ -83,18 +91,20 @@ public class ClassPatchManager {
    public void setup(Side side)
    {
        Pattern binpatchMatcher = Pattern.compile(String.format("binpatch/%s/.*.binpatch", side.toString().toLowerCase(Locale.ENGLISH)));
-        JarFile fmlJar;
+        JarInputStream jis;
        try
        {
-            FMLRelaunchLog.fine("FML URI is %s", FMLTweaker.getJarLocation());
-            File fmlJarFile = new File(FMLTweaker.getJarLocation());
-            if (!fmlJarFile.exists() || !fmlJarFile.isFile())
+            InputStream binpatchesCompressed = getClass().getResourceAsStream("/binpatches.pack.lzma");
+            if (binpatchesCompressed==null)
            {
-                FMLRelaunchLog.log(Level.INFO, "Not found an FML jar, I assume you're developing FML. Hi cpw or Lex!");
-                patches = ArrayListMultimap.create();
+                FMLRelaunchLog.log(Level.SEVERE, "The binary patch set is missing. Things are probably about to go very wrong.");
                return;
            }
-            fmlJar = new JarFile(fmlJarFile);
+            LzmaInputStream binpatchesDecompressed = new LzmaInputStream(binpatchesCompressed);
+            ByteArrayOutputStream jarBytes = new ByteArrayOutputStream();
+            JarOutputStream jos = new JarOutputStream(jarBytes);
+            Pack200.newUnpacker().unpack(binpatchesDecompressed, jos);
+            jis = new JarInputStream(new ByteArrayInputStream(jarBytes.toByteArray()));
        }
        catch (Exception e)
        {
@@ -104,28 +114,43 @@ public class ClassPatchManager {

        patches = ArrayListMultimap.create();

-        for (JarEntry entry : Collections.list(fmlJar.entries()))
+        do
        {
-            if (binpatchMatcher.matcher(entry.getName()).matches())
+            try
            {
-                ClassPatch cp = readPatch(entry, fmlJar);
-                if (cp != null)
+                JarEntry entry = jis.getNextJarEntry();
+                if (entry == null)
                {
-                    patches.put(cp.sourceClassName, cp);
+                    break;
+                }
+                if (binpatchMatcher.matcher(entry.getName()).matches())
+                {
+                    ClassPatch cp = readPatch(entry, jis);
+                    if (cp != null)
+                    {
+                        patches.put(cp.sourceClassName, cp);
+                    }
+                }
+                else
+                {
+                    jis.closeEntry();
                }
            }
-        }
-        FMLLog.fine("Read %d binary patches from %s", patches.size(), fmlJar.getName());
+            catch (IOException e)
+            {
+            }
+        } while (true);
+        FMLLog.fine("Read %d binary patches", patches.size());
        FMLLog.fine("Patch list :\n\t%s", Joiner.on("\t\n").join(patches.asMap().entrySet()));
    }

-    private ClassPatch readPatch(JarEntry patchEntry, JarFile jarFile)
+    private ClassPatch readPatch(JarEntry patchEntry, JarInputStream jis)
    {
-        FMLLog.finest("Reading patch data from %s in file %s", patchEntry.getName(), jarFile.getName());
+        FMLLog.finest("Reading patch data from %s", patchEntry.getName());
        ByteArrayDataInput input;
        try
        {
-            input = ByteStreams.newDataInput(ByteStreams.toByteArray(jarFile.getInputStream(patchEntry)));
+            input = ByteStreams.newDataInput(ByteStreams.toByteArray(jis));
        }
        catch (IOException e)
        {
@@ -2,7 +2,10 @@ package cpw.mods.fml.common.patcher;

 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.logging.Level;
@@ -19,11 +22,13 @@ import cpw.mods.fml.repackage.com.nothome.delta.Delta;

 public class GenDiffSet {

+    private static final List<String> RESERVED_NAMES = Arrays.asList("CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9");
+
    public static void main(String[] args) throws IOException
    {
        String sourceJar = args[0]; //Clean Vanilla jar minecraft.jar or minecraft_server.jar
        String targetDir = args[1]; //Directory containing obfed output classes, typically mcp/reobf/minecraft
-        String deobfData = args[2]; //Path to FML's deobfusication_data.zip
+        String deobfData = args[2]; //Path to FML's deobfusication_data.lzma
        String outputDir = args[3]; //Path to place generated .binpatch
        String killTarget = args[4]; //"true" if we should destroy the target file if it generated a successful .binpatch

@@ -40,12 +45,19 @@ public class GenDiffSet {
        for (String name : remapper.getObfedClasses())
        {
 //            Logger.getLogger("GENDIFF").info(String.format("Evaluating path for data :%s",name));
-            File targetFile = new File(targetDir, name.replace('/', File.separatorChar) + ".class");
+            String fileName = name;
+            String jarName = name;
+            if (RESERVED_NAMES.contains(name.toUpperCase(Locale.ENGLISH)))
+            {
+                fileName = "_"+name;
+            }
+            File targetFile = new File(targetDir, fileName.replace('/', File.separatorChar) + ".class");
+            jarName = jarName+".class";
            if (targetFile.exists())
            {
                String sourceClassName = name.replace('/', '.');
                String targetClassName = remapper.map(name).replace('/', '.');
-                JarEntry entry = sourceZip.getJarEntry(name);
+                JarEntry entry = sourceZip.getJarEntry(jarName);

                byte[] vanillaBytes = entry != null ? ByteStreams.toByteArray(sourceZip.getInputStream(entry)) : new byte[0];
                byte[] patchedBytes = Files.toByteArray(targetFile);
@@ -1,76 +1,76 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public ash.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
+public asi.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
-public np.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
-public np.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
-public np.b #FD:EntityList/field_75625_b #nameToClassMap
-public np.c #FD:EntityList/field_75626_c #classToNameMap
-public np.d #FD:EntityList/field_75623_d #idToClassMap
+public nq.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
+public nq.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
+public nq.b #FD:EntityList/field_75625_b #nameToClassMap
+public nq.c #FD:EntityList/field_75626_c #classToNameMap
+public nq.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
 #public bba.h #FD:RenderEngine/field_78367_h #textureList # -- MISSING MAPPING # -- MISSING MAPPING
 #public bge.g #FD:RenderEngine/field_78366_k #texturePack # -- MISSING MAPPING
 # RenderManager
-public bfx.q #FD:RenderManager/field_78729_o #renderers
+public bga.q #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public bfd.* #FD:RenderBlocks/*
-public bfd.*() #MD:RenderBlocks/*
+public bfg.* #FD:RenderBlocks/*
+public bfg.*() #MD:RenderBlocks/*
 #RenderPlayer
 #public-f bht.h #FD:RenderPlayer/field_77110_j #armorlist # -- MISSING MAPPING
 #RenderBiped
-public-f bgg.l #FD:RenderBiped/field_82424_k #armorlist
+public-f bgj.l #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
 #public bp.b #FD:StringTranslate/field_74815_b # -- MISSING MAPPING
 #public bp.e #FD:StringTranslate/field_74813_d # -- MISSING MAPPING
 # TileEntityRenderer
-public bip.m #FD:TileEntityRenderer/field_76966_m
+public bis.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
-public zz.a(Lxy;[Ljava/lang/Object;)Laac; #MD:CraftingManager/func_92103_a
-public zz.b(Lxy;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
+public aaa.a(Lxz;[Ljava/lang/Object;)Laad; #MD:CraftingManager/func_92103_a
+public aaa.b(Lxz;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
 # WeightedRandomItem
-public mf.a #FD:WeightedRandomItem/field_76292_a #probability
+public mg.a #FD:WeightedRandomItem/field_76292_a #probability
 # ItemStack
 #public+f tv.c #FD:ItemStack/field_77993_c #itemId
 # StatBase
-public kq.a #FD:StatBase/field_75978_a #statName
+public kr.a #FD:StatBase/field_75978_a #statName
 # NetLoginHandler
-public ju.a(Lju;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
-public ju.g #FD:NetLoginHandler/field_72543_h #userName
+public jv.a(Ljv;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
+public jv.g #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public jr.bJ()V #MD:EntityPlayerMP/func_71117_bO
-public jr.bX #FD:EntityPlayerMP/field_71139_cq
+public js.bJ()V #MD:EntityPlayerMP/func_71117_bO
+public js.bX #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
-public pq #CL:EntityAITaskEntry
+public pr #CL:EntityAITaskEntry
 # EntityAITasks
-public pp.a #FD:EntityAITasks/field_75782_a #taskList
+public pq.a #FD:EntityAITasks/field_75782_a #taskList
 # BlockChest
-public anc.m(Labq;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
+public and.m(Labr;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
 #public ng.aU #FD:EntityLiving/field_70736_aM #carryoverDamage # -- MISSING MAPPING
-public oc.c #FD:EntityLiving/field_70714_bg #tasks
+public od.c #FD:EntityLiving/field_70714_bg #tasks
 #public ng.bG #FD:EntityLiving/field_70703_bu #isJumping # -- MISSING MAPPING
 # EntityAIOcelotSit
-protected qc.a(Labq;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
-protected qc.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
+protected qd.a(Labr;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
+protected qd.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
 public c #CL:CallableMinecraftVersion
 public c.<init>(Lb;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
 # EntityAnimal
-public rl.bp #FD:EntityAnimal/field_70881_d #inLove
+public rm.bp #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
-public aca.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
-public aca.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
+public acb.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
+public acb.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
 # ComponentVillage
-public aje #CL:ComponentVillage
+public ajf #CL:ComponentVillage
 # EntityVillager - minmax lists
-public tv.a(Labg;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
-public tv.b(Labg;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
-public tv.bB #FD:EntityVillager/field_70958_bB
-public tv.bC #FD:EntityVillager/field_70960_bC
+public tw.a(Labh;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
+public tw.b(Labh;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
+public tw.bB #FD:EntityVillager/field_70958_bB
+public tw.bC #FD:EntityVillager/field_70960_bC
 # GuiButtonMerchant
-public axn #CL:GuiButtonMerchant
+public axo #CL:GuiButtonMerchant

-protected aun.a #FD:GuiYesNo/field_73942_a #guiScreen
+protected auo.a #FD:GuiYesNo/field_73942_a #guiScreen
 # Minecraft
-public atm.C #FD:Minecraft/field_71425_J #running
-public atm.M #FD:Minecraft/field_71446_o # textureManager
+public atn.C #FD:Minecraft/field_71425_J #running
+public atn.M #FD:Minecraft/field_71446_o # textureManager
@@ -2,11 +2,11 @@
 # Only runs at runtime because it's not necessary at compile time
 # has deobf and obf mappings so it runs OK in mcp
 # entityplayer -> network/player
-tz cpw/mods/fml/common/network/Player
+ua cpw/mods/fml/common/network/Player
 net.minecraft.entity.player.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-aqr cpw/mods/fml/common/registry/BlockProxy
+aqs cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.block.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-xw cpw/mods/fml/common/registry/ItemProxy
+xx cpw/mods/fml/common/registry/ItemProxy
 net.minecraft.item.Item cpw/mods/fml/common/registry/ItemProxy
@@ -34,12 +34,12 @@ ReobfClientSrg = %(DirTemp)s/client_ro_srg.srg
 ReobfServerSrg = %(DirTemp)s/server_ro_srg.srg

 [JAR]
-DirNatives = %(DirJars)s/versions/1.6/natives
-Json       = %(DirJars)s/versions/1.6/1.6.json
-Client     = %(DirJars)s/versions/1.6/1.6.jar
-Server     = %(DirJars)s/minecraft_server.1.6.jar
-MD5Client  = 6a64a2136e3a3fe4d29b0a0df30b25fc
-MD5Server  = 7c03305c8bf97a8e8f3cdb147fc90607
+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  = 3c56fb4b77b1ca37dde69b5eb896fc4d
+MD5Server  = ff8f81970a5955737c356b534d3aee96

 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -79,7 +79,7 @@ BinClientTemp = %(DirTempBin)s/minecraft
 BinServerTemp = %(DirTempBin)s/minecraft_server
 SrcClient  = %(DirSrc)s/minecraft
 SrcServer  = %(DirSrc)s/minecraft_server
-TestClient = net/minecraft/client/Minecraft
+TestClient = net/minecraft/client/main/Main
 TestServer = net/minecraft/server/MinecraftServer

 [PATCHES]
@@ -96,8 +96,8 @@ BinClient       = %(DirBin)s/minecraft
 BinServer       = %(DirBin)s/minecraft_server
 LogClient       = %(DirLogs)s/client_compile.log
 LogServer       = %(DirLogs)s/server_compile.log
-ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/versions/1.6/1.6.jar
-ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.1.6.jar
+ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
+ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
 ClientFixes     = %(DirConf)s/patches
 FixStart        = Start
 IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax/xml,javax/ws,argo
@@ -127,8 +127,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           = 130000
-ParamIndex        = 30000
+RGIndex           = 140000
+ParamIndex        = 40000

 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg
@@ -297,13 +297,15 @@ BackupList,net/minecraft/client/mco
 ExceptionMcoHttp,net/minecraft/client/mco
 ExceptionMcoService,net/minecraft/client/mco
 ExceptionRetryCall,net/minecraft/client/mco
+GuiScreenClientOutdated,net/minecraft/client/mco
+GuiScreenConfirmationType,net/minecraft/client/mco
 McoClient,net/minecraft/client/mco
 McoServer,net/minecraft/client/mco
 McoServerAddress,net/minecraft/client/mco
 McoServerList,net/minecraft/client/mco
 McoServerListEmptyAnon,net/minecraft/client/mco
-McoServerListUpdateThread,net/minecraft/client/mco
-McoServerListUpdateThreadComparer,net/minecraft/client/mco
+McoServerListUpdateTask,net/minecraft/client/mco
+McoServerListUpdateTaskComparator,net/minecraft/client/mco
 PendingInvite,net/minecraft/client/mco
 PendingInvitesList,net/minecraft/client/mco
 Request,net/minecraft/client/mco
@@ -405,10 +407,6 @@ EntitySnowShovelFX,net/minecraft/client/particle
 EntitySpellParticleFX,net/minecraft/client/particle
 EntitySplashFX,net/minecraft/client/particle
 EntitySuspendFX,net/minecraft/client/particle
-RenderCaveSpider,net/minecraft/client/render/entity
-RenderHorse,net/minecraft/client/render/entity
-RenderLeashKnot,net/minecraft/client/render/entity
-RendererLivingEntity,net/minecraft/client/render/entity
 ActiveRenderInfo,net/minecraft/client/renderer
 CallableMouseLocation,net/minecraft/client/renderer
 CallableParticlePositionInfo,net/minecraft/client/renderer
@@ -446,6 +444,7 @@ RenderBat,net/minecraft/client/renderer/entity
 RenderBiped,net/minecraft/client/renderer/entity
 RenderBlaze,net/minecraft/client/renderer/entity
 RenderBoat,net/minecraft/client/renderer/entity
+RenderCaveSpider,net/minecraft/client/renderer/entity
 RenderChicken,net/minecraft/client/renderer/entity
 RenderCow,net/minecraft/client/renderer/entity
 RenderCreeper,net/minecraft/client/renderer/entity
@@ -458,8 +457,10 @@ RenderFireball,net/minecraft/client/renderer/entity
 RenderFish,net/minecraft/client/renderer/entity
 RenderGhast,net/minecraft/client/renderer/entity
 RenderGiantZombie,net/minecraft/client/renderer/entity
+RenderHorse,net/minecraft/client/renderer/entity
 RenderIronGolem,net/minecraft/client/renderer/entity
 RenderItem,net/minecraft/client/renderer/entity
+RenderLeashKnot,net/minecraft/client/renderer/entity
 RenderLightningBolt,net/minecraft/client/renderer/entity
 RenderLiving,net/minecraft/client/renderer/entity
 RenderMagmaCube,net/minecraft/client/renderer/entity
@@ -486,6 +487,7 @@ RenderWither,net/minecraft/client/renderer/entity
 RenderWolf,net/minecraft/client/renderer/entity
 RenderXPOrb,net/minecraft/client/renderer/entity
 RenderZombie,net/minecraft/client/renderer/entity
+RendererLivingEntity,net/minecraft/client/renderer/entity
 AbstractTexture,net/minecraft/client/renderer/texture
 DynamicTexture,net/minecraft/client/renderer/texture
 IconRegister,net/minecraft/client/renderer/texture
@@ -522,7 +524,6 @@ DefaultResourcePack,net/minecraft/client/resources
 FallbackResourceManager,net/minecraft/client/resources
 FileResourcePack,net/minecraft/client/resources
 FolderResourcePack,net/minecraft/client/resources
-FolderResourcePackFilter,net/minecraft/client/resources
 FoliageColorReloadListener,net/minecraft/client/resources
 GrassColorReloadListener,net/minecraft/client/resources
 GuiScreenTemporaryResourcePackSelect,net/minecraft/client/resources
@@ -581,6 +582,7 @@ CommandHandler,net/minecraft/command
 CommandHelp,net/minecraft/command
 CommandKill,net/minecraft/command
 CommandNotFoundException,net/minecraft/command
+CommandPlaySound,net/minecraft/command
 CommandServerBan,net/minecraft/command
 CommandServerBanIp,net/minecraft/command
 CommandServerBanlist,net/minecraft/command
@@ -886,6 +888,7 @@ EntitySmallFireball,net/minecraft/entity/projectile
 EntitySnowball,net/minecraft/entity/projectile
 EntityThrowable,net/minecraft/entity/projectile
 EntityWitherSkull,net/minecraft/entity/projectile
+AnimalChest,net/minecraft/inventory
 Container,net/minecraft/inventory
 ContainerBeacon,net/minecraft/inventory
 ContainerBrewingStand,net/minecraft/inventory
@@ -894,6 +897,9 @@ ContainerDispenser,net/minecraft/inventory
 ContainerEnchantment,net/minecraft/inventory
 ContainerFurnace,net/minecraft/inventory
 ContainerHopper,net/minecraft/inventory
+ContainerHorseInventory,net/minecraft/inventory
+ContainerHorseInventorySlotArmor,net/minecraft/inventory
+ContainerHorseInventorySlotSaddle,net/minecraft/inventory
 ContainerMerchant,net/minecraft/inventory
 ContainerPlayer,net/minecraft/inventory
 ContainerRepair,net/minecraft/inventory
@@ -920,10 +926,6 @@ SlotEnchantment,net/minecraft/inventory
 SlotEnchantmentTable,net/minecraft/inventory
 SlotFurnace,net/minecraft/inventory
 SlotMerchantResult,net/minecraft/inventory
-AnimalChest,net/minecraft/inventroy
-ContainerHorseInventory,net/minecraft/inventroy
-ContainerHorseInventorySlotArmor,net/minecraft/inventroy
-ContainerHorseInventorySlotSaddle,net/minecraft/inventroy
 BehaviorDispenseArmor,net/minecraft/item
 BehaviorDispenseMinecart,net/minecraft/item
 EnumAction,net/minecraft/item
@@ -1,94 +1,50 @@
-diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- 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;
-       }
- 
-      while(true) {
-          try {
-            if(this.field_71425_J) {
-+            while(this.field_71425_J) {
-                if(this.field_71434_R && this.field_71433_S != null) {
-                   this.func_71377_b(this.field_71433_S);
-                   return;
-@@ -552,7 +551,6 @@
-                   this.func_71373_a(new GuiMemoryErrorScreen());
-                   System.gc();
-                }
-               continue;
-             }
-          } catch (MinecraftError var12) {
-             ;
-@@ -570,8 +568,6 @@
-             this.func_71405_e();
-          }
- 
-         return;
-      }
-    }
- 
-    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	Sat Apr 27 01:53:04 2013
-+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Apr 27 01:55:19 2013
+--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 21:44:00 2013
+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 21:45:42 2013
@@ -21,9 +21,14 @@
 
-    public String func_85085_a() {
+    public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
       StringBuilder var1 = new StringBuilder();
-      Field var2 = ClassLoader.class.getDeclaredField("classes");
-      var2.setAccessible(true);
+     ArrayList var3;
+     try {
+       Field var2 = ClassLoader.class.getDeclaredField("classes");
+       var2.setAccessible(true);
 -      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      ArrayList var3;
-+      try {
-+	     Field var2 = ClassLoader.class.getDeclaredField("classes");
-+	     var2.setAccessible(true);
-+	     var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      } catch(Exception ex) {
-+    	 return "";
-+      }
+      var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
+     } catch(Exception ex) {
+      return "";
+     }
       boolean var4 = true;
       boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
       HashMap var6 = new HashMap();
-diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
--- minecraft\net\minecraft\src\CodecMus.java	Sat 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;
+@@ -98,6 +103,10 @@
 
-+import java.io.IOException;
- import java.io.InputStream;
- import net.minecraft.src.MusInputStream;
- import paulscode.sound.codecs.CodecJOrbis;
-@@ -7,6 +8,10 @@
- public class CodecMus extends CodecJOrbis {
- 
-    protected InputStream openInputStream() {
-      return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
-+      try {
-+         return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
-+      } catch (IOException e) {
-+         return null;
-+      }
+    // $FF: synthetic method
+    public Object call() {
+     try {
+       return this.func_85085_a();
+     } catch(Exception ex) {
+      return null;
+     }
    }
 }
 diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
--- 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
+--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 21:44:00 2013
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 21:45:42 2013
@@ -11,6 +11,10 @@
 
 public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
 
-+   public ComponentStrongholdRightTurn(int p_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) {
-+      super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_);
+   public ComponentStrongholdRightTurn(int p_i2074_1_, Random p_i2074_2_, StructureBoundingBox p_i2074_3_, int p_i2074_4_) {
+      super(p_i2074_1_, p_i2074_2_, p_i2074_3_, p_i2074_4_);
 +   }
 +
    public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
       if(this.field_74885_f != 2 && this.field_74885_f != 3) {
          this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
--- minecraft\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:53:04 2013
-+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:55:19 2013
+--- minecraft\net\minecraft\src\DedicatedServer.java	Sun Jun 30 21:44:01 2013
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java	Sun Jun 30 21:45:42 2013
@@ -207,7 +207,7 @@
       System.exit(0);
    }
@@ -98,22 +54,91 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
       super.func_71190_q();
       this.func_71333_ah();
    }
+diff -r -U 3 minecraft\net\minecraft\src\EntityDragon.java minecraft_patched\net\minecraft\src\EntityDragon.java
+--- minecraft\net\minecraft\src\EntityDragon.java	Sun Jun 30 21:44:01 2013
+++ minecraft_patched\net\minecraft\src\EntityDragon.java	Sun Jun 30 21:45:42 2013
+@@ -551,4 +551,14 @@
+    protected float func_70599_aP() {
+       return 5.0F;
+    }
+
+   @Override
+   public float func_70667_aM() {
+      return 0.0f;
+   }
+
+   @Override
+   public float func_110183_aJ() {
+      return 0.0f;
+   }
+ }
+diff -r -U 3 minecraft\net\minecraft\src\EntityWither.java minecraft_patched\net\minecraft\src\EntityWither.java
+--- minecraft\net\minecraft\src\EntityWither.java	Sun Jun 30 21:44:02 2013
+++ minecraft_patched\net\minecraft\src\EntityWither.java	Sun Jun 30 21:45:42 2013
+@@ -458,4 +458,13 @@
+       this.field_70154_o = null;
+    }
+ 
+   @Override
+   public float func_70667_aM() {
+      return 0.0f;
+   }
+
+   @Override
+   public float func_110183_aJ() {
+      return 0.0f;
+   }
+ }
 diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java
--- 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
+--- minecraft\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 21:44:02 2013
+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 21:45:42 2013
@@ -38,7 +38,7 @@
    private final String field_96304_B;
 
-    private EnumChatFormatting(char p_i10000_3_) {
-      this(p_i10000_1_, p_i10000_2_, p_i10000_3_, false);
-+      this(p_i10000_3_, false);
+    private EnumChatFormatting(char p_i1336_3_) {
+-      this(p_i1336_1_, p_i1336_2_, p_i1336_3_, false);
+      this(p_i1336_3_, false);
    }
 
-    private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) {
+    private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_4_) {
+diff -r -U 3 minecraft\net\minecraft\src\FileResourcePack.java minecraft_patched\net\minecraft\src\FileResourcePack.java
+--- minecraft\net\minecraft\src\FileResourcePack.java	Sun Jun 30 21:44:02 2013
+++ minecraft_patched\net\minecraft\src\FileResourcePack.java	Sun Jun 30 21:45:42 2013
+@@ -84,12 +84,18 @@
+ 
+    protected void finalize() {
+       this.close();
+     try {
+       super.finalize();
+     } catch(Throwable t) {
+     }
+    }
+ 
+    public void close() {
+       if(this.field_110600_d != null) {
+        try {
+          this.field_110600_d.close();
+        } catch(Exception ex) {
+        }
+          this.field_110600_d = null;
+       }
+ 
+diff -r -U 3 minecraft\net\minecraft\src\FolderResourcePack.java minecraft_patched\net\minecraft\src\FolderResourcePack.java
+--- minecraft\net\minecraft\src\FolderResourcePack.java	Sun Jun 30 21:44:02 2013
+++ minecraft_patched\net\minecraft\src\FolderResourcePack.java	Sun Jun 30 21:46:52 2013
+@@ -29,7 +29,7 @@
+       HashSet var1 = Sets.newHashSet();
+       File var2 = new File(this.field_110597_b, "assets/");
+       if(var2.isDirectory()) {
+-         File[] var3 = var2.listFiles(DirectoryFileFilter.DIRECTORY);
+         File[] var3 = var2.listFiles((java.io.FileFilter)DirectoryFileFilter.DIRECTORY);
+          int var4 = var3.length;
+ 
+          for(int var5 = 0; var5 < var4; ++var5) {
 diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
--- 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 @@
+--- minecraft\net\minecraft\src\FontRenderer.java	Sun Jun 30 21:44:02 2013
+++ minecraft_patched\net\minecraft\src\FontRenderer.java	Sun Jun 30 21:45:42 2013
+@@ -625,8 +625,6 @@
          case 10:
             --var5;
             break;
@@ -122,19 +147,19 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
          case 167:
             if(var5 < var3 - 1) {
                ++var5;
-@@ -636,6 +634,8 @@
+@@ -640,6 +638,8 @@
                }
             }
             break;
 +         case 32:
-+             var6 = var5;
+            var6 = var5;
          default:
             var4 += this.func_78263_a(var8);
             if(var7) {
 diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
--- minecraft\net\minecraft\src\IntegratedServer.java	Sat Apr 27 01:53:05 2013
-+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sat Apr 27 01:55:19 2013
-@@ -101,7 +101,7 @@
+--- minecraft\net\minecraft\src\IntegratedServer.java	Sun Jun 30 21:44:02 2013
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java	Sun Jun 30 21:45:42 2013
+@@ -103,7 +103,7 @@
       return true;
    }
 
@@ -143,9 +168,60 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
       boolean var1 = this.field_71348_o;
       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\Minecraft.java minecraft_patched\net\minecraft\src\Minecraft.java
+--- minecraft\net\minecraft\src\Minecraft.java	Sun Jun 30 21:44:05 2013
+++ minecraft_patched\net\minecraft\src\Minecraft.java	Sun Jun 30 21:45:42 2013
+@@ -599,8 +599,8 @@
+          return;
+       }
+ 
+-      while(true) {
+-         try {
+      try {
+         while(this.field_71425_J) {
+             if(this.field_71425_J) {
+                if(this.field_71434_R && this.field_71433_S != null) {
+                   this.func_71377_b(this.field_71433_S);
+@@ -621,23 +621,20 @@
+                }
+                continue;
+             }
+-         } catch (MinecraftError var12) {
+-            ;
+-         } catch (ReportedException var13) {
+-            this.func_71396_d(var13.func_71575_a());
+-            this.func_71398_f();
+-            var13.printStackTrace();
+-            this.func_71377_b(var13.func_71575_a());
+-         } catch (Throwable var14) {
+-            var2 = this.func_71396_d(new CrashReport("Unexpected error", var14));
+-            this.func_71398_f();
+-            var14.printStackTrace();
+-            this.func_71377_b(var2);
+-         } finally {
+-            this.func_71405_e();
+          }
+-
+-         return;
+      } catch (MinecraftError var12) {
+      } catch (ReportedException var13) {
+         this.func_71396_d(var13.func_71575_a());
+         this.func_71398_f();
+         var13.printStackTrace();
+         this.func_71377_b(var13.func_71575_a());
+      } catch (Throwable var14) {
+         var2 = this.func_71396_d(new CrashReport("Unexpected error", var14));
+         this.func_71398_f();
+         var14.printStackTrace();
+         this.func_71377_b(var2);
+      } finally {
+         this.func_71405_e();
+       }
+    }
+ 
 diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java
--- 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
+--- minecraft\net\minecraft\src\RConThreadClient.java	Sun Jun 30 21:44:05 2013
+++ minecraft_patched\net\minecraft\src\RConThreadClient.java	Sun Jun 30 21:45:42 2013
@@ -32,8 +32,8 @@
    }
 
@@ -173,22 +249,21 @@ diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched
          }
 -
 -         return;
-      }
+      } catch (SocketTimeoutException var17) {
+      } catch (IOException var18) {
+      } catch (Exception var19) {
+         System.out.println(var19);
+      } finally {
+         this.func_72653_g();
+       }
 -
-+     } catch (SocketTimeoutException var17) {
-+     } catch (IOException var18) {
-+     } catch (Exception var19) {
-+        System.out.println(var19);
-+     } finally {
-+        this.func_72653_g();
-+     }
    }
 
    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	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 @@
+--- minecraft\net\minecraft\src\RenderBlocks.java	Sun Jun 30 21:44:05 2013
+++ minecraft_patched\net\minecraft\src\RenderBlocks.java	Sun Jun 30 21:45:42 2013
+@@ -1960,16 +1960,16 @@
       float var25 = (float)(p_78589_2_ + 1);
       float var26 = (float)(p_78589_4_ + 0);
       float var27 = (float)(p_78589_4_ + 1);
@@ -209,7 +284,7 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net
          int var29 = 0;
          int var30 = 0;
          int var31 = 16;
-@@ -2006,7 +2006,7 @@
+@@ -2016,7 +2016,7 @@
          var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var31), (double)var9.func_94207_b((double)var30));
          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var9.func_94214_a((double)var29), (double)var9.func_94207_b((double)var30));
          var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var27, (double)var9.func_94214_a((double)var29), (double)var9.func_94207_b((double)var32));
@@ -219,9 +294,9 @@ 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	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 @@
+--- minecraft\net\minecraft\src\RenderGlobal.java	Sun Jun 30 21:44:06 2013
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java	Sun Jun 30 21:45:42 2013
+@@ -1435,7 +1435,7 @@
          double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
          double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
          double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
@@ -230,11 +305,26 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
          if(p_72726_1_.equals("hugeexplosion")) {
             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\SoundPoolURLConnection.java minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java
+--- minecraft\net\minecraft\src\SoundPoolURLConnection.java	Sun Jun 30 21:44:06 2013
+++ minecraft_patched\net\minecraft\src\SoundPoolURLConnection.java	Sun Jun 30 21:45:42 2013
+@@ -22,7 +22,11 @@
+    public void connect() {}
+ 
+    public InputStream getInputStream() {
+     try {
+       return SoundPool.func_110655_a(this.field_110660_a).func_110536_a(this.field_110659_b).func_110527_b();
+     } catch(Exception ex) {
+      return null;
+     }
+    }
+ 
+    // $FF: synthetic method
 diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
--- 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
+--- minecraft\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 21:44:06 2013
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 21:45:42 2013
@@ -11,6 +11,7 @@
-       this.field_74504_a = p_i3285_1_;
+       this.field_74504_a = p_i1395_1_;
    }
 
 +   @SuppressWarnings("deprecation")
@@ -242,15 +332,13 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\
       try {
          Thread.sleep(5000L);
 diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sat Apr 27 01:53:07 2013
-+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sat Apr 27 01:55:19 2013
-@@ -20,7 +20,8 @@
+--- minecraft\net\minecraft\src\ThreadedFileIOBase.java	Sun Jun 30 21:44:06 2013
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Jun 30 21:45:42 2013
+@@ -20,6 +20,7 @@
    }
 
    public void run() {
-      this.func_75736_b();
-+      while(true)
-+         this.func_75736_b();
+     while(true)
+       this.func_75736_b();
    }
 
-    private void func_75736_b() {
@@ -1,41 +1,51 @@
 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	Sat Apr 27 01:54:18 2013
-+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sat Apr 27 01:56:15 2013
+--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 21:45:24 2013
+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java	Sun Jun 30 21:45:41 2013
@@ -21,9 +21,14 @@
 
-    public String func_85085_a() {
+    public String func_85085_a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {
       StringBuilder var1 = new StringBuilder();
-      Field var2 = ClassLoader.class.getDeclaredField("classes");
-      var2.setAccessible(true);
+     ArrayList var3;
+     try {
+       Field var2 = ClassLoader.class.getDeclaredField("classes");
+       var2.setAccessible(true);
 -      ArrayList var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      ArrayList var3;
-+      try {
-+         Field var2 = ClassLoader.class.getDeclaredField("classes");
-+         var2.setAccessible(true);
-+         var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
-+      } catch(Exception ex) {
-+    	 return "";
-+      }
+      var3 = new ArrayList((Vector)var2.get(CrashReport.class.getClassLoader()));
+     } catch(Exception ex) {
+      return "";
+     }
       boolean var4 = true;
       boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport");
       HashMap var6 = new HashMap();
+@@ -98,6 +103,10 @@
+ 
+    // $FF: synthetic method
+    public Object call() {
+-      return this.func_85085_a();
+     try {
+       return this.func_85085_a();
+     } catch(Exception ex) {
+       return null;
+     }
+    }
+ }
 diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Apr 27 01:54:19 2013
-+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sat Apr 27 01:56:15 2013
+--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 21:45:25 2013
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java	Sun Jun 30 21:45:41 2013
@@ -11,6 +11,10 @@
 
 public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
 
-+   public ComponentStrongholdRightTurn(int p_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) {
-+      super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_);
+   public ComponentStrongholdRightTurn(int p_i2074_1_, Random p_i2074_2_, StructureBoundingBox p_i2074_3_, int p_i2074_4_) {
+      super(p_i2074_1_, p_i2074_2_, p_i2074_3_, p_i2074_4_);
 +   }
 +
    public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
       if(this.field_74885_f != 2 && this.field_74885_f != 3) {
          this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
 diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
--- minecraft_server\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:54:19 2013
-+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sat Apr 27 01:56:15 2013
+--- minecraft_server\net\minecraft\src\DedicatedServer.java	Sun Jun 30 21:45:25 2013
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java	Sun Jun 30 21:45:41 2013
@@ -208,7 +208,7 @@
       System.exit(0);
    }
@@ -46,53 +56,43 @@ 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	Sat Apr 27 01:54:20 2013
-+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Sat Apr 27 01:56:15 2013
+--- minecraft_server\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 21:45:26 2013
+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java	Sun Jun 30 21:45:41 2013
@@ -38,7 +38,7 @@
    private final String field_96304_B;
 
-    private EnumChatFormatting(char p_i10000_3_) {
-      this(p_i10000_1_, p_i10000_2_, p_i10000_3_, false);
-+      this(p_i10000_3_, false);
+    private EnumChatFormatting(char p_i1336_3_) {
+-      this(p_i1336_1_, p_i1336_2_, p_i1336_3_, false);
+      this(p_i1336_3_, false);
    }
 
-    private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) {
+    private EnumChatFormatting(char p_i1337_3_, boolean p_i1337_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	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;
- import java.net.SocketAddress;
-+import java.util.ArrayList;
-+import java.util.Collections;
- import java.util.List;
- import net.minecraft.src.ILogAgent;
- import net.minecraft.src.INetworkManager;
-@@ -11,7 +13,7 @@
+--- minecraft_server\net\minecraft\src\MemoryConnection.java	Sun Jun 30 21:45:26 2013
+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java	Sun Jun 30 21:45:41 2013
+@@ -11,13 +11,18 @@
 public class MemoryConnection implements INetworkManager {
 
    private static final SocketAddress field_74444_a = new InetSocketAddress("127.0.0.1", 0);
 -   private final List field_74442_b;
-+   private final List field_74442_b = Collections.synchronizedList(new ArrayList());
+   private final List field_74442_b  = java.util.Collections.synchronizedList(new java.util.ArrayList());
    private final ILogAgent field_98214_c;
    private MemoryConnection field_74443_c;
    private NetHandler field_74440_d;
-@@ -19,6 +21,11 @@
+    private boolean field_74441_e;
    private String field_74438_f;
    private Object[] field_74439_g;
- 
-+   public MemoryConnection(ILogAgent p_i11025_1_, NetHandler p_i11025_2_) {
-+      this.field_74440_d = p_i11025_2_;
-+      this.field_98214_c = p_i11025_1_;
+
+   public MemoryConnection(ILogAgent p_i1392_1_, NetHandler p_i1392_2_) {
+      this.field_74440_d = p_i1392_2_;
+      this.field_98214_c = p_i1392_1_;
 +   }
-+   
+ 
    public void func_74425_a(NetHandler p_74425_1_) {
       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	Sat Apr 27 01:54:20 2013
-+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Sat Apr 27 01:56:15 2013
+--- minecraft_server\net\minecraft\src\RConThreadClient.java	Sun Jun 30 21:45:26 2013
+++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java	Sun Jun 30 21:45:41 2013
@@ -32,8 +32,8 @@
    }
 
@@ -120,23 +120,22 @@ diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_
          }
 -
 -         return;
-      }
+      } catch (SocketTimeoutException var17) {
+      } catch (IOException var18) {
+      } catch (Exception var19) {
+         System.out.println(var19);
+      } finally {
+         this.func_72653_g();
+       }
 -
-+     } catch (SocketTimeoutException var17) {
-+     } catch (IOException var18) {
-+     } catch (Exception var19) {
-+        System.out.println(var19);
-+     } finally {
-+        this.func_72653_g();
-+     }
    }
 
    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	Sat Apr 27 01:54:21 2013
-+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sat Apr 27 01:56:15 2013
+--- minecraft_server\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 21:45:27 2013
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java	Sun Jun 30 21:45:41 2013
@@ -11,6 +11,7 @@
-       this.field_74504_a = p_i3285_1_;
+       this.field_74504_a = p_i1395_1_;
    }
 
 +   @SuppressWarnings("deprecation")
@@ -144,15 +143,13 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s
       try {
          Thread.sleep(5000L);
 diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sat 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 @@
+--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java	Sun Jun 30 21:45:27 2013
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java	Sun Jun 30 21:45:41 2013
+@@ -20,6 +20,7 @@
    }
 
    public void run() {
-      this.func_75736_b();
-+      while(true)
-+         this.func_75736_b();
+     while(true)
+       this.func_75736_b();
    }
 
-    private void func_75736_b() {
@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 7.51
-ClientVersion = 1.5.2
-ServerVersion = 1.5.2
+MCPVersion = 8.02
+ClientVersion = 1.6.1
+ServerVersion = 1.6.1
@@ -81,7 +81,7 @@ def read_mc_versions(fml_dir, version=None, work_dir=None):
        mc_info['server_url'] = '%s/minecraft_server.%s.jar' % (base_url, version)
        if not work_dir is None:
            version_dir = os.path.join(work_dir, 'versions', version)
-            mc_info['natives_dir'] = os.path.join(work_dir, 'libraries', 'natives')
+            mc_info['natives_dir'] = os.path.join(version_dir, '%s-natives' % version)
            mc_info['library_dir'] = os.path.join(work_dir, 'libraries')
            mc_info['client_file'] = os.path.join(version_dir, '%s.jar' % version)
            mc_info['json_file']   = os.path.join(version_dir, '%s.json' % version)
@@ -272,7 +272,7 @@ def file_backup(file, md5=None):
    
    if os.path.isfile(src):
        if not get_md5(src) == md5 and not md5 is None:
-            print 'Modified %s detected, removing' % os.path.basename(src_jar)
+            print 'Modified %s detected, removing' % os.path.basename(src)
            os.remove(src)
        else:
            shutil.copy(src, bck) 
@@ -672,7 +672,7 @@ def create_merged_conf(mcp_dir, fml_dir):
    #Creates the merged conf folder from MCP's conf folder to fml_dir/conf
    
    #Lets grab the files we dont work on
-    for file in ['version.cfg', 'newids.csv', 'joined.exc']:
+    for file in ['version.cfg', 'joined.exc']:
        dst_file = os.path.join(fml_dir, 'conf', file)
        src_file = os.path.join(mcp_dir, 'conf', file)
        if not os.path.isdir(os.path.dirname(dst_file)):
@@ -1016,8 +1016,8 @@ def decompile_minecraft(fml_dir, mcp_dir, disable_at=False, disable_merge=False,
        Commands.applyss = applyss_shunt
        Commands.checkjars = checkjars_shunt
        #decompile -d -n -r
-        #         Conf  JAD    CSV    -r    -d    -a     -n    -p     -o     -l     -g     -c                 -s              --rg
-        decompile(None, False, False, True, True, False, True, False, False, False, False, not disable_client, enable_server, False)
+        #         Conf  JAD    CSV    -r    -d    -a     -n    -p     -o     -l     -g     -c                 -s              --rg  --workDir --json(None=compute) --nocopy
+        decompile(None, False, False, True, True, False, True, False, False, False, False, not disable_client, enable_server, False, os.path.join(mcp_dir,'jars'), None, True)
        reset_logger()
        os.chdir(fml_dir)
        post_decompile(mcp_dir, fml_dir)
@@ -1034,7 +1034,7 @@ def decompile_minecraft(fml_dir, mcp_dir, disable_at=False, disable_merge=False,
    cleanup_source(src_dir)
    
    os.chdir(mcp_dir)
-    commands = Commands(verify=True)
+    commands = Commands(verify=True,workdir=os.path.join(mcp_dir,'jars'))
    
    if not disable_client:
        updatemd5_side(mcp_dir, commands, CLIENT)
@@ -1130,6 +1130,7 @@ def download_minecraft(mcp_dir, fml_dir, version=None):
    
    # Remove any invalid files
    for type in ['client', 'server']:
+        print("Backing up %s"%type)
        file_backup(mc_info['%s_file' % type], mc_info['%s_md5' % type])
        failed = not download_file(mc_info['%s_url' % type], mc_info['%s_file' % type], mc_info['%s_md5' % type]) or failed
        file_backup(mc_info['%s_file' % type], mc_info['%s_md5' % type])
@@ -0,0 +1,125 @@
+{
+  "id": "FML{version}",
+  "time": "{timestamp}",
+  "releaseTime": "{timestamp}",
+  "type": "release",
+  "processArguments": "username_session_version",
+  "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
+  "minimumLauncherVersion": 2,
+  "libraries": [
+    {
+      "name": "net.minecraft:launchwrapper:1.3",
+      "comment" : "Important for FML, we add this"
+    },
+    {
+      "name": "org.ow2.asm:asm-all:4.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2",
+      "comment" : "Important for FML, we add this"
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:4.5",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "lzma:lzma:0.0.1"
+    },
+    {
+      "name": "com.paulscode:codecjorbis:20101023"
+    },
+    {
+      "name": "com.paulscode:codecwav:20101023"
+    },
+    {
+      "name": "com.paulscode:libraryjavasound:20101123"
+    },
+    {
+      "name": "com.paulscode:librarylwjglopenal:20100824"
+    },
+    {
+      "name": "com.paulscode:soundsystem:20120107"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "argo:argo:2.25_fixed"
+    },
+    {
+      "name": "net.sourceforge.argo:argo:2.25",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2",
+      "comment" : "grumble grumble grumble, y u no use proper version/artifact id grumble"
+    },
+    {
+      "name": "org.bouncycastle:bcprov-jdk15on:1.47",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "com.google.guava:guava:14.0",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.apache.commons:commons-lang3:3.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "commons-io:commons-io:2.4",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "net.java.jinput:jinput:2.0.5",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "net.java.jutils:jutils:1.0.0",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "com.google.code.gson:gson:2.2.2",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "net.java.jinput:jinput-platform:2.0.5",
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    }
+  ],
+  "mainClass": "net.minecraft.client.main.Main"
+}
@@ -0,0 +1,93 @@
+{
+  "id": "FML{version}",
+  "time": "{timestamp}",
+  "releaseTime": "{timestamp}",
+  "type": "release",
+  "processArguments": "username_session_version",
+  "minecraftArguments": "--username ${auth_player_name} --session ${auth_session} --version ${version_name} --gameDir ${game_directory} --assetsDir ${game_assets} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
+  "minimumLauncherVersion": 2,
+  "libraries": [
+    {
+      "name": "cpw.mods:fml:{version}",
+      "devdl" : "false"
+    },
+    {
+      "name": "net.minecraft:launchwrapper:1.3"
+    },
+    {
+      "name": "net.sf.jopt-simple:jopt-simple:4.5"
+    },
+    {
+      "name": "com.paulscode:codecjorbis:20101023"
+    },
+    {
+      "name": "com.paulscode:codecwav:20101023"
+    },
+    {
+      "name": "com.paulscode:libraryjavasound:20101123"
+    },
+    {
+      "name": "com.paulscode:librarylwjglopenal:20100824"
+    },
+    {
+      "name": "com.paulscode:soundsystem:20120107"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0"
+    },
+    {
+      "name": "argo:argo:2.25_fixed"
+    },
+    {
+      "name": "org.bouncycastle:bcprov-jdk15on:1.47"
+    },
+    {
+      "name": "com.google.guava:guava:14.0"
+    },
+    {
+      "name": "org.apache.commons:commons-lang3:3.1"
+    },
+    {
+      "name": "commons-io:commons-io:2.4"
+    },
+    {
+      "name": "net.java.jinput:jinput:2.0.5"
+    },
+    {
+      "name": "net.java.jutils:jutils:1.0.0"
+    },
+    {
+      "name": "com.google.code.gson:gson:2.2.2"
+    },
+    {
+      "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    },
+    {
+      "name": "net.java.jinput:jinput-platform:2.0.5",
+      "natives": {
+        "linux": "natives-linux",
+        "windows": "natives-windows",
+        "osx": "natives-osx"
+      },
+      "extract": {
+        "exclude": [
+          "META-INF/"
+        ]
+      }
+    }
+  ],
+  "mainClass": "net.minecraft.client.main.Main"
+}
@@ -1,5 +1,5 @@
 [default]
-current_ver = 1.6
+current_ver = 1.6.1
 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
@@ -100,3 +100,10 @@ server_md5 = 7c03305c8bf97a8e8f3cdb147fc90607
 mcp_ver    = 8.01
 mcp_url    = 
 mcp_md5    = 39da81bbb4d73b3f5e2d1f8f5682cdb9
+
+[1.6.1]
+client_md5 = 3c56fb4b77b1ca37dde69b5eb896fc4d
+server_md5 = ff8f81970a5955737c356b534d3aee96
+mcp_ver    = 8.02
+mcp_url    = 
+mcp_md5    = 39da81bbb4d73b3f5e2d1f8f5682cdb9
@@ -46,7 +46,7 @@
     }
 
     public void func_110436_a()
-@@ -725,6 +736,7 @@
+@@ -729,6 +740,7 @@
         {
             this.func_71405_e();
         }
@@ -54,7 +54,7 @@
     }
 
     private void func_71411_J()
-@@ -793,9 +805,11 @@
+@@ -797,9 +809,11 @@
 
         if (!this.field_71454_w)
         {
@@ -66,7 +66,7 @@
         }
 
         GL11.glFlush();
-@@ -1317,10 +1331,14 @@
+@@ -1321,10 +1335,14 @@
 
     public void func_71407_l()
     {
@@ -81,7 +81,7 @@
 
         this.field_71424_I.func_76320_a("stats");
         this.field_71413_E.func_77449_e();
-@@ -1771,6 +1789,8 @@
+@@ -1775,6 +1793,8 @@
             this.field_71453_ak.func_74428_b();
         }
 
@@ -90,7 +90,7 @@
         this.field_71424_I.func_76319_b();
         this.field_71423_H = func_71386_F();
     }
-@@ -1794,8 +1814,27 @@
+@@ -1798,8 +1818,27 @@
         }
 
         this.field_71413_E.func_77450_a(StatList.field_75936_f, 1);
@@ -1,11 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/gui/GuiErrorScreen.java
-+++ ../src-work/minecraft/net/minecraft/client/gui/GuiErrorScreen.java
-@@ -22,6 +22,8 @@
-         this.field_73887_h.add(new GuiButton(0, this.field_73880_f / 2 - 100, 140, I18n.func_135053_a("gui.cancel")));
-     }
- 
-+    public GuiErrorScreen(){}
-+
-     public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_)
-     {
-         this.func_73733_a(0, 0, this.field_73880_f, this.field_73881_g, -12574688, -11530224);
@@ -15,8 +15,8 @@
 +import java.util.List;
 import java.util.Random;
 import net.minecraft.client.Minecraft;
- import net.minecraft.client.renderer.Tessellator;
-@@ -23,6 +26,9 @@
+ import net.minecraft.client.mco.ExceptionMcoService;
+@@ -26,6 +29,9 @@
 import org.apache.commons.io.Charsets;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.glu.Project;
@@ -26,7 +26,7 @@
 
 @SideOnly(Side.CLIENT)
 public class GuiMainMenu extends GuiScreen
-@@ -52,6 +58,8 @@
+@@ -55,6 +61,8 @@
     private ResourceLocation field_110351_G;
     private GuiButton field_130023_H;
 
@@ -35,7 +35,7 @@
     public GuiMainMenu()
     {
         BufferedReader bufferedreader = null;
-@@ -203,13 +211,22 @@
+@@ -206,13 +214,22 @@
     private void func_130022_h()
     {
         this.field_130023_H.field_73748_h = true;
@@ -59,7 +59,7 @@
         this.field_130023_H.field_73748_h = false;
     }
 
-@@ -256,6 +273,11 @@
+@@ -259,6 +276,11 @@
         if (p_73875_1_.field_73741_f == 4)
         {
             this.field_73882_e.func_71400_g();
@@ -71,7 +71,7 @@
         }
 
         if (p_73875_1_.field_73741_f == 11)
-@@ -492,7 +514,16 @@
+@@ -520,7 +542,16 @@
             s = s + " Demo";
         }
 
@@ -13,28 +13,28 @@
 
 +    private static byte connectionCompatibilityLevel;
 +
-     public NetClientHandler(Minecraft p_i3103_1_, String p_i3103_2_, int p_i3103_3_) throws IOException
+     public NetClientHandler(Minecraft p_i1176_1_, String p_i1176_2_, int p_i1176_3_) throws IOException
     {
-         this.field_72563_h = p_i3103_1_;
-         Socket socket = new Socket(InetAddress.getByName(p_i3103_2_), p_i3103_3_);
-         this.field_72555_g = new TcpConnection(p_i3103_1_.func_98033_al(), socket, "Client", this);
-+        FMLNetworkHandler.onClientConnectionToRemoteServer(this, p_i3103_2_, p_i3103_3_, this.field_72555_g);
+         this.field_72563_h = p_i1176_1_;
+         Socket socket = new Socket(InetAddress.getByName(p_i1176_2_), p_i1176_3_);
+         this.field_72555_g = new TcpConnection(p_i1176_1_.func_98033_al(), socket, "Client", this);
+        FMLNetworkHandler.onClientConnectionToRemoteServer(this, p_i1176_2_, p_i1176_3_, this.field_72555_g);
     }
 
-     public NetClientHandler(Minecraft p_i11012_1_, String p_i11012_2_, int p_i11012_3_, GuiScreen p_i11012_4_) throws IOException
+     public NetClientHandler(Minecraft p_i1177_1_, String p_i1177_2_, int p_i1177_3_, GuiScreen p_i1177_4_) throws IOException
@@ -214,6 +218,7 @@
-         this.field_98183_l = p_i11012_4_;
-         Socket socket = new Socket(InetAddress.getByName(p_i11012_2_), p_i11012_3_);
-         this.field_72555_g = new TcpConnection(p_i11012_1_.func_98033_al(), socket, "Client", this);
-+        FMLNetworkHandler.onClientConnectionToRemoteServer(this, p_i11012_2_, p_i11012_3_, this.field_72555_g);
+         this.field_98183_l = p_i1177_4_;
+         Socket socket = new Socket(InetAddress.getByName(p_i1177_2_), p_i1177_3_);
+         this.field_72555_g = new TcpConnection(p_i1177_1_.func_98033_al(), socket, "Client", this);
+        FMLNetworkHandler.onClientConnectionToRemoteServer(this, p_i1177_2_, p_i1177_3_, this.field_72555_g);
     }
 
-     public NetClientHandler(Minecraft p_i3104_1_, IntegratedServer p_i3104_2_) throws IOException
+     public NetClientHandler(Minecraft p_i1178_1_, IntegratedServer p_i1178_2_) throws IOException
@@ -221,6 +226,7 @@
-         this.field_72563_h = p_i3104_1_;
-         this.field_72555_g = new MemoryConnection(p_i3104_1_.func_98033_al(), this);
-         p_i3104_2_.func_71343_a().func_71754_a((MemoryConnection)this.field_72555_g, p_i3104_1_.func_110432_I().func_111285_a());
-+        FMLNetworkHandler.onClientConnectionToIntegratedServer(this, p_i3104_2_, this.field_72555_g);
+         this.field_72563_h = p_i1178_1_;
+         this.field_72555_g = new MemoryConnection(p_i1178_1_.func_98033_al(), this);
+         p_i1178_2_.func_71343_a().func_71754_a((MemoryConnection)this.field_72555_g, p_i1178_1_.func_110432_I().func_111285_a());
+        FMLNetworkHandler.onClientConnectionToIntegratedServer(this, p_i1178_2_, this.field_72555_g);
     }
 
     public void func_72547_c()
@@ -1,111 +0,0 @@
--- ../src-base/minecraft/net/minecraft/client/renderer/RenderEngine.java
-+++ ../src-work/minecraft/net/minecraft/client/renderer/RenderEngine.java
-@@ -1,8 +1,11 @@
- package net.minecraft.client.renderer;
- 
-+import cpw.mods.fml.client.TextureFXManager;
-+import cpw.mods.fml.common.FMLLog;
- import cpw.mods.fml.relauncher.Side;
- import cpw.mods.fml.relauncher.SideOnly;
- import java.awt.Color;
-+import java.awt.Dimension;
- import java.awt.Graphics;
- import java.awt.image.BufferedImage;
- import java.io.IOException;
-@@ -11,6 +14,9 @@
- import java.util.HashMap;
- import java.util.Iterator;
- import java.util.Map;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+
- import javax.imageio.ImageIO;
- import net.minecraft.client.Minecraft;
- import net.minecraft.client.renderer.texture.TextureMap;
-@@ -37,6 +43,8 @@
-     private final TextureMap field_94155_m;
-     private int field_94153_n;
- 
-+    public static Logger log = FMLLog.getLogger();
-+
-     public RenderEngine(TexturePackList p_i3192_1_, GameSettings p_i3192_2_)
-     {
-         this.field_78366_k = p_i3192_1_;
-@@ -87,14 +95,17 @@
-                 }
-                 else
-                 {
-                    aint1 = this.func_78348_b(this.func_78345_a(inputstream));
-+                    BufferedImage bufferedimage = this.func_78345_a(inputstream);
-+                    TextureFXManager.instance().fixTransparency(bufferedimage, p_78346_1_);
-+                    aint1 = this.func_78348_b(bufferedimage);
-                 }
- 
-                 this.field_78359_d.put(p_78346_1_, aint1);
-                 return aint1;
-             }
-            catch (IOException ioexception)
-            {
-+            catch (Exception ioexception)
-+            {
-+                log.log(Level.INFO, String.format("An error occured reading texture file %s (getTexture)", p_78346_1_), ioexception);
-                 ioexception.printStackTrace();
-                 int[] aint2 = this.func_78348_b(this.field_78364_l);
-                 this.field_78359_d.put(p_78346_1_, aint2);
-@@ -162,6 +173,7 @@
-                 try
-                 {
-                     int i = GLAllocation.func_74528_a();
-+                    TextureFXManager.instance().bindTextureToName(p_78341_1_, i);
-                     boolean flag = p_78341_1_.startsWith("%blur%");
- 
-                     if (flag)
-@@ -184,7 +196,9 @@
-                     }
-                     else
-                     {
-                        this.func_98184_a(this.func_78345_a(inputstream), i, flag, flag1);
-+                        BufferedImage bufferedimage = this.func_78345_a(inputstream);
-+                        TextureFXManager.instance().fixTransparency(bufferedimage, p_78341_1_);
-+                        this.func_98184_a(bufferedimage, i, flag, flag1);
-                     }
- 
-                     this.field_78362_c.put(s1, Integer.valueOf(i));
-@@ -240,6 +254,7 @@
- 
-         int j = p_98184_1_.getWidth();
-         int k = p_98184_1_.getHeight();
-+        TextureFXManager.instance().setTextureDimensions(p_98184_2_, j, k);
-         int[] aint = new int[j * k];
-         p_98184_1_.getRGB(0, 0, j, k, aint, 0, j);
- 
-@@ -412,10 +427,12 @@
-                 }
- 
-                 BufferedImage bufferedimage1 = this.func_78345_a(itexturepack.func_77532_a(s));
-+                TextureFXManager.instance().fixTransparency(bufferedimage1, s);
-                 this.func_98184_a(bufferedimage1, j, flag, flag1);
-             }
-            catch (IOException ioexception)
-            {
-+            catch (Exception ioexception)
-+            {
-+                log.log(Level.INFO,String.format("An error occured reading texture file %s (refreshTexture)", s), ioexception);
-                 ioexception.printStackTrace();
-             }
-         }
-@@ -429,10 +446,12 @@
-             try
-             {
-                 bufferedimage = this.func_78345_a(itexturepack.func_77532_a(s));
-+                TextureFXManager.instance().fixTransparency(bufferedimage, s);
-                 this.func_78340_a(bufferedimage, (int[])this.field_78359_d.get(s));
-             }
-            catch (IOException ioexception1)
-            {
-+            catch (Exception ioexception1)
-+            {
-+                log.log(Level.INFO,String.format("An error occured reading texture file data %s (refreshTexture)", s), ioexception1);
-                 ioexception1.printStackTrace();
-             }
-         }
@@ -1,63 +0,0 @@
--- ../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();
-+    }
- }
@@ -1,34 +0,0 @@
--- ../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();
-+        }
-+    }
- }
@@ -8,7 +8,7 @@
 -        {
 -            return this.func_85085_a();
 -        }
-        catch (Exception e)
+-        catch (Exception ex)
 -        {
 -            return null;
 -        }
@@ -12,7 +12,7 @@
@@ -224,6 +226,8 @@
         }
 
-         field_77698_e[256 + p_i3659_1_] = this;
+         field_77698_e[256 + p_i1875_1_] = this;
 +
 +        GameData.newItemAdded(this);
     }
@@ -21,12 +21,12 @@
 +        this.vanillaCompatible = FMLNetworkHandler.vanillaLoginPacketCompatibility();
 +    }
 
-     public Packet1Login(int p_i3327_1_, WorldType p_i3327_2_, EnumGameType p_i3327_3_, boolean p_i3327_4_, int p_i3327_5_, int p_i3327_6_, int p_i3327_7_, int p_i3327_8_)
+     public Packet1Login(int p_i1440_1_, WorldType p_i1440_2_, EnumGameType p_i1440_3_, boolean p_i1440_4_, int p_i1440_5_, int p_i1440_6_, int p_i1440_7_, int p_i1440_8_)
     {
@@ -29,6 +36,7 @@
-         this.field_73556_g = (byte)p_i3327_7_;
-         this.field_73562_h = (byte)p_i3327_8_;
-         this.field_73560_c = p_i3327_4_;
+         this.field_73556_g = (byte)p_i1440_7_;
+         this.field_73562_h = (byte)p_i1440_8_;
+         this.field_73560_c = p_i1440_4_;
 +        this.vanillaCompatible = false;
     }
 
@@ -31,14 +31,14 @@
 +
 +    protected BiomeGenBase[] biomesForWorldType;
 
-     public WorldType(int p_i3737_1_, String p_i3737_2_)
+     public WorldType(int p_i1959_1_, String p_i1959_2_)
     {
@@ -28,6 +45,15 @@
         this.field_77140_h = true;
-         this.field_82748_f = p_i3738_1_;
-         field_77139_a[p_i3738_1_] = this;
+         this.field_82748_f = p_i1960_1_;
+         field_77139_a[p_i1960_1_] = this;
 +
-+        switch (p_i3738_1_)
+        switch (p_i1960_1_)
 +        {
 +            case 8:
 +                biomesForWorldType = base11Biomes;
@@ -1,14 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.java
 +++ ../src-work/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.java
-@@ -10,13 +10,8 @@
-     public GenLayerBiome(long p_i3888_1_, GenLayer p_i3888_3_, WorldType p_i3888_4_)
+@@ -10,13 +10,9 @@
+     public GenLayerBiome(long p_i2122_1_, GenLayer p_i2122_3_, WorldType p_i2122_4_)
     {
-         super(p_i3888_1_);
+         super(p_i2122_1_);
 -        this.field_75914_b = new BiomeGenBase[] {BiomeGenBase.field_76769_d, BiomeGenBase.field_76767_f, BiomeGenBase.field_76770_e, BiomeGenBase.field_76780_h, BiomeGenBase.field_76772_c, BiomeGenBase.field_76768_g, BiomeGenBase.field_76782_w};
-+        this.field_75914_b = p_i3888_4_.getBiomesForWorldType();
-         this.field_75909_a = p_i3888_3_;
-
-        if (p_i3888_4_ == WorldType.field_77136_e)
+        this.field_75914_b = p_i2122_4_.getBiomesForWorldType();
+         this.field_75909_a = p_i2122_3_;
+ 
+-        if (p_i2122_4_ == WorldType.field_77136_e)
 -        {
 -            this.field_75914_b = new BiomeGenBase[] {BiomeGenBase.field_76769_d, BiomeGenBase.field_76767_f, BiomeGenBase.field_76770_e, BiomeGenBase.field_76780_h, BiomeGenBase.field_76772_c, BiomeGenBase.field_76768_g};
 -        }
Author	SHA1	Message	Date
Christian	3f15cd54c2	Functional client @ 1.6.1	2013-06-30 21:02:23 -04:00
Christian	12c928c538	Tweak commands patch	2013-06-30 19:33:47 -04:00
Christian	7406b38d8a	1.6.1	2013-06-30 16:50:30 -04:00
Christian	ef646d3146	Merge branch '16launch'	2013-06-30 13:20:46 -04:00
Christian	18371bd8c9	Some fixes for updated mcp code	2013-06-30 13:17:20 -04:00
Christian	e35e4b16ff	More fixups	2013-06-30 09:04:50 -04:00
LexManos	3711da9c45	Another typo	2013-06-30 03:55:26 -07:00
LexManos	6a318ddb78	Fix typo in new packages.	2013-06-30 01:01:55 -07:00
LexManos	2766f9a293	Push conf folder for 1.6, Relied heavily on a yet-unreleased version of MCP.	2013-06-29 22:48:24 -07:00
Christian	2e3f2461fa	More fixes, binpatching works	2013-06-29 15:16:18 -04:00