From 5736d850f0d26eb7ce7cbe83273ba05d2eec0827 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 19 Dec 2012 19:10:00 -0800 Subject: [PATCH] MCP will reobf classes with reserved names in windows to a legal file name. And FML will try to read these classes over the default ones. --- commands.patch | 55 +++++++++++------- .../fml/relauncher/RelaunchClassLoader.java | 18 ++++++ eclipse-workspace-dev.zip | Bin 22669 -> 22735 bytes 3 files changed, 53 insertions(+), 20 deletions(-) diff --git a/commands.patch b/commands.patch index 734c743a5b..a833794700 100644 --- a/commands.patch +++ b/commands.patch @@ -106,25 +106,40 @@ 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)) -@@ -1554,7 +1565,16 @@ - except KeyError: - self.logger.error('* File %s not found for %s', out_class, in_class) - except IOError: -- self.logger.error('* File %s failed extracting for %s', out_class, in_class) -+ if not '/' in out_class: -+ try: -+ f = open(os.path.join(outpathlk[side], '_' + out_class, 'wb')) -+ f.write(zipjar.read(out_class)) -+ f.close() -+ self.logger.info('> Outputted %s to %s as %s', in_class.ljust(35), outpathlk[side], '_' + out_class) -+ except IOError: -+ self.logger.error('* File %s failed extracting for %s', out_class, in_class) -+ else: -+ self.logger.error('* File %s failed extracting for %s', out_class, in_class) +@@ -1535,6 +1546,8 @@ + if not os.path.exists(outpathlk[side]): + os.makedirs(outpathlk[side]) - def downloadupdates(self, force=False): - if not self.updateurl: -@@ -1594,6 +1614,9 @@ ++ reserved = ['CON', 'PRN', 'AUX', 'NUL', 'COM1', 'COM2', 'COM3', 'COM4', 'COM5', 'COM6', 'COM7', 'COM8', 'COM9', 'LPT1', 'LPT2', 'LPT3', 'LPT4', 'LPT5', 'LPT6', 'LPT7', 'LPT8', 'LPT9'] ++ + # HINT: We extract the modified class files + with closing(zipfile.ZipFile(jarlk[side])) as zipjar: + for in_class in trgclasses: +@@ -1548,6 +1561,23 @@ + out_class = out_class.replace(self.nullpkg, '') + if out_class[0] == '/': + out_class = out_class[1:] ++ ++ rename = False ++ for res in reserved: ++ if out_class.upper().startswith(res): ++ rename = True ++ break ++ ++ if rename: ++ try: ++ f = open(os.path.join(outpathlk[side], '_' + out_class), 'wb') ++ f.write(zipjar.read(out_class)) ++ f.close() ++ self.logger.info('> Outputted %s to %s as %s', in_class.ljust(35), outpathlk[side], '_' + out_class) ++ except IOError: ++ self.logger.error('* File %s failed extracting for %s', out_class, in_class) ++ continue ++ + 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 @@ sys.exit(1) for entry in newfiles: @@ -134,7 +149,7 @@ if entry[3] == 'U': self.logger.info('Retrieving file from server : %s', entry[0]) cur_file = os.path.normpath(entry[0]) -@@ -1614,6 +1637,9 @@ +@@ -1614,6 +1647,9 @@ md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver} outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver} src = {CLIENT: self.srcclient, SERVER: self.srcserver} @@ -144,7 +159,7 @@ # HINT: We need a table for the old md5 and the new ones md5table = {} -@@ -1656,3 +1682,6 @@ +@@ -1656,3 +1692,6 @@ except IOError: self.logger.error('* File %s copy failed', in_class) diff --git a/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java b/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java index 690cb112ed..1a8171d286 100644 --- a/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java +++ b/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java @@ -15,6 +15,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.jar.Attributes.Name; @@ -40,6 +41,8 @@ public class RelaunchClassLoader extends URLClassLoader private Map packageManifests = new HashMap(); private static Manifest EMPTY = new Manifest(); + + private static final String[] RESERVED = {"CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"}; public RelaunchClassLoader(URL[] sources) { @@ -271,6 +274,21 @@ public class RelaunchClassLoader extends URLClassLoader public byte[] getClassBytes(String name) throws IOException { + if (name.indexOf('.') == -1) + { + for (String res : RESERVED) + { + if (name.toUpperCase(Locale.ENGLISH).startsWith(res)) + { + byte[] data = getClassBytes("_" + name); + if (data != null) + { + return data; + } + } + } + } + InputStream classStream = null; try { diff --git a/eclipse-workspace-dev.zip b/eclipse-workspace-dev.zip index 3268fca9f269ee720d9ae5811beb494d49767bce..26a33422b118bc2c141e9a84c253f1c945ef346b 100644 GIT binary patch delta 1840 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