mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Final part of the deobfuscation data setup- fields are now deobfuscated as well.
All that remains, is to figure out what and how to distribute the deobfuscation data itself.
This commit is contained in:
1 parent
f00650481b
commit
b9ccadb2f1
3 files changed
+38
-6
No files matched your search
@@ -145,7 +145,6 @@ public class AccessTransformer implements IClassTransformer
|
||||
@Override
|
||||
public byte[] transform(String name, String transformedName, byte[] bytes)
|
||||
{
|
||||
System.out.printf("AT transforming %s : %s\n",name,transformedName);
|
||||
if (bytes == null) { return null; }
|
||||
if (!modifiers.containsKey(name)) { return bytes; }
|
||||
|
||||
|
||||
@@ -16,7 +16,6 @@ public class DeobfuscationTransformer implements IClassTransformer, IClassNameTr
|
||||
@Override
|
||||
public byte[] transform(String name, String transformedName, byte[] bytes)
|
||||
{
|
||||
System.out.println("***" + name + ":"+transformedName);
|
||||
if (bytes == null)
|
||||
{
|
||||
return null;
|
||||
|
||||
@@ -73,7 +73,6 @@ public class FMLDeobfuscatingRemapper extends Remapper {
|
||||
{
|
||||
String[] parts = Iterables.toArray(splitter.split(line),String.class);
|
||||
String typ = parts[0];
|
||||
System.out.printf("PARTS: %s\n", Arrays.asList(parts));
|
||||
if ("CL".equals(typ))
|
||||
{
|
||||
parseClass(builder, parts);
|
||||
@@ -95,10 +94,22 @@ public class FMLDeobfuscatingRemapper extends Remapper {
|
||||
FMLRelaunchLog.log(Level.SEVERE, ioe, "An error occurred loading the deobfuscation map data");
|
||||
}
|
||||
methodNameMaps = Maps.newHashMapWithExpectedSize(rawMethodMaps.size());
|
||||
fieldNameMaps = Maps.newHashMapWithExpectedSize(rawFieldMaps.size());
|
||||
}
|
||||
private void parseField(String[] parts)
|
||||
{
|
||||
//
|
||||
String oldSrg = parts[1];
|
||||
int lastOld = oldSrg.lastIndexOf('/');
|
||||
String cl = oldSrg.substring(0,lastOld);
|
||||
String oldName = oldSrg.substring(lastOld+1);
|
||||
String newSrg = parts[2];
|
||||
int lastNew = newSrg.lastIndexOf('/');
|
||||
String newName = newSrg.substring(lastNew+1);
|
||||
if (!rawFieldMaps.containsKey(cl))
|
||||
{
|
||||
rawFieldMaps.put(cl, Maps.<String,String>newHashMap());
|
||||
}
|
||||
rawFieldMaps.get(cl).put(oldName, newName);
|
||||
}
|
||||
|
||||
private void parseClass(Builder<String, String> builder, String[] parts)
|
||||
@@ -126,7 +137,12 @@ public class FMLDeobfuscatingRemapper extends Remapper {
|
||||
@Override
|
||||
public String mapFieldName(String owner, String name, String desc)
|
||||
{
|
||||
return name;
|
||||
if (classNameBiMap == null)
|
||||
{
|
||||
return name;
|
||||
}
|
||||
Map<String, String> fieldMap = getFieldMap(owner);
|
||||
return fieldMap!=null && fieldMap.containsKey(name) ? fieldMap.get(name) : name;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -163,6 +179,15 @@ public class FMLDeobfuscatingRemapper extends Remapper {
|
||||
return methodMap!=null && methodMap.containsKey(methodDescriptor) ? methodMap.get(methodDescriptor) : name;
|
||||
}
|
||||
|
||||
private Map<String,String> getFieldMap(String className)
|
||||
{
|
||||
if (!fieldNameMaps.containsKey(className))
|
||||
{
|
||||
findAndMergeSuperMaps(className);
|
||||
}
|
||||
return fieldNameMaps.get(className);
|
||||
}
|
||||
|
||||
private Map<String,String> getMethodMap(String className)
|
||||
{
|
||||
if (!methodNameMaps.containsKey(className))
|
||||
@@ -209,19 +234,28 @@ public class FMLDeobfuscatingRemapper extends Remapper {
|
||||
findAndMergeSuperMaps(superName);
|
||||
}
|
||||
}
|
||||
System.out.printf("Merging maps for %s (%s , %s)\n", name, superName, Arrays.asList(interfaces));
|
||||
Map<String, String> methodMap = Maps.<String,String>newHashMap();
|
||||
Map<String, String> fieldMap = Maps.<String,String>newHashMap();
|
||||
for (String parentThing : allParents)
|
||||
{
|
||||
if (methodNameMaps.containsKey(parentThing))
|
||||
{
|
||||
methodMap.putAll(methodNameMaps.get(parentThing));
|
||||
}
|
||||
if (fieldNameMaps.containsKey(parentThing))
|
||||
{
|
||||
fieldMap.putAll(fieldNameMaps.get(parentThing));
|
||||
}
|
||||
}
|
||||
if (rawMethodMaps.containsKey(name))
|
||||
{
|
||||
methodMap.putAll(rawMethodMaps.get(name));
|
||||
}
|
||||
if (rawFieldMaps.containsKey(name))
|
||||
{
|
||||
fieldMap.putAll(rawFieldMaps.get(name));
|
||||
}
|
||||
methodNameMaps.put(name, ImmutableMap.copyOf(methodMap));
|
||||
fieldNameMaps.put(name, ImmutableMap.copyOf(fieldMap));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user