diff --git a/src/main/java/net/runelite/deob/ClassFile.java b/src/main/java/net/runelite/asm/ClassFile.java similarity index 97% rename from src/main/java/net/runelite/deob/ClassFile.java rename to src/main/java/net/runelite/asm/ClassFile.java index f2d5a49cf1..1f24533ee4 100644 --- a/src/main/java/net/runelite/deob/ClassFile.java +++ b/src/main/java/net/runelite/asm/ClassFile.java @@ -1,8 +1,8 @@ -package net.runelite.deob; +package net.runelite.asm; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.pool.Class; -import net.runelite.deob.pool.NameAndType; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.pool.Class; +import net.runelite.asm.pool.NameAndType; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/src/main/java/net/runelite/deob/ClassGroup.java b/src/main/java/net/runelite/asm/ClassGroup.java similarity index 96% rename from src/main/java/net/runelite/deob/ClassGroup.java rename to src/main/java/net/runelite/asm/ClassGroup.java index 36aed0fdcd..4b25ac954d 100644 --- a/src/main/java/net/runelite/deob/ClassGroup.java +++ b/src/main/java/net/runelite/asm/ClassGroup.java @@ -1,11 +1,11 @@ -package net.runelite.deob; +package net.runelite.asm; import java.io.DataInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.runelite.deob.attributes.Code; +import net.runelite.asm.attributes.Code; public class ClassGroup { diff --git a/src/main/java/net/runelite/deob/ConstantPool.java b/src/main/java/net/runelite/asm/ConstantPool.java similarity index 75% rename from src/main/java/net/runelite/deob/ConstantPool.java rename to src/main/java/net/runelite/asm/ConstantPool.java index 8dae509745..7afef36169 100644 --- a/src/main/java/net/runelite/deob/ConstantPool.java +++ b/src/main/java/net/runelite/asm/ConstantPool.java @@ -1,10 +1,10 @@ -package net.runelite.deob; +package net.runelite.asm; -import net.runelite.deob.pool.ConstantType; -import net.runelite.deob.pool.InterfaceMethod; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.pool.PoolEntry; -import net.runelite.deob.pool.UTF8; +import net.runelite.asm.pool.ConstantType; +import net.runelite.asm.pool.InterfaceMethod; +import net.runelite.asm.pool.NameAndType; +import net.runelite.asm.pool.PoolEntry; +import net.runelite.asm.pool.UTF8; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -110,14 +110,14 @@ public class ConstantPool return u.getValue(); } - public net.runelite.deob.pool.Class getClass(int index) + public net.runelite.asm.pool.Class getClass(int index) { - return (net.runelite.deob.pool.Class) getEntry(index); + return (net.runelite.asm.pool.Class) getEntry(index); } - public net.runelite.deob.pool.Field getField(int index) + public net.runelite.asm.pool.Field getField(int index) { - return (net.runelite.deob.pool.Field) getEntry(index); + return (net.runelite.asm.pool.Field) getEntry(index); } public InterfaceMethod getInterfaceMethod(int index) @@ -125,9 +125,9 @@ public class ConstantPool return (InterfaceMethod) getEntry(index); } - public net.runelite.deob.pool.Method getMethod(int index) + public net.runelite.asm.pool.Method getMethod(int index) { - return (net.runelite.deob.pool.Method) getEntry(index); + return (net.runelite.asm.pool.Method) getEntry(index); } public NameAndType getNameAndType(int index) @@ -163,19 +163,19 @@ public class ConstantPool public int make(Object object) { if (object instanceof String) - return make(new net.runelite.deob.pool.String((String) object)); + return make(new net.runelite.asm.pool.String((String) object)); if (object instanceof Integer) - return make(new net.runelite.deob.pool.Integer((int) object)); + return make(new net.runelite.asm.pool.Integer((int) object)); if (object instanceof Float) - return make(new net.runelite.deob.pool.Float((float) object)); + return make(new net.runelite.asm.pool.Float((float) object)); if (object instanceof Long) - return make(new net.runelite.deob.pool.Long((long) object)); + return make(new net.runelite.asm.pool.Long((long) object)); if (object instanceof Double) - return make(new net.runelite.deob.pool.Double((double) object)); + return make(new net.runelite.asm.pool.Double((double) object)); System.err.println("Constant pool make with unknown object " + object + " type " + object.getClass()); diff --git a/src/main/java/net/runelite/deob/Field.java b/src/main/java/net/runelite/asm/Field.java similarity index 87% rename from src/main/java/net/runelite/deob/Field.java rename to src/main/java/net/runelite/asm/Field.java index 529f731505..e84cdb71d1 100644 --- a/src/main/java/net/runelite/deob/Field.java +++ b/src/main/java/net/runelite/asm/Field.java @@ -1,12 +1,12 @@ -package net.runelite.deob; +package net.runelite.asm; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.signature.Type; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.signature.Type; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.pool.NameAndType; +import net.runelite.asm.pool.NameAndType; public class Field { @@ -109,10 +109,10 @@ public class Field return attributes; } - public net.runelite.deob.pool.Field getPoolField() + public net.runelite.asm.pool.Field getPoolField() { - return new net.runelite.deob.pool.Field( - new net.runelite.deob.pool.Class(this.getFields().getClassFile().getName()), + return new net.runelite.asm.pool.Field( + new net.runelite.asm.pool.Class(this.getFields().getClassFile().getName()), new NameAndType(this.getName(), this.getType()) ); } diff --git a/src/main/java/net/runelite/deob/Fields.java b/src/main/java/net/runelite/asm/Fields.java similarity index 94% rename from src/main/java/net/runelite/deob/Fields.java rename to src/main/java/net/runelite/asm/Fields.java index d363dabfc9..770627f719 100644 --- a/src/main/java/net/runelite/deob/Fields.java +++ b/src/main/java/net/runelite/asm/Fields.java @@ -1,6 +1,6 @@ -package net.runelite.deob; +package net.runelite.asm; -import net.runelite.deob.pool.NameAndType; +import net.runelite.asm.pool.NameAndType; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/Interfaces.java b/src/main/java/net/runelite/asm/Interfaces.java similarity index 96% rename from src/main/java/net/runelite/deob/Interfaces.java rename to src/main/java/net/runelite/asm/Interfaces.java index 0d63d27d25..95df91491c 100644 --- a/src/main/java/net/runelite/deob/Interfaces.java +++ b/src/main/java/net/runelite/asm/Interfaces.java @@ -1,6 +1,6 @@ -package net.runelite.deob; +package net.runelite.asm; -import net.runelite.deob.pool.Class; +import net.runelite.asm.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/Method.java b/src/main/java/net/runelite/asm/Method.java similarity index 82% rename from src/main/java/net/runelite/deob/Method.java rename to src/main/java/net/runelite/asm/Method.java index e5c3c4bf5e..f740fd4dcc 100644 --- a/src/main/java/net/runelite/deob/Method.java +++ b/src/main/java/net/runelite/asm/Method.java @@ -1,13 +1,13 @@ -package net.runelite.deob; +package net.runelite.asm; -import net.runelite.deob.attributes.AttributeType; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.Exceptions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.attributes.AttributeType; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.Exceptions; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; +import net.runelite.asm.pool.NameAndType; +import net.runelite.asm.signature.Signature; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -185,18 +185,18 @@ public class Method return list; } - public net.runelite.deob.pool.Method getPoolMethod() + public net.runelite.asm.pool.Method getPoolMethod() { - return new net.runelite.deob.pool.Method( - new net.runelite.deob.pool.Class(this.getMethods().getClassFile().getName()), + return new net.runelite.asm.pool.Method( + new net.runelite.asm.pool.Class(this.getMethods().getClassFile().getName()), new NameAndType(this.getName(), new Signature(this.getDescriptor())) ); } - public net.runelite.deob.pool.InterfaceMethod getPoolInterfaceMethod() + public net.runelite.asm.pool.InterfaceMethod getPoolInterfaceMethod() { - return new net.runelite.deob.pool.InterfaceMethod( - new net.runelite.deob.pool.Class(this.getMethods().getClassFile().getName()), + return new net.runelite.asm.pool.InterfaceMethod( + new net.runelite.asm.pool.Class(this.getMethods().getClassFile().getName()), new NameAndType(this.getName(), new Signature(this.getDescriptor())) ); } diff --git a/src/main/java/net/runelite/deob/Methods.java b/src/main/java/net/runelite/asm/Methods.java similarity index 92% rename from src/main/java/net/runelite/deob/Methods.java rename to src/main/java/net/runelite/asm/Methods.java index dac43dc9f5..ef2e330553 100644 --- a/src/main/java/net/runelite/deob/Methods.java +++ b/src/main/java/net/runelite/asm/Methods.java @@ -1,7 +1,7 @@ -package net.runelite.deob; +package net.runelite.asm; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.pool.NameAndType; +import net.runelite.asm.signature.Signature; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/Annotations.java b/src/main/java/net/runelite/asm/attributes/Annotations.java similarity index 88% rename from src/main/java/net/runelite/deob/attributes/Annotations.java rename to src/main/java/net/runelite/asm/attributes/Annotations.java index 55cc079146..3a91723f29 100644 --- a/src/main/java/net/runelite/deob/attributes/Annotations.java +++ b/src/main/java/net/runelite/asm/attributes/Annotations.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes; +package net.runelite.asm.attributes; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import net.runelite.deob.attributes.annotation.Annotation; -import net.runelite.deob.signature.Type; +import net.runelite.asm.attributes.annotation.Annotation; +import net.runelite.asm.signature.Type; public class Annotations extends Attribute { diff --git a/src/main/java/net/runelite/deob/attributes/Attribute.java b/src/main/java/net/runelite/asm/attributes/Attribute.java similarity index 96% rename from src/main/java/net/runelite/deob/attributes/Attribute.java rename to src/main/java/net/runelite/asm/attributes/Attribute.java index 46980a5fb4..4578795efa 100644 --- a/src/main/java/net/runelite/deob/attributes/Attribute.java +++ b/src/main/java/net/runelite/asm/attributes/Attribute.java @@ -1,4 +1,4 @@ -package net.runelite.deob.attributes; +package net.runelite.asm.attributes; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/src/main/java/net/runelite/deob/attributes/AttributeType.java b/src/main/java/net/runelite/asm/attributes/AttributeType.java similarity index 95% rename from src/main/java/net/runelite/deob/attributes/AttributeType.java rename to src/main/java/net/runelite/asm/attributes/AttributeType.java index e9307bcc95..1eadf87e86 100644 --- a/src/main/java/net/runelite/deob/attributes/AttributeType.java +++ b/src/main/java/net/runelite/asm/attributes/AttributeType.java @@ -1,4 +1,4 @@ -package net.runelite.deob.attributes; +package net.runelite.asm.attributes; public enum AttributeType { diff --git a/src/main/java/net/runelite/deob/attributes/Attributes.java b/src/main/java/net/runelite/asm/attributes/Attributes.java similarity index 89% rename from src/main/java/net/runelite/deob/attributes/Attributes.java rename to src/main/java/net/runelite/asm/attributes/Attributes.java index 3aa6f0f0e8..1565f50a9b 100644 --- a/src/main/java/net/runelite/deob/attributes/Attributes.java +++ b/src/main/java/net/runelite/asm/attributes/Attributes.java @@ -1,18 +1,18 @@ -package net.runelite.deob.attributes; +package net.runelite.asm.attributes; -import net.runelite.deob.ClassFile; -import net.runelite.deob.Field; -import net.runelite.deob.Method; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Field; +import net.runelite.asm.Method; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.List; -import net.runelite.deob.attributes.annotation.Annotation; -import net.runelite.deob.attributes.annotation.Element; -import net.runelite.deob.pool.PoolEntry; -import net.runelite.deob.signature.Type; +import net.runelite.asm.attributes.annotation.Annotation; +import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.pool.PoolEntry; +import net.runelite.asm.signature.Type; public class Attributes { diff --git a/src/main/java/net/runelite/deob/attributes/Code.java b/src/main/java/net/runelite/asm/attributes/Code.java similarity index 85% rename from src/main/java/net/runelite/deob/attributes/Code.java rename to src/main/java/net/runelite/asm/attributes/Code.java index 4f1b1ef2df..34af91d24e 100644 --- a/src/main/java/net/runelite/deob/attributes/Code.java +++ b/src/main/java/net/runelite/asm/attributes/Code.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes; +package net.runelite.asm.attributes; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.code.Exceptions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.Exceptions; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.signature.Signature; public class Code extends Attribute { diff --git a/src/main/java/net/runelite/deob/attributes/ConstantValue.java b/src/main/java/net/runelite/asm/attributes/ConstantValue.java similarity index 94% rename from src/main/java/net/runelite/deob/attributes/ConstantValue.java rename to src/main/java/net/runelite/asm/attributes/ConstantValue.java index c64e739049..4cb2b6ddc9 100644 --- a/src/main/java/net/runelite/deob/attributes/ConstantValue.java +++ b/src/main/java/net/runelite/asm/attributes/ConstantValue.java @@ -1,6 +1,6 @@ -package net.runelite.deob.attributes; +package net.runelite.asm.attributes; -import net.runelite.deob.pool.PoolEntry; +import net.runelite.asm.pool.PoolEntry; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/Exceptions.java b/src/main/java/net/runelite/asm/attributes/Exceptions.java similarity index 86% rename from src/main/java/net/runelite/deob/attributes/Exceptions.java rename to src/main/java/net/runelite/asm/attributes/Exceptions.java index adfa20444d..3fc6d0f141 100644 --- a/src/main/java/net/runelite/deob/attributes/Exceptions.java +++ b/src/main/java/net/runelite/asm/attributes/Exceptions.java @@ -1,7 +1,7 @@ -package net.runelite.deob.attributes; +package net.runelite.asm.attributes; -import net.runelite.deob.ClassFile; -import net.runelite.deob.pool.Class; +import net.runelite.asm.ClassFile; +import net.runelite.asm.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/Unknown.java b/src/main/java/net/runelite/asm/attributes/Unknown.java similarity index 94% rename from src/main/java/net/runelite/deob/attributes/Unknown.java rename to src/main/java/net/runelite/asm/attributes/Unknown.java index 74fc97ebb3..a787f40fe2 100644 --- a/src/main/java/net/runelite/deob/attributes/Unknown.java +++ b/src/main/java/net/runelite/asm/attributes/Unknown.java @@ -1,4 +1,4 @@ -package net.runelite.deob.attributes; +package net.runelite.asm.attributes; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/annotation/Annotation.java b/src/main/java/net/runelite/asm/attributes/annotation/Annotation.java similarity index 88% rename from src/main/java/net/runelite/deob/attributes/annotation/Annotation.java rename to src/main/java/net/runelite/asm/attributes/annotation/Annotation.java index 4e3e95536e..9799928bf5 100644 --- a/src/main/java/net/runelite/deob/attributes/annotation/Annotation.java +++ b/src/main/java/net/runelite/asm/attributes/annotation/Annotation.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.annotation; +package net.runelite.asm.attributes.annotation; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.attributes.Annotations; -import net.runelite.deob.signature.Type; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.signature.Type; public class Annotation { diff --git a/src/main/java/net/runelite/deob/attributes/annotation/Element.java b/src/main/java/net/runelite/asm/attributes/annotation/Element.java similarity index 90% rename from src/main/java/net/runelite/deob/attributes/annotation/Element.java rename to src/main/java/net/runelite/asm/attributes/annotation/Element.java index 150bcb7515..ec9597ac37 100644 --- a/src/main/java/net/runelite/deob/attributes/annotation/Element.java +++ b/src/main/java/net/runelite/asm/attributes/annotation/Element.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.annotation; +package net.runelite.asm.attributes.annotation; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.pool.PoolEntry; -import net.runelite.deob.signature.Type; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.pool.PoolEntry; +import net.runelite.asm.signature.Type; public class Element { diff --git a/src/main/java/net/runelite/deob/attributes/code/Exception.java b/src/main/java/net/runelite/asm/attributes/code/Exception.java similarity index 94% rename from src/main/java/net/runelite/deob/attributes/code/Exception.java rename to src/main/java/net/runelite/asm/attributes/code/Exception.java index e9b4020206..0849f55bf1 100644 --- a/src/main/java/net/runelite/deob/attributes/code/Exception.java +++ b/src/main/java/net/runelite/asm/attributes/code/Exception.java @@ -1,8 +1,8 @@ -package net.runelite.deob.attributes.code; +package net.runelite.asm.attributes.code; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.pool.Class; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/Exceptions.java b/src/main/java/net/runelite/asm/attributes/code/Exceptions.java similarity index 89% rename from src/main/java/net/runelite/deob/attributes/code/Exceptions.java rename to src/main/java/net/runelite/asm/attributes/code/Exceptions.java index ea2a19f0e2..439165eac3 100644 --- a/src/main/java/net/runelite/deob/attributes/code/Exceptions.java +++ b/src/main/java/net/runelite/asm/attributes/code/Exceptions.java @@ -1,7 +1,7 @@ -package net.runelite.deob.attributes.code; +package net.runelite.asm.attributes.code; -import net.runelite.deob.ClassFile; -import net.runelite.deob.attributes.Code; +import net.runelite.asm.ClassFile; +import net.runelite.asm.attributes.Code; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/Instruction.java b/src/main/java/net/runelite/asm/attributes/code/Instruction.java similarity index 97% rename from src/main/java/net/runelite/deob/attributes/code/Instruction.java rename to src/main/java/net/runelite/asm/attributes/code/Instruction.java index bbc25b6295..9aecf0de5e 100644 --- a/src/main/java/net/runelite/deob/attributes/code/Instruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/Instruction.java @@ -1,14 +1,14 @@ -package net.runelite.deob.attributes.code; +package net.runelite.asm.attributes.code; import java.io.DataInputStream; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.execution.Frame; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.execution.Frame; import java.io.DataOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import net.runelite.deob.Method; +import net.runelite.asm.Method; public abstract class Instruction implements Cloneable { diff --git a/src/main/java/net/runelite/asm/attributes/code/InstructionType.java b/src/main/java/net/runelite/asm/attributes/code/InstructionType.java new file mode 100644 index 0000000000..213566b33f --- /dev/null +++ b/src/main/java/net/runelite/asm/attributes/code/InstructionType.java @@ -0,0 +1,431 @@ +package net.runelite.asm.attributes.code; + +import net.runelite.asm.attributes.code.instructions.AALoad; +import net.runelite.asm.attributes.code.instructions.AAStore; +import net.runelite.asm.attributes.code.instructions.AConstNull; +import net.runelite.asm.attributes.code.instructions.ALoad; +import net.runelite.asm.attributes.code.instructions.ALoad_0; +import net.runelite.asm.attributes.code.instructions.ALoad_1; +import net.runelite.asm.attributes.code.instructions.ALoad_2; +import net.runelite.asm.attributes.code.instructions.ALoad_3; +import net.runelite.asm.attributes.code.instructions.ANewArray; +import net.runelite.asm.attributes.code.instructions.AStore; +import net.runelite.asm.attributes.code.instructions.AStore_0; +import net.runelite.asm.attributes.code.instructions.AStore_1; +import net.runelite.asm.attributes.code.instructions.AStore_2; +import net.runelite.asm.attributes.code.instructions.AStore_3; +import net.runelite.asm.attributes.code.instructions.AThrow; +import net.runelite.asm.attributes.code.instructions.ArrayLength; +import net.runelite.asm.attributes.code.instructions.BALoad; +import net.runelite.asm.attributes.code.instructions.BAStore; +import net.runelite.asm.attributes.code.instructions.BiPush; +import net.runelite.asm.attributes.code.instructions.CALoad; +import net.runelite.asm.attributes.code.instructions.CAStore; +import net.runelite.asm.attributes.code.instructions.CheckCast; +import net.runelite.asm.attributes.code.instructions.D2F; +import net.runelite.asm.attributes.code.instructions.D2I; +import net.runelite.asm.attributes.code.instructions.D2L; +import net.runelite.asm.attributes.code.instructions.DALoad; +import net.runelite.asm.attributes.code.instructions.DAStore; +import net.runelite.asm.attributes.code.instructions.DAdd; +import net.runelite.asm.attributes.code.instructions.DCmpG; +import net.runelite.asm.attributes.code.instructions.DCmpL; +import net.runelite.asm.attributes.code.instructions.DConst_0; +import net.runelite.asm.attributes.code.instructions.DConst_1; +import net.runelite.asm.attributes.code.instructions.DDiv; +import net.runelite.asm.attributes.code.instructions.DLoad; +import net.runelite.asm.attributes.code.instructions.DLoad_0; +import net.runelite.asm.attributes.code.instructions.DLoad_1; +import net.runelite.asm.attributes.code.instructions.DLoad_2; +import net.runelite.asm.attributes.code.instructions.DLoad_3; +import net.runelite.asm.attributes.code.instructions.DMul; +import net.runelite.asm.attributes.code.instructions.DNeg; +import net.runelite.asm.attributes.code.instructions.DRem; +import net.runelite.asm.attributes.code.instructions.DStore; +import net.runelite.asm.attributes.code.instructions.DStore_0; +import net.runelite.asm.attributes.code.instructions.DStore_1; +import net.runelite.asm.attributes.code.instructions.DStore_2; +import net.runelite.asm.attributes.code.instructions.DStore_3; +import net.runelite.asm.attributes.code.instructions.DSub; +import net.runelite.asm.attributes.code.instructions.Dup; +import net.runelite.asm.attributes.code.instructions.Dup2; +import net.runelite.asm.attributes.code.instructions.Dup2_X1; +import net.runelite.asm.attributes.code.instructions.Dup2_X2; +import net.runelite.asm.attributes.code.instructions.Dup_X1; +import net.runelite.asm.attributes.code.instructions.Dup_X2; +import net.runelite.asm.attributes.code.instructions.F2D; +import net.runelite.asm.attributes.code.instructions.F2I; +import net.runelite.asm.attributes.code.instructions.F2L; +import net.runelite.asm.attributes.code.instructions.FALoad; +import net.runelite.asm.attributes.code.instructions.FAStore; +import net.runelite.asm.attributes.code.instructions.FAdd; +import net.runelite.asm.attributes.code.instructions.FCmpG; +import net.runelite.asm.attributes.code.instructions.FCmpL; +import net.runelite.asm.attributes.code.instructions.FConst_0; +import net.runelite.asm.attributes.code.instructions.FConst_1; +import net.runelite.asm.attributes.code.instructions.FConst_2; +import net.runelite.asm.attributes.code.instructions.FDiv; +import net.runelite.asm.attributes.code.instructions.FLoad; +import net.runelite.asm.attributes.code.instructions.FLoad_0; +import net.runelite.asm.attributes.code.instructions.FLoad_1; +import net.runelite.asm.attributes.code.instructions.FLoad_2; +import net.runelite.asm.attributes.code.instructions.FLoad_3; +import net.runelite.asm.attributes.code.instructions.FMul; +import net.runelite.asm.attributes.code.instructions.FNeg; +import net.runelite.asm.attributes.code.instructions.FRem; +import net.runelite.asm.attributes.code.instructions.FStore; +import net.runelite.asm.attributes.code.instructions.FStore_0; +import net.runelite.asm.attributes.code.instructions.FStore_1; +import net.runelite.asm.attributes.code.instructions.FStore_2; +import net.runelite.asm.attributes.code.instructions.FStore_3; +import net.runelite.asm.attributes.code.instructions.FSub; +import net.runelite.asm.attributes.code.instructions.GetField; +import net.runelite.asm.attributes.code.instructions.GetStatic; +import net.runelite.asm.attributes.code.instructions.Goto; +import net.runelite.asm.attributes.code.instructions.GotoW; +import net.runelite.asm.attributes.code.instructions.I2B; +import net.runelite.asm.attributes.code.instructions.I2C; +import net.runelite.asm.attributes.code.instructions.I2D; +import net.runelite.asm.attributes.code.instructions.I2F; +import net.runelite.asm.attributes.code.instructions.I2L; +import net.runelite.asm.attributes.code.instructions.I2S; +import net.runelite.asm.attributes.code.instructions.IALoad; +import net.runelite.asm.attributes.code.instructions.IAStore; +import net.runelite.asm.attributes.code.instructions.IAdd; +import net.runelite.asm.attributes.code.instructions.IAnd; +import net.runelite.asm.attributes.code.instructions.IConst_0; +import net.runelite.asm.attributes.code.instructions.IConst_1; +import net.runelite.asm.attributes.code.instructions.IConst_2; +import net.runelite.asm.attributes.code.instructions.IConst_3; +import net.runelite.asm.attributes.code.instructions.IConst_4; +import net.runelite.asm.attributes.code.instructions.IConst_5; +import net.runelite.asm.attributes.code.instructions.IConst_M1; +import net.runelite.asm.attributes.code.instructions.IDiv; +import net.runelite.asm.attributes.code.instructions.IInc; +import net.runelite.asm.attributes.code.instructions.ILoad; +import net.runelite.asm.attributes.code.instructions.ILoad_0; +import net.runelite.asm.attributes.code.instructions.ILoad_1; +import net.runelite.asm.attributes.code.instructions.ILoad_2; +import net.runelite.asm.attributes.code.instructions.ILoad_3; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.INeg; +import net.runelite.asm.attributes.code.instructions.IOr; +import net.runelite.asm.attributes.code.instructions.IRem; +import net.runelite.asm.attributes.code.instructions.IShL; +import net.runelite.asm.attributes.code.instructions.IShR; +import net.runelite.asm.attributes.code.instructions.IStore; +import net.runelite.asm.attributes.code.instructions.IStore_0; +import net.runelite.asm.attributes.code.instructions.IStore_1; +import net.runelite.asm.attributes.code.instructions.IStore_2; +import net.runelite.asm.attributes.code.instructions.IStore_3; +import net.runelite.asm.attributes.code.instructions.ISub; +import net.runelite.asm.attributes.code.instructions.IUShR; +import net.runelite.asm.attributes.code.instructions.IXor; +import net.runelite.asm.attributes.code.instructions.IfACmpEq; +import net.runelite.asm.attributes.code.instructions.IfACmpNe; +import net.runelite.asm.attributes.code.instructions.IfICmpEq; +import net.runelite.asm.attributes.code.instructions.IfCmpGe; +import net.runelite.asm.attributes.code.instructions.IfCmpGt; +import net.runelite.asm.attributes.code.instructions.IfCmpLe; +import net.runelite.asm.attributes.code.instructions.IfCmpLt; +import net.runelite.asm.attributes.code.instructions.IfICmpNe; +import net.runelite.asm.attributes.code.instructions.IfEq; +import net.runelite.asm.attributes.code.instructions.IfGe; +import net.runelite.asm.attributes.code.instructions.IfGt; +import net.runelite.asm.attributes.code.instructions.IfLe; +import net.runelite.asm.attributes.code.instructions.IfLt; +import net.runelite.asm.attributes.code.instructions.IfNe; +import net.runelite.asm.attributes.code.instructions.IfNonNull; +import net.runelite.asm.attributes.code.instructions.IfNull; +import net.runelite.asm.attributes.code.instructions.InstanceOf; +import net.runelite.asm.attributes.code.instructions.InvokeInterface; +import net.runelite.asm.attributes.code.instructions.InvokeSpecial; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.attributes.code.instructions.InvokeVirtual; +import net.runelite.asm.attributes.code.instructions.L2D; +import net.runelite.asm.attributes.code.instructions.L2F; +import net.runelite.asm.attributes.code.instructions.L2I; +import net.runelite.asm.attributes.code.instructions.LALoad; +import net.runelite.asm.attributes.code.instructions.LAStore; +import net.runelite.asm.attributes.code.instructions.LAdd; +import net.runelite.asm.attributes.code.instructions.LAnd; +import net.runelite.asm.attributes.code.instructions.LCmp; +import net.runelite.asm.attributes.code.instructions.LConst_0; +import net.runelite.asm.attributes.code.instructions.LConst_1; +import net.runelite.asm.attributes.code.instructions.LDC2_W; +import net.runelite.asm.attributes.code.instructions.LDC_W; +import net.runelite.asm.attributes.code.instructions.LDiv; +import net.runelite.asm.attributes.code.instructions.LLoad; +import net.runelite.asm.attributes.code.instructions.LLoad_0; +import net.runelite.asm.attributes.code.instructions.LLoad_1; +import net.runelite.asm.attributes.code.instructions.LLoad_2; +import net.runelite.asm.attributes.code.instructions.LLoad_3; +import net.runelite.asm.attributes.code.instructions.LMul; +import net.runelite.asm.attributes.code.instructions.LNeg; +import net.runelite.asm.attributes.code.instructions.LOr; +import net.runelite.asm.attributes.code.instructions.LRem; +import net.runelite.asm.attributes.code.instructions.LShL; +import net.runelite.asm.attributes.code.instructions.LShR; +import net.runelite.asm.attributes.code.instructions.LStore; +import net.runelite.asm.attributes.code.instructions.LStore_0; +import net.runelite.asm.attributes.code.instructions.LStore_1; +import net.runelite.asm.attributes.code.instructions.LStore_2; +import net.runelite.asm.attributes.code.instructions.LStore_3; +import net.runelite.asm.attributes.code.instructions.LSub; +import net.runelite.asm.attributes.code.instructions.LUShR; +import net.runelite.asm.attributes.code.instructions.LXor; +import net.runelite.asm.attributes.code.instructions.LookupSwitch; +import net.runelite.asm.attributes.code.instructions.MonitorEnter; +import net.runelite.asm.attributes.code.instructions.MonitorExit; +import net.runelite.asm.attributes.code.instructions.MultiANewArray; +import net.runelite.asm.attributes.code.instructions.NOP; +import net.runelite.asm.attributes.code.instructions.New; +import net.runelite.asm.attributes.code.instructions.NewArray; +import net.runelite.asm.attributes.code.instructions.Pop; +import net.runelite.asm.attributes.code.instructions.Pop2; +import net.runelite.asm.attributes.code.instructions.PutField; +import net.runelite.asm.attributes.code.instructions.PutStatic; +import net.runelite.asm.attributes.code.instructions.Return; +import net.runelite.asm.attributes.code.instructions.SALoad; +import net.runelite.asm.attributes.code.instructions.SAStore; +import net.runelite.asm.attributes.code.instructions.SiPush; +import net.runelite.asm.attributes.code.instructions.Swap; +import net.runelite.asm.attributes.code.instructions.TableSwitch; +import net.runelite.asm.attributes.code.instructions.VReturn; +import net.runelite.asm.attributes.code.instructions.Wide; + +public enum InstructionType +{ + NOP(0x00, "nop", NOP.class), + ACONST_NULL(0x01, "aconst_null", AConstNull.class), + ICONST_M1(0x02, "iconst_m1", IConst_M1.class), + ICONST_0(0x03, "iconst_0", IConst_0.class), + ICONST_1(0x04, "iconst_1", IConst_1.class), + ICONST_2(0x05, "iconst_2", IConst_2.class), + ICONST_3(0x06, "iconst_3", IConst_3.class), + ICONST_4(0x07, "iconst_4", IConst_4.class), + ICONST_5(0x08, "iconst_5", IConst_5.class), + LCONST_0(0x09, "lconst_0", LConst_0.class), + LCONST_1(0x0a, "lconst_1", LConst_1.class), + FCONST_0(0x0b, "fconst_0", FConst_0.class), + FCONST_1(0x0c, "fconst_1", FConst_1.class), + FCONST_2(0x0d, "fconst_2", FConst_2.class), + DCONST_0(0x0e, "dconst_0", DConst_0.class), + DCONST_1(0x0f, "dconst_1", DConst_1.class), + BIPUSH(0x10, "bipush", BiPush.class), + SIPUSH(0x11, "sipush", SiPush.class), + LDC(0x12, "ldc_w", LDC_W.class), + LDC_W(0x13, "ldc_w", LDC_W.class), + LDC2_W(0x14, "ldc2_w", LDC2_W.class), + ILOAD(0x15, "iload", ILoad.class), + LLOAD(0x16, "lload", LLoad.class), + FLOAD(0x17, "fload", FLoad.class), + DLOAD(0x18, "dload", DLoad.class), + ALOAD(0x19, "aload", ALoad.class), + ILOAD_0(0x1a, "iload_0", ILoad_0.class), + ILOAD_1(0x1b, "iload_1", ILoad_1.class), + ILOAD_2(0x1c, "iload_2", ILoad_2.class), + ILOAD_3(0x1d, "iload_3", ILoad_3.class), + LLOAD_0(0x1e, "lload_0", LLoad_0.class), + LLOAD_1(0x1f, "lload_1", LLoad_1.class), + LLOAD_2(0x20, "lload_2", LLoad_2.class), + LLOAD_3(0x21, "lload_3", LLoad_3.class), + FLOAD_0(0x22, "fload_0", FLoad_0.class), + FLOAD_1(0x23, "fload_1", FLoad_1.class), + FLOAD_2(0x24, "fload_2", FLoad_2.class), + FLOAD_3(0x25, "fload_3", FLoad_3.class), + DLOAD_0(0x26, "dload_0", DLoad_0.class), + DLOAD_1(0x27, "dload_1", DLoad_1.class), + DLOAD_2(0x28, "dload_2", DLoad_2.class), + DLOAD_3(0x29, "dload_3", DLoad_3.class), + ALOAD_0(0x2a, "aload_0", ALoad_0.class), + ALOAD_1(0x2b, "aload_1", ALoad_1.class), + ALOAD_2(0x2c, "aload_2", ALoad_2.class), + ALOAD_3(0x2d, "aload_3", ALoad_3.class), + IALOAD(0x2e, "iaload", IALoad.class), + LALOAD(0x2f, "laload", LALoad.class), + FALOAD(0x30, "faload", FALoad.class), + DALOAD(0x31, "daload", DALoad.class), + AALOAD(0x32, "aaload", AALoad.class), + BALOAD(0x33, "baload", BALoad.class), + CALOAD(0x34, "caload", CALoad.class), + SALOAD(0x35, "saload", SALoad.class), + ISTORE(0x36, "istore", IStore.class), + LSTORE(0x37, "lstore", LStore.class), + FSTORE(0x38, "fstore", FStore.class), + DSTORE(0x39, "dstore", DStore.class), + ASTORE(0x3a, "astore", AStore.class), + ISTORE_0(0x3b, "istore_0", IStore_0.class), + ISTORE_1(0x3c, "istore_1", IStore_1.class), + ISTORE_2(0x3d, "istore_2", IStore_2.class), + ISTORE_3(0x3e, "istore_3", IStore_3.class), + LSTORE_0(0x3f, "lstore_0", LStore_0.class), + LSTORE_1(0x40, "lstore_1", LStore_1.class), + LSTORE_2(0x41, "lstore_2", LStore_2.class), + LSTORE_3(0x42, "lstore_3", LStore_3.class), + FSTORE_0(0x43, "fstore_0", FStore_0.class), + FSTORE_1(0x44, "fstore_1", FStore_1.class), + FSTORE_2(0x45, "fstore_2", FStore_2.class), + FSTORE_3(0x46, "fstore_3", FStore_3.class), + DST0RE_0(0x47, "dstore_0", DStore_0.class), + DSTORE_1(0x48, "dstore_1", DStore_1.class), + DSTORE_2(0x49, "dstore_2", DStore_2.class), + DSTORE_3(0x4a, "dstore_3", DStore_3.class), + ASTORE_0(0x4b, "astore_0", AStore_0.class), + ASTORE_1(0x4c, "astore_1", AStore_1.class), + ASTORE_2(0x4d, "astore_2", AStore_2.class), + ASTORE_3(0x4e, "astore_3", AStore_3.class), + IASTORE(0x4f, "iastore", IAStore.class), + LASTORE(0x50, "lastore", LAStore.class), + FASTORE(0x51, "fastore", FAStore.class), + DASTORE(0x52, "dastore", DAStore.class), + AASTORE(0x53, "aastore", AAStore.class), + BASTORE(0x54, "bastore", BAStore.class), + CASTORE(0x55, "castore", CAStore.class), + SASTORE(0x56, "sastore", SAStore.class), + POP(0x57, "pop", Pop.class), + POP2(0x58, "pop2", Pop2.class), + DUP(0x59, "dup", Dup.class), + DUP_X1(0x5a, "dup_x1", Dup_X1.class), + DUP_X2(0x5b, "dup_x2", Dup_X2.class), + DUP2(0x5c, "dup2", Dup2.class), + DUP2_X1(0x5d, "dup2_x1", Dup2_X1.class), + DUP2_X2(0x5e, "dup2_x2", Dup2_X2.class), + SWAP(0x5f, "swap", Swap.class), + IADD(0x60, "iadd", IAdd.class), + LADD(0x61, "ladd", LAdd.class), + FADD(0x62, "fadd", FAdd.class), + DADD(0x63, "dadd", DAdd.class), + ISUB(0x64, "isub", ISub.class), + LSUB(0x65, "lsub", LSub.class), + FSUB(0x66, "fsub", FSub.class), + DSUB(0x67, "dsub", DSub.class), + IMUL(0x68, "imul", IMul.class), + LMUL(0x69, "lmul", LMul.class), + FMUL(0x6a, "fmul", FMul.class), + DMUL(0x6b, "dmul", DMul.class), + IDIV(0x6c, "idiv", IDiv.class), + LDIV(0x6d, "ldiv", LDiv.class), + FDIV(0x6e, "fdiv", FDiv.class), + DDIV(0x6f, "ddiv", DDiv.class), + IREM(0x70, "irem", IRem.class), + LREM(0x71, "lrem", LRem.class), + FREM(0x72, "frem", FRem.class), + DREM(0x73, "drem", DRem.class), + INEG(0x74, "ineg", INeg.class), + LNEG(0x75, "lneg", LNeg.class), + FNEG(0x76, "fneg", FNeg.class), + DNEG(0x77, "dneg", DNeg.class), + ISHL(0x78, "ishl", IShL.class), + LSHL(0x79, "lshl", LShL.class), + ISHR(0x7a, "ishr", IShR.class), + LSHR(0x7b, "lshr", LShR.class), + IUSHR(0x7c, "iushr", IUShR.class), + LUSHR(0x7d, "lushr", LUShR.class), + IAND(0x7e, "iand", IAnd.class), + LAND(0x7f, "land", LAnd.class), + IOR(0x80, "ior", IOr.class), + LOR(0x81, "lor", LOr.class), + IXOR(0x82, "ixor", IXor.class), + LXOR(0x83, "lxor", LXor.class), + IINC(0x84, "iinc", IInc.class), + I2L(0x85, "i2l", I2L.class), + I2F(0x86, "i2f", I2F.class), + I2D(0x87, "i2d", I2D.class), + L2I(0x88, "l2i", L2I.class), + L2F(0x89, "l2f", L2F.class), + L2D(0x8a, "l2d", L2D.class), + F2I(0x8b, "f2i", F2I.class), + F2L(0x8c, "f2l", F2L.class), + F2D(0x8d, "f2d", F2D.class), + D2I(0x8e, "d2i", D2I.class), + D2L(0x8f, "d2l", D2L.class), + D2F(0x90, "d2f", D2F.class), + I2B(0x91, "i2b", I2B.class), + I2C(0x92, "i2c", I2C.class), + I2S(0x93, "i2s", I2S.class), + LCMP(0x94, "lcmp", LCmp.class), + FCMPL(0x95, "fcmpl", FCmpL.class), + FCMPG(0x96, "fcmpg", FCmpG.class), + DCMPL(0x97, "dcmpl", DCmpL.class), + DCMPG(0x98, "dcmpg", DCmpG.class), + IFEQ(0x99, "ifeq", IfEq.class), + IFNE(0x9a, "ifne", IfNe.class), + IFLT(0x9b, "iflt", IfLt.class), + IFGE(0x9c, "ifge", IfGe.class), + IFGT(0x9d, "ifgt", IfGt.class), + IFLE(0x9e, "ifle", IfLe.class), + IF_ICMPEQ(0x9f, "if_icmpeq", IfICmpEq.class), + IF_ICMPNE(0xa0, "if_icmpne", IfICmpNe.class), + IF_ICMPLT(0xa1, "if_cmplt", IfCmpLt.class), + IF_ICMPGE(0xa2, "if_icmpge", IfCmpGe.class), + IF_ICMPGT(0xa3, "if_icmpgt", IfCmpGt.class), + IF_ICMPLE(0xa4, "if_icmple", IfCmpLe.class), + IF_ACMPEQ(0xa5, "if_acmpeq", IfACmpEq.class), + IF_ACMPNE(0xa6, "if_acmpne", IfACmpNe.class), + GOTO(0xa7, "goto", Goto.class), + TABLESWITCH(0xaa, "tableswitch", TableSwitch.class), + LOOKUPSWITCH(0xab, "lookupswitch", LookupSwitch.class), + IRETURN(0xac, "ireturn", Return.class), + LRETURN(0xad, "lreturn", Return.class), + FRETURN(0xae, "freturn", Return.class), + DRETURN(0xaf, "dreturn", Return.class), + ARETURN(0xb0, "areturn", Return.class), + RETURN(0xb1, "return", VReturn.class), + GETSTATIC(0xb2, "getstatic", GetStatic.class), + PUTSTATIC(0xb3, "putstatic", PutStatic.class), + GETFIELD(0xb4, "getfield", GetField.class), + PUTFIELD(0xb5, "putfield", PutField.class), + INVOKEVIRTUAL(0xb6, "invokevirtual", InvokeVirtual.class), + INVOKESPECIAL(0xb7, "invokespecial", InvokeSpecial.class), + INVOKESTATIC(0xb8, "invokestatic", InvokeStatic.class), + INVOKEINTERFACE(0xb9, "invokeinterface", InvokeInterface.class), + NEW(0xbb, "new", New.class), + NEWARRAY(0xbc, "newarray", NewArray.class), + ANEWARRAY(0xbd, "anewarray", ANewArray.class), + ARRAYLENGTH(0xbe, "arraylength", ArrayLength.class), + ATHROW(0xbf, "athrow", AThrow.class), + CHECKCAST(0xc0, "checkcast", CheckCast.class), + INSTANCEOf(0xc1, "instanceof", InstanceOf.class), + MONITORENTER(0xc2, "monitorenter", MonitorEnter.class), + MONITOREXIT(0xc3, "monitorexit", MonitorExit.class), + WIDE(0xc4, "wide", Wide.class), + MULTIANEWARRAY(0xc5, "multianewarray", MultiANewArray.class), + IFNULL(0xc6, "ifnull", IfNull.class), + IFNONNULL(0xc7, "ifnonnull", IfNonNull.class), + GOTO_W(0xc8, "goto_w", GotoW.class); + + private byte code; + private String name; + private Class clazz; + + InstructionType(int op, String name, Class clazz) + { + this.code = (byte) op; + this.name = name; + this.clazz = clazz; + } + + public byte getCode() + { + return code; + } + + public String getName() + { + return name; + } + + public Class getInstructionClass() + { + return clazz; + } + + public static InstructionType findInstructionFromCode(byte code) + { + for (InstructionType t : InstructionType.values()) + if (t.getCode() == code) + return t; + return null; + } +} diff --git a/src/main/java/net/runelite/deob/attributes/code/Instructions.java b/src/main/java/net/runelite/asm/attributes/code/Instructions.java similarity index 93% rename from src/main/java/net/runelite/deob/attributes/code/Instructions.java rename to src/main/java/net/runelite/asm/attributes/code/Instructions.java index 5555b026c1..8c667252b8 100644 --- a/src/main/java/net/runelite/deob/attributes/code/Instructions.java +++ b/src/main/java/net/runelite/asm/attributes/code/Instructions.java @@ -1,7 +1,7 @@ -package net.runelite.deob.attributes.code; +package net.runelite.asm.attributes.code; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -196,7 +196,7 @@ public class Instructions } oldi.from.clear(); - for (net.runelite.deob.attributes.code.Exception e : code.getExceptions().getExceptions()) + for (net.runelite.asm.attributes.code.Exception e : code.getExceptions().getExceptions()) e.replace(oldi, newi); } } diff --git a/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayLoad.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayLoad.java new file mode 100644 index 0000000000..c5007465ba --- /dev/null +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayLoad.java @@ -0,0 +1,6 @@ +package net.runelite.asm.attributes.code.instruction.types; + +public interface ArrayLoad +{ + +} diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/ArrayStoreInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayStoreInstruction.java similarity index 54% rename from src/main/java/net/runelite/deob/attributes/code/instruction/types/ArrayStoreInstruction.java rename to src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayStoreInstruction.java index be720de008..7113b720de 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/ArrayStoreInstruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/ArrayStoreInstruction.java @@ -1,4 +1,4 @@ -package net.runelite.deob.attributes.code.instruction.types; +package net.runelite.asm.attributes.code.instruction.types; public interface ArrayStoreInstruction extends MappableInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instruction/types/ComparisonInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/ComparisonInstruction.java new file mode 100644 index 0000000000..62b6aab5df --- /dev/null +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/ComparisonInstruction.java @@ -0,0 +1,6 @@ +package net.runelite.asm.attributes.code.instruction.types; + +public interface ComparisonInstruction +{ + +} diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/DupInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/DupInstruction.java similarity index 55% rename from src/main/java/net/runelite/deob/attributes/code/instruction/types/DupInstruction.java rename to src/main/java/net/runelite/asm/attributes/code/instruction/types/DupInstruction.java index b9fd1a5c83..8b3139088a 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/DupInstruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/DupInstruction.java @@ -1,6 +1,6 @@ -package net.runelite.deob.attributes.code.instruction.types; +package net.runelite.asm.attributes.code.instruction.types; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.StackContext; public interface DupInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instruction/types/FieldInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/FieldInstruction.java new file mode 100644 index 0000000000..169cb8bf48 --- /dev/null +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/FieldInstruction.java @@ -0,0 +1,10 @@ +package net.runelite.asm.attributes.code.instruction.types; + +import net.runelite.asm.pool.Field; + +public interface FieldInstruction +{ + public Field getField(); + + public net.runelite.asm.Field getMyField(); +} diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/GetFieldInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/GetFieldInstruction.java similarity index 50% rename from src/main/java/net/runelite/deob/attributes/code/instruction/types/GetFieldInstruction.java rename to src/main/java/net/runelite/asm/attributes/code/instruction/types/GetFieldInstruction.java index 73755aca9b..cd80a61368 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/GetFieldInstruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/GetFieldInstruction.java @@ -1,4 +1,4 @@ -package net.runelite.deob.attributes.code.instruction.types; +package net.runelite.asm.attributes.code.instruction.types; public interface GetFieldInstruction extends FieldInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/InvokeInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/InvokeInstruction.java similarity index 57% rename from src/main/java/net/runelite/deob/attributes/code/instruction/types/InvokeInstruction.java rename to src/main/java/net/runelite/asm/attributes/code/instruction/types/InvokeInstruction.java index ac71c98af1..27c8e7c589 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/InvokeInstruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/InvokeInstruction.java @@ -1,9 +1,9 @@ -package net.runelite.deob.attributes.code.instruction.types; +package net.runelite.asm.attributes.code.instruction.types; import java.util.List; -import net.runelite.deob.Method; -import net.runelite.deob.pool.PoolEntry; +import net.runelite.asm.Method; +import net.runelite.asm.pool.PoolEntry; public interface InvokeInstruction extends MappableInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/JumpingInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/JumpingInstruction.java similarity index 50% rename from src/main/java/net/runelite/deob/attributes/code/instruction/types/JumpingInstruction.java rename to src/main/java/net/runelite/asm/attributes/code/instruction/types/JumpingInstruction.java index e62fd48cf2..183fa1ad60 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/JumpingInstruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/JumpingInstruction.java @@ -1,6 +1,6 @@ -package net.runelite.deob.attributes.code.instruction.types; +package net.runelite.asm.attributes.code.instruction.types; -import net.runelite.deob.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instruction; import java.util.List; public interface JumpingInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/LVTInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstruction.java similarity index 53% rename from src/main/java/net/runelite/deob/attributes/code/instruction/types/LVTInstruction.java rename to src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstruction.java index 24f0109534..af29c13a9f 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/LVTInstruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/LVTInstruction.java @@ -1,6 +1,6 @@ -package net.runelite.deob.attributes.code.instruction.types; +package net.runelite.asm.attributes.code.instruction.types; -import net.runelite.deob.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instruction; public interface LVTInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/MappableInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/MappableInstruction.java similarity index 73% rename from src/main/java/net/runelite/deob/attributes/code/instruction/types/MappableInstruction.java rename to src/main/java/net/runelite/asm/attributes/code/instruction/types/MappableInstruction.java index f884363550..424f66990d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/MappableInstruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/MappableInstruction.java @@ -1,7 +1,7 @@ -package net.runelite.deob.attributes.code.instruction.types; +package net.runelite.asm.attributes.code.instruction.types; import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; -import net.runelite.deob.execution.InstructionContext; +import net.runelite.asm.execution.InstructionContext; public interface MappableInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instruction/types/PushConstantInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/PushConstantInstruction.java new file mode 100644 index 0000000000..2ed0636bc7 --- /dev/null +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/PushConstantInstruction.java @@ -0,0 +1,11 @@ +package net.runelite.asm.attributes.code.instruction.types; + +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.pool.PoolEntry; + +public interface PushConstantInstruction +{ + public PoolEntry getConstant(); + + public Instruction setConstant(PoolEntry entry); +} diff --git a/src/main/java/net/runelite/asm/attributes/code/instruction/types/ReturnInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/ReturnInstruction.java new file mode 100644 index 0000000000..6fe6af1244 --- /dev/null +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/ReturnInstruction.java @@ -0,0 +1,6 @@ +package net.runelite.asm.attributes.code.instruction.types; + +public interface ReturnInstruction +{ + +} diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/SetFieldInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/SetFieldInstruction.java similarity index 57% rename from src/main/java/net/runelite/deob/attributes/code/instruction/types/SetFieldInstruction.java rename to src/main/java/net/runelite/asm/attributes/code/instruction/types/SetFieldInstruction.java index d3508b52ad..829276d2ab 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/SetFieldInstruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/SetFieldInstruction.java @@ -1,4 +1,4 @@ -package net.runelite.deob.attributes.code.instruction.types; +package net.runelite.asm.attributes.code.instruction.types; public interface SetFieldInstruction extends FieldInstruction, MappableInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/WideInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/WideInstruction.java similarity index 70% rename from src/main/java/net/runelite/deob/attributes/code/instruction/types/WideInstruction.java rename to src/main/java/net/runelite/asm/attributes/code/instruction/types/WideInstruction.java index 753ddc509d..aadcdcd595 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/WideInstruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/WideInstruction.java @@ -1,4 +1,4 @@ -package net.runelite.deob.attributes.code.instruction.types; +package net.runelite.asm.attributes.code.instruction.types; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/AALoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java similarity index 56% rename from src/main/java/net/runelite/deob/attributes/code/instructions/AALoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java index 7b4b293532..b59dceae4b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/AALoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/AALoad.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ArrayLoad; -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.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.ArrayLoad; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class AALoad extends Instruction implements ArrayLoad { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/AAStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/AAStore.java similarity index 61% rename from src/main/java/net/runelite/deob/attributes/code/instructions/AAStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/AAStore.java index 9375ec6562..64770fcfd9 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/AAStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/AAStore.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class AAStore extends ArrayStore { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/AConstNull.java b/src/main/java/net/runelite/asm/attributes/code/instructions/AConstNull.java similarity index 53% rename from src/main/java/net/runelite/deob/attributes/code/instructions/AConstNull.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/AConstNull.java index d36fe138f4..d25f13eb27 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/AConstNull.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/AConstNull.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class AConstNull extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad.java similarity index 76% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ALoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ALoad.java index 37c6c99efe..5e360f5e21 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_0.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_0.java index c3c5d90bd7..4451752b1c 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_0.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_1.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_1.java index be1d58db56..5f73d46573 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_1.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_2.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_2.java index 39aeb83e9f..33c95d738a 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_2.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_3.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_3.java index 834bf76b33..d10f3fe03d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ALoad_3.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ANewArray.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ANewArray.java similarity index 68% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ANewArray.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ANewArray.java index 5245daa395..8b008c25e4 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ANewArray.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ANewArray.java @@ -1,21 +1,21 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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 net.runelite.asm.ClassFile; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Type; +import net.runelite.asm.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.execution.Value; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.execution.Value; public class ANewArray extends Instruction { @@ -53,7 +53,7 @@ public class ANewArray extends Instruction ins.pop(count); - Type t = new Type(new net.runelite.deob.signature.Type("[" + clazz.getName())); + Type t = new Type(new net.runelite.asm.signature.Type("[" + clazz.getName())); StackContext ctx = new StackContext(ins, t, Value.newArray(count.getValue())); stack.push(ctx); @@ -65,7 +65,7 @@ public class ANewArray extends Instruction @Override public void lookup() { - net.runelite.deob.signature.Type t = new net.runelite.deob.signature.Type(clazz.getName()); + net.runelite.asm.signature.Type t = new net.runelite.asm.signature.Type(clazz.getName()); String name = t.getType(); if (name.startsWith("L") && name.endsWith(";")) name = name.substring(1, name.length() - 1); diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/AStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/AStore.java similarity index 73% rename from src/main/java/net/runelite/deob/attributes/code/instructions/AStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/AStore.java index 304d31af02..bf4454d077 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/AStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/AStore.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/AStore_0.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/AStore_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/AStore_0.java index 7e3e6a8e6b..ebc7d673a7 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/AStore_0.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class AStore_0 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/AStore_1.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/AStore_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/AStore_1.java index 9fa865e113..e083b7e0c4 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/AStore_1.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class AStore_1 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/AStore_2.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/AStore_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/AStore_2.java index b30e3f2917..96a0301342 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/AStore_2.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class AStore_2 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/AStore_3.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/AStore_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/AStore_3.java index 6716f6e283..0ad39f6244 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/AStore_3.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class AStore_3 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/AThrow.java b/src/main/java/net/runelite/asm/attributes/code/instructions/AThrow.java similarity index 56% rename from src/main/java/net/runelite/deob/attributes/code/instructions/AThrow.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/AThrow.java index 8f1b081b1c..70d61df1df 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/AThrow.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/AThrow.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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.asm.execution.Type; import java.io.IOException; import java.util.List; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ArrayLength.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayLength.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ArrayLength.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ArrayLength.java index e252430c9b..50bd9261a7 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ArrayLength.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayLength.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ArrayStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java similarity index 74% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ArrayStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java index 01147b4c4c..384decef29 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ArrayStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.Field; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ArrayLoad; -import net.runelite.deob.attributes.code.instruction.types.ArrayStoreInstruction; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.Field; +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.ArrayLoad; +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.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public abstract class ArrayStore extends Instruction implements ArrayStoreInstruction { @@ -63,8 +63,8 @@ public abstract class ArrayStore extends Instruction implements ArrayStoreInstru GetFieldInstruction gf1 = (GetFieldInstruction) base1.getInstruction(), gf2 = (GetFieldInstruction) base2.getInstruction(); - net.runelite.deob.Field f1 = gf1.getMyField(), - f2 = gf2.getMyField(); + net.runelite.asm.Field f1 = gf1.getMyField(), + f2 = gf2.getMyField(); if (f1 != null && f2 != null) { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/BALoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/BALoad.java similarity index 57% rename from src/main/java/net/runelite/deob/attributes/code/instructions/BALoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/BALoad.java index 930353fab5..0f729f2d11 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/BALoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/BALoad.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ArrayLoad; -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.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.ArrayLoad; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class BALoad extends Instruction implements ArrayLoad { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/BAStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/BAStore.java similarity index 61% rename from src/main/java/net/runelite/deob/attributes/code/instructions/BAStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/BAStore.java index f572308d44..0ae0741276 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/BAStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/BAStore.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class BAStore extends ArrayStore { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/BiPush.java b/src/main/java/net/runelite/asm/attributes/code/instructions/BiPush.java similarity index 66% rename from src/main/java/net/runelite/deob/attributes/code/instructions/BiPush.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/BiPush.java index 744b45a453..f522c680bf 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/BiPush.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/BiPush.java @@ -1,19 +1,19 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class BiPush extends Instruction implements PushConstantInstruction { @@ -62,7 +62,7 @@ public class BiPush extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Integer(b); + return new net.runelite.asm.pool.Integer(b); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/CALoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/CALoad.java similarity index 57% rename from src/main/java/net/runelite/deob/attributes/code/instructions/CALoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/CALoad.java index 7ccce45863..b45902c0fc 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/CALoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/CALoad.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ArrayLoad; -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.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.ArrayLoad; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class CALoad extends Instruction implements ArrayLoad { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/CAStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/CAStore.java similarity index 61% rename from src/main/java/net/runelite/deob/attributes/code/instructions/CAStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/CAStore.java index ddc869ae95..e205a3ed70 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/CAStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/CAStore.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class CAStore extends ArrayStore { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/CheckCast.java b/src/main/java/net/runelite/asm/attributes/code/instructions/CheckCast.java similarity index 66% rename from src/main/java/net/runelite/deob/attributes/code/instructions/CheckCast.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/CheckCast.java index 14d81ee6d3..0c7ce23613 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/CheckCast.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/CheckCast.java @@ -1,20 +1,20 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.pool.Class; +import net.runelite.asm.ClassFile; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.execution.Type; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.execution.Type; public class CheckCast extends Instruction { @@ -51,7 +51,7 @@ public class CheckCast extends Instruction ins.pop(value); StackContext ctx = new StackContext(ins, - new Type(new net.runelite.deob.signature.Type(clazz.getName())), + new Type(new net.runelite.asm.signature.Type(clazz.getName())), value.getValue() ); stack.push(ctx); diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/D2F.java b/src/main/java/net/runelite/asm/attributes/code/instructions/D2F.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/D2F.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/D2F.java index e64b6cc401..0bb0b13466 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/D2F.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/D2F.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/D2I.java b/src/main/java/net/runelite/asm/attributes/code/instructions/D2I.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/D2I.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/D2I.java index 1d7ad4dc5c..23984b7e6f 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/D2I.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/D2I.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/D2L.java b/src/main/java/net/runelite/asm/attributes/code/instructions/D2L.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/D2L.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/D2L.java index 5ef0d5eecb..d667bf6871 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/D2L.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/D2L.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DALoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DALoad.java similarity index 56% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DALoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DALoad.java index 324825aa97..59dcb76052 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DALoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DALoad.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ArrayLoad; -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.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.ArrayLoad; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class DALoad extends Instruction implements ArrayLoad { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DAStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DAStore.java similarity index 61% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DAStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DAStore.java index 3687f8f294..bfe352c973 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DAStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DAStore.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class DAStore extends ArrayStore { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DAdd.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DAdd.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DAdd.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DAdd.java index 267803d865..85f37c5b18 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DAdd.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DAdd.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class DAdd extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DCmpG.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DCmpG.java similarity index 67% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DCmpG.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DCmpG.java index ea8b90cc04..fbcdd43e50 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DCmpG.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DCmpG.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class DCmpG extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DCmpL.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DCmpL.java similarity index 67% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DCmpL.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DCmpL.java index cae239003a..e8530fdc58 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DCmpL.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DCmpL.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class DCmpL extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DConst_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DConst_0.java similarity index 55% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DConst_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DConst_0.java index 9803530e05..09b5d3f3e2 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DConst_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DConst_0.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class DConst_0 extends Instruction implements PushConstantInstruction { @@ -37,7 +37,7 @@ public class DConst_0 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Double(0.0d); + return new net.runelite.asm.pool.Double(0.0d); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DConst_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DConst_1.java similarity index 55% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DConst_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DConst_1.java index 8afde9f462..863d5ae649 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DConst_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DConst_1.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class DConst_1 extends Instruction implements PushConstantInstruction { @@ -37,7 +37,7 @@ public class DConst_1 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Double(1.0d); + return new net.runelite.asm.pool.Double(1.0d); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DDiv.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DDiv.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DDiv.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DDiv.java index fba0b9322f..f52ff1f2b8 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DDiv.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DDiv.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class DDiv extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad.java similarity index 75% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DLoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DLoad.java index a94ac1ce6a..aea5aa9a33 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_0.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_0.java index edc26b864d..f6323c5f44 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_0.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class DLoad_0 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_1.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_1.java index 38bdf7d5c9..186beff2f2 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_1.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class DLoad_1 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_2.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_2.java index 844c917263..57f0723d11 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_2.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class DLoad_2 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_3.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_3.java index c95a57fdf4..5c772533b4 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DLoad_3.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class DLoad_3 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DMul.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DMul.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DMul.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DMul.java index 821c958a15..5e040e6904 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DMul.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DMul.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class DMul extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DNeg.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DNeg.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DNeg.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DNeg.java index 7730d273d9..3e1629c35e 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DNeg.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DNeg.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class DNeg extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DRem.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DRem.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DRem.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DRem.java index aad1a52815..e425b365c1 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DRem.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DRem.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class DRem extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DStore.java similarity index 72% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DStore.java index b05a316505..f1840fa47d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DStore.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DStore_0.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DStore_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DStore_0.java index c3a45978c5..d85dcf2030 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DStore_0.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DStore_1.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DStore_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DStore_1.java index 0d93776fff..dd35ce785f 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DStore_1.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class DStore_1 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DStore_2.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DStore_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DStore_2.java index 42d3994a9f..faf2e600e4 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DStore_2.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DStore_3.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DStore_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DStore_3.java index 305d0abf0d..1b4ded8e1f 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DStore_3.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class DStore_3 extends Instruction implements LVTInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/DSub.java b/src/main/java/net/runelite/asm/attributes/code/instructions/DSub.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/DSub.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/DSub.java index 3b83fef81f..cac305df3f 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/DSub.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/DSub.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class DSub extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup.java similarity index 79% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Dup.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Dup.java index 84e619a016..db1b2ee2d8 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; import java.io.IOException; import java.util.List; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.attributes.code.instruction.types.DupInstruction; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.attributes.code.instruction.types.DupInstruction; public class Dup extends Instruction implements DupInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2.java similarity index 79% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Dup2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Dup2.java index 8a5240ccc6..48413385af 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; import java.io.IOException; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.attributes.code.instruction.types.DupInstruction; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Type; +import net.runelite.asm.attributes.code.instruction.types.DupInstruction; public class Dup2 extends Instruction implements DupInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X1.java similarity index 86% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X1.java index 11568773aa..1bb5754aff 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X1.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; import java.io.IOException; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.attributes.code.instruction.types.DupInstruction; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Type; +import net.runelite.asm.attributes.code.instruction.types.DupInstruction; public class Dup2_X1 extends Instruction implements DupInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X2.java similarity index 80% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X2.java index 775c52d021..5143ff5407 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup2_X2.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; import java.io.IOException; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.attributes.code.instruction.types.DupInstruction; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Type; +import net.runelite.asm.attributes.code.instruction.types.DupInstruction; public class Dup2_X2 extends Instruction implements DupInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X1.java similarity index 82% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X1.java index 733949fe4e..6b67831d2c 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X1.java @@ -1,14 +1,14 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; import java.io.IOException; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.attributes.code.instruction.types.DupInstruction; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.attributes.code.instruction.types.DupInstruction; public class Dup_X1 extends Instruction implements DupInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X2.java similarity index 81% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X2.java index 2cead393a3..985bf364e2 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Dup_X2.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; import java.io.IOException; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.attributes.code.instruction.types.DupInstruction; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Type; +import net.runelite.asm.attributes.code.instruction.types.DupInstruction; public class Dup_X2 extends Instruction implements DupInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/F2D.java b/src/main/java/net/runelite/asm/attributes/code/instructions/F2D.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/F2D.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/F2D.java index ee3e5d13eb..08eb569427 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/F2D.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/F2D.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/F2I.java b/src/main/java/net/runelite/asm/attributes/code/instructions/F2I.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/F2I.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/F2I.java index 94b7d88f68..39e2bec02d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/F2I.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/F2I.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/F2L.java b/src/main/java/net/runelite/asm/attributes/code/instructions/F2L.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/F2L.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/F2L.java index f7b5f7010e..a61bf4951a 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/F2L.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/F2L.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FALoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FALoad.java similarity index 56% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FALoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FALoad.java index 1c82150e07..c1a53bc52b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FALoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FALoad.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ArrayLoad; -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.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.ArrayLoad; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class FALoad extends Instruction implements ArrayLoad { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FAStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FAStore.java similarity index 61% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FAStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FAStore.java index cdaf83283d..cfc75e8ef7 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FAStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FAStore.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class FAStore extends ArrayStore { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FAdd.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FAdd.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FAdd.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FAdd.java index dc0674de12..b0c46cc1b0 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FAdd.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FAdd.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class FAdd extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FCmpG.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FCmpG.java similarity index 67% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FCmpG.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FCmpG.java index dcb64d4538..b997007cf9 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FCmpG.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FCmpG.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class FCmpG extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FCmpL.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FCmpL.java similarity index 67% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FCmpL.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FCmpL.java index 723a085cda..b59364f9e6 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FCmpL.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FCmpL.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class FCmpL extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FConst_0.java similarity index 55% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FConst_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FConst_0.java index 6681094ad7..9e511caa1e 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FConst_0.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class FConst_0 extends Instruction implements PushConstantInstruction { @@ -37,7 +37,7 @@ public class FConst_0 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Float(0.0f); + return new net.runelite.asm.pool.Float(0.0f); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FConst_1.java similarity index 55% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FConst_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FConst_1.java index 2f2d29966f..3d2d766f60 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FConst_1.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class FConst_1 extends Instruction implements PushConstantInstruction { @@ -37,7 +37,7 @@ public class FConst_1 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Float(1.0f); + return new net.runelite.asm.pool.Float(1.0f); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FConst_2.java similarity index 55% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FConst_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FConst_2.java index b33cb456e8..db4af7e9aa 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FConst_2.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class FConst_2 extends Instruction implements PushConstantInstruction { @@ -37,7 +37,7 @@ public class FConst_2 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Float(2.0f); + return new net.runelite.asm.pool.Float(2.0f); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FDiv.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FDiv.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FDiv.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FDiv.java index 925c5dfacc..f2ec4d6834 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FDiv.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FDiv.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class FDiv extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad.java similarity index 75% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FLoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FLoad.java index c2395375a7..6be8df521a 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_0.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_0.java index 6b8fc6f02d..2267543ff9 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_0.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class FLoad_0 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_1.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_1.java index 937162efa5..a2b159886b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_1.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class FLoad_1 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_2.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_2.java index 921eb906e8..f75c910c3e 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_2.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class FLoad_2 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_3.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_3.java index 1ca1ff3336..01a948998b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FLoad_3.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class FLoad_3 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FMul.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FMul.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FMul.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FMul.java index e8722838e8..9fdd771003 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FMul.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FMul.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class FMul extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FNeg.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FNeg.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FNeg.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FNeg.java index 91618a516b..506a775be8 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FNeg.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FNeg.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class FNeg extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FRem.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FRem.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FRem.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FRem.java index fa1167ea0f..c9013b8976 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FRem.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FRem.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class FRem extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FStore.java similarity index 72% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FStore.java index 0acd9edc81..fe89f865f2 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FStore.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FStore_0.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FStore_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FStore_0.java index 6e7f376800..c40056c456 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FStore_0.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class FStore_0 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FStore_1.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FStore_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FStore_1.java index 968bf81b06..1fa7dfae28 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FStore_1.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class FStore_1 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FStore_2.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FStore_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FStore_2.java index d461bca55c..7f9e8e1b68 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FStore_2.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class FStore_2 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FStore_3.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FStore_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FStore_3.java index 39c1e4fe8b..3ed4d83597 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FStore_3.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class FStore_3 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/FSub.java b/src/main/java/net/runelite/asm/attributes/code/instructions/FSub.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/FSub.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/FSub.java index be34ff426a..3a3c90b68a 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/FSub.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/FSub.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class FSub extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java b/src/main/java/net/runelite/asm/attributes/code/instructions/GetField.java similarity index 69% rename from src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/GetField.java index 2f2505366a..33e42fa7f2 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/GetField.java @@ -1,29 +1,29 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; -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 net.runelite.deob.pool.Field; -import net.runelite.deob.pool.NameAndType; +import net.runelite.asm.ClassFile; +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.GetFieldInstruction; +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.asm.execution.Type; +import net.runelite.asm.pool.Class; +import net.runelite.asm.pool.Field; +import net.runelite.asm.pool.NameAndType; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.Method; -import net.runelite.deob.execution.Value; +import net.runelite.asm.Method; +import net.runelite.asm.execution.Value; public class GetField extends Instruction implements GetFieldInstruction { private Field field; - private net.runelite.deob.Field myField; + private net.runelite.asm.Field myField; public GetField(Instructions instructions, InstructionType type, int pc) { @@ -83,7 +83,7 @@ public class GetField extends Instruction implements GetFieldInstruction } @Override - public net.runelite.deob.Field getMyField() + public net.runelite.asm.Field getMyField() { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -92,7 +92,7 @@ public class GetField extends Instruction implements GetFieldInstruction if (cf == null) return null; - net.runelite.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.asm.Field f2 = cf.findFieldDeep(nat); return f2; } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java b/src/main/java/net/runelite/asm/attributes/code/instructions/GetStatic.java similarity index 66% rename from src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/GetStatic.java index 96503fdc89..9daadbaaa7 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/GetStatic.java @@ -1,29 +1,29 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; -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 net.runelite.deob.pool.Field; -import net.runelite.deob.pool.NameAndType; +import net.runelite.asm.ClassFile; +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.GetFieldInstruction; +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.asm.execution.Type; +import net.runelite.asm.pool.Class; +import net.runelite.asm.pool.Field; +import net.runelite.asm.pool.NameAndType; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.Method; -import net.runelite.deob.execution.Value; +import net.runelite.asm.Method; +import net.runelite.asm.execution.Value; public class GetStatic extends Instruction implements GetFieldInstruction { private Field field; - private net.runelite.deob.Field myField; + private net.runelite.asm.Field myField; public GetStatic(Instructions instructions, InstructionType type, int pc) { @@ -80,7 +80,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction } @Override - public net.runelite.deob.Field getMyField() + public net.runelite.asm.Field getMyField() { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -89,7 +89,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction if (cf == null) return null; - net.runelite.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.asm.Field f2 = cf.findFieldDeep(nat); return f2; } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Goto.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Goto.java similarity index 81% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Goto.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Goto.java index d16c0a61e0..ef5d687290 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Goto.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Goto.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; +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.JumpingInstruction; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/GotoW.java b/src/main/java/net/runelite/asm/attributes/code/instructions/GotoW.java similarity index 75% rename from src/main/java/net/runelite/deob/attributes/code/instructions/GotoW.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/GotoW.java index 123bed2413..53a4f4cf97 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/GotoW.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/GotoW.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; +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.JumpingInstruction; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/I2B.java b/src/main/java/net/runelite/asm/attributes/code/instructions/I2B.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/I2B.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/I2B.java index 851e561e26..3848c06618 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/I2B.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/I2B.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/I2C.java b/src/main/java/net/runelite/asm/attributes/code/instructions/I2C.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/I2C.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/I2C.java index 39a35741d2..44c16231b4 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/I2C.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/I2C.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/I2D.java b/src/main/java/net/runelite/asm/attributes/code/instructions/I2D.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/I2D.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/I2D.java index 8ba4bd273e..5eed7d613e 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/I2D.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/I2D.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/I2F.java b/src/main/java/net/runelite/asm/attributes/code/instructions/I2F.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/I2F.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/I2F.java index 1b9e24d7c7..bfdebed69b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/I2F.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/I2F.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/I2L.java b/src/main/java/net/runelite/asm/attributes/code/instructions/I2L.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/I2L.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/I2L.java index 3ef56b15b7..36ddb73996 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/I2L.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/I2L.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/I2S.java b/src/main/java/net/runelite/asm/attributes/code/instructions/I2S.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/I2S.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/I2S.java index 7a2d7ff642..4a1d93873b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/I2S.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/I2S.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IALoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IALoad.java similarity index 56% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IALoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IALoad.java index 375eef5ba2..446a9c887d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IALoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IALoad.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ArrayLoad; -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.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.ArrayLoad; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class IALoad extends Instruction implements ArrayLoad { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IAStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IAStore.java similarity index 61% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IAStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IAStore.java index 5abea63b68..d20c007f08 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IAStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IAStore.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class IAStore extends ArrayStore { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IAdd.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IAdd.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IAdd.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IAdd.java index 5134a2c251..42fc465c7a 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IAdd.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IAdd.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; +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.arithmetic.DMath; import net.runelite.deob.deobfuscators.arithmetic.Encryption; -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.Value; +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.asm.execution.Value; public class IAdd extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IAnd.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IAnd.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IAnd.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IAnd.java index 8642e0928c..06413daa5b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IAnd.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IAnd.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class IAnd extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_0.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IConst_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IConst_0.java index 28d2ed37f0..000e8bb1db 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_0.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class IConst_0 extends Instruction implements PushConstantInstruction { @@ -42,7 +42,7 @@ public class IConst_0 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Integer(0); + return new net.runelite.asm.pool.Integer(0); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_1.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IConst_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IConst_1.java index b439222857..71dfdc1e2b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_1.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class IConst_1 extends Instruction implements PushConstantInstruction { @@ -42,7 +42,7 @@ public class IConst_1 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Integer(1); + return new net.runelite.asm.pool.Integer(1); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_2.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IConst_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IConst_2.java index a9d9839939..b4142598eb 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_2.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class IConst_2 extends Instruction implements PushConstantInstruction { @@ -42,7 +42,7 @@ public class IConst_2 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Integer(2); + return new net.runelite.asm.pool.Integer(2); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_3.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IConst_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IConst_3.java index b6d876e3e6..05abc792bb 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_3.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class IConst_3 extends Instruction implements PushConstantInstruction { @@ -42,7 +42,7 @@ public class IConst_3 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Integer(3); + return new net.runelite.asm.pool.Integer(3); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_4.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_4.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IConst_4.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IConst_4.java index 4d36497ae0..83dcd9aba6 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_4.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_4.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class IConst_4 extends Instruction implements PushConstantInstruction { @@ -42,7 +42,7 @@ public class IConst_4 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Integer(4); + return new net.runelite.asm.pool.Integer(4); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_5.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_5.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IConst_5.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IConst_5.java index f85a37e3a9..b427fee9e2 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_5.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_5.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class IConst_5 extends Instruction implements PushConstantInstruction { @@ -42,7 +42,7 @@ public class IConst_5 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Integer(5); + return new net.runelite.asm.pool.Integer(5); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_M1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_M1.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IConst_M1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IConst_M1.java index 12322dfbd3..29c2c2e596 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_M1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IConst_M1.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class IConst_M1 extends Instruction implements PushConstantInstruction { @@ -42,7 +42,7 @@ public class IConst_M1 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Integer(-1); + return new net.runelite.asm.pool.Integer(-1); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IDiv.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IDiv.java similarity index 65% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IDiv.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IDiv.java index 8ca1568901..6e923a61be 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IDiv.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IDiv.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class IDiv extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IInc.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IInc.java similarity index 74% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IInc.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IInc.java index 3684fffbb0..382f097f51 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IInc.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IInc.java @@ -1,20 +1,20 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; -import net.runelite.deob.execution.Type; -import net.runelite.deob.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class IInc extends Instruction implements LVTInstruction, WideInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad.java similarity index 76% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ILoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ILoad.java index edb25e4f54..30dfd4b18c 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_0.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_0.java index b1ed13a713..3a242da324 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_0.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class ILoad_0 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_1.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_1.java index e272da0fbd..a9ad86f737 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_1.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class ILoad_1 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_2.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_2.java index 392e13df2d..085c87ffb6 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_2.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class ILoad_2 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_3.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_3.java index 8b3a6a7f7e..7a9e4abea7 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ILoad_3.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class ILoad_3 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IMul.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IMul.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IMul.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IMul.java index 7985008126..f1bd8751a4 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IMul.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IMul.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; +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.arithmetic.DMath; import net.runelite.deob.deobfuscators.arithmetic.Encryption; -import net.runelite.deob.execution.Execution; -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.Value; +import net.runelite.asm.execution.Execution; +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.asm.execution.Value; public class IMul extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/INeg.java b/src/main/java/net/runelite/asm/attributes/code/instructions/INeg.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/INeg.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/INeg.java index 3001733696..ea5ce72e1e 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/INeg.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/INeg.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class INeg extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IOr.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IOr.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IOr.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IOr.java index b9e2ef0150..ab4658b4cc 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IOr.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IOr.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class IOr extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IRem.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IRem.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IRem.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IRem.java index bac8005ea5..e7c5538488 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IRem.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IRem.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class IRem extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IShL.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IShL.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IShL.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IShL.java index b4c085d16b..99d111deac 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IShL.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IShL.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class IShL extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IShR.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IShR.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IShR.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IShR.java index 962c7f5ae0..433373c955 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IShR.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IShR.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class IShR extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IStore.java similarity index 72% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IStore.java index 4f979ce926..2a3bae2c2d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IStore.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IStore_0.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IStore_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IStore_0.java index fa1b2ad140..6ab28247ef 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IStore_0.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class IStore_0 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IStore_1.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IStore_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IStore_1.java index a22a2f69e8..72de8e333c 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IStore_1.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class IStore_1 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IStore_2.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IStore_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IStore_2.java index ba51d66985..e557f4bb53 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IStore_2.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class IStore_2 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IStore_3.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IStore_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IStore_3.java index 0dcb43ba54..1860ef1c21 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IStore_3.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class IStore_3 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/ISub.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ISub.java similarity index 60% rename from src/main/java/net/runelite/deob/attributes/code/instructions/ISub.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/ISub.java index f22bc6bfd8..c9cce5fde4 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/ISub.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ISub.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; +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.arithmetic.Encryption; -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.Value; +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.asm.execution.Value; public class ISub extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IUShR.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IUShR.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IUShR.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IUShR.java index a21a61245b..b5c88db9dd 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IUShR.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IUShR.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class IUShR extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IXor.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IXor.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IXor.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IXor.java index 07e5743f6f..209f08d366 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IXor.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IXor.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class IXor extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/If.java b/src/main/java/net/runelite/asm/attributes/code/instructions/If.java similarity index 88% rename from src/main/java/net/runelite/deob/attributes/code/instructions/If.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/If.java index 471d4bb2ee..83b511e695 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/If.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/If.java @@ -1,14 +1,14 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; -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.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.ComparisonInstruction; +import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -16,14 +16,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.runelite.deob.Field; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.deob.attributes.code.instruction.types.MappableInstruction; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.Field; +import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; 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.execution.Execution; +import net.runelite.asm.execution.Execution; public abstract class If extends Instruction implements JumpingInstruction, ComparisonInstruction, MappableInstruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/If0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/If0.java similarity index 85% rename from src/main/java/net/runelite/deob/attributes/code/instructions/If0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/If0.java index 8a82cb3c87..5729ca2b6e 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/If0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/If0.java @@ -1,23 +1,23 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; -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.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.ComparisonInstruction; +import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; +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 java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Arrays; import java.util.List; -import net.runelite.deob.Field; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.deob.attributes.code.instruction.types.MappableInstruction; +import net.runelite.asm.Field; +import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpEq.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpEq.java similarity index 82% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpEq.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpEq.java index 6c97ea9b0e..9853583ef6 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpEq.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpEq.java @@ -1,10 +1,10 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class IfACmpEq extends If { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpNe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpNe.java similarity index 82% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpNe.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpNe.java index c5f18ae69d..e13f927f3f 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfACmpNe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpNe.java @@ -1,10 +1,10 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class IfACmpNe extends If { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpGe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGe.java similarity index 79% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpGe.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGe.java index 5ec56b27bc..6330da88ee 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpGe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGe.java @@ -1,9 +1,9 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.InstructionContext; +import net.runelite.asm.execution.InstructionContext; public class IfCmpGe extends If { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpGt.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGt.java similarity index 73% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpGt.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGt.java index 73ceec4fdd..d47161791f 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpGt.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGt.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; public class IfCmpGt extends If { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpLe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLe.java similarity index 79% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpLe.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLe.java index f113893263..b9ba48b674 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpLe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLe.java @@ -1,9 +1,9 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.InstructionContext; +import net.runelite.asm.execution.InstructionContext; public class IfCmpLe extends If { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpLt.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLt.java similarity index 79% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpLt.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLt.java index 81f7d678e5..9246241c83 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfCmpLt.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLt.java @@ -1,9 +1,9 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.InstructionContext; +import net.runelite.asm.execution.InstructionContext; public class IfCmpLt extends If { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfEq.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfEq.java similarity index 78% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfEq.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfEq.java index 493012361a..ac0558dc3d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfEq.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfEq.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import static net.runelite.deob.attributes.code.instructions.IfICmpEq.isOne; -import static net.runelite.deob.attributes.code.instructions.IfICmpEq.isZero; +import net.runelite.asm.attributes.code.Instruction; +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.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class IfEq extends If0 { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfGe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfGe.java similarity index 65% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfGe.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfGe.java index ba98d70e80..da51e1a5d4 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfGe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfGe.java @@ -1,8 +1,8 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.execution.InstructionContext; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.InstructionContext; public class IfGe extends If0 { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfGt.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfGt.java similarity index 78% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfGt.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfGt.java index 2b1eb3a6ea..36942d1cff 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfGt.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfGt.java @@ -1,9 +1,9 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.InstructionContext; +import net.runelite.asm.execution.InstructionContext; public class IfGt extends If0 { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfICmpEq.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpEq.java similarity index 81% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfICmpEq.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpEq.java index 9bdebfd48e..43cfa7613f 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfICmpEq.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpEq.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; +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.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class IfICmpEq extends If { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfICmpNe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpNe.java similarity index 81% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfICmpNe.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpNe.java index e08542d63b..7bf3f768f7 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfICmpNe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpNe.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; +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.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class IfICmpNe extends If { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfLe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfLe.java similarity index 78% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfLe.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfLe.java index 72cec50406..ca0843463b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfLe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfLe.java @@ -1,9 +1,9 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.InstructionContext; +import net.runelite.asm.execution.InstructionContext; public class IfLe extends If0 { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfLt.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfLt.java similarity index 78% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfLt.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfLt.java index 748f60f146..ff6a8911ed 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfLt.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfLt.java @@ -1,9 +1,9 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.InstructionContext; +import net.runelite.asm.execution.InstructionContext; public class IfLt extends If0 { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfNe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNe.java similarity index 79% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfNe.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfNe.java index 4fa5cf426c..45ccc5154c 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfNe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNe.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.MappableInstruction; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; +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.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class IfNe extends If0 { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfNonNull.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNonNull.java similarity index 81% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfNonNull.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfNonNull.java index eef12892ca..1bb4dfa37a 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfNonNull.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNonNull.java @@ -1,10 +1,10 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class IfNonNull extends If0 { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/IfNull.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNull.java similarity index 82% rename from src/main/java/net/runelite/deob/attributes/code/instructions/IfNull.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/IfNull.java index 872af41796..b8c231ec17 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/IfNull.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNull.java @@ -1,10 +1,10 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.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.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class IfNull extends If0 { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InstanceOf.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InstanceOf.java similarity index 68% rename from src/main/java/net/runelite/deob/attributes/code/instructions/InstanceOf.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/InstanceOf.java index fff770fe54..384a107edc 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InstanceOf.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InstanceOf.java @@ -1,20 +1,20 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.pool.Class; +import net.runelite.asm.ClassFile; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.execution.Value; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.execution.Value; public class InstanceOf extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeInterface.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java similarity index 79% rename from src/main/java/net/runelite/deob/attributes/code/instructions/InvokeInterface.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java index 4f56cf24ee..b4664c87b9 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeInterface.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java @@ -1,39 +1,39 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction; -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.InterfaceMethod; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.pool.PoolEntry; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +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.InvokeInstruction; +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.asm.execution.Type; +import net.runelite.asm.pool.InterfaceMethod; +import net.runelite.asm.pool.NameAndType; +import net.runelite.asm.pool.PoolEntry; +import net.runelite.asm.signature.Signature; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Arrays; import java.util.List; -import net.runelite.deob.Field; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.Field; +import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; import net.runelite.deob.deobfuscators.Renamer; import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Value; public class InvokeInterface extends Instruction implements InvokeInstruction { private InterfaceMethod method; private int count; - private List myMethods; + private List myMethods; public InvokeInterface(Instructions instructions, InstructionType type, int pc) { @@ -65,14 +65,14 @@ public class InvokeInterface extends Instruction implements InvokeInstruction } @Override - public List getMethods() + public List getMethods() { return myMethods != null ? myMethods : Arrays.asList(); } - private void findMethodFromClass(List list, ClassFile clazz) + private void findMethodFromClass(List list, ClassFile clazz) { - net.runelite.deob.Method m = clazz.findMethodDeep(method.getNameAndType()); + net.runelite.asm.Method m = clazz.findMethodDeep(method.getNameAndType()); if (m != null && !list.contains(m)) list.add(m); @@ -108,7 +108,7 @@ public class InvokeInterface extends Instruction implements InvokeInstruction ins.push(ctx); } - for (net.runelite.deob.Method method : getMethods()) + for (net.runelite.asm.Method method : getMethods()) { ins.invoke(method); @@ -129,7 +129,7 @@ public class InvokeInterface extends Instruction implements InvokeInstruction @Override public void removeParameter(int idx) { - net.runelite.deob.pool.Class clazz = method.getClassEntry(); + net.runelite.asm.pool.Class clazz = method.getClassEntry(); NameAndType nat = method.getNameAndType(); // create new signature @@ -146,7 +146,7 @@ public class InvokeInterface extends Instruction implements InvokeInstruction return method; } - private List lookupMethods() + private List lookupMethods() { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); @@ -176,7 +176,7 @@ public class InvokeInterface extends Instruction implements InvokeInstruction { InvokeInterface otherIv = (InvokeInterface) other.getInstruction(); - List myMethods = this.getMethods(), + List myMethods = this.getMethods(), otherMethods = otherIv.getMethods(); assert myMethods.size() == otherMethods.size(); @@ -242,7 +242,7 @@ public class InvokeInterface extends Instruction implements InvokeInstruction if (!thisIi.method.getNameAndType().getDescriptor().equals(otherIi.method.getNameAndType().getDescriptor())) return false; - List thisMethods = thisIi.getMethods(), + List thisMethods = thisIi.getMethods(), otherMethods = otherIi.getMethods(); if ((thisMethods != null) != (otherMethods != null)) @@ -256,8 +256,8 @@ public class InvokeInterface extends Instruction implements InvokeInstruction for (int i = 0; i < thisMethods.size(); ++i) { - net.runelite.deob.Method m1 = thisMethods.get(i), - m2 = otherMethods.get(i); + net.runelite.asm.Method m1 = thisMethods.get(i); + net.runelite.asm.Method m2 = otherMethods.get(i); if (!m1.getMethods().getClassFile().getPoolClass().equals(m2.getMethods().getClassFile().getPoolClass())) return false; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeSpecial.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java similarity index 78% rename from src/main/java/net/runelite/deob/attributes/code/instructions/InvokeSpecial.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java index a9ae3df712..85fbeed866 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeSpecial.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java @@ -1,20 +1,20 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction; -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.Method; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.pool.PoolEntry; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +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.InvokeInstruction; +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.asm.execution.Type; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -22,17 +22,17 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.runelite.deob.Field; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.Field; +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.execution.Execution; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Value; public class InvokeSpecial extends Instruction implements InvokeInstruction { private Method method; - private List myMethods; + private List myMethods; public InvokeSpecial(Instructions instructions, InstructionType type, int pc) { @@ -62,7 +62,7 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction } @Override - public List getMethods() + public List getMethods() { return myMethods != null ? myMethods : Arrays.asList(); } @@ -95,7 +95,7 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction ins.push(ctx); } - for (net.runelite.deob.Method method : getMethods()) + for (net.runelite.asm.Method method : getMethods()) { ins.invoke(method); @@ -128,7 +128,7 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction @Override public void removeParameter(int idx) { - net.runelite.deob.pool.Class clazz = method.getClassEntry(); + net.runelite.asm.pool.Class clazz = method.getClassEntry(); NameAndType nat = method.getNameAndType(); // create new signature @@ -159,10 +159,10 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction if (otherClass == null) return; // not our class - net.runelite.deob.Method other = otherClass.findMethod(method.getNameAndType()); + net.runelite.asm.Method other = otherClass.findMethod(method.getNameAndType()); assert other != null; - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(other); myMethods = list; } @@ -179,11 +179,11 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction { InvokeSpecial otherIv = (InvokeSpecial) other.getInstruction(); - List myMethods = this.getMethods(), + List myMethods = this.getMethods(), otherMethods = otherIv.getMethods(); - List m1 = this.myMethods; - List m2 = ((InvokeSpecial) other.getInstruction()).myMethods; + List m1 = this.myMethods; + List m2 = ((InvokeSpecial) other.getInstruction()).myMethods; assert myMethods.size() == otherMethods.size(); for (int i = 0; i < myMethods.size(); ++i) @@ -247,7 +247,7 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction if (!thisIi.method.getNameAndType().getDescriptor().equals(otherIi.method.getNameAndType().getDescriptor())) return false; - List thisMethods = thisIi.getMethods(), + List thisMethods = thisIi.getMethods(), otherMethods = otherIi.getMethods(); if ((thisMethods != null) != (otherMethods != null)) @@ -264,8 +264,8 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction for (int i = 0; i < thisMethods.size(); ++i) { - net.runelite.deob.Method m1 = thisMethods.get(i), - m2 = otherMethods.get(i); + net.runelite.asm.Method m1 = thisMethods.get(i); + net.runelite.asm.Method m2 = otherMethods.get(i); if (!m1.getMethods().getClassFile().getPoolClass().equals(m2.getMethods().getClassFile().getPoolClass())) return false; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeStatic.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java similarity index 77% rename from src/main/java/net/runelite/deob/attributes/code/instructions/InvokeStatic.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java index 6bbb25edcb..9b209725e1 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeStatic.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java @@ -1,20 +1,20 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction; -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.Method; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.pool.PoolEntry; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +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.InvokeInstruction; +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.asm.execution.Type; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -22,17 +22,17 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.runelite.deob.Field; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.Field; +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.execution.Execution; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Value; public class InvokeStatic extends Instruction implements InvokeInstruction { private Method method; - private net.runelite.deob.Method myMethod; + private net.runelite.asm.Method myMethod; public InvokeStatic(Instructions instructions, InstructionType type, int pc) { @@ -67,7 +67,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction } @Override - public List getMethods() + public List getMethods() { return myMethod != null ? Arrays.asList(myMethod) : Arrays.asList(); } @@ -97,7 +97,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction ins.push(ctx); } - for (net.runelite.deob.Method method : getMethods()) + for (net.runelite.asm.Method method : getMethods()) { ins.invoke(method); @@ -124,7 +124,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction @Override public void removeParameter(int idx) { - net.runelite.deob.pool.Class clazz = method.getClassEntry(); + net.runelite.asm.pool.Class clazz = method.getClassEntry(); NameAndType nat = method.getNameAndType(); // create new signature @@ -141,7 +141,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction return method; } - private net.runelite.deob.Method lookupMethod() + private net.runelite.asm.Method lookupMethod() { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); @@ -149,7 +149,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction if (otherClass == null) return null; // not our class - net.runelite.deob.Method other = otherClass.findMethodDeepStatic(method.getNameAndType()); + net.runelite.asm.Method other = otherClass.findMethodDeepStatic(method.getNameAndType()); assert other != null; return other; @@ -172,7 +172,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction @Override public void map(ParallelExecutorMapping mapping, InstructionContext ctx, InstructionContext other) { - List myMethods = this.getMethods(), + List myMethods = this.getMethods(), otherMethods = ((InvokeStatic) other.getInstruction()).getMethods(); assert myMethods.size() == otherMethods.size(); @@ -216,7 +216,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction if (!thisIi.method.getNameAndType().getDescriptor().equals(otherIi.method.getNameAndType().getDescriptor())) return false; - List thisMethods = thisIi.getMethods(), + List thisMethods = thisIi.getMethods(), otherMethods = otherIi.getMethods(); if ((thisMethods != null) != (otherMethods != null)) @@ -233,8 +233,8 @@ public class InvokeStatic extends Instruction implements InvokeInstruction for (int i = 0; i < thisMethods.size(); ++i) { - net.runelite.deob.Method m1 = thisMethods.get(i), - m2 = otherMethods.get(i); + net.runelite.asm.Method m1 = thisMethods.get(i); + net.runelite.asm.Method m2 = otherMethods.get(i); /* The class names are random */ diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java similarity index 80% rename from src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java index b566727291..f55018ab2e 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java @@ -1,38 +1,38 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction; -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.Method; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.pool.PoolEntry; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +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.InvokeInstruction; +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.asm.execution.Type; +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 java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Arrays; import java.util.List; -import net.runelite.deob.Field; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.Field; +import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; import net.runelite.deob.deobfuscators.Renamer; import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Value; public class InvokeVirtual extends Instruction implements InvokeInstruction { private Method method; - private List myMethods; + private List myMethods; public InvokeVirtual(Instructions instructions, InstructionType type, int pc) { @@ -95,7 +95,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction ins.push(ctx); } - for (net.runelite.deob.Method method : getMethods()) + for (net.runelite.asm.Method method : getMethods()) { ins.invoke(method); @@ -114,7 +114,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction } @Override - public List getMethods() + public List getMethods() { return myMethods != null ? myMethods : Arrays.asList(); } @@ -122,7 +122,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction @Override public void removeParameter(int idx) { - net.runelite.deob.pool.Class clazz = method.getClassEntry(); + net.runelite.asm.pool.Class clazz = method.getClassEntry(); NameAndType nat = method.getNameAndType(); // create new signature @@ -139,7 +139,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction return method; } - private List lookupMethods() + private List lookupMethods() { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); @@ -149,7 +149,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction // when I recompile classes I can see the class of invokevirtuals methods change, get all methods - net.runelite.deob.Method m = otherClass.findMethodDeep(method.getNameAndType()); + net.runelite.asm.Method m = otherClass.findMethodDeep(method.getNameAndType()); if (m == null) { return null; @@ -177,7 +177,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction { InvokeVirtual otherIv = (InvokeVirtual) other.getInstruction(); - List myMethods = this.getMethods(), + List myMethods = this.getMethods(), otherMethods = otherIv.getMethods(); assert method.getNameAndType().getDescriptor().equals(otherIv.method.getNameAndType().getDescriptor()); @@ -185,7 +185,8 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction for (int i = 0; i < myMethods.size(); ++i) { - net.runelite.deob.Method m1 = myMethods.get(i), m2 = otherMethods.get(i); + net.runelite.asm.Method m1 = myMethods.get(i); + net.runelite.asm.Method m2 = otherMethods.get(i); assert m1.getMethods().getClassFile().getName().equals(m2.getMethods().getClassFile().getName()); @@ -253,7 +254,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction if (!thisIi.method.getNameAndType().getDescriptor().equals(otherIi.method.getNameAndType().getDescriptor())) return false; - List thisMethods = thisIi.getMethods(), + List thisMethods = thisIi.getMethods(), otherMethods = otherIi.getMethods(); if ((thisMethods != null) != (otherMethods != null)) @@ -267,8 +268,8 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction for (int i = 0; i < thisMethods.size(); ++i) { - net.runelite.deob.Method m1 = thisMethods.get(i), - m2 = otherMethods.get(i); + net.runelite.asm.Method m1 = thisMethods.get(i); + net.runelite.asm.Method m2 = otherMethods.get(i); if (!m1.getMethods().getClassFile().getPoolClass().equals(m2.getMethods().getClassFile().getPoolClass())) return false; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/L2D.java b/src/main/java/net/runelite/asm/attributes/code/instructions/L2D.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/L2D.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/L2D.java index dc8dfc1abd..780ce62c62 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/L2D.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/L2D.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/L2F.java b/src/main/java/net/runelite/asm/attributes/code/instructions/L2F.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/L2F.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/L2F.java index f3e03a205e..1b4ae7075e 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/L2F.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/L2F.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/L2I.java b/src/main/java/net/runelite/asm/attributes/code/instructions/L2I.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/L2I.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/L2I.java index aff60f4175..54ae48d791 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/L2I.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/L2I.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LALoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LALoad.java similarity index 56% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LALoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LALoad.java index 2286de46ba..2d66026d77 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LALoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LALoad.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ArrayLoad; -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.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.ArrayLoad; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class LALoad extends Instruction implements ArrayLoad { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LAStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LAStore.java similarity index 61% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LAStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LAStore.java index 511b7457d6..ab6bb8364b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LAStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LAStore.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class LAStore extends ArrayStore { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LAdd.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LAdd.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LAdd.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LAdd.java index 87db46575c..fd4e4f701d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LAdd.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LAdd.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LAdd extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LAnd.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LAnd.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LAnd.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LAnd.java index d5fabb5f24..4c456fff76 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LAnd.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LAnd.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LAnd extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LCmp.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LCmp.java similarity index 67% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LCmp.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LCmp.java index 21eb78e655..8214035793 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LCmp.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LCmp.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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 java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class LCmp extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LConst_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LConst_0.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LConst_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LConst_0.java index 27e1e6445c..c4e7c7f21a 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LConst_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LConst_0.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.Value; -import net.runelite.deob.pool.PoolEntry; +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.asm.execution.Frame; +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.asm.pool.PoolEntry; public class LConst_0 extends Instruction implements PushConstantInstruction { @@ -40,7 +40,7 @@ public class LConst_0 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Long(0); + return new net.runelite.asm.pool.Long(0); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LConst_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LConst_1.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LConst_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LConst_1.java index e21f1c33fb..21f0542f67 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LConst_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LConst_1.java @@ -1,15 +1,15 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.Value; -import net.runelite.deob.pool.PoolEntry; +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.asm.execution.Frame; +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.asm.pool.PoolEntry; public class LConst_1 extends Instruction implements PushConstantInstruction { @@ -40,7 +40,7 @@ public class LConst_1 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Long(1); + return new net.runelite.asm.pool.Long(1); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LDC2_W.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LDC2_W.java similarity index 75% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LDC2_W.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LDC2_W.java index 1061bf9e1b..f2bd430409 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LDC2_W.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LDC2_W.java @@ -1,20 +1,20 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.execution.Value; -import net.runelite.deob.pool.ConstantType; +import net.runelite.asm.execution.Value; +import net.runelite.asm.pool.ConstantType; public class LDC2_W extends Instruction implements PushConstantInstruction { @@ -28,14 +28,14 @@ public class LDC2_W extends Instruction implements PushConstantInstruction public LDC2_W(Instructions instructions, long value) { super(instructions, InstructionType.LDC2_W, -1); - this.value = new net.runelite.deob.pool.Long(value); + this.value = new net.runelite.asm.pool.Long(value); length += 2; } public LDC2_W(Instructions instructions, double value) { super(instructions, InstructionType.LDC2_W, -1); - this.value = new net.runelite.deob.pool.Double(value); + this.value = new net.runelite.asm.pool.Double(value); length += 2; } diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LDC_W.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LDC_W.java similarity index 81% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LDC_W.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LDC_W.java index 5db15217f1..b5a785c8ab 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LDC_W.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LDC_W.java @@ -1,20 +1,20 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.execution.Value; -import net.runelite.deob.pool.ConstantType; +import net.runelite.asm.execution.Value; +import net.runelite.asm.pool.ConstantType; public class LDC_W extends Instruction implements PushConstantInstruction { @@ -39,12 +39,12 @@ public class LDC_W extends Instruction implements PushConstantInstruction public LDC_W(Instructions instructions, int value) { - this(instructions, new net.runelite.deob.pool.Integer(value)); + this(instructions, new net.runelite.asm.pool.Integer(value)); } public LDC_W(Instructions instructions, float value) { - this(instructions, new net.runelite.deob.pool.Float(value)); + this(instructions, new net.runelite.asm.pool.Float(value)); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LDiv.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LDiv.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LDiv.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LDiv.java index 547e29674a..131055c627 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LDiv.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LDiv.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LDiv extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad.java similarity index 75% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LLoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LLoad.java index 55454ffe5f..235ecbe16b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_0.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_0.java index 2af3afd74e..854d604943 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_0.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class LLoad_0 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_1.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_1.java index 578bbef5fb..caed8beaf9 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_1.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_2.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_2.java index 2dbef92a2a..5da2d0fd32 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_2.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_3.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_3.java index 4f2c871359..04867b641a 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LLoad_3.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LMul.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LMul.java similarity index 65% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LMul.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LMul.java index 7a702271ce..c11ed0981b 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LMul.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LMul.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LMul extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LNeg.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LNeg.java similarity index 59% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LNeg.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LNeg.java index c5bba9387d..f0393b6062 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LNeg.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LNeg.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LNeg extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LOr.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LOr.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LOr.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LOr.java index 6a3d0ccd8d..d9144f0c33 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LOr.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LOr.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LOr extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LRem.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LRem.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LRem.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LRem.java index ec02d32779..57eee54ef3 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LRem.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LRem.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LRem extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LShL.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LShL.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LShL.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LShL.java index fd36ba828f..32223e3b90 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LShL.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LShL.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LShL extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LShR.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LShR.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LShR.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LShR.java index c8783ae1b4..1ace82e19c 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LShR.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LShR.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LShR extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LStore.java similarity index 72% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LStore.java index 70488a61d5..1d840b0531 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LStore.java @@ -1,17 +1,17 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LStore_0.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LStore_0.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LStore_0.java index ccc0ff4992..608804ecbd 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LStore_0.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class LStore_0 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_1.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LStore_1.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LStore_1.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LStore_1.java index 0a00e59afe..3fab32442c 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_1.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LStore_1.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class LStore_1 extends Instruction implements LVTInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LStore_2.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LStore_2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LStore_2.java index 6bb5f06a98..e81b98e990 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LStore_2.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_3.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LStore_3.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LStore_3.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LStore_3.java index bff2d947e4..9b57a232a1 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_3.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LStore_3.java @@ -1,16 +1,16 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -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.execution.VariableContext; -import net.runelite.deob.execution.Variables; +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.LVTInstruction; +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.asm.execution.Type; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LSub.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LSub.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LSub.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LSub.java index eccf344d52..e6c1c48e08 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LSub.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LSub.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LSub extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LUShR.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LUShR.java similarity index 63% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LUShR.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LUShR.java index 73d2a1b98a..bd7eb97bef 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LUShR.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LUShR.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LUShR extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LXor.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LXor.java similarity index 62% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LXor.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LXor.java index 47d70f9df7..e70334e1b7 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LXor.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LXor.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.Value; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Value; public class LXor extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/LookupSwitch.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LookupSwitch.java similarity index 86% rename from src/main/java/net/runelite/deob/attributes/code/instructions/LookupSwitch.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/LookupSwitch.java index 77a40d5748..9f15f4ec99 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/LookupSwitch.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LookupSwitch.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; -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.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.JumpingInstruction; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/MonitorEnter.java b/src/main/java/net/runelite/asm/attributes/code/instructions/MonitorEnter.java similarity index 50% rename from src/main/java/net/runelite/deob/attributes/code/instructions/MonitorEnter.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/MonitorEnter.java index 1a801edfc7..2e998028bc 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/MonitorEnter.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/MonitorEnter.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class MonitorEnter extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/MonitorExit.java b/src/main/java/net/runelite/asm/attributes/code/instructions/MonitorExit.java similarity index 50% rename from src/main/java/net/runelite/deob/attributes/code/instructions/MonitorExit.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/MonitorExit.java index 37bf30c950..f5eadc13d3 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/MonitorExit.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/MonitorExit.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class MonitorExit extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/MultiANewArray.java b/src/main/java/net/runelite/asm/attributes/code/instructions/MultiANewArray.java similarity index 70% rename from src/main/java/net/runelite/deob/attributes/code/instructions/MultiANewArray.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/MultiANewArray.java index d0b1b26884..b710f69dce 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/MultiANewArray.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/MultiANewArray.java @@ -1,21 +1,21 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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 net.runelite.asm.ClassFile; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Type; +import net.runelite.asm.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.execution.Value; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.execution.Value; public class MultiANewArray extends Instruction { @@ -59,7 +59,7 @@ public class MultiANewArray extends Instruction lenghts[i] = ctx.getValue(); } - Type t = new Type(new net.runelite.deob.signature.Type(clazz.getName())); + Type t = new Type(new net.runelite.asm.signature.Type(clazz.getName())); StackContext ctx = new StackContext(ins, t, Value.newArray(lenghts)); stack.push(ctx); @@ -71,7 +71,7 @@ public class MultiANewArray extends Instruction @Override public void lookup() { - net.runelite.deob.signature.Type t = new net.runelite.deob.signature.Type(clazz.getName()); + net.runelite.asm.signature.Type t = new net.runelite.asm.signature.Type(clazz.getName()); String name = t.getType(); if (name.startsWith("L") && name.endsWith(";")) name = name.substring(1, name.length() - 1); diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/NOP.java b/src/main/java/net/runelite/asm/attributes/code/instructions/NOP.java similarity index 57% rename from src/main/java/net/runelite/deob/attributes/code/instructions/NOP.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/NOP.java index 4ec6d0c69a..4197d7c959 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/NOP.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/NOP.java @@ -1,10 +1,10 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/New.java b/src/main/java/net/runelite/asm/attributes/code/instructions/New.java similarity index 68% rename from src/main/java/net/runelite/deob/attributes/code/instructions/New.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/New.java index e3efcfd0c8..12678fe2cc 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/New.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/New.java @@ -1,21 +1,21 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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 net.runelite.asm.ClassFile; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.Type; +import net.runelite.asm.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.execution.Value; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.execution.Value; public class New extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/NewArray.java b/src/main/java/net/runelite/asm/attributes/code/instructions/NewArray.java similarity index 74% rename from src/main/java/net/runelite/deob/attributes/code/instructions/NewArray.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/NewArray.java index bb389d87cf..41001d1fda 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/NewArray.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/NewArray.java @@ -1,18 +1,18 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +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.asm.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class NewArray extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Pop.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Pop.java similarity index 56% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Pop.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Pop.java index 44420a5bcf..13d0161bf4 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Pop.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Pop.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +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.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class Pop extends Instruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Pop2.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Pop2.java similarity index 58% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Pop2.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Pop2.java index ba03d34cbe..67d41f5588 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Pop2.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Pop2.java @@ -1,9 +1,9 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.execution.Frame; +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.execution.Frame; import java.io.IOException; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/PutField.java b/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java similarity index 72% rename from src/main/java/net/runelite/deob/attributes/code/instructions/PutField.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java index d1dec3d4e5..5a4b69f0d2 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/PutField.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java @@ -1,31 +1,31 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.SetFieldInstruction; -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.pool.Class; -import net.runelite.deob.pool.Field; -import net.runelite.deob.pool.NameAndType; +import net.runelite.asm.ClassFile; +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.SetFieldInstruction; +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.asm.pool.Class; +import net.runelite.asm.pool.Field; +import net.runelite.asm.pool.NameAndType; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; public class PutField extends Instruction implements SetFieldInstruction { private Field field; - private net.runelite.deob.Field myField; + private net.runelite.asm.Field myField; public PutField(Instructions instructions, InstructionType type, int pc) throws IOException { @@ -73,7 +73,7 @@ public class PutField extends Instruction implements SetFieldInstruction } @Override - public net.runelite.deob.Field getMyField() + public net.runelite.asm.Field getMyField() { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -82,7 +82,7 @@ public class PutField extends Instruction implements SetFieldInstruction if (cf == null) return null; - net.runelite.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.asm.Field f2 = cf.findFieldDeep(nat); return f2; } @@ -103,8 +103,8 @@ public class PutField extends Instruction implements SetFieldInstruction @Override public void map(ParallelExecutorMapping mapping, InstructionContext ctx, InstructionContext other) { - net.runelite.deob.Field myField = this.getMyField(), - otherField = ((PutField) other.getInstruction()).getMyField(); + net.runelite.asm.Field myField = this.getMyField(); + net.runelite.asm.Field otherField = ((PutField) other.getInstruction()).getMyField(); assert myField.getType().equals(otherField.getType()); @@ -123,8 +123,8 @@ public class PutField extends Instruction implements SetFieldInstruction GetFieldInstruction gf1 = (GetFieldInstruction) base1.getInstruction(), gf2 = (GetFieldInstruction) base2.getInstruction(); - net.runelite.deob.Field f1 = gf1.getMyField(), - f2 = gf2.getMyField(); + net.runelite.asm.Field f1 = gf1.getMyField(); + net.runelite.asm.Field f2 = gf2.getMyField(); if (f1 != null && f2 != null) { @@ -144,8 +144,8 @@ public class PutField extends Instruction implements SetFieldInstruction PutField thisPf = (PutField) thisIc.getInstruction(), otherPf = (PutField) otherIc.getInstruction(); - net.runelite.deob.Field f1 = thisPf.getMyField(), - f2 = otherPf.getMyField(); + net.runelite.asm.Field f1 = thisPf.getMyField(); + net.runelite.asm.Field f2 = otherPf.getMyField(); if ((f1 != null) != (f2 != null)) return false; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/PutStatic.java b/src/main/java/net/runelite/asm/attributes/code/instructions/PutStatic.java similarity index 73% rename from src/main/java/net/runelite/deob/attributes/code/instructions/PutStatic.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/PutStatic.java index 71144368cc..5436a720c4 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/PutStatic.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/PutStatic.java @@ -1,30 +1,30 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.ClassFile; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.SetFieldInstruction; -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.pool.Class; -import net.runelite.deob.pool.Field; -import net.runelite.deob.pool.NameAndType; +import net.runelite.asm.ClassFile; +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.SetFieldInstruction; +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.asm.pool.Class; +import net.runelite.asm.pool.Field; +import net.runelite.asm.pool.NameAndType; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; public class PutStatic extends Instruction implements SetFieldInstruction { private Field field; - private net.runelite.deob.Field myField; + private net.runelite.asm.Field myField; public PutStatic(Instructions instructions, InstructionType type, int pc) throws IOException { @@ -71,7 +71,7 @@ public class PutStatic extends Instruction implements SetFieldInstruction } @Override - public net.runelite.deob.Field getMyField() + public net.runelite.asm.Field getMyField() { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -80,7 +80,7 @@ public class PutStatic extends Instruction implements SetFieldInstruction if (cf == null) return null; - net.runelite.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.asm.Field f2 = cf.findFieldDeep(nat); return f2; } @@ -101,8 +101,8 @@ public class PutStatic extends Instruction implements SetFieldInstruction @Override public void map(ParallelExecutorMapping mapping, InstructionContext ctx, InstructionContext other) { - net.runelite.deob.Field myField = this.getMyField(), - otherField = ((PutStatic) other.getInstruction()).getMyField(); + net.runelite.asm.Field myField = this.getMyField(); + net.runelite.asm.Field otherField = ((PutStatic) other.getInstruction()).getMyField(); assert myField.getType().equals(otherField.getType()); @@ -119,8 +119,8 @@ public class PutStatic extends Instruction implements SetFieldInstruction GetFieldInstruction gf1 = (GetFieldInstruction) base1.getInstruction(), gf2 = (GetFieldInstruction) base2.getInstruction(); - net.runelite.deob.Field f1 = gf1.getMyField(), - f2 = gf2.getMyField(); + net.runelite.asm.Field f1 = gf1.getMyField(); + net.runelite.asm.Field f2 = gf2.getMyField(); if (f1 != null && f2 != null) { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Return.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Return.java similarity index 55% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Return.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Return.java index 50fd6b64c7..9650d8be11 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Return.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Return.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ReturnInstruction; -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.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.ReturnInstruction; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class Return extends Instruction implements ReturnInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/SALoad.java b/src/main/java/net/runelite/asm/attributes/code/instructions/SALoad.java similarity index 57% rename from src/main/java/net/runelite/deob/attributes/code/instructions/SALoad.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/SALoad.java index c4a65f46bd..8b02f27653 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/SALoad.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/SALoad.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ArrayLoad; -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.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.ArrayLoad; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class SALoad extends Instruction implements ArrayLoad { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/SAStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/SAStore.java similarity index 61% rename from src/main/java/net/runelite/deob/attributes/code/instructions/SAStore.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/SAStore.java index 8d0057d4fb..c1b2a72292 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/SAStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/SAStore.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class SAStore extends ArrayStore { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/SiPush.java b/src/main/java/net/runelite/asm/attributes/code/instructions/SiPush.java similarity index 66% rename from src/main/java/net/runelite/deob/attributes/code/instructions/SiPush.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/SiPush.java index 884d39b910..fa44546fbc 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/SiPush.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/SiPush.java @@ -1,19 +1,19 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -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.pool.PoolEntry; +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.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.execution.Value; +import net.runelite.asm.execution.Value; public class SiPush extends Instruction implements PushConstantInstruction { @@ -61,7 +61,7 @@ public class SiPush extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new net.runelite.deob.pool.Integer(s); + return new net.runelite.asm.pool.Integer(s); } @Override diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Swap.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Swap.java similarity index 64% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Swap.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Swap.java index b587e86fd9..d0e7d26920 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Swap.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Swap.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -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.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.Stack; +import net.runelite.asm.execution.StackContext; public class Swap extends Instruction { diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/TableSwitch.java b/src/main/java/net/runelite/asm/attributes/code/instructions/TableSwitch.java similarity index 86% rename from src/main/java/net/runelite/deob/attributes/code/instructions/TableSwitch.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/TableSwitch.java index 7a2e62268a..82a7980a9d 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/TableSwitch.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/TableSwitch.java @@ -1,13 +1,13 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; -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.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.JumpingInstruction; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/VReturn.java b/src/main/java/net/runelite/asm/attributes/code/instructions/VReturn.java similarity index 54% rename from src/main/java/net/runelite/deob/attributes/code/instructions/VReturn.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/VReturn.java index 952f3504e1..852d5be004 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/VReturn.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/VReturn.java @@ -1,11 +1,11 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; +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.ReturnInstruction; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; public class VReturn extends Instruction implements ReturnInstruction diff --git a/src/main/java/net/runelite/deob/attributes/code/instructions/Wide.java b/src/main/java/net/runelite/asm/attributes/code/instructions/Wide.java similarity index 80% rename from src/main/java/net/runelite/deob/attributes/code/instructions/Wide.java rename to src/main/java/net/runelite/asm/attributes/code/instructions/Wide.java index c58d4721fb..ae4f1b77fe 100644 --- a/src/main/java/net/runelite/deob/attributes/code/instructions/Wide.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/Wide.java @@ -1,12 +1,12 @@ -package net.runelite.deob.attributes.code.instructions; +package net.runelite.asm.attributes.code.instructions; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.WideInstruction; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; +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.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.WideInstruction; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/execution/Execution.java b/src/main/java/net/runelite/asm/execution/Execution.java similarity index 93% rename from src/main/java/net/runelite/deob/execution/Execution.java rename to src/main/java/net/runelite/asm/execution/Execution.java index a7d7db5348..9687d7b684 100644 --- a/src/main/java/net/runelite/deob/execution/Execution.java +++ b/src/main/java/net/runelite/asm/execution/Execution.java @@ -1,10 +1,10 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deob; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.code.Instruction; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.Instruction; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/net/runelite/deob/execution/Frame.java b/src/main/java/net/runelite/asm/execution/Frame.java similarity index 90% rename from src/main/java/net/runelite/deob/execution/Frame.java rename to src/main/java/net/runelite/asm/execution/Frame.java index 89f45c63c4..1b8347e317 100644 --- a/src/main/java/net/runelite/deob/execution/Frame.java +++ b/src/main/java/net/runelite/asm/execution/Frame.java @@ -1,21 +1,21 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.List; -import net.runelite.deob.Field; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Exception; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.deob.attributes.code.instruction.types.MappableInstruction; -import net.runelite.deob.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.deob.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.deob.attributes.code.instructions.AThrow; -import net.runelite.deob.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Exception; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.pool.NameAndType; +import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; +import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; +import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; +import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; +import net.runelite.asm.attributes.code.instructions.AThrow; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; public class Frame { diff --git a/src/main/java/net/runelite/deob/execution/InstructionContext.java b/src/main/java/net/runelite/asm/execution/InstructionContext.java similarity index 92% rename from src/main/java/net/runelite/deob/execution/InstructionContext.java rename to src/main/java/net/runelite/asm/execution/InstructionContext.java index e7bffbd26d..ae34911dd0 100644 --- a/src/main/java/net/runelite/deob/execution/InstructionContext.java +++ b/src/main/java/net/runelite/asm/execution/InstructionContext.java @@ -1,14 +1,14 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; import java.util.ArrayList; import java.util.List; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.code.Instruction; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.Instruction; import java.util.Objects; -import net.runelite.deob.attributes.code.instruction.types.DupInstruction; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.SetFieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.DupInstruction; +import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; public class InstructionContext { diff --git a/src/main/java/net/runelite/deob/execution/MethodContext.java b/src/main/java/net/runelite/asm/execution/MethodContext.java similarity index 88% rename from src/main/java/net/runelite/deob/execution/MethodContext.java rename to src/main/java/net/runelite/asm/execution/MethodContext.java index bf842c7848..ab6cd23c5a 100644 --- a/src/main/java/net/runelite/deob/execution/MethodContext.java +++ b/src/main/java/net/runelite/asm/execution/MethodContext.java @@ -1,9 +1,9 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import net.runelite.deob.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instruction; import org.apache.commons.collections4.map.MultiValueMap; public class MethodContext diff --git a/src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java b/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java similarity index 97% rename from src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java rename to src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java index b7bde30684..4c81929991 100644 --- a/src/main/java/net/runelite/deob/execution/ParallellMappingExecutor.java +++ b/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java @@ -1,14 +1,14 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.deob.attributes.code.instructions.InvokeStatic; -import net.runelite.deob.attributes.code.instructions.Return; +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; diff --git a/src/main/java/net/runelite/deob/execution/Stack.java b/src/main/java/net/runelite/asm/execution/Stack.java similarity index 89% rename from src/main/java/net/runelite/deob/execution/Stack.java rename to src/main/java/net/runelite/asm/execution/Stack.java index b1f71974cd..2c27a08dcd 100644 --- a/src/main/java/net/runelite/deob/execution/Stack.java +++ b/src/main/java/net/runelite/asm/execution/Stack.java @@ -1,4 +1,4 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; import java.util.Arrays; import java.util.List; @@ -32,7 +32,7 @@ public class Stack { if (size == stack.length) { - net.runelite.deob.Method m = i.getPushed().getInstruction().getInstructions().getCode().getAttributes().getMethod(); + net.runelite.asm.Method m = i.getPushed().getInstruction().getInstructions().getCode().getAttributes().getMethod(); System.err.println("stack overflow in " + m.getMethods().getClassFile().getName() + " method " + m.getNameAndType().getName()); for (int c = 0; c < stack.length; ++c) printStack(stack[c], 0); diff --git a/src/main/java/net/runelite/deob/execution/StackContext.java b/src/main/java/net/runelite/asm/execution/StackContext.java similarity index 94% rename from src/main/java/net/runelite/deob/execution/StackContext.java rename to src/main/java/net/runelite/asm/execution/StackContext.java index 0b95a56e68..85b5f802b2 100644 --- a/src/main/java/net/runelite/deob/execution/StackContext.java +++ b/src/main/java/net/runelite/asm/execution/StackContext.java @@ -1,4 +1,4 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/net/runelite/deob/execution/Type.java b/src/main/java/net/runelite/asm/execution/Type.java similarity index 90% rename from src/main/java/net/runelite/deob/execution/Type.java rename to src/main/java/net/runelite/asm/execution/Type.java index 49277da0fd..b8cec0a934 100644 --- a/src/main/java/net/runelite/deob/execution/Type.java +++ b/src/main/java/net/runelite/asm/execution/Type.java @@ -1,4 +1,4 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; public class Type { @@ -11,7 +11,7 @@ public class Type this.type = type; } - public Type(net.runelite.deob.signature.Type t) + public Type(net.runelite.asm.signature.Type t) { type = asmTypeToClass(t.getType()); for (int i = 0; i < t.getArrayDims(); ++i) diff --git a/src/main/java/net/runelite/deob/execution/Value.java b/src/main/java/net/runelite/asm/execution/Value.java similarity index 98% rename from src/main/java/net/runelite/deob/execution/Value.java rename to src/main/java/net/runelite/asm/execution/Value.java index 7e1b2e9ac2..a34d96fa9c 100644 --- a/src/main/java/net/runelite/deob/execution/Value.java +++ b/src/main/java/net/runelite/asm/execution/Value.java @@ -1,4 +1,4 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/src/main/java/net/runelite/deob/execution/VariableContext.java b/src/main/java/net/runelite/asm/execution/VariableContext.java similarity index 97% rename from src/main/java/net/runelite/deob/execution/VariableContext.java rename to src/main/java/net/runelite/asm/execution/VariableContext.java index cd48cae0e7..d62b9fbb55 100644 --- a/src/main/java/net/runelite/deob/execution/VariableContext.java +++ b/src/main/java/net/runelite/asm/execution/VariableContext.java @@ -1,4 +1,4 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/net/runelite/deob/execution/Variables.java b/src/main/java/net/runelite/asm/execution/Variables.java similarity index 87% rename from src/main/java/net/runelite/deob/execution/Variables.java rename to src/main/java/net/runelite/asm/execution/Variables.java index e6a90e683c..204752a5b8 100644 --- a/src/main/java/net/runelite/deob/execution/Variables.java +++ b/src/main/java/net/runelite/asm/execution/Variables.java @@ -1,4 +1,4 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; import java.util.Arrays; diff --git a/src/main/java/net/runelite/deob/asm/AsmUtils.java b/src/main/java/net/runelite/asm/objectwebasm/AsmUtils.java similarity index 87% rename from src/main/java/net/runelite/deob/asm/AsmUtils.java rename to src/main/java/net/runelite/asm/objectwebasm/AsmUtils.java index a2cfed4671..ee3ba6e59e 100644 --- a/src/main/java/net/runelite/deob/asm/AsmUtils.java +++ b/src/main/java/net/runelite/asm/objectwebasm/AsmUtils.java @@ -1,8 +1,8 @@ -package net.runelite.deob.asm; +package net.runelite.asm.objectwebasm; import java.io.IOException; import java.io.InputStream; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; diff --git a/src/main/java/net/runelite/deob/asm/NonloadingClassWriter.java b/src/main/java/net/runelite/asm/objectwebasm/NonloadingClassWriter.java similarity index 91% rename from src/main/java/net/runelite/deob/asm/NonloadingClassWriter.java rename to src/main/java/net/runelite/asm/objectwebasm/NonloadingClassWriter.java index 4a3ba0c260..496e0e1fcd 100644 --- a/src/main/java/net/runelite/deob/asm/NonloadingClassWriter.java +++ b/src/main/java/net/runelite/asm/objectwebasm/NonloadingClassWriter.java @@ -1,7 +1,7 @@ -package net.runelite.deob.asm; +package net.runelite.asm.objectwebasm; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import org.objectweb.asm.ClassWriter; class NonloadingClassWriter extends ClassWriter diff --git a/src/main/java/net/runelite/deob/pool/Class.java b/src/main/java/net/runelite/asm/pool/Class.java similarity index 92% rename from src/main/java/net/runelite/deob/pool/Class.java rename to src/main/java/net/runelite/asm/pool/Class.java index dc173474ab..81c0977a1f 100644 --- a/src/main/java/net/runelite/deob/pool/Class.java +++ b/src/main/java/net/runelite/asm/pool/Class.java @@ -1,7 +1,7 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.execution.Type; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/pool/ConstantType.java b/src/main/java/net/runelite/asm/pool/ConstantType.java similarity index 96% rename from src/main/java/net/runelite/deob/pool/ConstantType.java rename to src/main/java/net/runelite/asm/pool/ConstantType.java index b01e813cae..fced9ec018 100644 --- a/src/main/java/net/runelite/deob/pool/ConstantType.java +++ b/src/main/java/net/runelite/asm/pool/ConstantType.java @@ -1,4 +1,4 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; public enum ConstantType { diff --git a/src/main/java/net/runelite/deob/pool/Double.java b/src/main/java/net/runelite/asm/pool/Double.java similarity index 91% rename from src/main/java/net/runelite/deob/pool/Double.java rename to src/main/java/net/runelite/asm/pool/Double.java index 0d47d7cfaf..ee0f2855a1 100644 --- a/src/main/java/net/runelite/deob/pool/Double.java +++ b/src/main/java/net/runelite/asm/pool/Double.java @@ -1,7 +1,7 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.execution.Type; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/pool/Field.java b/src/main/java/net/runelite/asm/pool/Field.java similarity index 95% rename from src/main/java/net/runelite/deob/pool/Field.java rename to src/main/java/net/runelite/asm/pool/Field.java index 4c226d2e3a..806654fc4a 100644 --- a/src/main/java/net/runelite/deob/pool/Field.java +++ b/src/main/java/net/runelite/asm/pool/Field.java @@ -1,6 +1,6 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; +import net.runelite.asm.ConstantPool; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/pool/Float.java b/src/main/java/net/runelite/asm/pool/Float.java similarity index 89% rename from src/main/java/net/runelite/deob/pool/Float.java rename to src/main/java/net/runelite/asm/pool/Float.java index 25fb7af5ea..d70e37cbb5 100644 --- a/src/main/java/net/runelite/deob/pool/Float.java +++ b/src/main/java/net/runelite/asm/pool/Float.java @@ -1,7 +1,7 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.execution.Type; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/pool/Integer.java b/src/main/java/net/runelite/asm/pool/Integer.java similarity index 90% rename from src/main/java/net/runelite/deob/pool/Integer.java rename to src/main/java/net/runelite/asm/pool/Integer.java index d0329e43e5..81a284de8e 100644 --- a/src/main/java/net/runelite/deob/pool/Integer.java +++ b/src/main/java/net/runelite/asm/pool/Integer.java @@ -1,7 +1,7 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.execution.Type; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/pool/InterfaceMethod.java b/src/main/java/net/runelite/asm/pool/InterfaceMethod.java similarity index 95% rename from src/main/java/net/runelite/deob/pool/InterfaceMethod.java rename to src/main/java/net/runelite/asm/pool/InterfaceMethod.java index 78c896bcad..2d6b3a3565 100644 --- a/src/main/java/net/runelite/deob/pool/InterfaceMethod.java +++ b/src/main/java/net/runelite/asm/pool/InterfaceMethod.java @@ -1,6 +1,6 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; +import net.runelite.asm.ConstantPool; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/pool/Long.java b/src/main/java/net/runelite/asm/pool/Long.java similarity index 90% rename from src/main/java/net/runelite/deob/pool/Long.java rename to src/main/java/net/runelite/asm/pool/Long.java index 9960bcc33b..df3d3a887b 100644 --- a/src/main/java/net/runelite/deob/pool/Long.java +++ b/src/main/java/net/runelite/asm/pool/Long.java @@ -1,7 +1,7 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.execution.Type; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/pool/Method.java b/src/main/java/net/runelite/asm/pool/Method.java similarity index 95% rename from src/main/java/net/runelite/deob/pool/Method.java rename to src/main/java/net/runelite/asm/pool/Method.java index 091e547fd7..d91dc8f656 100644 --- a/src/main/java/net/runelite/deob/pool/Method.java +++ b/src/main/java/net/runelite/asm/pool/Method.java @@ -1,6 +1,6 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; +import net.runelite.asm.ConstantPool; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/pool/NameAndType.java b/src/main/java/net/runelite/asm/pool/NameAndType.java similarity index 94% rename from src/main/java/net/runelite/deob/pool/NameAndType.java rename to src/main/java/net/runelite/asm/pool/NameAndType.java index 204fcd3da7..a8f9628b86 100644 --- a/src/main/java/net/runelite/deob/pool/NameAndType.java +++ b/src/main/java/net/runelite/asm/pool/NameAndType.java @@ -1,8 +1,8 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.signature.Signature; -import net.runelite.deob.signature.Type; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.signature.Signature; +import net.runelite.asm.signature.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/pool/PoolEntry.java b/src/main/java/net/runelite/asm/pool/PoolEntry.java similarity index 87% rename from src/main/java/net/runelite/deob/pool/PoolEntry.java rename to src/main/java/net/runelite/asm/pool/PoolEntry.java index 889920338c..2d7e7efe0f 100644 --- a/src/main/java/net/runelite/deob/pool/PoolEntry.java +++ b/src/main/java/net/runelite/asm/pool/PoolEntry.java @@ -1,10 +1,10 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; import java.io.DataOutputStream; import java.io.IOException; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.execution.Type; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.execution.Type; public abstract class PoolEntry { diff --git a/src/main/java/net/runelite/deob/pool/String.java b/src/main/java/net/runelite/asm/pool/String.java similarity index 92% rename from src/main/java/net/runelite/deob/pool/String.java rename to src/main/java/net/runelite/asm/pool/String.java index 78898aef49..12d717e054 100644 --- a/src/main/java/net/runelite/deob/pool/String.java +++ b/src/main/java/net/runelite/asm/pool/String.java @@ -1,7 +1,7 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; -import net.runelite.deob.execution.Type; +import net.runelite.asm.ConstantPool; +import net.runelite.asm.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/pool/UTF8.java b/src/main/java/net/runelite/asm/pool/UTF8.java similarity index 93% rename from src/main/java/net/runelite/deob/pool/UTF8.java rename to src/main/java/net/runelite/asm/pool/UTF8.java index 73b3da1768..90272edb4e 100644 --- a/src/main/java/net/runelite/deob/pool/UTF8.java +++ b/src/main/java/net/runelite/asm/pool/UTF8.java @@ -1,6 +1,6 @@ -package net.runelite.deob.pool; +package net.runelite.asm.pool; -import net.runelite.deob.ConstantPool; +import net.runelite.asm.ConstantPool; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/net/runelite/deob/signature/Signature.java b/src/main/java/net/runelite/asm/signature/Signature.java similarity index 93% rename from src/main/java/net/runelite/deob/signature/Signature.java rename to src/main/java/net/runelite/asm/signature/Signature.java index 60ed0abeec..0bcefb94e0 100644 --- a/src/main/java/net/runelite/deob/signature/Signature.java +++ b/src/main/java/net/runelite/asm/signature/Signature.java @@ -1,4 +1,4 @@ -package net.runelite.deob.signature; +package net.runelite.asm.signature; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/net/runelite/deob/signature/Type.java b/src/main/java/net/runelite/asm/signature/Type.java similarity index 91% rename from src/main/java/net/runelite/deob/signature/Type.java rename to src/main/java/net/runelite/asm/signature/Type.java index e692fb21b9..03d67a4a83 100644 --- a/src/main/java/net/runelite/deob/signature/Type.java +++ b/src/main/java/net/runelite/asm/signature/Type.java @@ -1,4 +1,4 @@ -package net.runelite.deob.signature; +package net.runelite.asm.signature; import java.util.Objects; diff --git a/src/main/java/net/runelite/deob/Deob.java b/src/main/java/net/runelite/deob/Deob.java index b78e3e15a8..a881405a0d 100644 --- a/src/main/java/net/runelite/deob/Deob.java +++ b/src/main/java/net/runelite/deob/Deob.java @@ -1,5 +1,6 @@ package net.runelite.deob; +import net.runelite.asm.ClassGroup; import java.io.File; import java.io.IOException; import net.runelite.deob.deobfuscators.ConstantParameter; @@ -17,7 +18,7 @@ import net.runelite.deob.deobfuscators.arithmetic.ModArith; import net.runelite.deob.deobfuscators.arithmetic.MultiplicationDeobfuscator; import net.runelite.deob.deobfuscators.arithmetic.MultiplyOneDeobfuscator; import net.runelite.deob.deobfuscators.arithmetic.MultiplyZeroDeobfuscator; -import net.runelite.deob.execution.Execution; +import net.runelite.asm.execution.Execution; import net.runelite.deob.util.JarUtil; public class Deob diff --git a/src/main/java/net/runelite/deob/Deobfuscator.java b/src/main/java/net/runelite/deob/Deobfuscator.java index 4ddf4d1709..d1fc65e86a 100644 --- a/src/main/java/net/runelite/deob/Deobfuscator.java +++ b/src/main/java/net/runelite/deob/Deobfuscator.java @@ -1,5 +1,7 @@ package net.runelite.deob; +import net.runelite.asm.ClassGroup; + public interface Deobfuscator { public void run(ClassGroup group); diff --git a/src/main/java/net/runelite/deob/attributes/code/InstructionType.java b/src/main/java/net/runelite/deob/attributes/code/InstructionType.java deleted file mode 100644 index 094a0d570a..0000000000 --- a/src/main/java/net/runelite/deob/attributes/code/InstructionType.java +++ /dev/null @@ -1,431 +0,0 @@ -package net.runelite.deob.attributes.code; - -import net.runelite.deob.attributes.code.instructions.AALoad; -import net.runelite.deob.attributes.code.instructions.AAStore; -import net.runelite.deob.attributes.code.instructions.AConstNull; -import net.runelite.deob.attributes.code.instructions.ALoad; -import net.runelite.deob.attributes.code.instructions.ALoad_0; -import net.runelite.deob.attributes.code.instructions.ALoad_1; -import net.runelite.deob.attributes.code.instructions.ALoad_2; -import net.runelite.deob.attributes.code.instructions.ALoad_3; -import net.runelite.deob.attributes.code.instructions.ANewArray; -import net.runelite.deob.attributes.code.instructions.AStore; -import net.runelite.deob.attributes.code.instructions.AStore_0; -import net.runelite.deob.attributes.code.instructions.AStore_1; -import net.runelite.deob.attributes.code.instructions.AStore_2; -import net.runelite.deob.attributes.code.instructions.AStore_3; -import net.runelite.deob.attributes.code.instructions.AThrow; -import net.runelite.deob.attributes.code.instructions.ArrayLength; -import net.runelite.deob.attributes.code.instructions.BALoad; -import net.runelite.deob.attributes.code.instructions.BAStore; -import net.runelite.deob.attributes.code.instructions.BiPush; -import net.runelite.deob.attributes.code.instructions.CALoad; -import net.runelite.deob.attributes.code.instructions.CAStore; -import net.runelite.deob.attributes.code.instructions.CheckCast; -import net.runelite.deob.attributes.code.instructions.D2F; -import net.runelite.deob.attributes.code.instructions.D2I; -import net.runelite.deob.attributes.code.instructions.D2L; -import net.runelite.deob.attributes.code.instructions.DALoad; -import net.runelite.deob.attributes.code.instructions.DAStore; -import net.runelite.deob.attributes.code.instructions.DAdd; -import net.runelite.deob.attributes.code.instructions.DCmpG; -import net.runelite.deob.attributes.code.instructions.DCmpL; -import net.runelite.deob.attributes.code.instructions.DConst_0; -import net.runelite.deob.attributes.code.instructions.DConst_1; -import net.runelite.deob.attributes.code.instructions.DDiv; -import net.runelite.deob.attributes.code.instructions.DLoad; -import net.runelite.deob.attributes.code.instructions.DLoad_0; -import net.runelite.deob.attributes.code.instructions.DLoad_1; -import net.runelite.deob.attributes.code.instructions.DLoad_2; -import net.runelite.deob.attributes.code.instructions.DLoad_3; -import net.runelite.deob.attributes.code.instructions.DMul; -import net.runelite.deob.attributes.code.instructions.DNeg; -import net.runelite.deob.attributes.code.instructions.DRem; -import net.runelite.deob.attributes.code.instructions.DStore; -import net.runelite.deob.attributes.code.instructions.DStore_0; -import net.runelite.deob.attributes.code.instructions.DStore_1; -import net.runelite.deob.attributes.code.instructions.DStore_2; -import net.runelite.deob.attributes.code.instructions.DStore_3; -import net.runelite.deob.attributes.code.instructions.DSub; -import net.runelite.deob.attributes.code.instructions.Dup; -import net.runelite.deob.attributes.code.instructions.Dup2; -import net.runelite.deob.attributes.code.instructions.Dup2_X1; -import net.runelite.deob.attributes.code.instructions.Dup2_X2; -import net.runelite.deob.attributes.code.instructions.Dup_X1; -import net.runelite.deob.attributes.code.instructions.Dup_X2; -import net.runelite.deob.attributes.code.instructions.F2D; -import net.runelite.deob.attributes.code.instructions.F2I; -import net.runelite.deob.attributes.code.instructions.F2L; -import net.runelite.deob.attributes.code.instructions.FALoad; -import net.runelite.deob.attributes.code.instructions.FAStore; -import net.runelite.deob.attributes.code.instructions.FAdd; -import net.runelite.deob.attributes.code.instructions.FCmpG; -import net.runelite.deob.attributes.code.instructions.FCmpL; -import net.runelite.deob.attributes.code.instructions.FConst_0; -import net.runelite.deob.attributes.code.instructions.FConst_1; -import net.runelite.deob.attributes.code.instructions.FConst_2; -import net.runelite.deob.attributes.code.instructions.FDiv; -import net.runelite.deob.attributes.code.instructions.FLoad; -import net.runelite.deob.attributes.code.instructions.FLoad_0; -import net.runelite.deob.attributes.code.instructions.FLoad_1; -import net.runelite.deob.attributes.code.instructions.FLoad_2; -import net.runelite.deob.attributes.code.instructions.FLoad_3; -import net.runelite.deob.attributes.code.instructions.FMul; -import net.runelite.deob.attributes.code.instructions.FNeg; -import net.runelite.deob.attributes.code.instructions.FRem; -import net.runelite.deob.attributes.code.instructions.FStore; -import net.runelite.deob.attributes.code.instructions.FStore_0; -import net.runelite.deob.attributes.code.instructions.FStore_1; -import net.runelite.deob.attributes.code.instructions.FStore_2; -import net.runelite.deob.attributes.code.instructions.FStore_3; -import net.runelite.deob.attributes.code.instructions.FSub; -import net.runelite.deob.attributes.code.instructions.GetField; -import net.runelite.deob.attributes.code.instructions.GetStatic; -import net.runelite.deob.attributes.code.instructions.Goto; -import net.runelite.deob.attributes.code.instructions.GotoW; -import net.runelite.deob.attributes.code.instructions.I2B; -import net.runelite.deob.attributes.code.instructions.I2C; -import net.runelite.deob.attributes.code.instructions.I2D; -import net.runelite.deob.attributes.code.instructions.I2F; -import net.runelite.deob.attributes.code.instructions.I2L; -import net.runelite.deob.attributes.code.instructions.I2S; -import net.runelite.deob.attributes.code.instructions.IALoad; -import net.runelite.deob.attributes.code.instructions.IAStore; -import net.runelite.deob.attributes.code.instructions.IAdd; -import net.runelite.deob.attributes.code.instructions.IAnd; -import net.runelite.deob.attributes.code.instructions.IConst_0; -import net.runelite.deob.attributes.code.instructions.IConst_1; -import net.runelite.deob.attributes.code.instructions.IConst_2; -import net.runelite.deob.attributes.code.instructions.IConst_3; -import net.runelite.deob.attributes.code.instructions.IConst_4; -import net.runelite.deob.attributes.code.instructions.IConst_5; -import net.runelite.deob.attributes.code.instructions.IConst_M1; -import net.runelite.deob.attributes.code.instructions.IDiv; -import net.runelite.deob.attributes.code.instructions.IInc; -import net.runelite.deob.attributes.code.instructions.ILoad; -import net.runelite.deob.attributes.code.instructions.ILoad_0; -import net.runelite.deob.attributes.code.instructions.ILoad_1; -import net.runelite.deob.attributes.code.instructions.ILoad_2; -import net.runelite.deob.attributes.code.instructions.ILoad_3; -import net.runelite.deob.attributes.code.instructions.IMul; -import net.runelite.deob.attributes.code.instructions.INeg; -import net.runelite.deob.attributes.code.instructions.IOr; -import net.runelite.deob.attributes.code.instructions.IRem; -import net.runelite.deob.attributes.code.instructions.IShL; -import net.runelite.deob.attributes.code.instructions.IShR; -import net.runelite.deob.attributes.code.instructions.IStore; -import net.runelite.deob.attributes.code.instructions.IStore_0; -import net.runelite.deob.attributes.code.instructions.IStore_1; -import net.runelite.deob.attributes.code.instructions.IStore_2; -import net.runelite.deob.attributes.code.instructions.IStore_3; -import net.runelite.deob.attributes.code.instructions.ISub; -import net.runelite.deob.attributes.code.instructions.IUShR; -import net.runelite.deob.attributes.code.instructions.IXor; -import net.runelite.deob.attributes.code.instructions.IfACmpEq; -import net.runelite.deob.attributes.code.instructions.IfACmpNe; -import net.runelite.deob.attributes.code.instructions.IfICmpEq; -import net.runelite.deob.attributes.code.instructions.IfCmpGe; -import net.runelite.deob.attributes.code.instructions.IfCmpGt; -import net.runelite.deob.attributes.code.instructions.IfCmpLe; -import net.runelite.deob.attributes.code.instructions.IfCmpLt; -import net.runelite.deob.attributes.code.instructions.IfICmpNe; -import net.runelite.deob.attributes.code.instructions.IfEq; -import net.runelite.deob.attributes.code.instructions.IfGe; -import net.runelite.deob.attributes.code.instructions.IfGt; -import net.runelite.deob.attributes.code.instructions.IfLe; -import net.runelite.deob.attributes.code.instructions.IfLt; -import net.runelite.deob.attributes.code.instructions.IfNe; -import net.runelite.deob.attributes.code.instructions.IfNonNull; -import net.runelite.deob.attributes.code.instructions.IfNull; -import net.runelite.deob.attributes.code.instructions.InstanceOf; -import net.runelite.deob.attributes.code.instructions.InvokeInterface; -import net.runelite.deob.attributes.code.instructions.InvokeSpecial; -import net.runelite.deob.attributes.code.instructions.InvokeStatic; -import net.runelite.deob.attributes.code.instructions.InvokeVirtual; -import net.runelite.deob.attributes.code.instructions.L2D; -import net.runelite.deob.attributes.code.instructions.L2F; -import net.runelite.deob.attributes.code.instructions.L2I; -import net.runelite.deob.attributes.code.instructions.LALoad; -import net.runelite.deob.attributes.code.instructions.LAStore; -import net.runelite.deob.attributes.code.instructions.LAdd; -import net.runelite.deob.attributes.code.instructions.LAnd; -import net.runelite.deob.attributes.code.instructions.LCmp; -import net.runelite.deob.attributes.code.instructions.LConst_0; -import net.runelite.deob.attributes.code.instructions.LConst_1; -import net.runelite.deob.attributes.code.instructions.LDC2_W; -import net.runelite.deob.attributes.code.instructions.LDC_W; -import net.runelite.deob.attributes.code.instructions.LDiv; -import net.runelite.deob.attributes.code.instructions.LLoad; -import net.runelite.deob.attributes.code.instructions.LLoad_0; -import net.runelite.deob.attributes.code.instructions.LLoad_1; -import net.runelite.deob.attributes.code.instructions.LLoad_2; -import net.runelite.deob.attributes.code.instructions.LLoad_3; -import net.runelite.deob.attributes.code.instructions.LMul; -import net.runelite.deob.attributes.code.instructions.LNeg; -import net.runelite.deob.attributes.code.instructions.LOr; -import net.runelite.deob.attributes.code.instructions.LRem; -import net.runelite.deob.attributes.code.instructions.LShL; -import net.runelite.deob.attributes.code.instructions.LShR; -import net.runelite.deob.attributes.code.instructions.LStore; -import net.runelite.deob.attributes.code.instructions.LStore_0; -import net.runelite.deob.attributes.code.instructions.LStore_1; -import net.runelite.deob.attributes.code.instructions.LStore_2; -import net.runelite.deob.attributes.code.instructions.LStore_3; -import net.runelite.deob.attributes.code.instructions.LSub; -import net.runelite.deob.attributes.code.instructions.LUShR; -import net.runelite.deob.attributes.code.instructions.LXor; -import net.runelite.deob.attributes.code.instructions.LookupSwitch; -import net.runelite.deob.attributes.code.instructions.MonitorEnter; -import net.runelite.deob.attributes.code.instructions.MonitorExit; -import net.runelite.deob.attributes.code.instructions.MultiANewArray; -import net.runelite.deob.attributes.code.instructions.NOP; -import net.runelite.deob.attributes.code.instructions.New; -import net.runelite.deob.attributes.code.instructions.NewArray; -import net.runelite.deob.attributes.code.instructions.Pop; -import net.runelite.deob.attributes.code.instructions.Pop2; -import net.runelite.deob.attributes.code.instructions.PutField; -import net.runelite.deob.attributes.code.instructions.PutStatic; -import net.runelite.deob.attributes.code.instructions.Return; -import net.runelite.deob.attributes.code.instructions.SALoad; -import net.runelite.deob.attributes.code.instructions.SAStore; -import net.runelite.deob.attributes.code.instructions.SiPush; -import net.runelite.deob.attributes.code.instructions.Swap; -import net.runelite.deob.attributes.code.instructions.TableSwitch; -import net.runelite.deob.attributes.code.instructions.VReturn; -import net.runelite.deob.attributes.code.instructions.Wide; - -public enum InstructionType -{ - NOP(0x00, "nop", NOP.class), - ACONST_NULL(0x01, "aconst_null", AConstNull.class), - ICONST_M1(0x02, "iconst_m1", IConst_M1.class), - ICONST_0(0x03, "iconst_0", IConst_0.class), - ICONST_1(0x04, "iconst_1", IConst_1.class), - ICONST_2(0x05, "iconst_2", IConst_2.class), - ICONST_3(0x06, "iconst_3", IConst_3.class), - ICONST_4(0x07, "iconst_4", IConst_4.class), - ICONST_5(0x08, "iconst_5", IConst_5.class), - LCONST_0(0x09, "lconst_0", LConst_0.class), - LCONST_1(0x0a, "lconst_1", LConst_1.class), - FCONST_0(0x0b, "fconst_0", FConst_0.class), - FCONST_1(0x0c, "fconst_1", FConst_1.class), - FCONST_2(0x0d, "fconst_2", FConst_2.class), - DCONST_0(0x0e, "dconst_0", DConst_0.class), - DCONST_1(0x0f, "dconst_1", DConst_1.class), - BIPUSH(0x10, "bipush", BiPush.class), - SIPUSH(0x11, "sipush", SiPush.class), - LDC(0x12, "ldc_w", LDC_W.class), - LDC_W(0x13, "ldc_w", LDC_W.class), - LDC2_W(0x14, "ldc2_w", LDC2_W.class), - ILOAD(0x15, "iload", ILoad.class), - LLOAD(0x16, "lload", LLoad.class), - FLOAD(0x17, "fload", FLoad.class), - DLOAD(0x18, "dload", DLoad.class), - ALOAD(0x19, "aload", ALoad.class), - ILOAD_0(0x1a, "iload_0", ILoad_0.class), - ILOAD_1(0x1b, "iload_1", ILoad_1.class), - ILOAD_2(0x1c, "iload_2", ILoad_2.class), - ILOAD_3(0x1d, "iload_3", ILoad_3.class), - LLOAD_0(0x1e, "lload_0", LLoad_0.class), - LLOAD_1(0x1f, "lload_1", LLoad_1.class), - LLOAD_2(0x20, "lload_2", LLoad_2.class), - LLOAD_3(0x21, "lload_3", LLoad_3.class), - FLOAD_0(0x22, "fload_0", FLoad_0.class), - FLOAD_1(0x23, "fload_1", FLoad_1.class), - FLOAD_2(0x24, "fload_2", FLoad_2.class), - FLOAD_3(0x25, "fload_3", FLoad_3.class), - DLOAD_0(0x26, "dload_0", DLoad_0.class), - DLOAD_1(0x27, "dload_1", DLoad_1.class), - DLOAD_2(0x28, "dload_2", DLoad_2.class), - DLOAD_3(0x29, "dload_3", DLoad_3.class), - ALOAD_0(0x2a, "aload_0", ALoad_0.class), - ALOAD_1(0x2b, "aload_1", ALoad_1.class), - ALOAD_2(0x2c, "aload_2", ALoad_2.class), - ALOAD_3(0x2d, "aload_3", ALoad_3.class), - IALOAD(0x2e, "iaload", IALoad.class), - LALOAD(0x2f, "laload", LALoad.class), - FALOAD(0x30, "faload", FALoad.class), - DALOAD(0x31, "daload", DALoad.class), - AALOAD(0x32, "aaload", AALoad.class), - BALOAD(0x33, "baload", BALoad.class), - CALOAD(0x34, "caload", CALoad.class), - SALOAD(0x35, "saload", SALoad.class), - ISTORE(0x36, "istore", IStore.class), - LSTORE(0x37, "lstore", LStore.class), - FSTORE(0x38, "fstore", FStore.class), - DSTORE(0x39, "dstore", DStore.class), - ASTORE(0x3a, "astore", AStore.class), - ISTORE_0(0x3b, "istore_0", IStore_0.class), - ISTORE_1(0x3c, "istore_1", IStore_1.class), - ISTORE_2(0x3d, "istore_2", IStore_2.class), - ISTORE_3(0x3e, "istore_3", IStore_3.class), - LSTORE_0(0x3f, "lstore_0", LStore_0.class), - LSTORE_1(0x40, "lstore_1", LStore_1.class), - LSTORE_2(0x41, "lstore_2", LStore_2.class), - LSTORE_3(0x42, "lstore_3", LStore_3.class), - FSTORE_0(0x43, "fstore_0", FStore_0.class), - FSTORE_1(0x44, "fstore_1", FStore_1.class), - FSTORE_2(0x45, "fstore_2", FStore_2.class), - FSTORE_3(0x46, "fstore_3", FStore_3.class), - DST0RE_0(0x47, "dstore_0", DStore_0.class), - DSTORE_1(0x48, "dstore_1", DStore_1.class), - DSTORE_2(0x49, "dstore_2", DStore_2.class), - DSTORE_3(0x4a, "dstore_3", DStore_3.class), - ASTORE_0(0x4b, "astore_0", AStore_0.class), - ASTORE_1(0x4c, "astore_1", AStore_1.class), - ASTORE_2(0x4d, "astore_2", AStore_2.class), - ASTORE_3(0x4e, "astore_3", AStore_3.class), - IASTORE(0x4f, "iastore", IAStore.class), - LASTORE(0x50, "lastore", LAStore.class), - FASTORE(0x51, "fastore", FAStore.class), - DASTORE(0x52, "dastore", DAStore.class), - AASTORE(0x53, "aastore", AAStore.class), - BASTORE(0x54, "bastore", BAStore.class), - CASTORE(0x55, "castore", CAStore.class), - SASTORE(0x56, "sastore", SAStore.class), - POP(0x57, "pop", Pop.class), - POP2(0x58, "pop2", Pop2.class), - DUP(0x59, "dup", Dup.class), - DUP_X1(0x5a, "dup_x1", Dup_X1.class), - DUP_X2(0x5b, "dup_x2", Dup_X2.class), - DUP2(0x5c, "dup2", Dup2.class), - DUP2_X1(0x5d, "dup2_x1", Dup2_X1.class), - DUP2_X2(0x5e, "dup2_x2", Dup2_X2.class), - SWAP(0x5f, "swap", Swap.class), - IADD(0x60, "iadd", IAdd.class), - LADD(0x61, "ladd", LAdd.class), - FADD(0x62, "fadd", FAdd.class), - DADD(0x63, "dadd", DAdd.class), - ISUB(0x64, "isub", ISub.class), - LSUB(0x65, "lsub", LSub.class), - FSUB(0x66, "fsub", FSub.class), - DSUB(0x67, "dsub", DSub.class), - IMUL(0x68, "imul", IMul.class), - LMUL(0x69, "lmul", LMul.class), - FMUL(0x6a, "fmul", FMul.class), - DMUL(0x6b, "dmul", DMul.class), - IDIV(0x6c, "idiv", IDiv.class), - LDIV(0x6d, "ldiv", LDiv.class), - FDIV(0x6e, "fdiv", FDiv.class), - DDIV(0x6f, "ddiv", DDiv.class), - IREM(0x70, "irem", IRem.class), - LREM(0x71, "lrem", LRem.class), - FREM(0x72, "frem", FRem.class), - DREM(0x73, "drem", DRem.class), - INEG(0x74, "ineg", INeg.class), - LNEG(0x75, "lneg", LNeg.class), - FNEG(0x76, "fneg", FNeg.class), - DNEG(0x77, "dneg", DNeg.class), - ISHL(0x78, "ishl", IShL.class), - LSHL(0x79, "lshl", LShL.class), - ISHR(0x7a, "ishr", IShR.class), - LSHR(0x7b, "lshr", LShR.class), - IUSHR(0x7c, "iushr", IUShR.class), - LUSHR(0x7d, "lushr", LUShR.class), - IAND(0x7e, "iand", IAnd.class), - LAND(0x7f, "land", LAnd.class), - IOR(0x80, "ior", IOr.class), - LOR(0x81, "lor", LOr.class), - IXOR(0x82, "ixor", IXor.class), - LXOR(0x83, "lxor", LXor.class), - IINC(0x84, "iinc", IInc.class), - I2L(0x85, "i2l", I2L.class), - I2F(0x86, "i2f", I2F.class), - I2D(0x87, "i2d", I2D.class), - L2I(0x88, "l2i", L2I.class), - L2F(0x89, "l2f", L2F.class), - L2D(0x8a, "l2d", L2D.class), - F2I(0x8b, "f2i", F2I.class), - F2L(0x8c, "f2l", F2L.class), - F2D(0x8d, "f2d", F2D.class), - D2I(0x8e, "d2i", D2I.class), - D2L(0x8f, "d2l", D2L.class), - D2F(0x90, "d2f", D2F.class), - I2B(0x91, "i2b", I2B.class), - I2C(0x92, "i2c", I2C.class), - I2S(0x93, "i2s", I2S.class), - LCMP(0x94, "lcmp", LCmp.class), - FCMPL(0x95, "fcmpl", FCmpL.class), - FCMPG(0x96, "fcmpg", FCmpG.class), - DCMPL(0x97, "dcmpl", DCmpL.class), - DCMPG(0x98, "dcmpg", DCmpG.class), - IFEQ(0x99, "ifeq", IfEq.class), - IFNE(0x9a, "ifne", IfNe.class), - IFLT(0x9b, "iflt", IfLt.class), - IFGE(0x9c, "ifge", IfGe.class), - IFGT(0x9d, "ifgt", IfGt.class), - IFLE(0x9e, "ifle", IfLe.class), - IF_ICMPEQ(0x9f, "if_icmpeq", IfICmpEq.class), - IF_ICMPNE(0xa0, "if_icmpne", IfICmpNe.class), - IF_ICMPLT(0xa1, "if_cmplt", IfCmpLt.class), - IF_ICMPGE(0xa2, "if_icmpge", IfCmpGe.class), - IF_ICMPGT(0xa3, "if_icmpgt", IfCmpGt.class), - IF_ICMPLE(0xa4, "if_icmple", IfCmpLe.class), - IF_ACMPEQ(0xa5, "if_acmpeq", IfACmpEq.class), - IF_ACMPNE(0xa6, "if_acmpne", IfACmpNe.class), - GOTO(0xa7, "goto", Goto.class), - TABLESWITCH(0xaa, "tableswitch", TableSwitch.class), - LOOKUPSWITCH(0xab, "lookupswitch", LookupSwitch.class), - IRETURN(0xac, "ireturn", Return.class), - LRETURN(0xad, "lreturn", Return.class), - FRETURN(0xae, "freturn", Return.class), - DRETURN(0xaf, "dreturn", Return.class), - ARETURN(0xb0, "areturn", Return.class), - RETURN(0xb1, "return", VReturn.class), - GETSTATIC(0xb2, "getstatic", GetStatic.class), - PUTSTATIC(0xb3, "putstatic", PutStatic.class), - GETFIELD(0xb4, "getfield", GetField.class), - PUTFIELD(0xb5, "putfield", PutField.class), - INVOKEVIRTUAL(0xb6, "invokevirtual", InvokeVirtual.class), - INVOKESPECIAL(0xb7, "invokespecial", InvokeSpecial.class), - INVOKESTATIC(0xb8, "invokestatic", InvokeStatic.class), - INVOKEINTERFACE(0xb9, "invokeinterface", InvokeInterface.class), - NEW(0xbb, "new", New.class), - NEWARRAY(0xbc, "newarray", NewArray.class), - ANEWARRAY(0xbd, "anewarray", ANewArray.class), - ARRAYLENGTH(0xbe, "arraylength", ArrayLength.class), - ATHROW(0xbf, "athrow", AThrow.class), - CHECKCAST(0xc0, "checkcast", CheckCast.class), - INSTANCEOf(0xc1, "instanceof", InstanceOf.class), - MONITORENTER(0xc2, "monitorenter", MonitorEnter.class), - MONITOREXIT(0xc3, "monitorexit", MonitorExit.class), - WIDE(0xc4, "wide", Wide.class), - MULTIANEWARRAY(0xc5, "multianewarray", MultiANewArray.class), - IFNULL(0xc6, "ifnull", IfNull.class), - IFNONNULL(0xc7, "ifnonnull", IfNonNull.class), - GOTO_W(0xc8, "goto_w", GotoW.class); - - private byte code; - private String name; - private Class clazz; - - InstructionType(int op, String name, Class clazz) - { - this.code = (byte) op; - this.name = name; - this.clazz = clazz; - } - - public byte getCode() - { - return code; - } - - public String getName() - { - return name; - } - - public Class getInstructionClass() - { - return clazz; - } - - public static InstructionType findInstructionFromCode(byte code) - { - for (InstructionType t : InstructionType.values()) - if (t.getCode() == code) - return t; - return null; - } -} diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/ArrayLoad.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/ArrayLoad.java deleted file mode 100644 index d7336a8f0a..0000000000 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/ArrayLoad.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.runelite.deob.attributes.code.instruction.types; - -public interface ArrayLoad -{ - -} diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/ComparisonInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/ComparisonInstruction.java deleted file mode 100644 index f771601273..0000000000 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/ComparisonInstruction.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.runelite.deob.attributes.code.instruction.types; - -public interface ComparisonInstruction -{ - -} diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/FieldInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/FieldInstruction.java deleted file mode 100644 index f76e776e37..0000000000 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/FieldInstruction.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.runelite.deob.attributes.code.instruction.types; - -import net.runelite.deob.pool.Field; - -public interface FieldInstruction -{ - public Field getField(); - - public net.runelite.deob.Field getMyField(); -} diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/PushConstantInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/PushConstantInstruction.java deleted file mode 100644 index de451ab1fe..0000000000 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/PushConstantInstruction.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.runelite.deob.attributes.code.instruction.types; - -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.pool.PoolEntry; - -public interface PushConstantInstruction -{ - public PoolEntry getConstant(); - - public Instruction setConstant(PoolEntry entry); -} diff --git a/src/main/java/net/runelite/deob/attributes/code/instruction/types/ReturnInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/ReturnInstruction.java deleted file mode 100644 index 85a982448f..0000000000 --- a/src/main/java/net/runelite/deob/attributes/code/instruction/types/ReturnInstruction.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.runelite.deob.attributes.code.instruction.types; - -public interface ReturnInstruction -{ - -} diff --git a/src/main/java/net/runelite/deob/deobfuscators/ConstantParameter.java b/src/main/java/net/runelite/deob/deobfuscators/ConstantParameter.java index 4897e999b7..1f0edb4755 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/ConstantParameter.java +++ b/src/main/java/net/runelite/deob/deobfuscators/ConstantParameter.java @@ -1,22 +1,22 @@ package net.runelite.deob.deobfuscators; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.attributes.code.instructions.Goto; -import net.runelite.deob.attributes.code.instructions.If; -import net.runelite.deob.attributes.code.instructions.If0; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; +import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; +import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; +import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instructions.Goto; +import net.runelite.asm.attributes.code.instructions.If; +import net.runelite.asm.attributes.code.instructions.If0; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -26,11 +26,11 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; -import net.runelite.deob.attributes.Annotations; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.attributes.annotation.Annotation; -import net.runelite.deob.attributes.annotation.Element; -import net.runelite.deob.signature.Type; +import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.attributes.annotation.Annotation; +import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.signature.Type; import org.apache.commons.collections4.map.MultiValueMap; class ConstantMethodParameter @@ -529,11 +529,11 @@ public class ConstantParameter implements Deobfuscator if (annotations != null && annotations.find(OBFUSCATED_SIGNATURE) != null) return; - Annotation annotation = attributes.addAnnotation(OBFUSCATED_SIGNATURE, "signature", new net.runelite.deob.pool.UTF8(m.getDescriptor().toString())); + Annotation annotation = attributes.addAnnotation(OBFUSCATED_SIGNATURE, "signature", new net.runelite.asm.pool.UTF8(m.getDescriptor().toString())); Element element = new Element(annotation); element.setType(new Type("garbageValue")); - element.setValue(new net.runelite.deob.pool.UTF8(value.toString())); + element.setValue(new net.runelite.asm.pool.UTF8(value.toString())); annotation.addElement(element); } diff --git a/src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java b/src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java index e1667a322f..260f2a067b 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java +++ b/src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java @@ -1,21 +1,21 @@ package net.runelite.deob.deobfuscators; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Field; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.AttributeType; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.ConstantValue; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.FieldInstruction; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.deob.attributes.code.instructions.LDC_W; -import net.runelite.deob.attributes.code.instructions.NOP; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.AttributeType; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.ConstantValue; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; +import net.runelite.asm.attributes.code.instructions.LDC_W; +import net.runelite.asm.attributes.code.instructions.NOP; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/net/runelite/deob/deobfuscators/FieldMover.java b/src/main/java/net/runelite/deob/deobfuscators/FieldMover.java index f91ecaf800..532256538d 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/FieldMover.java +++ b/src/main/java/net/runelite/deob/deobfuscators/FieldMover.java @@ -1,31 +1,31 @@ package net.runelite.deob.deobfuscators; import java.util.ArrayList; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Field; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.instruction.types.FieldInstruction; -import net.runelite.deob.pool.NameAndType; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; +import net.runelite.asm.pool.NameAndType; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TreeMap; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instructions.Goto; -import net.runelite.deob.attributes.code.instructions.PutStatic; -import net.runelite.deob.attributes.code.instructions.VReturn; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.attributes.code.InstructionType; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instructions.Goto; +import net.runelite.asm.attributes.code.instructions.PutStatic; +import net.runelite.asm.attributes.code.instructions.VReturn; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.signature.Signature; import org.apache.commons.collections4.map.MultiValueMap; public class FieldMover implements Deobfuscator @@ -153,8 +153,8 @@ public class FieldMover implements Deobfuscator { assert field.getFields().getClassFile() != to; - net.runelite.deob.pool.Field newField = new net.runelite.deob.pool.Field( - new net.runelite.deob.pool.Class(to.getName()), + net.runelite.asm.pool.Field newField = new net.runelite.asm.pool.Field( + new net.runelite.asm.pool.Class(to.getName()), new NameAndType(field.getName(), field.getType()) ); diff --git a/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java b/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java index ee9d890341..9240ffb322 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java +++ b/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java @@ -2,23 +2,23 @@ package net.runelite.deob.deobfuscators; import java.util.List; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.ComparisonInstruction; -import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.deob.attributes.code.instructions.AThrow; -import net.runelite.deob.attributes.code.instructions.Goto; -import net.runelite.deob.attributes.code.instructions.If; -import net.runelite.deob.attributes.code.instructions.If0; -import net.runelite.deob.attributes.code.instructions.New; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.ComparisonInstruction; +import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; +import net.runelite.asm.attributes.code.instructions.AThrow; +import net.runelite.asm.attributes.code.instructions.Goto; +import net.runelite.asm.attributes.code.instructions.If; +import net.runelite.asm.attributes.code.instructions.If0; +import net.runelite.asm.attributes.code.instructions.New; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; public class IllegalStateExceptions implements Deobfuscator { @@ -53,7 +53,7 @@ public class IllegalStateExceptions implements Deobfuscator continue; New new2 = (New) ins2; - net.runelite.deob.pool.Class clazz = new2.getNewClass(); + net.runelite.asm.pool.Class clazz = new2.getNewClass(); if (!clazz.getName().equals("java/lang/IllegalStateException")) continue; diff --git a/src/main/java/net/runelite/deob/deobfuscators/MethodInliner.java b/src/main/java/net/runelite/deob/deobfuscators/MethodInliner.java index f3aa92eee9..39169bac7f 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/MethodInliner.java +++ b/src/main/java/net/runelite/deob/deobfuscators/MethodInliner.java @@ -1,33 +1,33 @@ package net.runelite.deob.deobfuscators; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.ReturnInstruction; -import net.runelite.deob.attributes.code.instructions.AStore; -import net.runelite.deob.attributes.code.instructions.DStore; -import net.runelite.deob.attributes.code.instructions.FStore; -import net.runelite.deob.attributes.code.instructions.Goto; -import net.runelite.deob.attributes.code.instructions.IStore; -import net.runelite.deob.attributes.code.instructions.InvokeStatic; -import net.runelite.deob.attributes.code.instructions.LStore; -import net.runelite.deob.attributes.code.instructions.NOP; -import net.runelite.deob.signature.Signature; -import net.runelite.deob.signature.Type; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; +import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; +import net.runelite.asm.attributes.code.instructions.AStore; +import net.runelite.asm.attributes.code.instructions.DStore; +import net.runelite.asm.attributes.code.instructions.FStore; +import net.runelite.asm.attributes.code.instructions.Goto; +import net.runelite.asm.attributes.code.instructions.IStore; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.attributes.code.instructions.LStore; +import net.runelite.asm.attributes.code.instructions.NOP; +import net.runelite.asm.signature.Signature; +import net.runelite.asm.signature.Type; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import net.runelite.deob.attributes.code.Exceptions; -import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; -import net.runelite.deob.attributes.code.instructions.If; +import net.runelite.asm.attributes.code.Exceptions; +import net.runelite.asm.attributes.code.instruction.types.JumpingInstruction; +import net.runelite.asm.attributes.code.instructions.If; public class MethodInliner implements Deobfuscator { @@ -218,7 +218,7 @@ public class MethodInliner implements Deobfuscator } invokeIns.from.clear(); - for (net.runelite.deob.attributes.code.Exception e : invokeMethodCode.getExceptions().getExceptions()) + for (net.runelite.asm.attributes.code.Exception e : invokeMethodCode.getExceptions().getExceptions()) e.replace(invokeIns, firstParamStore); methodInstructions.remove(invokeIns); @@ -255,7 +255,7 @@ public class MethodInliner implements Deobfuscator Exceptions fromExceptions = invokeMethod.getCode().getExceptions(); Exceptions toExceptions = method.getCode().getExceptions(); - for (net.runelite.deob.attributes.code.Exception e : fromExceptions.getExceptions()) + for (net.runelite.asm.attributes.code.Exception e : fromExceptions.getExceptions()) { e = e.clone(); e.setExceptions(toExceptions); @@ -290,7 +290,7 @@ public class MethodInliner implements Deobfuscator for (Instruction i2 : insMap.values()) i2.replace(oldI, i); - for (net.runelite.deob.attributes.code.Exception e : toExceptions.getExceptions()) + for (net.runelite.asm.attributes.code.Exception e : toExceptions.getExceptions()) e.replace(oldI, i); insMap.put(orig, i); diff --git a/src/main/java/net/runelite/deob/deobfuscators/MethodMover.java b/src/main/java/net/runelite/deob/deobfuscators/MethodMover.java index 5499f72e90..b98da5bebe 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/MethodMover.java +++ b/src/main/java/net/runelite/deob/deobfuscators/MethodMover.java @@ -1,13 +1,13 @@ package net.runelite.deob.deobfuscators; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -98,8 +98,8 @@ public class MethodMover implements Deobfuscator { assert method.getMethods().getClassFile() != to; - net.runelite.deob.pool.Method newMethod = new net.runelite.deob.pool.Method( - new net.runelite.deob.pool.Class(to.getName()), + net.runelite.asm.pool.Method newMethod = new net.runelite.asm.pool.Method( + new net.runelite.asm.pool.Class(to.getName()), method.getNameAndType() ); diff --git a/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java b/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java index 5a6ec2dd60..ba8ff1640c 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java +++ b/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java @@ -6,11 +6,11 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Field; -import net.runelite.deob.Method; +import net.runelite.asm.Field; +import net.runelite.asm.Method; import net.runelite.deob.util.NameMappings; public class RenameUnique implements Deobfuscator diff --git a/src/main/java/net/runelite/deob/deobfuscators/Renamer.java b/src/main/java/net/runelite/deob/deobfuscators/Renamer.java index 55fc9b3a54..11905f1662 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/Renamer.java +++ b/src/main/java/net/runelite/deob/deobfuscators/Renamer.java @@ -4,18 +4,18 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Field; -import net.runelite.deob.Interfaces; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Exceptions; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.pool.UTF8; -import net.runelite.deob.signature.Signature; -import net.runelite.deob.signature.Type; +import net.runelite.asm.Field; +import net.runelite.asm.Interfaces; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Exceptions; +import net.runelite.asm.pool.NameAndType; +import net.runelite.asm.pool.UTF8; +import net.runelite.asm.signature.Signature; +import net.runelite.asm.signature.Type; import net.runelite.deob.util.NameMappings; public class Renamer implements Deobfuscator @@ -32,16 +32,16 @@ public class Renamer implements Deobfuscator private void renameClass(ClassFile on, ClassFile old, String name) { if (on.getParentClass().getName().equals(old.getName())) - on.setParentClass(new net.runelite.deob.pool.Class(name)); + on.setParentClass(new net.runelite.asm.pool.Class(name)); Interfaces interfaces = on.getInterfaces(); - List interfaceList = interfaces.getInterfaces(); - for (net.runelite.deob.pool.Class inter : interfaceList) + List interfaceList = interfaces.getInterfaces(); + for (net.runelite.asm.pool.Class inter : interfaceList) if (inter.getName().equals(old.getName())) { int idx = interfaceList.indexOf(inter); interfaceList.remove(idx); - interfaceList.add(idx, new net.runelite.deob.pool.Class(name)); + interfaceList.add(idx, new net.runelite.asm.pool.Class(name)); break; } } diff --git a/src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java b/src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java index 516f3e5764..a666dba9a1 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java +++ b/src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java @@ -1,10 +1,10 @@ package net.runelite.deob.deobfuscators; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; import java.util.ArrayList; @@ -22,7 +22,7 @@ public class RuntimeExceptions implements Deobfuscator if (c == null) continue; - for (net.runelite.deob.attributes.code.Exception e : new ArrayList<>(c.getExceptions().getExceptions())) + for (net.runelite.asm.attributes.code.Exception e : new ArrayList<>(c.getExceptions().getExceptions())) { if (e.getCatchType() != null && e.getCatchType().getName().equals("java/lang/RuntimeException")) { diff --git a/src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java b/src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java index e7eb79b840..f05735c573 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java +++ b/src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java @@ -1,12 +1,12 @@ package net.runelite.deob.deobfuscators; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.execution.Execution; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.execution.Execution; import java.util.ArrayList; import java.util.List; @@ -32,7 +32,7 @@ public class UnreachedCode implements Deobfuscator i.from.clear(); // if this is never executed, anything that jumps here ia also never executed? // if this is an exception handler, the exception handler is never used... - for (net.runelite.deob.attributes.code.Exception e : new ArrayList<>(m.getCode().getExceptions().getExceptions())) + for (net.runelite.asm.attributes.code.Exception e : new ArrayList<>(m.getCode().getExceptions().getExceptions())) { if (e.getStart() == i) { diff --git a/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java b/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java index 5c319acc43..47b57fdb79 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java +++ b/src/main/java/net/runelite/deob/deobfuscators/UnusedClass.java @@ -1,8 +1,8 @@ package net.runelite.deob.deobfuscators; import java.util.ArrayList; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; public class UnusedClass implements Deobfuscator diff --git a/src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java b/src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java index c8002b62c5..392c6125af 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java +++ b/src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java @@ -2,16 +2,16 @@ package net.runelite.deob.deobfuscators; import java.util.ArrayList; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Field; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.instruction.types.FieldInstruction; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.deob.attributes.code.instruction.types.SetFieldInstruction; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; public class UnusedFields implements Deobfuscator { diff --git a/src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java b/src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java index aa2b333fd3..56de5c0191 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java +++ b/src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java @@ -1,11 +1,11 @@ package net.runelite.deob.deobfuscators; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deob; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Method; -import net.runelite.deob.execution.Execution; +import net.runelite.asm.Method; +import net.runelite.asm.execution.Execution; import java.util.ArrayList; diff --git a/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java b/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java index 817972dfcb..c420c2aba7 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java +++ b/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java @@ -1,27 +1,27 @@ package net.runelite.deob.deobfuscators; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deob; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.pool.PoolEntry; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; +import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.pool.NameAndType; +import net.runelite.asm.pool.PoolEntry; +import net.runelite.asm.signature.Signature; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.execution.StackContext; import org.apache.commons.collections4.CollectionUtils; @@ -150,9 +150,9 @@ public class UnusedParameters implements Deobfuscator InvokeInstruction ii = (InvokeInstruction) i; PoolEntry pool = ii.getMethod(); - if (pool instanceof net.runelite.deob.pool.Method) + if (pool instanceof net.runelite.asm.pool.Method) { - net.runelite.deob.pool.Method pm = (net.runelite.deob.pool.Method) pool; + net.runelite.asm.pool.Method pm = (net.runelite.asm.pool.Method) pool; if (pm.getClassEntry().getName().equals(method.getMethods().getClassFile().getName()) && pm.getNameAndType().equals(method.getNameAndType()) && !done.contains(i)) { @@ -161,9 +161,9 @@ public class UnusedParameters implements Deobfuscator //assert false; } } - else if (pool instanceof net.runelite.deob.pool.InterfaceMethod) + else if (pool instanceof net.runelite.asm.pool.InterfaceMethod) { - net.runelite.deob.pool.InterfaceMethod pm = (net.runelite.deob.pool.InterfaceMethod) pool; + net.runelite.asm.pool.InterfaceMethod pm = (net.runelite.asm.pool.InterfaceMethod) pool; if (pm.getClassEntry().getName().equals(method.getMethods().getClassFile().getName()) && pm.getNameAndType().equals(method.getNameAndType()) && !done.contains(i)) { diff --git a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DMath.java b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DMath.java index f2d403b2a8..893f74bb5d 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DMath.java +++ b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/DMath.java @@ -1,7 +1,7 @@ package net.runelite.deob.deobfuscators.arithmetic; import java.math.BigInteger; -import net.runelite.deob.pool.PoolEntry; +import net.runelite.asm.pool.PoolEntry; public class DMath { @@ -122,9 +122,9 @@ public class DMath public static PoolEntry toPool(Number value) { if (value instanceof Integer) - return new net.runelite.deob.pool.Integer((int) value); + return new net.runelite.asm.pool.Integer((int) value); else if (value instanceof Long) - return new net.runelite.deob.pool.Long((long) value); + return new net.runelite.asm.pool.Long((long) value); else throw new IllegalArgumentException(); } diff --git a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java index dbd8bed369..d831203288 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java +++ b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Encryption.java @@ -7,7 +7,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; import net.runelite.deob.gson.GsonFactory; -import net.runelite.deob.pool.Field; +import net.runelite.asm.pool.Field; public class Encryption { diff --git a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java index dd1e10b1d6..d06c53e804 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java +++ b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java @@ -7,31 +7,31 @@ import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Field; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.FieldInstruction; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.deob.attributes.code.instructions.IMul; -import net.runelite.deob.attributes.code.instructions.LDC2_W; -import net.runelite.deob.attributes.code.instructions.LDC_W; -import net.runelite.deob.attributes.code.instructions.LMul; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; -import net.runelite.deob.pool.PoolEntry; -import net.runelite.deob.signature.Type; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.LDC2_W; +import net.runelite.asm.attributes.code.instructions.LDC_W; +import net.runelite.asm.attributes.code.instructions.LMul; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.pool.PoolEntry; +import net.runelite.asm.signature.Type; import org.apache.commons.collections4.map.MultiValueMap; -import net.runelite.deob.attributes.code.instruction.types.ArrayStoreInstruction; +import net.runelite.asm.attributes.code.instruction.types.ArrayStoreInstruction; public class ModArith implements Deobfuscator { @@ -593,7 +593,7 @@ public class ModArith implements Deobfuscator if (p.getType() == Integer.class) { - ilist.add(i++, new LDC_W(ins, new net.runelite.deob.pool.Integer((int) p.getter))); + ilist.add(i++, new LDC_W(ins, new net.runelite.asm.pool.Integer((int) p.getter))); ilist.add(i++, new IMul(ins)); } else if (p.getType() == Long.class) @@ -620,7 +620,7 @@ public class ModArith implements Deobfuscator // imul if (p.getType() == Integer.class) { - ilist.add(++i, new LDC_W(ins, new net.runelite.deob.pool.Integer((int) p.setter))); + ilist.add(++i, new LDC_W(ins, new net.runelite.asm.pool.Integer((int) p.setter))); ilist.add(++i, new IMul(ins)); } else if (p.getType() == Long.class) @@ -682,8 +682,8 @@ public class ModArith implements Deobfuscator continue; PoolEntry value = pair.getType() == Long.class ? - new net.runelite.deob.pool.Long((long) pair.getter) : - new net.runelite.deob.pool.Integer((int) pair.getter); + new net.runelite.asm.pool.Long((long) pair.getter) : + new net.runelite.asm.pool.Integer((int) pair.getter); String ename = pair.getType() == Long.class ? "longValue" : "intValue"; diff --git a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscator.java b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscator.java index 2e1f603503..275e0a79f5 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscator.java +++ b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscator.java @@ -3,32 +3,32 @@ package net.runelite.deob.deobfuscators.arithmetic; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.DupInstruction; -import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.attributes.code.instructions.BiPush; -import net.runelite.deob.attributes.code.instructions.IAdd; -import net.runelite.deob.attributes.code.instructions.IConst_M1; -import net.runelite.deob.attributes.code.instructions.IInc; -import net.runelite.deob.attributes.code.instructions.IMul; -import net.runelite.deob.attributes.code.instructions.ISub; -import net.runelite.deob.attributes.code.instructions.LAdd; -import net.runelite.deob.attributes.code.instructions.LDC2_W; -import net.runelite.deob.attributes.code.instructions.LDC_W; -import net.runelite.deob.attributes.code.instructions.LMul; -import net.runelite.deob.attributes.code.instructions.LSub; -import net.runelite.deob.attributes.code.instructions.SiPush; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; -import net.runelite.deob.execution.VariableContext; -import net.runelite.deob.execution.Variables; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.DupInstruction; +import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instructions.BiPush; +import net.runelite.asm.attributes.code.instructions.IAdd; +import net.runelite.asm.attributes.code.instructions.IConst_M1; +import net.runelite.asm.attributes.code.instructions.IInc; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.ISub; +import net.runelite.asm.attributes.code.instructions.LAdd; +import net.runelite.asm.attributes.code.instructions.LDC2_W; +import net.runelite.asm.attributes.code.instructions.LDC_W; +import net.runelite.asm.attributes.code.instructions.LMul; +import net.runelite.asm.attributes.code.instructions.LSub; +import net.runelite.asm.attributes.code.instructions.SiPush; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; public class MultiplicationDeobfuscator implements Deobfuscator { diff --git a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationExpression.java b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationExpression.java index 3887d9766f..ab5a1428f9 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationExpression.java +++ b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationExpression.java @@ -2,11 +2,11 @@ package net.runelite.deob.deobfuscators.arithmetic; import java.util.ArrayList; import java.util.List; -import net.runelite.deob.Field; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.instruction.types.FieldInstruction; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.execution.InstructionContext; +import net.runelite.asm.Field; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.instruction.types.FieldInstruction; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.execution.InstructionContext; public class MultiplicationExpression { diff --git a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscator.java b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscator.java index bc89e794b0..0b342572ef 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscator.java +++ b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscator.java @@ -4,18 +4,18 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.attributes.code.instructions.IMul; -import net.runelite.deob.attributes.code.instructions.LMul; -import net.runelite.deob.attributes.code.instructions.NOP; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.LMul; +import net.runelite.asm.attributes.code.instructions.NOP; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class MultiplyOneDeobfuscator implements Deobfuscator { diff --git a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscator.java b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscator.java index 583f84acff..b50d9bebaa 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscator.java +++ b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscator.java @@ -1,19 +1,19 @@ package net.runelite.deob.deobfuscators.arithmetic; import java.util.List; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.attributes.code.instructions.IMul; -import net.runelite.deob.attributes.code.instructions.LDC2_W; -import net.runelite.deob.attributes.code.instructions.LDC_W; -import net.runelite.deob.attributes.code.instructions.LMul; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; -import net.runelite.deob.execution.StackContext; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.LDC2_W; +import net.runelite.asm.attributes.code.instructions.LDC_W; +import net.runelite.asm.attributes.code.instructions.LMul; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.StackContext; public class MultiplyZeroDeobfuscator implements Deobfuscator { @@ -82,7 +82,7 @@ public class MultiplyZeroDeobfuscator implements Deobfuscator ictx.removeStack(0); if (instruction instanceof IMul) - ins.replace(instruction, new LDC_W(ins, new net.runelite.deob.pool.Integer(0))); + ins.replace(instruction, new LDC_W(ins, new net.runelite.asm.pool.Integer(0))); else if (instruction instanceof LMul) ins.replace(instruction, new LDC2_W(ins, 0L)); else diff --git a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Pair.java b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Pair.java index 97ed804d7b..b0c4e8b738 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Pair.java +++ b/src/main/java/net/runelite/deob/deobfuscators/arithmetic/Pair.java @@ -1,6 +1,6 @@ package net.runelite.deob.deobfuscators.arithmetic; -import net.runelite.deob.pool.Field; +import net.runelite.asm.pool.Field; public class Pair { diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/AnnotationMapper.java b/src/main/java/net/runelite/deob/deobfuscators/rename/AnnotationMapper.java index a3624f0bbf..8a8f3e7189 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/AnnotationMapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/rename/AnnotationMapper.java @@ -1,13 +1,13 @@ package net.runelite.deob.deobfuscators.rename; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.Field; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.attributes.annotation.Annotation; -import net.runelite.deob.attributes.annotation.Element; -import net.runelite.deob.signature.Type; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.attributes.annotation.Annotation; +import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.signature.Type; public class AnnotationMapper { diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/Mapper.java b/src/main/java/net/runelite/deob/deobfuscators/rename/Mapper.java index f3654bfeca..52097405a3 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/Mapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/rename/Mapper.java @@ -6,14 +6,14 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.Field; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Annotations; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.execution.ParallellMappingExecutor; -import net.runelite.deob.signature.Type; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.execution.ParallellMappingExecutor; +import net.runelite.asm.signature.Type; public class Mapper { diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java index 14d42fb757..c2dac7ed25 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java +++ b/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java @@ -4,25 +4,25 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.instruction.types.ArrayLoad; -import net.runelite.deob.attributes.code.instruction.types.DupInstruction; -import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction; -import net.runelite.deob.attributes.code.instruction.types.LVTInstruction; -import net.runelite.deob.attributes.code.instruction.types.MappableInstruction; -import net.runelite.deob.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.attributes.code.instruction.types.SetFieldInstruction; -import net.runelite.deob.attributes.code.instructions.InvokeStatic; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.InstructionContext; -import net.runelite.deob.execution.ParallellMappingExecutor; -import net.runelite.deob.execution.StackContext; -import net.runelite.deob.execution.VariableContext; -import net.runelite.deob.execution.Variables; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.instruction.types.ArrayLoad; +import net.runelite.asm.attributes.code.instruction.types.DupInstruction; +import net.runelite.asm.attributes.code.instruction.types.InvokeInstruction; +import net.runelite.asm.attributes.code.instruction.types.LVTInstruction; +import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; +import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; +import net.runelite.asm.attributes.code.instruction.types.SetFieldInstruction; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.InstructionContext; +import net.runelite.asm.execution.ParallellMappingExecutor; +import net.runelite.asm.execution.StackContext; +import net.runelite.asm.execution.VariableContext; +import net.runelite.asm.execution.Variables; +import net.runelite.asm.signature.Signature; public class MappingExecutorUtil { @@ -224,14 +224,14 @@ public class MappingExecutorUtil { String className; - if (ii.getMethod() instanceof net.runelite.deob.pool.Method) + if (ii.getMethod() instanceof net.runelite.asm.pool.Method) { - net.runelite.deob.pool.Method m = (net.runelite.deob.pool.Method) ii.getMethod(); + net.runelite.asm.pool.Method m = (net.runelite.asm.pool.Method) ii.getMethod(); className = m.getClassEntry().getName(); } - else if (ii.getMethod() instanceof net.runelite.deob.pool.InterfaceMethod) + else if (ii.getMethod() instanceof net.runelite.asm.pool.InterfaceMethod) { - net.runelite.deob.pool.InterfaceMethod m = (net.runelite.deob.pool.InterfaceMethod) ii.getMethod(); + net.runelite.asm.pool.InterfaceMethod m = (net.runelite.asm.pool.InterfaceMethod) ii.getMethod(); className = m.getClassEntry().getName(); } else diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/MethodSignatureMapper.java b/src/main/java/net/runelite/deob/deobfuscators/rename/MethodSignatureMapper.java index ae88ea1d94..484737983f 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/MethodSignatureMapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/rename/MethodSignatureMapper.java @@ -2,8 +2,8 @@ package net.runelite.deob.deobfuscators.rename; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import net.runelite.deob.ClassFile; -import net.runelite.deob.Method; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Method; public class MethodSignatureMapper { diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/PacketHandler.java b/src/main/java/net/runelite/deob/deobfuscators/rename/PacketHandler.java index 186d561844..86f8d1233f 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/PacketHandler.java +++ b/src/main/java/net/runelite/deob/deobfuscators/rename/PacketHandler.java @@ -1,10 +1,10 @@ package net.runelite.deob.deobfuscators.rename; import java.util.List; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.instructions.If; -import net.runelite.deob.attributes.code.instructions.IfICmpEq; -import net.runelite.deob.attributes.code.instructions.IfICmpNe; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.instructions.If; +import net.runelite.asm.attributes.code.instructions.IfICmpEq; +import net.runelite.asm.attributes.code.instructions.IfICmpNe; public class PacketHandler { diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java b/src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java index cde9747500..4f1191a029 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java +++ b/src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java @@ -7,10 +7,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.Field; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.code.instructions.If; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.code.instructions.If; public class ParallelExecutorMapping { diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/StaticMethodSignatureMapper.java b/src/main/java/net/runelite/deob/deobfuscators/rename/StaticMethodSignatureMapper.java index 0c6b73e6f7..477756118e 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/StaticMethodSignatureMapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/rename/StaticMethodSignatureMapper.java @@ -5,10 +5,10 @@ import com.google.common.collect.Multimap; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.Method; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Method; +import net.runelite.asm.signature.Signature; public class StaticMethodSignatureMapper { diff --git a/src/main/java/net/runelite/deob/gson/ClassSerializer.java b/src/main/java/net/runelite/deob/gson/ClassSerializer.java index 9d379c2c62..8fd4a9c9f2 100644 --- a/src/main/java/net/runelite/deob/gson/ClassSerializer.java +++ b/src/main/java/net/runelite/deob/gson/ClassSerializer.java @@ -5,7 +5,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import java.lang.reflect.Type; -import net.runelite.deob.pool.Class; +import net.runelite.asm.pool.Class; public class ClassSerializer implements JsonSerializer { diff --git a/src/main/java/net/runelite/deob/gson/FieldSerializer.java b/src/main/java/net/runelite/deob/gson/FieldSerializer.java index 117af2c2ca..a912bf0f25 100644 --- a/src/main/java/net/runelite/deob/gson/FieldSerializer.java +++ b/src/main/java/net/runelite/deob/gson/FieldSerializer.java @@ -5,7 +5,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import java.lang.reflect.Type; -import net.runelite.deob.pool.Field; +import net.runelite.asm.pool.Field; public class FieldSerializer implements JsonSerializer { diff --git a/src/main/java/net/runelite/deob/gson/GsonFactory.java b/src/main/java/net/runelite/deob/gson/GsonFactory.java index 3d658f585d..22068517fe 100644 --- a/src/main/java/net/runelite/deob/gson/GsonFactory.java +++ b/src/main/java/net/runelite/deob/gson/GsonFactory.java @@ -2,9 +2,9 @@ package net.runelite.deob.gson; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import net.runelite.deob.pool.Field; -import net.runelite.deob.pool.Method; -import net.runelite.deob.pool.Class; +import net.runelite.asm.pool.Field; +import net.runelite.asm.pool.Method; +import net.runelite.asm.pool.Class; public class GsonFactory { diff --git a/src/main/java/net/runelite/deob/gson/MethodSerializer.java b/src/main/java/net/runelite/deob/gson/MethodSerializer.java index 2ce6a547a5..595e76cd7b 100644 --- a/src/main/java/net/runelite/deob/gson/MethodSerializer.java +++ b/src/main/java/net/runelite/deob/gson/MethodSerializer.java @@ -5,7 +5,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import java.lang.reflect.Type; -import net.runelite.deob.pool.Method; +import net.runelite.asm.pool.Method; public class MethodSerializer implements JsonSerializer diff --git a/src/main/java/net/runelite/deob/injection/Inject.java b/src/main/java/net/runelite/deob/injection/Inject.java index 0a5a1f34e7..fbe053cbdc 100644 --- a/src/main/java/net/runelite/deob/injection/Inject.java +++ b/src/main/java/net/runelite/deob/injection/Inject.java @@ -2,37 +2,37 @@ package net.runelite.deob.injection; import java.io.IOException; import java.util.List; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.Field; -import net.runelite.deob.Interfaces; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Annotations; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.annotation.Annotation; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instructions.ALoad; -import net.runelite.deob.attributes.code.instructions.BiPush; -import net.runelite.deob.attributes.code.instructions.DLoad; -import net.runelite.deob.attributes.code.instructions.FLoad; -import net.runelite.deob.attributes.code.instructions.GetField; -import net.runelite.deob.attributes.code.instructions.GetStatic; -import net.runelite.deob.attributes.code.instructions.ILoad; -import net.runelite.deob.attributes.code.instructions.IMul; -import net.runelite.deob.attributes.code.instructions.InvokeVirtual; -import net.runelite.deob.attributes.code.instructions.LDC2_W; -import net.runelite.deob.attributes.code.instructions.LDC_W; -import net.runelite.deob.attributes.code.instructions.LLoad; -import net.runelite.deob.attributes.code.instructions.LMul; -import net.runelite.deob.attributes.code.instructions.Return; -import net.runelite.deob.attributes.code.instructions.SiPush; -import net.runelite.deob.signature.Type; -import net.runelite.deob.pool.Class; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.signature.Signature; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Field; +import net.runelite.asm.Interfaces; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.annotation.Annotation; +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.instructions.ALoad; +import net.runelite.asm.attributes.code.instructions.BiPush; +import net.runelite.asm.attributes.code.instructions.DLoad; +import net.runelite.asm.attributes.code.instructions.FLoad; +import net.runelite.asm.attributes.code.instructions.GetField; +import net.runelite.asm.attributes.code.instructions.GetStatic; +import net.runelite.asm.attributes.code.instructions.ILoad; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.InvokeVirtual; +import net.runelite.asm.attributes.code.instructions.LDC2_W; +import net.runelite.asm.attributes.code.instructions.LDC_W; +import net.runelite.asm.attributes.code.instructions.LLoad; +import net.runelite.asm.attributes.code.instructions.LMul; +import net.runelite.asm.attributes.code.instructions.Return; +import net.runelite.asm.attributes.code.instructions.SiPush; +import net.runelite.asm.signature.Type; +import net.runelite.asm.pool.Class; +import net.runelite.asm.pool.NameAndType; +import net.runelite.asm.signature.Signature; import net.runelite.mapping.Import; public class Inject diff --git a/src/main/java/net/runelite/deob/injection/InjectReplace.java b/src/main/java/net/runelite/deob/injection/InjectReplace.java index 98c5b2d68b..01c6c33dac 100644 --- a/src/main/java/net/runelite/deob/injection/InjectReplace.java +++ b/src/main/java/net/runelite/deob/injection/InjectReplace.java @@ -4,28 +4,28 @@ import java.io.DataInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import net.runelite.deob.ClassFile; -import net.runelite.deob.Method; -import net.runelite.deob.Methods; -import net.runelite.deob.attributes.Annotations; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.annotation.Annotation; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.InstructionType; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instructions.ALoad; -import net.runelite.deob.attributes.code.instructions.DLoad; -import net.runelite.deob.attributes.code.instructions.FLoad; -import net.runelite.deob.attributes.code.instructions.ILoad; -import net.runelite.deob.attributes.code.instructions.InvokeSpecial; -import net.runelite.deob.attributes.code.instructions.InvokeVirtual; -import net.runelite.deob.attributes.code.instructions.LLoad; -import net.runelite.deob.attributes.code.instructions.New; -import net.runelite.deob.attributes.code.instructions.Pop; -import net.runelite.deob.attributes.code.instructions.Return; -import net.runelite.deob.pool.NameAndType; -import net.runelite.deob.signature.Type; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Method; +import net.runelite.asm.Methods; +import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.annotation.Annotation; +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.instructions.ALoad; +import net.runelite.asm.attributes.code.instructions.DLoad; +import net.runelite.asm.attributes.code.instructions.FLoad; +import net.runelite.asm.attributes.code.instructions.ILoad; +import net.runelite.asm.attributes.code.instructions.InvokeSpecial; +import net.runelite.asm.attributes.code.instructions.InvokeVirtual; +import net.runelite.asm.attributes.code.instructions.LLoad; +import net.runelite.asm.attributes.code.instructions.New; +import net.runelite.asm.attributes.code.instructions.Pop; +import net.runelite.asm.attributes.code.instructions.Return; +import net.runelite.asm.pool.NameAndType; +import net.runelite.asm.signature.Type; public class InjectReplace { @@ -118,7 +118,7 @@ public class InjectReplace continue; InvokeSpecial is = (InvokeSpecial) i; - net.runelite.deob.pool.Method method = (net.runelite.deob.pool.Method) is.getMethod(); + net.runelite.asm.pool.Method method = (net.runelite.asm.pool.Method) is.getMethod(); assert method.getNameAndType().getDescriptor().size() == 0; // Replace classes must extend Object so this must be Object.init() instructions.replace(i, new Pop(instructions)); // pop this @@ -258,12 +258,11 @@ public class InjectReplace InvokeSpecial is = (InvokeSpecial) i; - net.runelite.deob.pool.Method invokedMethod = (net.runelite.deob.pool.Method) is.getMethod(); + net.runelite.asm.pool.Method invokedMethod = (net.runelite.asm.pool.Method) is.getMethod(); if (invokedMethod.getNameAndType().equals(deobfuscatedNat)) { - is.setMethod( - new net.runelite.deob.pool.Method( + is.setMethod(new net.runelite.asm.pool.Method( classToInject.getParentClass(), // invokedMethod.getClassEntry() is probably our dummy class m.getNameAndType() // set to obfuscated name ) @@ -321,12 +320,11 @@ public class InjectReplace // The super constructor invokespecial will be the first invokespecial instruction encountered InvokeSpecial is = (InvokeSpecial) i; - net.runelite.deob.pool.Method method = (net.runelite.deob.pool.Method) is.getMethod(); + net.runelite.asm.pool.Method method = (net.runelite.asm.pool.Method) is.getMethod(); assert method.getClassEntry().equals(vanilla.getPoolClass()); assert method.getNameAndType().getName().equals(""); - is.setMethod( - new net.runelite.deob.pool.Method( + is.setMethod(new net.runelite.asm.pool.Method( classToInject.getPoolClass(), method.getNameAndType() ) @@ -381,10 +379,9 @@ public class InjectReplace } InvokeSpecial is = (InvokeSpecial) i; - net.runelite.deob.pool.Method method = (net.runelite.deob.pool.Method) is.getMethod(); + net.runelite.asm.pool.Method method = (net.runelite.asm.pool.Method) is.getMethod(); - is.setMethod( - new net.runelite.deob.pool.Method( + is.setMethod(new net.runelite.asm.pool.Method( classToInject.getPoolClass(), method.getNameAndType() ) diff --git a/src/main/java/net/runelite/deob/util/JarUtil.java b/src/main/java/net/runelite/deob/util/JarUtil.java index c10a858bb0..b918c7948c 100644 --- a/src/main/java/net/runelite/deob/util/JarUtil.java +++ b/src/main/java/net/runelite/deob/util/JarUtil.java @@ -13,9 +13,9 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.asm.AsmUtils; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.objectwebasm.AsmUtils; import org.objectweb.asm.ClassReader; public class JarUtil diff --git a/src/main/java/net/runelite/deob/util/NameMappings.java b/src/main/java/net/runelite/deob/util/NameMappings.java index acbe690a80..a8ff7a9de2 100644 --- a/src/main/java/net/runelite/deob/util/NameMappings.java +++ b/src/main/java/net/runelite/deob/util/NameMappings.java @@ -8,9 +8,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; import net.runelite.deob.gson.GsonFactory; -import net.runelite.deob.pool.Class; -import net.runelite.deob.pool.Field; -import net.runelite.deob.pool.Method; +import net.runelite.asm.pool.Class; +import net.runelite.asm.pool.Field; +import net.runelite.asm.pool.Method; public class NameMappings { diff --git a/src/test/java/net/runelite/deob/annotations/AnnotationTest.java b/src/test/java/net/runelite/asm/annotations/AnnotationTest.java similarity index 74% rename from src/test/java/net/runelite/deob/annotations/AnnotationTest.java rename to src/test/java/net/runelite/asm/annotations/AnnotationTest.java index 63b33a736d..8bd3e0c6ea 100644 --- a/src/test/java/net/runelite/deob/annotations/AnnotationTest.java +++ b/src/test/java/net/runelite/asm/annotations/AnnotationTest.java @@ -1,4 +1,4 @@ -package net.runelite.deob.annotations; +package net.runelite.asm.annotations; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -7,15 +7,15 @@ import java.io.DataOutputStream; import java.io.InputStream; import java.util.List; import java.util.Optional; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Annotations; -import net.runelite.deob.attributes.AttributeType; -import net.runelite.deob.attributes.annotation.Annotation; -import net.runelite.deob.attributes.annotation.Element; -import net.runelite.deob.pool.UTF8; -import net.runelite.deob.signature.Type; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.attributes.AttributeType; +import net.runelite.asm.attributes.annotation.Annotation; +import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.pool.UTF8; +import net.runelite.asm.signature.Type; import org.junit.Assert; import org.junit.Test; @@ -24,7 +24,7 @@ public class AnnotationTest @Test public void testAnnotation() throws Exception { - InputStream in = this.getClass().getClassLoader().getResourceAsStream("net/runelite/deob/annotations/TestClass.class"); + InputStream in = this.getClass().getClassLoader().getResourceAsStream("net/runelite/asm/annotations/TestClass.class"); Assert.assertNotNull(in); ClassGroup group = new ClassGroup(); @@ -45,7 +45,7 @@ public class AnnotationTest Annotations annotations = (Annotations) method.getAttributes().findType(AttributeType.RUNTIMEVISIBLEANNOTATIONS); Assert.assertNotNull(annotations); - Optional annotation = annotations.getAnnotations().stream().filter(a -> a.getType().equals(new Type("Lnet/runelite/deob/annotations/MyAnnotation;"))).findFirst(); + Optional annotation = annotations.getAnnotations().stream().filter(a -> a.getType().equals(new Type("Lnet/runelite/asm/annotations/MyAnnotation;"))).findFirst(); Assert.assertTrue(annotation.isPresent()); Annotation an = annotation.get(); diff --git a/src/test/java/net/runelite/deob/annotations/MyAnnotation.java b/src/test/java/net/runelite/asm/annotations/MyAnnotation.java similarity index 78% rename from src/test/java/net/runelite/deob/annotations/MyAnnotation.java rename to src/test/java/net/runelite/asm/annotations/MyAnnotation.java index a2e61a650a..1ed9124bc7 100644 --- a/src/test/java/net/runelite/deob/annotations/MyAnnotation.java +++ b/src/test/java/net/runelite/asm/annotations/MyAnnotation.java @@ -1,4 +1,4 @@ -package net.runelite.deob.annotations; +package net.runelite.asm.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/test/java/net/runelite/deob/annotations/TestClass.java b/src/test/java/net/runelite/asm/annotations/TestClass.java similarity index 76% rename from src/test/java/net/runelite/deob/annotations/TestClass.java rename to src/test/java/net/runelite/asm/annotations/TestClass.java index 38115c9456..86fc8e9142 100644 --- a/src/test/java/net/runelite/deob/annotations/TestClass.java +++ b/src/test/java/net/runelite/asm/annotations/TestClass.java @@ -1,4 +1,4 @@ -package net.runelite.deob.annotations; +package net.runelite.asm.annotations; public class TestClass { diff --git a/src/test/java/net/runelite/deob/execution/ExecutionTest.java b/src/test/java/net/runelite/asm/execution/ExecutionTest.java similarity index 85% rename from src/test/java/net/runelite/deob/execution/ExecutionTest.java rename to src/test/java/net/runelite/asm/execution/ExecutionTest.java index de77cd4d5e..6248a102fd 100644 --- a/src/test/java/net/runelite/deob/execution/ExecutionTest.java +++ b/src/test/java/net/runelite/asm/execution/ExecutionTest.java @@ -1,7 +1,8 @@ -package net.runelite.deob.execution; +package net.runelite.asm.execution; +import net.runelite.asm.execution.Execution; import java.io.File; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import net.runelite.deob.deobfuscators.rename.MapStaticTest; import net.runelite.deob.util.JarUtil; import org.junit.Test; diff --git a/src/test/java/net/runelite/deob/ClassGroupFactory.java b/src/test/java/net/runelite/deob/ClassGroupFactory.java index 5886403cfd..9df7d8a196 100644 --- a/src/test/java/net/runelite/deob/ClassGroupFactory.java +++ b/src/test/java/net/runelite/deob/ClassGroupFactory.java @@ -1,11 +1,17 @@ package net.runelite.deob; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instructions.VReturn; -import net.runelite.deob.signature.Signature; -import net.runelite.deob.signature.Type; +import net.runelite.asm.ClassFile; +import net.runelite.asm.Methods; +import net.runelite.asm.Fields; +import net.runelite.asm.Method; +import net.runelite.asm.Field; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instructions.VReturn; +import net.runelite.asm.signature.Signature; +import net.runelite.asm.signature.Type; public class ClassGroupFactory { diff --git a/src/test/java/net/runelite/deob/deobfuscators/arithmetic/ModArithTest.java b/src/test/java/net/runelite/deob/deobfuscators/arithmetic/ModArithTest.java index 13f5532b4b..59a518bf75 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/arithmetic/ModArithTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/arithmetic/ModArithTest.java @@ -3,14 +3,14 @@ package net.runelite.deob.deobfuscators.arithmetic; import java.io.DataInputStream; import java.io.IOException; import java.io.InputStream; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instructions.LDC_W; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instructions.LDC_W; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscatorTest.java b/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscatorTest.java index 21b4020ea6..2a04a9d4c1 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscatorTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplicationDeobfuscatorTest.java @@ -1,38 +1,38 @@ package net.runelite.deob.deobfuscators.arithmetic; import java.util.Collection; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import net.runelite.deob.ClassGroupFactory; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.Field; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instructions.Dup2_X1; -import net.runelite.deob.attributes.code.instructions.Dup_X1; -import net.runelite.deob.attributes.code.instructions.Goto; -import net.runelite.deob.attributes.code.instructions.IAdd; -import net.runelite.deob.attributes.code.instructions.IConst_0; -import net.runelite.deob.attributes.code.instructions.IConst_2; -import net.runelite.deob.attributes.code.instructions.IConst_3; -import net.runelite.deob.attributes.code.instructions.IConst_M1; -import net.runelite.deob.attributes.code.instructions.ILoad; -import net.runelite.deob.attributes.code.instructions.IMul; -import net.runelite.deob.attributes.code.instructions.IStore; -import net.runelite.deob.attributes.code.instructions.IStore_0; -import net.runelite.deob.attributes.code.instructions.IfEq; -import net.runelite.deob.attributes.code.instructions.InvokeStatic; -import net.runelite.deob.attributes.code.instructions.LConst_1; -import net.runelite.deob.attributes.code.instructions.LDC2_W; -import net.runelite.deob.attributes.code.instructions.LDC_W; -import net.runelite.deob.attributes.code.instructions.LLoad; -import net.runelite.deob.attributes.code.instructions.LMul; -import net.runelite.deob.attributes.code.instructions.LStore_0; -import net.runelite.deob.attributes.code.instructions.NOP; -import net.runelite.deob.attributes.code.instructions.Pop; -import net.runelite.deob.attributes.code.instructions.VReturn; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.InstructionContext; +import net.runelite.asm.Field; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instructions.Dup2_X1; +import net.runelite.asm.attributes.code.instructions.Dup_X1; +import net.runelite.asm.attributes.code.instructions.Goto; +import net.runelite.asm.attributes.code.instructions.IAdd; +import net.runelite.asm.attributes.code.instructions.IConst_0; +import net.runelite.asm.attributes.code.instructions.IConst_2; +import net.runelite.asm.attributes.code.instructions.IConst_3; +import net.runelite.asm.attributes.code.instructions.IConst_M1; +import net.runelite.asm.attributes.code.instructions.ILoad; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.IStore; +import net.runelite.asm.attributes.code.instructions.IStore_0; +import net.runelite.asm.attributes.code.instructions.IfEq; +import net.runelite.asm.attributes.code.instructions.InvokeStatic; +import net.runelite.asm.attributes.code.instructions.LConst_1; +import net.runelite.asm.attributes.code.instructions.LDC2_W; +import net.runelite.asm.attributes.code.instructions.LDC_W; +import net.runelite.asm.attributes.code.instructions.LLoad; +import net.runelite.asm.attributes.code.instructions.LMul; +import net.runelite.asm.attributes.code.instructions.LStore_0; +import net.runelite.asm.attributes.code.instructions.NOP; +import net.runelite.asm.attributes.code.instructions.Pop; +import net.runelite.asm.attributes.code.instructions.VReturn; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.InstructionContext; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscatorTest.java b/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscatorTest.java index f48c00d6cf..c832ef73c6 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscatorTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyOneDeobfuscatorTest.java @@ -1,28 +1,28 @@ package net.runelite.deob.deobfuscators.arithmetic; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import net.runelite.deob.ClassGroupFactory; import net.runelite.deob.Deobfuscator; -import net.runelite.deob.attributes.Code; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.Instructions; -import net.runelite.deob.attributes.code.instructions.Goto; -import net.runelite.deob.attributes.code.instructions.IConst_1; -import net.runelite.deob.attributes.code.instructions.IConst_2; -import net.runelite.deob.attributes.code.instructions.IConst_3; -import net.runelite.deob.attributes.code.instructions.IConst_M1; -import net.runelite.deob.attributes.code.instructions.IDiv; -import net.runelite.deob.attributes.code.instructions.ILoad; -import net.runelite.deob.attributes.code.instructions.IMul; -import net.runelite.deob.attributes.code.instructions.IStore_0; -import net.runelite.deob.attributes.code.instructions.IStore_1; -import net.runelite.deob.attributes.code.instructions.IfEq; -import net.runelite.deob.attributes.code.instructions.IfICmpEq; -import net.runelite.deob.attributes.code.instructions.LDC_W; -import net.runelite.deob.attributes.code.instructions.NOP; -import net.runelite.deob.attributes.code.instructions.SiPush; -import net.runelite.deob.attributes.code.instructions.VReturn; -import net.runelite.deob.execution.Execution; +import net.runelite.asm.attributes.Code; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.Instructions; +import net.runelite.asm.attributes.code.instructions.Goto; +import net.runelite.asm.attributes.code.instructions.IConst_1; +import net.runelite.asm.attributes.code.instructions.IConst_2; +import net.runelite.asm.attributes.code.instructions.IConst_3; +import net.runelite.asm.attributes.code.instructions.IConst_M1; +import net.runelite.asm.attributes.code.instructions.IDiv; +import net.runelite.asm.attributes.code.instructions.ILoad; +import net.runelite.asm.attributes.code.instructions.IMul; +import net.runelite.asm.attributes.code.instructions.IStore_0; +import net.runelite.asm.attributes.code.instructions.IStore_1; +import net.runelite.asm.attributes.code.instructions.IfEq; +import net.runelite.asm.attributes.code.instructions.IfICmpEq; +import net.runelite.asm.attributes.code.instructions.LDC_W; +import net.runelite.asm.attributes.code.instructions.NOP; +import net.runelite.asm.attributes.code.instructions.SiPush; +import net.runelite.asm.attributes.code.instructions.VReturn; +import net.runelite.asm.execution.Execution; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/AnnotationMapperTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/AnnotationMapperTest.java index 9c7d585bfe..10f26fbf61 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/AnnotationMapperTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/AnnotationMapperTest.java @@ -2,7 +2,7 @@ package net.runelite.deob.deobfuscators.rename; import java.io.File; import java.io.IOException; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import net.runelite.deob.util.JarUtil; import org.junit.Test; diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java index fc9d9213e3..969a649fd6 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java @@ -12,22 +12,22 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.stream.Collectors; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; import net.runelite.deob.Deob; -import net.runelite.deob.Field; -import net.runelite.deob.Method; -import net.runelite.deob.attributes.Annotations; -import net.runelite.deob.attributes.AttributeType; -import net.runelite.deob.attributes.annotation.Annotation; -import net.runelite.deob.attributes.code.Instruction; -import net.runelite.deob.attributes.code.instructions.If; -import net.runelite.deob.attributes.code.instructions.IfICmpEq; -import net.runelite.deob.attributes.code.instructions.IfICmpNe; -import net.runelite.deob.execution.Execution; -import net.runelite.deob.execution.Frame; -import net.runelite.deob.execution.ParallellMappingExecutor; -import net.runelite.deob.signature.Type; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.attributes.AttributeType; +import net.runelite.asm.attributes.annotation.Annotation; +import net.runelite.asm.attributes.code.Instruction; +import net.runelite.asm.attributes.code.instructions.If; +import net.runelite.asm.attributes.code.instructions.IfICmpEq; +import net.runelite.asm.attributes.code.instructions.IfICmpNe; +import net.runelite.asm.execution.Execution; +import net.runelite.asm.execution.Frame; +import net.runelite.asm.execution.ParallellMappingExecutor; +import net.runelite.asm.signature.Type; import net.runelite.deob.util.JarUtil; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/MapTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/MapTest.java index 737296ce6e..700da913dd 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/MapTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/MapTest.java @@ -2,8 +2,8 @@ package net.runelite.deob.deobfuscators.rename; import java.io.File; import java.io.IOException; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.Method; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Method; import net.runelite.deob.util.JarUtil; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/MapperTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/MapperTest.java index 0df3276f35..3bde79d109 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/MapperTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/MapperTest.java @@ -2,7 +2,7 @@ package net.runelite.deob.deobfuscators.rename; import java.io.File; import java.io.IOException; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import static net.runelite.deob.deobfuscators.rename.MapStaticTest.print; import static net.runelite.deob.deobfuscators.rename.MapStaticTest.summary; import net.runelite.deob.util.JarUtil; diff --git a/src/test/java/net/runelite/deob/injection/InjectTest.java b/src/test/java/net/runelite/deob/injection/InjectTest.java index ba8cb578dc..f05377d2b0 100644 --- a/src/test/java/net/runelite/deob/injection/InjectTest.java +++ b/src/test/java/net/runelite/deob/injection/InjectTest.java @@ -2,7 +2,7 @@ package net.runelite.deob.injection; import java.io.File; import java.io.IOException; -import net.runelite.deob.ClassGroup; +import net.runelite.asm.ClassGroup; import net.runelite.deob.util.JarUtil; import org.junit.After; import org.junit.Before; diff --git a/src/test/java/net/runelite/deob/runeloader/MappingImporter.java b/src/test/java/net/runelite/deob/runeloader/MappingImporter.java index 2c8c257b7c..37679cb3f8 100644 --- a/src/test/java/net/runelite/deob/runeloader/MappingImporter.java +++ b/src/test/java/net/runelite/deob/runeloader/MappingImporter.java @@ -2,19 +2,19 @@ package net.runelite.deob.runeloader; import java.io.File; import java.io.IOException; -import net.runelite.deob.ClassFile; -import net.runelite.deob.ClassGroup; -import net.runelite.deob.Field; -import net.runelite.deob.attributes.Annotations; -import net.runelite.deob.attributes.AttributeType; -import net.runelite.deob.attributes.Attributes; -import net.runelite.deob.attributes.annotation.Annotation; -import net.runelite.deob.attributes.annotation.Element; -import net.runelite.deob.pool.UTF8; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Field; +import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.attributes.AttributeType; +import net.runelite.asm.attributes.Attributes; +import net.runelite.asm.attributes.annotation.Annotation; +import net.runelite.asm.attributes.annotation.Element; +import net.runelite.asm.pool.UTF8; import net.runelite.deob.runeloader.inject.AddInterfaceInstruction; import net.runelite.deob.runeloader.inject.GetterInjectInstruction; import net.runelite.deob.runeloader.inject.InjectionModscript; -import net.runelite.deob.signature.Type; +import net.runelite.asm.signature.Type; import net.runelite.deob.util.JarUtil; import org.junit.After; import org.junit.Assert;