Optimize imports

This commit is contained in:
Lucwousin
2019-11-16 03:56:15 +01:00
parent 7900089eda
commit 55b0845a18
44 changed files with 99 additions and 164 deletions

View File

@@ -24,6 +24,7 @@
*/
package net.runelite.deob;
import java.util.List;
import net.runelite.asm.ClassFile;
import net.runelite.asm.Field;
import net.runelite.asm.Method;
@@ -33,8 +34,6 @@ import net.runelite.asm.attributes.annotation.Annotation;
import net.runelite.asm.attributes.annotation.Element;
import net.runelite.asm.signature.Signature;
import java.util.List;
public class DeobAnnotations
{
public static final Type OBFUSCATED_NAME = new Type("Lnet/runelite/mapping/ObfuscatedName;");

View File

@@ -25,6 +25,7 @@
package net.runelite.deob.deobfuscators;
import java.util.List;
import net.runelite.asm.ClassFile;
import net.runelite.asm.ClassGroup;
import net.runelite.asm.Field;
@@ -35,31 +36,29 @@ import net.runelite.deob.DeobAnnotations;
import net.runelite.deob.Deobfuscator;
import net.runelite.deob.util.NameMappings;
import java.util.List;
public class RenameUnique implements Deobfuscator
{
private Renamer renamer;
private void generateClassNames(NameMappings map, ClassGroup group)
{
int i = 0;
for (ClassFile cf : group.getClasses())
{
if (cf.getName().length() > Deob.OBFUSCATED_NAME_MAX_LEN)
{
continue;
}
map.map(cf.getPoolClass(), "class" + i++);
}
}
private void generateFieldNames(NameMappings map, ClassGroup group)
{
int i = 0;
for (ClassFile cf : group.getClasses())
for (Field field : cf.getFields())
{
@@ -67,7 +66,7 @@ public class RenameUnique implements Deobfuscator
{
continue;
}
map.map(field.getPoolField(), "field" + i++);
}
}
@@ -75,7 +74,7 @@ public class RenameUnique implements Deobfuscator
private void generateMethodNames(NameMappings map, ClassGroup group)
{
int i = 0;
for (ClassFile cf : group.getClasses())
for (Method method : cf.getMethods())
{
@@ -83,16 +82,16 @@ public class RenameUnique implements Deobfuscator
{
continue;
}
List<Method> virtualMethods = VirtualMethods.getVirtualMethods(method);
assert !virtualMethods.isEmpty();
String name;
if (virtualMethods.size() == 1)
name = "method" + i++;
else
name = "vmethod" + i++;
for (Method m : virtualMethods)
map.map(m.getPoolMethod(), name);
}
@@ -103,13 +102,13 @@ public class RenameUnique implements Deobfuscator
{
group.buildClassGraph();
group.lookup();
NameMappings mappings = new NameMappings();
this.generateClassNames(mappings, group);
this.generateFieldNames(mappings, group);
this.generateMethodNames(mappings, group);
renamer = new Renamer(mappings);
renamer.run(group);
}

View File

@@ -25,7 +25,6 @@
package net.runelite.deob.deobfuscators.packethandler;
import java.util.Objects;
import net.runelite.asm.Type;
import net.runelite.asm.attributes.code.Instruction;
import net.runelite.asm.execution.InstructionContext;