diff --git a/src/main/java/net/runelite/deob/attributes/code/Instruction.java b/src/main/java/net/runelite/deob/attributes/code/Instruction.java index c6773226e3..d99a662f66 100644 --- a/src/main/java/net/runelite/deob/attributes/code/Instruction.java +++ b/src/main/java/net/runelite/deob/attributes/code/Instruction.java @@ -221,7 +221,7 @@ public abstract class Instruction } // look up symbols from pool - public void lookup2() + public void lookup() { } diff --git a/src/main/java/net/runelite/deob/attributes/code/Instructions.java b/src/main/java/net/runelite/deob/attributes/code/Instructions.java index b3329045f4..672f649217 100644 --- a/src/main/java/net/runelite/deob/attributes/code/Instructions.java +++ b/src/main/java/net/runelite/deob/attributes/code/Instructions.java @@ -257,7 +257,7 @@ public class Instructions public void lookup() { for (Instruction i : instructions) - i.lookup2(); + i.lookup(); } public void regeneratePool() diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ANewArray.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ANewArray.java index 381bd406c3..093d3ddf39 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ANewArray.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ANewArray.java @@ -15,7 +15,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import net.runelite.deob.ClassGroup; -import net.runelite.deob.util.NameMappings; public class ANewArray extends Instruction { @@ -63,7 +62,7 @@ public class ANewArray extends Instruction } @Override - public void lookup2() + public void lookup() { net.runelite.deob.signature.Type t = new net.runelite.deob.signature.Type(clazz.getName()); String name = t.getType(); diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/CheckCast.java b/src/main/java/net/runelite/deob/attributes/code/instructions/CheckCast.java index b0a34b8361..0d3e51c0e9 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/CheckCast.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/CheckCast.java @@ -8,14 +8,12 @@ import net.runelite.deob.execution.Frame; import net.runelite.deob.execution.InstructionContext; import net.runelite.deob.execution.Stack; import net.runelite.deob.execution.StackContext; -import net.runelite.deob.execution.Type; import net.runelite.deob.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import net.runelite.deob.ClassGroup; -import net.runelite.deob.util.NameMappings; public class CheckCast extends Instruction { @@ -60,7 +58,7 @@ public class CheckCast extends Instruction } @Override - public void lookup2() + public void lookup() { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); myClass = group.findClass(clazz.getName()); diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java b/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java index e21f1830d3..781c7c9d9d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java @@ -17,10 +17,6 @@ import net.runelite.deob.pool.NameAndType; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.deobfuscators.arithmetic.Encryption; -import net.runelite.deob.deobfuscators.arithmetic.Pair; -import net.runelite.deob.util.NameMappings; public class GetField extends Instruction implements GetFieldInstruction { @@ -84,7 +80,7 @@ public class GetField extends Instruction implements GetFieldInstruction } @Override - public void lookup2() + public void lookup() { myField = getMyField(); } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java b/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java index 1f8db72264..e27b0b846d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java @@ -17,10 +17,6 @@ import net.runelite.deob.pool.NameAndType; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.deobfuscators.arithmetic.Encryption; -import net.runelite.deob.deobfuscators.arithmetic.Pair; -import net.runelite.deob.util.NameMappings; public class GetStatic extends Instruction implements GetFieldInstruction { @@ -88,7 +84,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction } @Override - public void lookup2() + public void lookup() { myField = this.getMyField(); } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InstanceOf.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InstanceOf.java index 67345d0775..3d7f206f6b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InstanceOf.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InstanceOf.java @@ -14,7 +14,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import net.runelite.deob.ClassGroup; -import net.runelite.deob.util.NameMappings; public class InstanceOf extends Instruction { @@ -58,7 +57,7 @@ public class InstanceOf extends Instruction } @Override - public void lookup2() + public void lookup() { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); myClass = group.findClass(clazz.getName()); diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeInterface.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeInterface.java index 3b55806b4e..ba98a8d7c3 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeInterface.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeInterface.java @@ -11,9 +11,7 @@ import net.runelite.deob.execution.InstructionContext; import net.runelite.deob.execution.Stack; import net.runelite.deob.execution.StackContext; import net.runelite.deob.execution.Type; -import net.runelite.deob.pool.Class; import net.runelite.deob.pool.InterfaceMethod; -import net.runelite.deob.pool.Method; import net.runelite.deob.pool.NameAndType; import net.runelite.deob.pool.PoolEntry; import net.runelite.deob.signature.Signature; @@ -24,7 +22,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import net.runelite.deob.execution.Execution; -import net.runelite.deob.util.NameMappings; public class InvokeInterface extends Instruction implements InvokeInstruction { @@ -144,7 +141,7 @@ public class InvokeInterface extends Instruction implements InvokeInstruction } @Override - public void lookup2() + public void lookup() { myMethods = this.getMethods(); } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeSpecial.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeSpecial.java index 54c84a0021..4b69f621b5 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeSpecial.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeSpecial.java @@ -11,7 +11,6 @@ import net.runelite.deob.execution.InstructionContext; import net.runelite.deob.execution.Stack; import net.runelite.deob.execution.StackContext; import net.runelite.deob.execution.Type; -import net.runelite.deob.pool.Class; import net.runelite.deob.pool.Method; import net.runelite.deob.pool.NameAndType; import net.runelite.deob.pool.PoolEntry; @@ -23,8 +22,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import net.runelite.deob.execution.Execution; -import net.runelite.deob.pool.InterfaceMethod; -import net.runelite.deob.util.NameMappings; public class InvokeSpecial extends Instruction implements InvokeInstruction { @@ -137,7 +134,7 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction } @Override - public void lookup2() + public void lookup() { myMethods = this.getMethods(); } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeStatic.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeStatic.java index 617d78a57c..38a2b67d43 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeStatic.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeStatic.java @@ -11,7 +11,6 @@ import net.runelite.deob.execution.InstructionContext; import net.runelite.deob.execution.Stack; import net.runelite.deob.execution.StackContext; import net.runelite.deob.execution.Type; -import net.runelite.deob.pool.Class; import net.runelite.deob.pool.Method; import net.runelite.deob.pool.NameAndType; import net.runelite.deob.pool.PoolEntry; @@ -23,7 +22,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import net.runelite.deob.execution.Execution; -import net.runelite.deob.util.NameMappings; public class InvokeStatic extends Instruction implements InvokeInstruction { @@ -140,7 +138,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction } @Override - public void lookup2() + public void lookup() { myMethods = this.getMethods(); } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java index c2467d7ec0..c9257271c5 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java @@ -11,7 +11,6 @@ import net.runelite.deob.execution.InstructionContext; import net.runelite.deob.execution.Stack; import net.runelite.deob.execution.StackContext; import net.runelite.deob.execution.Type; -import net.runelite.deob.pool.Class; import net.runelite.deob.pool.Method; import net.runelite.deob.pool.NameAndType; import net.runelite.deob.pool.PoolEntry; @@ -23,7 +22,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import net.runelite.deob.execution.Execution; -import net.runelite.deob.util.NameMappings; public class InvokeVirtual extends Instruction implements InvokeInstruction { @@ -141,7 +139,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction } @Override - public void lookup2() + public void lookup() { myMethods = this.getMethods(); } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/MultiANewArray.java b/src/main/java/net/runelite/deob/attributes/code/instructions/MultiANewArray.java index e37dbe7bd5..6a05b0aba7 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/MultiANewArray.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/MultiANewArray.java @@ -15,7 +15,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import net.runelite.deob.ClassGroup; -import net.runelite.deob.util.NameMappings; public class MultiANewArray extends Instruction { @@ -66,7 +65,7 @@ public class MultiANewArray extends Instruction } @Override - public void lookup2() + public void lookup() { net.runelite.deob.signature.Type t = new net.runelite.deob.signature.Type(clazz.getName()); String name = t.getType(); diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/New.java b/src/main/java/net/runelite/deob/attributes/code/instructions/New.java index d57a567386..ed3d8905b1 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/New.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/New.java @@ -15,7 +15,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import net.runelite.deob.ClassGroup; -import net.runelite.deob.util.NameMappings; public class New extends Instruction { @@ -61,7 +60,7 @@ public class New extends Instruction } @Override - public void lookup2() + public void lookup() { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); myClass = group.findClass(clazz.getName()); diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/PutField.java b/src/main/java/net/runelite/deob/attributes/code/instructions/PutField.java index b78b513329..ddb551b4ea 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/PutField.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/PutField.java @@ -16,10 +16,6 @@ import net.runelite.deob.pool.NameAndType; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.deobfuscators.arithmetic.Encryption; -import net.runelite.deob.deobfuscators.arithmetic.Pair; -import net.runelite.deob.util.NameMappings; public class PutField extends Instruction implements SetFieldInstruction { @@ -79,7 +75,7 @@ public class PutField extends Instruction implements SetFieldInstruction } @Override - public void lookup2() + public void lookup() { myField = getMyField(); } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/PutStatic.java b/src/main/java/net/runelite/deob/attributes/code/instructions/PutStatic.java index 425ae1d120..627107b28d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/PutStatic.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/PutStatic.java @@ -16,8 +16,6 @@ import net.runelite.deob.pool.NameAndType; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.util.NameMappings; public class PutStatic extends Instruction implements SetFieldInstruction { @@ -76,7 +74,7 @@ public class PutStatic extends Instruction implements SetFieldInstruction } @Override - public void lookup2() + public void lookup() { myField = getMyField(); }