Some fixes for updated mcp code

commands.patch

@@ -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 @@
+@@ -892,6 +894,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 @@
+@@ -1223,6 +1227,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 @@
+@@ -1280,7 +1287,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 @@
+@@ -1288,7 +1295,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 @@
+@@ -1645,7 +1652,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 @@
+@@ -1660,6 +1667,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 @@
+@@ -1832,6 +1842,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 @@
+@@ -1852,6 +1865,9 @@
          md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
          outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
          src = {CLIENT: self.srcclient, SERVER: self.srcserver}

conf/mcp.cfg

@@ -34,10 +34,10 @@ 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
+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  = 6a64a2136e3a3fe4d29b0a0df30b25fc
 MD5Server  = 7c03305c8bf97a8e8f3cdb147fc90607
 
@@ -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           = 135000
+ParamIndex        = 35000
 
 [ASTYLE]
 AstyleConfig  = %(DirConf)s/astyle.cfg

install/fml.py

@@ -85,7 +85,7 @@ def read_mc_versions(fml_dir, version=None, work_dir=None):
             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)
-            mc_info['server_file'] = os.path.join(work_dir, 'minecraft_server.%s.jar' % version)
+            mc_info['server_file'] = os.path.join(work_dir, 'minecraft_server.jar')
             mc_info['asset_dir']   = os.path.join(work_dir, 'assets')
     else:
         mc_info['new_launcher'] = False
@@ -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
+        decompile(None, False, False, True, True, False, True, False, False, False, False, not disable_client, enable_server, False, 'none')
         reset_logger()
         os.chdir(fml_dir)
         post_decompile(mcp_dir, fml_dir)
@@ -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])