Refactor move rename -> mapping package

This commit is contained in:
Adam
2016-04-16 21:59:51 -04:00
parent 1d0ee8bfcb
commit fe54620dbe
46 changed files with 67 additions and 58 deletions

View File

@@ -1,6 +1,6 @@
package net.runelite.asm.attributes.code.instruction.types;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
public interface MappableInstruction

View File

@@ -6,8 +6,8 @@ import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.asm.attributes.code.instruction.types.ArrayStoreInstruction;
import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.StackContext;

View File

@@ -11,8 +11,8 @@ import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.Stack;
import net.runelite.asm.execution.StackContext;
import net.runelite.asm.execution.Value;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public class IDiv extends Instruction implements MappableInstruction
{

View File

@@ -19,9 +19,9 @@ import net.runelite.asm.execution.Frame;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.Stack;
import net.runelite.asm.execution.StackContext;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.PacketHandler;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.PacketHandler;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public abstract class If extends Instruction implements JumpingInstruction, ComparisonInstruction, MappableInstruction
{

View File

@@ -17,8 +17,8 @@ import net.runelite.asm.execution.Frame;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.Stack;
import net.runelite.asm.execution.StackContext;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public abstract class If0 extends Instruction implements JumpingInstruction, ComparisonInstruction, MappableInstruction
{

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.StackContext;

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.StackContext;

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
public class IfCmpGe extends If

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.Execution;
import net.runelite.asm.execution.Frame;
import net.runelite.asm.execution.InstructionContext;

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
public class IfCmpLe extends If

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
public class IfCmpLt extends If

View File

@@ -5,7 +5,7 @@ import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import static net.runelite.asm.attributes.code.instructions.IfICmpEq.isOne;
import static net.runelite.asm.attributes.code.instructions.IfICmpEq.isZero;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.StackContext;

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
public class IfGt extends If0

View File

@@ -4,7 +4,7 @@ import net.runelite.asm.attributes.code.Instruction;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.StackContext;

View File

@@ -3,7 +3,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.StackContext;

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
public class IfLe extends If0

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
public class IfLt extends If0

View File

@@ -4,7 +4,7 @@ import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.asm.attributes.code.instruction.types.MappableInstruction;
import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.StackContext;

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.StackContext;

View File

@@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions;
import net.runelite.asm.attributes.code.InstructionType;
import net.runelite.asm.attributes.code.Instructions;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.StackContext;

View File

@@ -25,8 +25,8 @@ import net.runelite.asm.pool.NameAndType;
import net.runelite.asm.pool.PoolEntry;
import net.runelite.asm.signature.Signature;
import net.runelite.asm.signature.util.VirtualMethods;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public class InvokeInterface extends Instruction implements InvokeInstruction
{

View File

@@ -25,8 +25,8 @@ import net.runelite.asm.pool.Method;
import net.runelite.asm.pool.NameAndType;
import net.runelite.asm.pool.PoolEntry;
import net.runelite.asm.signature.Signature;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public class InvokeSpecial extends Instruction implements InvokeInstruction
{

View File

@@ -24,8 +24,8 @@ import net.runelite.asm.pool.Method;
import net.runelite.asm.pool.NameAndType;
import net.runelite.asm.pool.PoolEntry;
import net.runelite.asm.signature.Signature;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public class InvokeStatic extends Instruction implements InvokeInstruction
{

View File

@@ -25,8 +25,8 @@ import net.runelite.asm.pool.NameAndType;
import net.runelite.asm.pool.PoolEntry;
import net.runelite.asm.signature.Signature;
import net.runelite.asm.signature.util.VirtualMethods;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public class InvokeVirtual extends Instruction implements InvokeInstruction
{

View File

@@ -13,8 +13,8 @@ import net.runelite.asm.execution.InstructionContext;
import net.runelite.asm.execution.Stack;
import net.runelite.asm.execution.StackContext;
import net.runelite.asm.execution.Value;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public class LCmp extends Instruction implements MappableInstruction
{

View File

@@ -18,8 +18,8 @@ import net.runelite.asm.execution.StackContext;
import net.runelite.asm.pool.Class;
import net.runelite.asm.pool.Field;
import net.runelite.asm.pool.NameAndType;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public class PutField extends Instruction implements SetFieldInstruction
{

View File

@@ -17,8 +17,8 @@ import net.runelite.asm.execution.StackContext;
import net.runelite.asm.pool.Class;
import net.runelite.asm.pool.Field;
import net.runelite.asm.pool.NameAndType;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public class PutStatic extends Instruction implements SetFieldInstruction
{

View File

@@ -9,8 +9,8 @@ import net.runelite.asm.Method;
import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction;
import net.runelite.asm.attributes.code.instructions.InvokeStatic;
import net.runelite.asm.attributes.code.instructions.Return;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
public class ParallellMappingExecutor
{

View File

@@ -1,4 +1,4 @@
package net.runelite.deob.deobfuscators.rename;
package net.runelite.deob.deobfuscators.mapping;
import net.runelite.asm.ClassFile;
import net.runelite.asm.ClassGroup;

View File

@@ -1,4 +1,4 @@
package net.runelite.deob.deobfuscators.rename;
package net.runelite.deob.deobfuscators.mapping;
import java.util.HashMap;
import java.util.Map;

View File

@@ -1,4 +1,4 @@
package net.runelite.deob.deobfuscators.rename;
package net.runelite.deob.deobfuscators.mapping;
import java.util.ArrayList;
import java.util.Collection;

View File

@@ -5,8 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.runelite.asm.Method;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
public class ExecutionMapper
{

View File

@@ -1,4 +1,4 @@
package net.runelite.deob.deobfuscators.rename;
package net.runelite.deob.deobfuscators.mapping;
import com.google.common.collect.Multimap;
import java.util.ArrayList;

View File

@@ -1,4 +1,4 @@
package net.runelite.deob.deobfuscators.rename;
package net.runelite.deob.deobfuscators.mapping;
public class Mapping
{

View File

@@ -1,4 +1,4 @@
package net.runelite.deob.deobfuscators.rename;
package net.runelite.deob.deobfuscators.mapping;
import net.runelite.asm.ClassFile;
import net.runelite.asm.ClassGroup;

View File

@@ -1,4 +1,4 @@
package net.runelite.deob.deobfuscators.rename;
package net.runelite.deob.deobfuscators.mapping;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;

View File

@@ -1,4 +1,4 @@
package net.runelite.deob.deobfuscators.rename;
package net.runelite.deob.deobfuscators.mapping;
import java.util.List;
import net.runelite.asm.attributes.code.Instruction;

View File

@@ -1,4 +1,4 @@
package net.runelite.deob.deobfuscators.rename;
package net.runelite.deob.deobfuscators.mapping;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;

View File

@@ -1,4 +1,4 @@
package net.runelite.deob.deobfuscators.rename;
package net.runelite.deob.deobfuscators.mapping;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;

View File

@@ -3,9 +3,9 @@ package net.runelite.deob.updater;
import java.io.File;
import java.io.IOException;
import net.runelite.asm.ClassGroup;
import net.runelite.deob.deobfuscators.rename.AnnotationMapper;
import net.runelite.deob.deobfuscators.rename.Mapper;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.AnnotationMapper;
import net.runelite.deob.deobfuscators.mapping.Mapper;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.deob.util.JarUtil;
public class UpdateMappings

View File

@@ -1,5 +1,6 @@
package net.runelite.deob.deobfuscators.rename;
import net.runelite.deob.deobfuscators.mapping.ClassGroupMapper;
import java.io.File;
import java.io.IOException;
import java.util.Map;

View File

@@ -1,5 +1,6 @@
package net.runelite.deob.deobfuscators.rename;
import net.runelite.deob.deobfuscators.mapping.ClassMapper;
import java.io.File;
import java.io.IOException;
import net.runelite.asm.ClassGroup;

View File

@@ -1,5 +1,9 @@
package net.runelite.deob.deobfuscators.rename;
import net.runelite.deob.deobfuscators.mapping.PacketHandler;
import net.runelite.deob.deobfuscators.mapping.Mapper;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import com.google.common.collect.Multimap;
import java.io.File;
import java.io.IOException;

View File

@@ -1,5 +1,8 @@
package net.runelite.deob.deobfuscators.rename;
import net.runelite.deob.deobfuscators.mapping.Mapper;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;

View File

@@ -1,5 +1,7 @@
package net.runelite.deob.deobfuscators.rename;
import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping;
import net.runelite.deob.deobfuscators.mapping.Mapper;
import java.io.File;
import java.io.IOException;
import net.runelite.asm.ClassFile;

View File

@@ -10,8 +10,8 @@ import org.junit.Test;
public class InjectTest
{
private static final File DEOBFUSCATED = new File("d:/rs/07/gamepack_v20_mapped.jar");
private static final File VANILLA = new File(InjectTest.class.getResource("/gamepack_v20.jar").getFile());
private static final File DEOBFUSCATED = new File("d:/rs/07/gamepack_v21_mapped.jar");//C:\\Users\\Adam\\.m2\\repository\\net\\runelite\\rs\\rs-client\\1.0-SNAPSHOT\\rs-client-1.0-SNAPSHOT.jar");
private static final File VANILLA = new File(InjectTest.class.getResource("/gamepack_v21.jar").getFile());
private static final File OUT = new File("d:/rs/07/adamout.jar");
private ClassGroup deob, vanilla;