upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix AT, Fix exc. Almost works now!

Browse Source
This commit is contained in:
Christian committed 2013-12-12 01:39:30 -05:00
1 parent 7a4ceebf5e
commit 7ea571f593
5 files changed
+39 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
+11 -9
View File
@@ -53,7 +53,7 @@ import cpw.mods.fml.relauncher.FMLRelaunchLog;
public class AccessTransformer implements IClassTransformer
{
private static final boolean DEBUG = false;
private static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("fml.debugAccessTransformer", "false"));
private class Modifier
{
public String name = "";
@@ -124,20 +124,20 @@ public class AccessTransformer implements IClassTransformer
return true;
}
List<String> parts = Lists.newArrayList(Splitter.on(" ").trimResults().split(line));
if (parts.size()>2)
if (parts.size()>3)
{
throw new RuntimeException("Invalid config file line "+ input);
}
Modifier m = new Modifier();
m.setTargetAccess(parts.get(0));
List<String> descriptor = Lists.newArrayList(Splitter.on(".").trimResults().split(parts.get(1)));
if (descriptor.size() == 1)
if (parts.size() == 2)
{
m.modifyClassVisibility = true;
}
else
{
String nameReference = descriptor.get(1);
String nameReference = parts.get(2);
int parenIdx = nameReference.indexOf('(');
if (parenIdx>0)
{
@@ -149,7 +149,9 @@ public class AccessTransformer implements IClassTransformer
m.name = nameReference;
}
}
modifiers.put(descriptor.get(0).replace('/', '.'), m);
String className = parts.get(1).replace('/', '.');
modifiers.put(className, m);
if (DEBUG) System.out.printf("AT RULE: %s %s %s (type %s)\n", toBinary(m.targetAccess), m.name, m.desc, className);
return true;
}
});
@@ -163,15 +165,15 @@ public class AccessTransformer implements IClassTransformer
if (DEBUG)
{
FMLRelaunchLog.fine("Considering all methods and fields on %s (%s)\n", name, transformedName);
FMLRelaunchLog.fine("Considering all methods and fields on %s (%s)\n", transformedName, name);
}
if (!modifiers.containsKey(name)) { return bytes; }
if (!modifiers.containsKey(transformedName)) { return bytes; }
ClassNode classNode = new ClassNode();
ClassReader classReader = new ClassReader(bytes);
classReader.accept(classNode, 0);
Collection<Modifier> mods = modifiers.get(name);
Collection<Modifier> mods = modifiers.get(transformedName);
for (Modifier m : mods)
{
if (m.modifyClassVisibility)
src/main/java/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java
+2 -1
View File
@@ -20,11 +20,12 @@ public class FMLDeobfTweaker implements ITweaker {
@Override
public void injectIntoClassLoader(LaunchClassLoader classLoader)
{
// Deobfuscation transformer, always last
// Deobfuscation transformer, always last, and the access transformer tweaker as well
if (!(Boolean)Launch.blackboard.get("fml.deobfuscatedEnvironment"))
{
classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.DeobfuscationTransformer");
}
classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.AccessTransformer");
try
{
FMLRelaunchLog.fine("Validating minecraft");
src/main/java/cpw/mods/fml/relauncher/FMLCorePlugin.java
-1
View File
@@ -20,7 +20,6 @@ public class FMLCorePlugin implements IFMLLoadingPlugin
public String[] getASMTransformerClass()
{
return new String[] {
"cpw.mods.fml.common.asm.transformers.AccessTransformer",
"cpw.mods.fml.common.asm.transformers.MarkerTransformer",
"cpw.mods.fml.common.asm.transformers.SideTransformer",
};