keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fixed AccessTransformer issue with trying to load files, instead of resources.

Browse source
This commit is contained in:
LexManos 2012-08-01 03:17:36 -07:00
parent 1753b28475
commit b9982f18f5
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
fml/transformers/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
View file

@ -77,7 +77,16 @@ public class AccessTransformer implements IClassTransformer
private void readMapFile(String rulesFile) throws IOException 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<Void>() Resources.readLines(rulesResource, Charsets.UTF_8, new LineProcessor<Void>()
{ {
@Override @Override
@ -103,9 +112,9 @@ public class AccessTransformer implements IClassTransformer
m.setTargetAccess(parts.get(0)); m.setTargetAccess(parts.get(0));
List<String> descriptor = Lists.newArrayList(Splitter.on(".").trimResults().split(parts.get(1))); List<String> descriptor = Lists.newArrayList(Splitter.on(".").trimResults().split(parts.get(1)));
List<String> method = Lists.newArrayList(Splitter.on(CharMatcher.anyOf("()")).omitEmptyStrings().trimResults().split(descriptor.get(1))); List<String> 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); m.name = method.get(0);
modifiers.put(descriptor.get(0), m); modifiers.put(descriptor.get(0), m);
@ -228,7 +237,7 @@ public class AccessTransformer implements IClassTransformer
System.out.println("Could not find target jar: " + orig); System.out.println("Could not find target jar: " + orig);
return; return;
} }
/*
if (temp.exists()) if (temp.exists())
{ {
if (orig.exists() && !orig.renameTo(new File(args[0] + (new SimpleDateFormat(".yyyy.MM.dd.HHmmss")).format(new Date())))) 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; return;
} }
} }
*/
if (!orig.renameTo(temp)) if (!orig.renameTo(temp))
{ {
System.out.println("Could not rename file: " + orig + " -> " + temp); System.out.println("Could not rename file: " + orig + " -> " + temp);
@ -257,6 +266,11 @@ public class AccessTransformer implements IClassTransformer
{ {
e.printStackTrace(); 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 private static void processJar(File inFile, File outFile, AccessTransformer[] transformers) throws IOException