From b9982f18f5dd63937dfcc1b44157be431327bd91 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 1 Aug 2012 03:17:36 -0700 Subject: [PATCH] Fixed AccessTransformer issue with trying to load files, instead of resources. --- .../asm/transformers/AccessTransformer.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/fml/transformers/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/fml/transformers/cpw/mods/fml/common/asm/transformers/AccessTransformer.java index 760284e06..f627847d4 100644 --- a/fml/transformers/cpw/mods/fml/common/asm/transformers/AccessTransformer.java +++ b/fml/transformers/cpw/mods/fml/common/asm/transformers/AccessTransformer.java @@ -77,7 +77,16 @@ public class AccessTransformer implements IClassTransformer private void readMapFile(String rulesFile) throws IOException { - URL rulesResource = Resources.getResource(rulesFile); + File file = new File(rulesFile); + URL rulesResource; + if (file.exists()) + { + rulesResource = file.toURI().toURL(); + } + else + { + rulesResource = Resources.getResource(rulesFile); + } Resources.readLines(rulesResource, Charsets.UTF_8, new LineProcessor() { @Override @@ -103,9 +112,9 @@ public class AccessTransformer implements IClassTransformer m.setTargetAccess(parts.get(0)); List descriptor = Lists.newArrayList(Splitter.on(".").trimResults().split(parts.get(1))); List method = Lists.newArrayList(Splitter.on(CharMatcher.anyOf("()")).omitEmptyStrings().trimResults().split(descriptor.get(1))); - if (method.size()==2) + if (method.size()==3) //cpw, cleanthis up plz { - m.desc = method.get(1); + m.desc = String.format("(%s)%s", method.get(1), method.get(2)); } m.name = method.get(0); modifiers.put(descriptor.get(0), m); @@ -228,7 +237,7 @@ public class AccessTransformer implements IClassTransformer System.out.println("Could not find target jar: " + orig); return; } - +/* if (temp.exists()) { if (orig.exists() && !orig.renameTo(new File(args[0] + (new SimpleDateFormat(".yyyy.MM.dd.HHmmss")).format(new Date())))) @@ -242,7 +251,7 @@ public class AccessTransformer implements IClassTransformer return; } } - +*/ if (!orig.renameTo(temp)) { System.out.println("Could not rename file: " + orig + " -> " + temp); @@ -257,6 +266,11 @@ public class AccessTransformer implements IClassTransformer { e.printStackTrace(); } + + if (!temp.delete()) + { + System.out.println("Could not delete temp file: " + temp); + } } private static void processJar(File inFile, File outFile, AccessTransformer[] transformers) throws IOException