From 2d7eb5cb7fc22b0d52872e63ae9d9c8475724247 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 11 Aug 2012 14:01:27 -0400 Subject: [PATCH] Fix commands.py to always include the two side classes so the fml jars are valid. --- commands.patch | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/commands.patch b/commands.patch index 741b9f23c5..b53dec71c5 100644 --- a/commands.patch +++ b/commands.patch @@ -152,7 +152,17 @@ dirs = ' '.join(pkglist) forkcmd = self.cmdastyle.format(classes=dirs, conffile=self.astyleconf) self.runcmd(forkcmd) -@@ -1592,6 +1622,9 @@ +@@ -1526,6 +1556,9 @@ + trgclasses.append(key) + self.logger.info('> Unchanged class found: %s', key) + classes = {} ++ for key in [ 'cpw/mods/fml/common/asm/SideOnly.class', 'cpw/mods/fml/common/Side.class' ]: ++ self.logger.info('> Forcing FML class: %s', key) ++ trgclasses.append(key) + srg_data = parse_srg(srglk[side]) + for row in srg_data['CL']: + classes[row['deobf_name']] = row['obf_name'] +@@ -1592,6 +1625,9 @@ sys.exit(1) for entry in newfiles: