Update for MC 1.6.4

Make final transformers actually work on methods as well.
Format the log messages through MessageFormat. Thanks CovertJaguar for the pointer. Closes #282
2026-11-14 09:05:17 +00:00 · 2013-09-20 16:25:12 -04:00 · 2013-09-19 12:59:12 -07:00 · 2013-09-19 08:23:56 -04:00 · 2013-09-18 15:21:56 -07:00 · 2013-09-18 18:01:04 -04:00
12 changed files with 1208 additions and 861 deletions
@@ -1,17 +1,6 @@
 --- commands.py
 +++ commands.py
-@@ -126,8 +126,8 @@
- 
- 
- def truncate(text, length):
-    if len(text) > length:
-        return text[:length] + '...'
-+    #if len(text) > length:
-+    #    return text[:length] + '...'
-     return text
- 
- 
-@@ -139,6 +139,8 @@
+@@ -141,6 +141,8 @@
             fieldnames = csvreader.fieldnames
     return set(fieldnames)
 
@@ -20,7 +9,7 @@
 
 class Commands(object):
     """Contains the commands and initialisation for a full mcp run"""
-@@ -950,6 +952,8 @@
+@@ -952,6 +954,8 @@
         binlk = {CLIENT: self.binclient, SERVER: self.binserver}
         testlk = {CLIENT: self.testclient, SERVER: self.testserver}
 
@@ -29,7 +18,7 @@
         if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
             return False
         return True
-@@ -1281,23 +1285,34 @@
+@@ -1283,23 +1287,34 @@
         pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
         pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
         pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
@@ -66,7 +55,7 @@
             classpath = os.pathsep.join(cplk[side])
             forkcmd = self.cmdrecompscala.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], pkgs=dirs)
             try:
-@@ -1317,7 +1332,15 @@
+@@ -1319,7 +1334,15 @@
                 self.logger.error('================================')
                 self.logger.error('')
                 raise
@@ -83,7 +72,7 @@
         classpath = os.pathsep.join(cplk[side])
         forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
                                         pkgs=dirs)
-@@ -1336,9 +1359,10 @@
+@@ -1338,9 +1361,10 @@
             self.logger.error('==================')
             self.logger.error('')
             raise
@@ -95,7 +84,7 @@
         classpath = [os.path.join('..', p) for p in classpath]
         classpath = os.pathsep.join(classpath)
         os.chdir(self.dirjars)
-@@ -1703,7 +1727,7 @@
+@@ -1705,7 +1729,7 @@
         self.runcmd(forkcmd)
         return True
 
@@ -104,7 +93,7 @@
         if not reobf:
             md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
         else:
-@@ -1718,6 +1742,9 @@
+@@ -1720,6 +1744,9 @@
                     class_path = ''
                 else:
                     class_path += '/'
@@ -114,7 +103,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))
-@@ -1890,6 +1917,9 @@
+@@ -1892,6 +1919,9 @@
                 sys.exit(1)
 
         for entry in newfiles:
@@ -124,7 +113,7 @@
             if entry[3] == 'U':
                 self.logger.info('Retrieving file from server : %s', entry[0])
                 cur_file = os.path.normpath(entry[0])
-@@ -1910,6 +1940,9 @@
+@@ -1912,6 +1942,9 @@
         md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
         outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
         src = {CLIENT: self.srcclient, SERVER: self.srcserver}
@@ -284,7 +284,7 @@ public class AccessTransformer implements IClassTransformer
        }

        // Clear the "final" marker on fields only if specified in control field
-        if (target.changeFinal && target.desc == "")
+        if (target.changeFinal)
        {
            if (target.markFinal)
            {
@@ -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,7 +37,7 @@ final class FMLLogFormatter extends Formatter
        String name = lvl.getLocalizedName();
        if ( name == null )
        {
-            name = lvl.getName();        	
+            name = lvl.getName();
        }

        if ( ( name != null ) && ( name.length() > 0 ) )
@@ -57,7 +57,7 @@ final class FMLLogFormatter extends Formatter
        {
            msg.append("[] ");
        }
-        msg.append(record.getMessage());
+        msg.append(formatMessage(record));
        msg.append(LINE_SEPARATOR);
        Throwable thr = record.getThrown();

@@ -23,7 +23,7 @@ public-f bgu.l #FD:RenderBiped/field_82424_k #armorlist
 #public bp.b #FD:StringTranslate/field_74815_b # -- MISSING MAPPING
 #public bp.e #FD:StringTranslate/field_74813_d # -- MISSING MAPPING
 # 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 aaf.a(Lye;[Ljava/lang/Object;)Laai; #MD:CraftingManager/func_92103_a
 public aaf.b(Lye;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
@@ -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  = 233effe2110d40a0519cf1489e4ccb1c
-MD5Server  = 8ed981ab6030412f586bfe38ff0aaa82
+MD5Client  = 2e5044f5359e82245551167a237f3167
+MD5Server  = ba3145656b1480122bd8759cecd7b7a1

 [RETROGUARD]
 Location       = %(DirRuntime)s/bin/retroguard.jar
@@ -1,4 +1,4 @@
 [VERSION]
-MCPVersion = 8.09
-ClientVersion = 1.6.3
-ServerVersion = 1.6.3
+MCPVersion = 8.11
+ClientVersion = 1.6.4
+ServerVersion = 1.6.4
@@ -4,10 +4,10 @@
 	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1.jar" sourcepath="jars/libraries/org/ow2/asm/asm-debug-all/4.1/asm-debug-all-4.1-sources.jar"/>
-	<classpathentry kind="lib" path="jars/libraries/net/minecraft/launchwrapper/1.3/launchwrapper-1.3.jar"/>
-	<classpathentry kind="lib" path="jars/versions/1.6.2/1.6.2.jar">
+	<classpathentry kind="lib" path="jars/libraries/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar"/>
+	<classpathentry kind="lib" path="jars/versions/1.6.3/1.6.3.jar">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft/jars/versions/1.6.2/1.6.2-natives"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft/jars/versions/1.6.3/1.6.3-natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="jars/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar"/>
@@ -0,0 +1,137 @@
+{
+  "id": "FML{version}",
+  "time": "{timestamp}",
+  "releaseTime": "{timestamp}",
+  "type": "release",
+  "processArguments": "username_session_version",
+  "minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
+  "minimumLauncherVersion": 4,
+  "libraries": [
+    {
+      "name": "net.minecraft:launchwrapper:1.7",
+      "comment" : "Important for FML, we add this"
+    },
+    {
+      "name": "org.ow2.asm:asm-debug-all:4.1",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2",
+      "comment" : "Important for FML, we add this"
+    },
+    {
+      "name": "org.scala-lang:scala-library:2.10.2",
+      "children" : ["sources"],
+      "url" : "http://repo.maven.apache.org/maven2",
+      "comment" : "Important for FML, we add this"
+    },
+    {
+      "name": "org.scala-lang:scala-compiler:2.10.2",
+      "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.launchwrapper.Launch"
+}
@@ -0,0 +1,214 @@
+{
+  "install": {
+    "profileName": "FML",
+    "target":"@minecraft_version@-FML@version@",
+    "path":"cpw.mods:fml:@version@",
+    "version":"FML @version@",
+    "filePath":"@universal_jar@",
+    "welcome":"Welcome to the simple FML installer.",
+    "minecraft":"@minecraft_version@",
+    "mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
+    "logo":"/big_logo.png"
+  },
+  "versionInfo": {
+    "id": "@minecraft_version@-FML@version@",
+    "time": "@timestamp@",
+    "releaseTime": "1960-01-01T00:00:00-0700",
+    "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": 4,
+    "libraries": [
+      {
+        "name": "cpw.mods:fml:@version@",
+        "url": "http://files.minecraftforge.net/maven/"
+      },
+      {
+        "name": "net.minecraft:launchwrapper:1.7",
+        "serverreq":true
+      },
+      {
+        "name": "org.ow2.asm:asm-all:4.1",
+        "serverreq":true
+      },
+      {
+        "name": "org.scala-lang:scala-library:2.10.2",
+        "url" : "http://files.minecraftforge.net/maven/",
+        "checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "dffc88e804861c9eaba39283757000b6558ea573" ],
+        "comment" : "Important for FML, we add this",
+        "serverreq":true,
+        "clientreq":true
+      },
+      {
+        "name": "org.scala-lang:scala-compiler:2.10.2",
+        "url" : "http://files.minecraftforge.net/maven/",
+        "checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "40281b3ffc69fb385953522c843363ccaf71ba89" ],
+        "comment" : "Important for FML, we add this",
+        "serverreq":true,
+        "clientreq":true
+      },
+      {
+        "name": "lzma:lzma:0.0.1",
+        "serverreq":true
+      },
+      {
+        "name": "net.sf.jopt-simple:jopt-simple:4.5",
+        "serverreq":true
+      },
+      {
+        "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": "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:2.9.0",
+        "rules": [
+          {
+            "action": "allow"
+          },
+          {
+            "action": "disallow",
+            "os": {
+              "name": "osx",
+              "version": "^10\\.5\\.\\d$"
+            }
+          }
+        ]
+      },
+      {
+        "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0",
+        "rules": [
+          {
+            "action": "allow"
+          },
+          {
+            "action": "disallow",
+            "os": {
+              "name": "osx",
+              "version": "^10\\.5\\.\\d$"
+            }
+          }
+        ]
+      },
+      {
+        "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
+        "rules": [
+          {
+            "action": "allow"
+          },
+          {
+            "action": "disallow",
+            "os": {
+              "name": "osx",
+              "version": "^10\\.5\\.\\d$"
+            }
+          }
+        ],
+        "natives": {
+          "linux": "natives-linux",
+          "windows": "natives-windows",
+          "osx": "natives-osx"
+        },
+        "extract": {
+          "exclude": [
+            "META-INF/"
+          ]
+        }
+      },
+      {
+        "name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3",
+        "rules": [
+          {
+            "action": "allow",
+            "os": {
+              "name": "osx",
+              "version": "^10\\.5\\.\\d$"
+            }
+          }
+        ]
+      },
+      {
+        "name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3",
+        "rules": [
+          {
+            "action": "allow",
+            "os": {
+              "name": "osx",
+              "version": "^10\\.5\\.\\d$"
+            }
+          }
+        ]
+      },
+      {
+        "name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
+        "rules": [
+          {
+            "action": "allow",
+            "os": {
+              "name": "osx",
+              "version": "^10\\.5\\.\\d$"
+            }
+          }
+        ],
+        "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.launchwrapper.Launch"
+  }
+}
@@ -1,5 +1,5 @@
 [default]
-current_ver = 1.6.3
+current_ver = 1.6.4
 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
@@ -119,5 +119,12 @@ mcp_md5    = ebcecfa00aae07548e67787044410a11
 client_md5 = 233effe2110d40a0519cf1489e4ccb1c
 server_md5 = 8ed981ab6030412f586bfe38ff0aaa82
 mcp_ver    = 8.09
-mcp_url    = 
-mcp_md5    = 
+mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp809.zip
+mcp_md5    = 19133b5915dc26a90d84f587172c6692
+
+[1.6.4]
+client_md5 = 2e5044f5359e82245551167a237f3167
+server_md5 = ba3145656b1480122bd8759cecd7b7a1
+mcp_ver    = 8.11
+mcp_url    = http://mcp.ocean-labs.de/files/archive/mcp811.zip
+mcp_md5    = 2d7a759309b5cc10ca29caa0b10f3bfc
Author	SHA1	Message	Date
Christian	25981706ef	Update for MC 1.6.4	2013-09-20 16:25:12 -04:00
Lex Manos	82d896a35e	Make final transformers actually work on methods as well.	2013-09-19 12:59:12 -07:00
Christian	e7dd728f95	Format the log messages through MessageFormat. Thanks CovertJaguar for the pointer. Closes #282	2013-09-19 08:23:56 -04:00
Lex Manos	8f2e675581	Update the src distro's eclipse workspace.	2013-09-18 15:21:56 -07:00
Christian	ff75416a32	Update mc_versions data and commands patch and eclipse workspace	2013-09-18 18:01:04 -04:00