diff --git a/fml/commands.patch b/fml/commands.patch index eaa076453..4a2cc6b2b 100644 --- a/fml/commands.patch +++ b/fml/commands.patch @@ -18,18 +18,17 @@ if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))): return False return True -@@ -1029,6 +1033,10 @@ +@@ -1029,6 +1033,9 @@ pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver} pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog} -+ if side == SERVER and not os.path.exists(pathbinlk[side]): #Disable server because FML recombines it into client -+ self.logger.info('Server side recompiling skipped, this is normal') -+ return ++ if side == SERVER: #Warn about server because FML recombines it into client ++ self.logger.info('Server side recompiling might be skipped, this is normal, do not complain to FML/Forge team about server side.') + if not os.path.exists(pathbinlk[side]): os.makedirs(pathbinlk[side]) -@@ -1062,7 +1070,7 @@ +@@ -1062,7 +1069,7 @@ raise def startserver(self): @@ -38,7 +37,7 @@ classpath = [os.path.join('..', p) for p in classpath] classpath = os.pathsep.join(classpath) os.chdir(self.dirjars) -@@ -1070,7 +1078,7 @@ +@@ -1070,7 +1077,7 @@ self.runmc(forkcmd) def startclient(self): @@ -47,7 +46,7 @@ classpath = [os.path.join('..', p) for p in classpath] classpath = os.pathsep.join(classpath) natives = os.path.join('..', self.dirnatives) -@@ -1197,20 +1205,20 @@ +@@ -1197,20 +1204,20 @@ with open(self.csvmethods, 'rb') as fh: methodsreader = csv.DictReader(fh) for row in methodsreader: @@ -71,7 +70,7 @@ names['params'][row['param']] = row['name'] regexps = { -@@ -1344,13 +1352,13 @@ +@@ -1344,13 +1351,13 @@ methods = {} for row in methodsreader: #HINT: Only include methods that have a non-empty description @@ -87,7 +86,7 @@ fields[row['searge']] = row['desc'].replace('*/', '* /') regexps = { -@@ -1427,7 +1435,7 @@ +@@ -1427,7 +1434,7 @@ self.runcmd(forkcmd) return True @@ -96,7 +95,7 @@ if not reobf: md5lk = {CLIENT: self.md5client, SERVER: self.md5server} else: -@@ -1442,6 +1450,9 @@ +@@ -1442,6 +1449,9 @@ class_path = '' else: class_path += '/' @@ -106,7 +105,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)) -@@ -1535,6 +1546,8 @@ +@@ -1535,6 +1545,8 @@ if not os.path.exists(outpathlk[side]): os.makedirs(outpathlk[side]) @@ -115,7 +114,7 @@ # HINT: We extract the modified class files with closing(zipfile.ZipFile(jarlk[side])) as zipjar: for in_class in trgclasses: -@@ -1548,6 +1561,23 @@ +@@ -1548,6 +1560,23 @@ out_class = out_class.replace(self.nullpkg, '') if out_class[0] == '/': out_class = out_class[1:] @@ -139,7 +138,7 @@ try: zipjar.extract(out_class, outpathlk[side]) self.logger.info('> Outputted %s to %s as %s', in_class.ljust(35), outpathlk[side], out_class) -@@ -1594,6 +1624,9 @@ +@@ -1594,6 +1623,9 @@ sys.exit(1) for entry in newfiles: @@ -149,7 +148,7 @@ if entry[3] == 'U': self.logger.info('Retrieving file from server : %s', entry[0]) cur_file = os.path.normpath(entry[0]) -@@ -1614,6 +1647,9 @@ +@@ -1614,6 +1646,9 @@ md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver} outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver} src = {CLIENT: self.srcclient, SERVER: self.srcserver} @@ -159,7 +158,7 @@ # HINT: We need a table for the old md5 and the new ones md5table = {} -@@ -1656,3 +1692,6 @@ +@@ -1656,3 +1691,6 @@ except IOError: self.logger.error('* File %s copy failed', in_class)