Deob: Make mapping dumper dump (theoretically) all you need for updating (#1191)
* Deob: Make mapping dumper dump (theoretically) all you need for updating * Update ClassFile.java
This commit is contained in:
Lucwousin
+5
-224
@@ -24,266 +24,47 @@
|
||||
*/
|
||||
package net.runelite.deob.deobfuscators.mapping;
|
||||
|
||||
import com.google.common.io.Files;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.Charset;
|
||||
import java.time.Instant;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonObject;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import net.runelite.asm.ClassFile;
|
||||
import net.runelite.asm.ClassGroup;
|
||||
import net.runelite.asm.Field;
|
||||
import net.runelite.asm.Method;
|
||||
import net.runelite.asm.Type;
|
||||
import net.runelite.asm.attributes.code.Parameter;
|
||||
import net.runelite.asm.signature.Signature;
|
||||
import net.runelite.deob.Deob;
|
||||
import net.runelite.deob.DeobAnnotations;
|
||||
import net.runelite.deob.DeobTestProperties;
|
||||
import net.runelite.deob.deobfuscators.mapping.mappingdumper.MappedClass;
|
||||
import net.runelite.deob.deobfuscators.mapping.mappingdumper.MappedField;
|
||||
import net.runelite.deob.deobfuscators.mapping.mappingdumper.MappedMethod;
|
||||
import net.runelite.deob.deobfuscators.mapping.mappingdumper.MappingDump;
|
||||
import net.runelite.deob.util.JarUtil;
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class MappingDumper
|
||||
{
|
||||
@Rule
|
||||
public DeobTestProperties properties = new DeobTestProperties();
|
||||
|
||||
private final Logger log = LoggerFactory.getLogger(MappingDumper.class);
|
||||
|
||||
private MappingDump dump;
|
||||
private Map<String, MappedClass> classMap;
|
||||
private ClassGroup group;
|
||||
private static final String OUTDIR = "";
|
||||
private final File OUTFILE = new File(OUTDIR, "rlplushooks.json");
|
||||
|
||||
@Before
|
||||
public void before()
|
||||
public void before() throws IOException
|
||||
{
|
||||
dump = new MappingDump();
|
||||
dump.revision = properties.getRsVersion();
|
||||
dump.classes = new ArrayList<>();
|
||||
dump.staticFields = new ArrayList<>();
|
||||
dump.staticMethods = new ArrayList<>();
|
||||
classMap = new HashMap<>();
|
||||
group = JarUtil.loadJar(new File(properties.getRsClient()));
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
public void newDump() throws IOException
|
||||
public void newDump()
|
||||
{
|
||||
final ClassGroup group = JarUtil.loadJar(new File(properties.getRsClient()));
|
||||
|
||||
|
||||
// First create all the mappedclasses, so we can add static methods to their lists
|
||||
for (ClassFile c : group.getClasses())
|
||||
{
|
||||
if (c.getName().contains("runelite"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
final MappedClass mc = new MappedClass();
|
||||
|
||||
mc.obfuscatedName = DeobAnnotations.getObfuscatedName(c.getAnnotations());
|
||||
mc.implementingName = DeobAnnotations.getImplements(c);
|
||||
mc.superClass = c.getSuperName();
|
||||
mc.interfaces = c.getInterfaces().getIntfNames();
|
||||
mc.constructors = new ArrayList<>();
|
||||
mc.fields = new ArrayList<>();
|
||||
mc.methods = new ArrayList<>();
|
||||
mc.access = c.getAccess();
|
||||
mc.staticMethods = new ArrayList<>();
|
||||
mc.staticFields = new ArrayList<>();
|
||||
|
||||
dump.classes.add(mc);
|
||||
classMap.put(c.getName(), mc);
|
||||
|
||||
dump.totalClasses++;
|
||||
if (mc.implementingName != null)
|
||||
{
|
||||
dump.totalNamedClasses++;
|
||||
}
|
||||
}
|
||||
|
||||
for (ClassFile c : group.getClasses())
|
||||
{
|
||||
if (c.getName().contains("runelite"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
final MappedClass mc = classMap.get(c.getName());
|
||||
|
||||
getFields(c, mc);
|
||||
|
||||
getMethods(c, mc);
|
||||
}
|
||||
|
||||
dump.totalNonStaticFields = dump.totalFields - dump.totalStaticFields;
|
||||
dump.totalNamedNonStaticFields = dump.totalNamedFields - dump.totalNamedStaticFields;
|
||||
dump.totalNonStaticMethods = dump.totalMethods - dump.totalStaticMethods;
|
||||
dump.totalNamedNonStaticMethods = dump.totalNamedMethods - dump.totalNamedStaticMethods;
|
||||
|
||||
final Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||
Files.asCharSink(OUTFILE, Charset.defaultCharset()).write(gson.toJson(dump));
|
||||
|
||||
log.info("Dumped current mappings. revision {}", dump.revision);
|
||||
log.info("Total classes: {}. Total mapped classes: {}. ({}%)", dump.totalClasses, dump.totalNamedClasses, dump.totalNamedClasses * 100 / dump.totalClasses);
|
||||
log.info("Total non static methods: {}. Total mapped non static methods: {}. ({}%)", dump.totalNonStaticMethods, dump.totalNamedNonStaticMethods, dump.totalNamedNonStaticMethods * 100 / dump.totalNamedMethods);
|
||||
log.info("Total methods: {}. Total mapped methods: {}. ({}%)", dump.totalMethods, dump.totalNamedMethods, dump.totalNamedMethods * 100 / dump.totalMethods);
|
||||
log.info("Total fields: {}. Total mapped fields: {}. ({}%)", dump.totalFields, dump.totalNamedFields, dump.totalNamedFields * 100 / dump.totalFields);
|
||||
log.info("Total non static fields: {}. Total mapped non static fields: {}. ({}%)", dump.totalNonStaticFields, dump.totalNamedNonStaticFields, dump.totalNamedNonStaticFields * 100 / dump.totalNamedFields);
|
||||
|
||||
}
|
||||
|
||||
private void getFields(final ClassFile c, final MappedClass mc)
|
||||
{
|
||||
for (Field f : c.getFields())
|
||||
{
|
||||
dump.totalFields++;
|
||||
|
||||
if (f.isStatic())
|
||||
{
|
||||
dump.totalStaticFields++;
|
||||
}
|
||||
|
||||
if (Deob.isObfuscated(f.getName()))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
dump.totalNamedFields++;
|
||||
|
||||
final MappedField mf = new MappedField();
|
||||
|
||||
mf.exportedName = f.getName();
|
||||
mf.owner = mc.obfuscatedName;
|
||||
mf.obfuscatedName = DeobAnnotations.getObfuscatedName(f.getAnnotations());
|
||||
mf.access = f.getAccessFlags();
|
||||
mf.descriptor = DeobAnnotations.getAnnotationValue(f.getAnnotations(), DeobAnnotations.OBFUSCATED_SIGNATURE);
|
||||
|
||||
Number decoder = DeobAnnotations.getObfuscatedGetter(f);
|
||||
if (decoder != null)
|
||||
{
|
||||
mf.decoder = decoder.longValue();
|
||||
}
|
||||
|
||||
if (mf.descriptor == null)
|
||||
{
|
||||
mf.descriptor = f.getType().toString();
|
||||
}
|
||||
|
||||
if (f.isStatic())
|
||||
{
|
||||
dump.staticFields.add(mf);
|
||||
dump.totalNamedStaticFields++;
|
||||
|
||||
int _index = mf.exportedName.indexOf('_');
|
||||
|
||||
if (_index != -1)
|
||||
{
|
||||
String className = mf.exportedName.substring(0, _index);
|
||||
MappedClass staticOwner = classMap.get(className);
|
||||
|
||||
if (staticOwner != null)
|
||||
{
|
||||
staticOwner.staticFields.add(mf);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
mc.fields.add(mf);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void getMethods(final ClassFile c, final MappedClass mc)
|
||||
{
|
||||
for (Method m : c.getMethods())
|
||||
{
|
||||
dump.totalMethods++;
|
||||
|
||||
if (m.isStatic())
|
||||
{
|
||||
dump.totalStaticMethods++;
|
||||
}
|
||||
|
||||
if (Deob.isObfuscated(m.getName()) || m.getName().equals("<clinit>"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
dump.totalNamedMethods++;
|
||||
|
||||
final MappedMethod mm = new MappedMethod();
|
||||
|
||||
mm.exportedName = m.getName();
|
||||
mm.owner = mc.obfuscatedName;
|
||||
mm.obfuscatedName = DeobAnnotations.getObfuscatedName(m.getAnnotations());
|
||||
mm.access = m.getAccessFlags();
|
||||
mm.parameters = new ArrayList<>();
|
||||
mm.descriptor = DeobAnnotations.getObfuscatedSignature(m) != null ? DeobAnnotations.getObfuscatedSignature(m).toString() : m.getDescriptor().toString();
|
||||
|
||||
try
|
||||
{
|
||||
mm.garbageValue = Long.parseLong(DeobAnnotations.getDecoder(m));
|
||||
}
|
||||
catch (NumberFormatException e)
|
||||
{
|
||||
mm.garbageValue = null;
|
||||
}
|
||||
|
||||
for (Parameter p : m.getParameters())
|
||||
{
|
||||
mm.parameters.add(p.getName());
|
||||
}
|
||||
|
||||
if (m.getName().equals("<init>"))
|
||||
{
|
||||
mm.exportedName = null;
|
||||
mc.constructors.add(mm);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (m.isStatic())
|
||||
{
|
||||
dump.staticMethods.add(mm);
|
||||
dump.totalNamedStaticMethods++;
|
||||
|
||||
int _index = mm.exportedName.indexOf('_');
|
||||
|
||||
if (_index != -1)
|
||||
{
|
||||
String className = mm.exportedName.substring(0, _index - 1);
|
||||
MappedClass staticOwner = classMap.get(className);
|
||||
|
||||
if (staticOwner != null)
|
||||
{
|
||||
staticOwner.staticMethods.add(mm);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
mc.methods.add(mm);
|
||||
}
|
||||
}
|
||||
new net.runelite.deob.updater.MappingDumper(group).dump(OUTFILE);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
-22
@@ -1,22 +0,0 @@
|
||||
package net.runelite.deob.deobfuscators.mapping.mappingdumper;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import java.util.List;
|
||||
|
||||
public class MappedClass
|
||||
{
|
||||
@SerializedName("class")
|
||||
public String implementingName;
|
||||
@SerializedName("name")
|
||||
public String obfuscatedName;
|
||||
@SerializedName("super")
|
||||
public String superClass;
|
||||
public int access;
|
||||
public List<String> interfaces;
|
||||
public List<MappedField> fields;
|
||||
public List<MappedMethod> methods;
|
||||
public List<MappedMethod> constructors;
|
||||
// Static fields/methods belonging to this class (ClassName_name)
|
||||
public List<MappedField> staticFields;
|
||||
public List<MappedMethod> staticMethods;
|
||||
}
|
||||
-15
@@ -1,15 +0,0 @@
|
||||
package net.runelite.deob.deobfuscators.mapping.mappingdumper;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class MappedField
|
||||
{
|
||||
@SerializedName("field")
|
||||
public String exportedName;
|
||||
public String owner;
|
||||
@SerializedName("name")
|
||||
public String obfuscatedName;
|
||||
public int access;
|
||||
public String descriptor;
|
||||
public Long decoder;
|
||||
}
|
||||
-17
@@ -1,17 +0,0 @@
|
||||
package net.runelite.deob.deobfuscators.mapping.mappingdumper;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import java.util.List;
|
||||
|
||||
public class MappedMethod
|
||||
{
|
||||
@SerializedName("method")
|
||||
public String exportedName;
|
||||
public String owner;
|
||||
@SerializedName("name")
|
||||
public String obfuscatedName;
|
||||
public int access;
|
||||
public List<String> parameters;
|
||||
public String descriptor;
|
||||
public Long garbageValue;
|
||||
}
|
||||
-35
@@ -1,35 +0,0 @@
|
||||
package net.runelite.deob.deobfuscators.mapping.mappingdumper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class MappingDump
|
||||
{
|
||||
public int revision;
|
||||
|
||||
public int totalClasses;
|
||||
public int totalNamedClasses;
|
||||
|
||||
public int totalFields;
|
||||
public int totalNamedFields;
|
||||
|
||||
public int totalNonStaticFields;
|
||||
public int totalNamedNonStaticFields;
|
||||
|
||||
public int totalStaticFields;
|
||||
public int totalNamedStaticFields;
|
||||
|
||||
public int totalMethods;
|
||||
public int totalNamedMethods;
|
||||
|
||||
public int totalNonStaticMethods;
|
||||
public int totalNamedNonStaticMethods;
|
||||
|
||||
public int totalStaticMethods;
|
||||
public int totalNamedStaticMethods;
|
||||
|
||||
public List<MappedClass> classes;
|
||||
|
||||
// Static things belonging to a certain class will be in both these lists and in the classes
|
||||
public List<MappedField> staticFields;
|
||||
public List<MappedMethod> staticMethods;
|
||||
}
|
||||
Reference in New Issue
Block a user