diff --git a/pom.xml b/pom.xml index e2e41c6a79..9e5f2a3779 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - info.sigterm + net.runelite deob 0.0.1-SNAPSHOT diff --git a/src/main/java/info/sigterm/deob/attributes/code/InstructionType.java b/src/main/java/info/sigterm/deob/attributes/code/InstructionType.java deleted file mode 100644 index 4bfb31da8e..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/InstructionType.java +++ /dev/null @@ -1,239 +0,0 @@ -package info.sigterm.deob.attributes.code; - -import info.sigterm.deob.attributes.code.instructions.*; - -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", If0.class), - IFNE(0x9a, "ifne", If0.class), - IFLT(0x9b, "iflt", If0.class), - IFGE(0x9c, "ifge", If0.class), - IFGT(0x9d, "ifgt", If0.class), - IFLE(0x9e, "ifle", If0.class), - IF_ICMPEQ(0x9f, "if_icmpeq", If.class), - IF_ICMPNE(0xa0, "if_icmpne", If.class), - IF_ICMPLT(0xa1, "if_cmplt", If.class), - IF_ICMPGE(0xa2, "if_icmpge", If.class), - IF_ICMPGT(0xa3, "if_icmpgt", If.class), - IF_ICMPLE(0xa4, "if_icmple", If.class), - IF_ACMPEQ(0xa5, "if_acmpeq", If.class), - IF_ACMPNE(0xa6, "if_acmpne", If.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", If0.class), - IFNONNULL(0xc7, "ifnonnull", If0.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/info/sigterm/deob/attributes/code/instruction/types/ComparisonInstruction.java b/src/main/java/info/sigterm/deob/attributes/code/instruction/types/ComparisonInstruction.java deleted file mode 100644 index 9c2c2fa128..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/ComparisonInstruction.java +++ /dev/null @@ -1,6 +0,0 @@ -package info.sigterm.deob.attributes.code.instruction.types; - -public interface ComparisonInstruction -{ - -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/FieldInstruction.java b/src/main/java/info/sigterm/deob/attributes/code/instruction/types/FieldInstruction.java deleted file mode 100644 index d0d99fb163..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/FieldInstruction.java +++ /dev/null @@ -1,10 +0,0 @@ -package info.sigterm.deob.attributes.code.instruction.types; - -import info.sigterm.deob.pool.Field; - -public interface FieldInstruction -{ - public Field getField(); - - public info.sigterm.deob.Field getMyField(); -} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/ReturnInstruction.java b/src/main/java/info/sigterm/deob/attributes/code/instruction/types/ReturnInstruction.java deleted file mode 100644 index cc3ebaa3a6..0000000000 --- a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/ReturnInstruction.java +++ /dev/null @@ -1,6 +0,0 @@ -package info.sigterm.deob.attributes.code.instruction.types; - -public interface ReturnInstruction -{ - -} diff --git a/src/main/java/info/sigterm/deob/ClassFile.java b/src/main/java/net/runelite/deob/ClassFile.java similarity index 96% rename from src/main/java/info/sigterm/deob/ClassFile.java rename to src/main/java/net/runelite/deob/ClassFile.java index ee3e065d5e..c1bc7aad38 100644 --- a/src/main/java/info/sigterm/deob/ClassFile.java +++ b/src/main/java/net/runelite/deob/ClassFile.java @@ -1,8 +1,8 @@ -package info.sigterm.deob; +package net.runelite.deob; -import info.sigterm.deob.attributes.Attributes; -import info.sigterm.deob.pool.Class; -import info.sigterm.deob.pool.NameAndType; +import net.runelite.deob.attributes.Attributes; +import net.runelite.deob.pool.Class; +import net.runelite.deob.pool.NameAndType; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/src/main/java/info/sigterm/deob/ClassGroup.java b/src/main/java/net/runelite/deob/ClassGroup.java similarity index 96% rename from src/main/java/info/sigterm/deob/ClassGroup.java rename to src/main/java/net/runelite/deob/ClassGroup.java index f1d2c4afc3..b6533e13fe 100644 --- a/src/main/java/info/sigterm/deob/ClassGroup.java +++ b/src/main/java/net/runelite/deob/ClassGroup.java @@ -1,4 +1,4 @@ -package info.sigterm.deob; +package net.runelite.deob; import java.io.DataInputStream; import java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/ConstantPool.java b/src/main/java/net/runelite/deob/ConstantPool.java similarity index 75% rename from src/main/java/info/sigterm/deob/ConstantPool.java rename to src/main/java/net/runelite/deob/ConstantPool.java index 57dd0f8ede..8193237f25 100644 --- a/src/main/java/info/sigterm/deob/ConstantPool.java +++ b/src/main/java/net/runelite/deob/ConstantPool.java @@ -1,10 +1,10 @@ -package info.sigterm.deob; +package net.runelite.deob; -import info.sigterm.deob.pool.ConstantType; -import info.sigterm.deob.pool.InterfaceMethod; -import info.sigterm.deob.pool.NameAndType; -import info.sigterm.deob.pool.PoolEntry; -import info.sigterm.deob.pool.UTF8; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -110,14 +110,14 @@ public class ConstantPool return u.getValue(); } - public info.sigterm.deob.pool.Class getClass(int index) + public net.runelite.deob.pool.Class getClass(int index) { - return (info.sigterm.deob.pool.Class) getEntry(index); + return (net.runelite.deob.pool.Class) getEntry(index); } - public info.sigterm.deob.pool.Field getField(int index) + public net.runelite.deob.pool.Field getField(int index) { - return (info.sigterm.deob.pool.Field) getEntry(index); + return (net.runelite.deob.pool.Field) getEntry(index); } public InterfaceMethod getInterfaceMethod(int index) @@ -125,9 +125,9 @@ public class ConstantPool return (InterfaceMethod) getEntry(index); } - public info.sigterm.deob.pool.Method getMethod(int index) + public net.runelite.deob.pool.Method getMethod(int index) { - return (info.sigterm.deob.pool.Method) getEntry(index); + return (net.runelite.deob.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 info.sigterm.deob.pool.String((String) object)); + return make(new net.runelite.deob.pool.String((String) object)); if (object instanceof Integer) - return make(new info.sigterm.deob.pool.Integer((int) object)); + return make(new net.runelite.deob.pool.Integer((int) object)); if (object instanceof Float) - return make(new info.sigterm.deob.pool.Float((float) object)); + return make(new net.runelite.deob.pool.Float((float) object)); if (object instanceof Long) - return make(new info.sigterm.deob.pool.Long((long) object)); + return make(new net.runelite.deob.pool.Long((long) object)); if (object instanceof Double) - return make(new info.sigterm.deob.pool.Double((double) object)); + return make(new net.runelite.deob.pool.Double((double) object)); System.err.println("Constant pool make with unknown object " + object + " type " + object.getClass()); diff --git a/src/main/java/info/sigterm/deob/Deob.java b/src/main/java/net/runelite/deob/Deob.java similarity index 96% rename from src/main/java/info/sigterm/deob/Deob.java rename to src/main/java/net/runelite/deob/Deob.java index 79dada7ecb..e257169337 100644 --- a/src/main/java/info/sigterm/deob/Deob.java +++ b/src/main/java/net/runelite/deob/Deob.java @@ -1,8 +1,8 @@ -package info.sigterm.deob; +package net.runelite.deob; -import info.sigterm.deob.deobfuscators.FieldInliner; -import info.sigterm.deob.deobfuscators.FieldMover; -import info.sigterm.deob.deobfuscators.MethodMover; +import net.runelite.deob.deobfuscators.FieldInliner; +import net.runelite.deob.deobfuscators.FieldMover; +import net.runelite.deob.deobfuscators.MethodMover; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/src/main/java/info/sigterm/deob/Deobfuscator.java b/src/main/java/net/runelite/deob/Deobfuscator.java similarity index 68% rename from src/main/java/info/sigterm/deob/Deobfuscator.java rename to src/main/java/net/runelite/deob/Deobfuscator.java index 15c4821ec6..4ddf4d1709 100644 --- a/src/main/java/info/sigterm/deob/Deobfuscator.java +++ b/src/main/java/net/runelite/deob/Deobfuscator.java @@ -1,4 +1,4 @@ -package info.sigterm.deob; +package net.runelite.deob; public interface Deobfuscator { diff --git a/src/main/java/info/sigterm/deob/Field.java b/src/main/java/net/runelite/deob/Field.java similarity index 92% rename from src/main/java/info/sigterm/deob/Field.java rename to src/main/java/net/runelite/deob/Field.java index 32e81e0719..7c5dd69afe 100644 --- a/src/main/java/info/sigterm/deob/Field.java +++ b/src/main/java/net/runelite/deob/Field.java @@ -1,8 +1,8 @@ -package info.sigterm.deob; +package net.runelite.deob; -import info.sigterm.deob.attributes.Attributes; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.signature.Type; +import net.runelite.deob.attributes.Attributes; +import net.runelite.deob.attributes.code.Instruction; +import net.runelite.deob.signature.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/Fields.java b/src/main/java/net/runelite/deob/Fields.java similarity index 92% rename from src/main/java/info/sigterm/deob/Fields.java rename to src/main/java/net/runelite/deob/Fields.java index aa46de1f63..293bc7fa1b 100644 --- a/src/main/java/info/sigterm/deob/Fields.java +++ b/src/main/java/net/runelite/deob/Fields.java @@ -1,6 +1,6 @@ -package info.sigterm.deob; +package net.runelite.deob; -import info.sigterm.deob.pool.NameAndType; +import net.runelite.deob.pool.NameAndType; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/Interfaces.java b/src/main/java/net/runelite/deob/Interfaces.java similarity index 95% rename from src/main/java/info/sigterm/deob/Interfaces.java rename to src/main/java/net/runelite/deob/Interfaces.java index 9db18f5edc..df3fbd1d66 100644 --- a/src/main/java/info/sigterm/deob/Interfaces.java +++ b/src/main/java/net/runelite/deob/Interfaces.java @@ -1,6 +1,6 @@ -package info.sigterm.deob; +package net.runelite.deob; -import info.sigterm.deob.pool.Class; +import net.runelite.deob.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/Method.java b/src/main/java/net/runelite/deob/Method.java similarity index 85% rename from src/main/java/info/sigterm/deob/Method.java rename to src/main/java/net/runelite/deob/Method.java index 25ed1f469b..45830a7870 100644 --- a/src/main/java/info/sigterm/deob/Method.java +++ b/src/main/java/net/runelite/deob/Method.java @@ -1,13 +1,13 @@ -package info.sigterm.deob; +package net.runelite.deob; -import info.sigterm.deob.attributes.AttributeType; -import info.sigterm.deob.attributes.Attributes; -import info.sigterm.deob.attributes.Code; -import info.sigterm.deob.attributes.Exceptions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.pool.NameAndType; -import info.sigterm.deob.signature.Signature; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/Methods.java b/src/main/java/net/runelite/deob/Methods.java similarity index 92% rename from src/main/java/info/sigterm/deob/Methods.java rename to src/main/java/net/runelite/deob/Methods.java index bea54eab0c..fab0c4e7c7 100644 --- a/src/main/java/info/sigterm/deob/Methods.java +++ b/src/main/java/net/runelite/deob/Methods.java @@ -1,7 +1,7 @@ -package info.sigterm.deob; +package net.runelite.deob; -import info.sigterm.deob.pool.NameAndType; -import info.sigterm.deob.signature.Signature; +import net.runelite.deob.pool.NameAndType; +import net.runelite.deob.signature.Signature; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/Attribute.java b/src/main/java/net/runelite/deob/attributes/Attribute.java similarity index 96% rename from src/main/java/info/sigterm/deob/attributes/Attribute.java rename to src/main/java/net/runelite/deob/attributes/Attribute.java index a01b5779c0..08e9c54b3b 100644 --- a/src/main/java/info/sigterm/deob/attributes/Attribute.java +++ b/src/main/java/net/runelite/deob/attributes/Attribute.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.attributes; +package net.runelite.deob.attributes; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/AttributeType.java b/src/main/java/net/runelite/deob/attributes/AttributeType.java similarity index 94% rename from src/main/java/info/sigterm/deob/attributes/AttributeType.java rename to src/main/java/net/runelite/deob/attributes/AttributeType.java index 3c631396f6..c7fbbf3793 100644 --- a/src/main/java/info/sigterm/deob/attributes/AttributeType.java +++ b/src/main/java/net/runelite/deob/attributes/AttributeType.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.attributes; +package net.runelite.deob.attributes; public enum AttributeType { diff --git a/src/main/java/info/sigterm/deob/attributes/Attributes.java b/src/main/java/net/runelite/deob/attributes/Attributes.java similarity index 94% rename from src/main/java/info/sigterm/deob/attributes/Attributes.java rename to src/main/java/net/runelite/deob/attributes/Attributes.java index e73bb053ec..c18d178278 100644 --- a/src/main/java/info/sigterm/deob/attributes/Attributes.java +++ b/src/main/java/net/runelite/deob/attributes/Attributes.java @@ -1,8 +1,8 @@ -package info.sigterm.deob.attributes; +package net.runelite.deob.attributes; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.Field; -import info.sigterm.deob.Method; +import net.runelite.deob.ClassFile; +import net.runelite.deob.Field; +import net.runelite.deob.Method; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/Code.java b/src/main/java/net/runelite/deob/attributes/Code.java similarity index 85% rename from src/main/java/info/sigterm/deob/attributes/Code.java rename to src/main/java/net/runelite/deob/attributes/Code.java index 7a46c24951..db94a29fd0 100644 --- a/src/main/java/info/sigterm/deob/attributes/Code.java +++ b/src/main/java/net/runelite/deob/attributes/Code.java @@ -1,10 +1,10 @@ -package info.sigterm.deob.attributes; +package net.runelite.deob.attributes; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.code.Exceptions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/ConstantValue.java b/src/main/java/net/runelite/deob/attributes/ConstantValue.java similarity index 90% rename from src/main/java/info/sigterm/deob/attributes/ConstantValue.java rename to src/main/java/net/runelite/deob/attributes/ConstantValue.java index d18ba41f4a..97222f2df2 100644 --- a/src/main/java/info/sigterm/deob/attributes/ConstantValue.java +++ b/src/main/java/net/runelite/deob/attributes/ConstantValue.java @@ -1,6 +1,6 @@ -package info.sigterm.deob.attributes; +package net.runelite.deob.attributes; -import info.sigterm.deob.pool.PoolEntry; +import net.runelite.deob.pool.PoolEntry; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/Exceptions.java b/src/main/java/net/runelite/deob/attributes/Exceptions.java similarity index 86% rename from src/main/java/info/sigterm/deob/attributes/Exceptions.java rename to src/main/java/net/runelite/deob/attributes/Exceptions.java index 792ca33b21..d5c2cdbccc 100644 --- a/src/main/java/info/sigterm/deob/attributes/Exceptions.java +++ b/src/main/java/net/runelite/deob/attributes/Exceptions.java @@ -1,7 +1,7 @@ -package info.sigterm.deob.attributes; +package net.runelite.deob.attributes; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.pool.Class; +import net.runelite.deob.ClassFile; +import net.runelite.deob.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/Unknown.java b/src/main/java/net/runelite/deob/attributes/Unknown.java similarity index 94% rename from src/main/java/info/sigterm/deob/attributes/Unknown.java rename to src/main/java/net/runelite/deob/attributes/Unknown.java index 8fe8201bc9..632e5353b7 100644 --- a/src/main/java/info/sigterm/deob/attributes/Unknown.java +++ b/src/main/java/net/runelite/deob/attributes/Unknown.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.attributes; +package net.runelite.deob.attributes; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/Exception.java b/src/main/java/net/runelite/deob/attributes/code/Exception.java similarity index 92% rename from src/main/java/info/sigterm/deob/attributes/code/Exception.java rename to src/main/java/net/runelite/deob/attributes/code/Exception.java index d60753c3d2..b0ae83fa6f 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/Exception.java +++ b/src/main/java/net/runelite/deob/attributes/code/Exception.java @@ -1,8 +1,8 @@ -package info.sigterm.deob.attributes.code; +package net.runelite.deob.attributes.code; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ConstantPool; -import info.sigterm.deob.pool.Class; +import net.runelite.deob.ClassFile; +import net.runelite.deob.ConstantPool; +import net.runelite.deob.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/Exceptions.java b/src/main/java/net/runelite/deob/attributes/code/Exceptions.java similarity index 88% rename from src/main/java/info/sigterm/deob/attributes/code/Exceptions.java rename to src/main/java/net/runelite/deob/attributes/code/Exceptions.java index b9a8023c20..274e4886c5 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/Exceptions.java +++ b/src/main/java/net/runelite/deob/attributes/code/Exceptions.java @@ -1,7 +1,7 @@ -package info.sigterm.deob.attributes.code; +package net.runelite.deob.attributes.code; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.Code; +import net.runelite.deob.ClassFile; +import net.runelite.deob.attributes.Code; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/Instruction.java b/src/main/java/net/runelite/deob/attributes/code/Instruction.java similarity index 91% rename from src/main/java/info/sigterm/deob/attributes/code/Instruction.java rename to src/main/java/net/runelite/deob/attributes/code/Instruction.java index cf0bd0f7bf..62e4dca8ac 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/Instruction.java +++ b/src/main/java/net/runelite/deob/attributes/code/Instruction.java @@ -1,11 +1,11 @@ -package info.sigterm.deob.attributes.code; +package net.runelite.deob.attributes.code; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ConstantPool; -import info.sigterm.deob.Field; -import info.sigterm.deob.Method; -import info.sigterm.deob.block.Block; -import info.sigterm.deob.execution.Frame; +import net.runelite.deob.ClassFile; +import net.runelite.deob.ConstantPool; +import net.runelite.deob.Field; +import net.runelite.deob.Method; +import net.runelite.deob.block.Block; +import net.runelite.deob.execution.Frame; import java.io.DataOutputStream; import java.io.IOException; @@ -222,11 +222,11 @@ public abstract class Instruction { } - public void renameField(Field f, info.sigterm.deob.pool.Field name) + public void renameField(Field f, net.runelite.deob.pool.Field name) { } - public void renameMethod(Method oldMethod, info.sigterm.deob.pool.Method newMethod) + public void renameMethod(Method oldMethod, net.runelite.deob.pool.Method newMethod) { } } diff --git a/src/main/java/net/runelite/deob/attributes/code/InstructionType.java b/src/main/java/net/runelite/deob/attributes/code/InstructionType.java new file mode 100644 index 0000000000..336cba1620 --- /dev/null +++ b/src/main/java/net/runelite/deob/attributes/code/InstructionType.java @@ -0,0 +1,417 @@ +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.If; +import net.runelite.deob.attributes.code.instructions.If0; +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", If0.class), + IFNE(0x9a, "ifne", If0.class), + IFLT(0x9b, "iflt", If0.class), + IFGE(0x9c, "ifge", If0.class), + IFGT(0x9d, "ifgt", If0.class), + IFLE(0x9e, "ifle", If0.class), + IF_ICMPEQ(0x9f, "if_icmpeq", If.class), + IF_ICMPNE(0xa0, "if_icmpne", If.class), + IF_ICMPLT(0xa1, "if_cmplt", If.class), + IF_ICMPGE(0xa2, "if_icmpge", If.class), + IF_ICMPGT(0xa3, "if_icmpgt", If.class), + IF_ICMPLE(0xa4, "if_icmple", If.class), + IF_ACMPEQ(0xa5, "if_acmpeq", If.class), + IF_ACMPNE(0xa6, "if_acmpne", If.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", If0.class), + IFNONNULL(0xc7, "ifnonnull", If0.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/info/sigterm/deob/attributes/code/Instructions.java b/src/main/java/net/runelite/deob/attributes/code/Instructions.java similarity index 91% rename from src/main/java/info/sigterm/deob/attributes/code/Instructions.java rename to src/main/java/net/runelite/deob/attributes/code/Instructions.java index a591dd9a27..a5febcf75b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/Instructions.java +++ b/src/main/java/net/runelite/deob/attributes/code/Instructions.java @@ -1,11 +1,11 @@ -package info.sigterm.deob.attributes.code; +package net.runelite.deob.attributes.code; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.Field; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.Code; -import info.sigterm.deob.attributes.code.instruction.types.JumpingInstruction; -import info.sigterm.deob.block.Block; +import net.runelite.deob.ClassFile; +import net.runelite.deob.Field; +import net.runelite.deob.Method; +import net.runelite.deob.attributes.Code; +import net.runelite.deob.attributes.code.instruction.types.JumpingInstruction; +import net.runelite.deob.block.Block; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -232,13 +232,13 @@ public class Instructions i.renameClass(cf, name); } - public void renameField(Field f, info.sigterm.deob.pool.Field newField) + public void renameField(Field f, net.runelite.deob.pool.Field newField) { for (Instruction i : instructions) i.renameField(f, newField); } - public void renameMethod(Method oldMethod, info.sigterm.deob.pool.Method newMethod) + public void renameMethod(Method oldMethod, net.runelite.deob.pool.Method newMethod) { for (Instruction i : instructions) i.renameMethod(oldMethod, newMethod); 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 new file mode 100644 index 0000000000..f771601273 --- /dev/null +++ b/src/main/java/net/runelite/deob/attributes/code/instruction/types/ComparisonInstruction.java @@ -0,0 +1,6 @@ +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 new file mode 100644 index 0000000000..f76e776e37 --- /dev/null +++ b/src/main/java/net/runelite/deob/attributes/code/instruction/types/FieldInstruction.java @@ -0,0 +1,10 @@ +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/info/sigterm/deob/attributes/code/instruction/types/GetFieldInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/GetFieldInstruction.java similarity index 50% rename from src/main/java/info/sigterm/deob/attributes/code/instruction/types/GetFieldInstruction.java rename to src/main/java/net/runelite/deob/attributes/code/instruction/types/GetFieldInstruction.java index d1a02b8723..73755aca9b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/GetFieldInstruction.java +++ b/src/main/java/net/runelite/deob/attributes/code/instruction/types/GetFieldInstruction.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.attributes.code.instruction.types; +package net.runelite.deob.attributes.code.instruction.types; public interface GetFieldInstruction extends FieldInstruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/InvokeInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/InvokeInstruction.java similarity index 53% rename from src/main/java/info/sigterm/deob/attributes/code/instruction/types/InvokeInstruction.java rename to src/main/java/net/runelite/deob/attributes/code/instruction/types/InvokeInstruction.java index 110cb1f8cd..e822222d43 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/InvokeInstruction.java +++ b/src/main/java/net/runelite/deob/attributes/code/instruction/types/InvokeInstruction.java @@ -1,9 +1,9 @@ -package info.sigterm.deob.attributes.code.instruction.types; +package net.runelite.deob.attributes.code.instruction.types; import java.util.List; -import info.sigterm.deob.Method; -import info.sigterm.deob.pool.PoolEntry; +import net.runelite.deob.Method; +import net.runelite.deob.pool.PoolEntry; public interface InvokeInstruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/JumpingInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/JumpingInstruction.java similarity index 50% rename from src/main/java/info/sigterm/deob/attributes/code/instruction/types/JumpingInstruction.java rename to src/main/java/net/runelite/deob/attributes/code/instruction/types/JumpingInstruction.java index dcbd6f23dc..e62fd48cf2 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/JumpingInstruction.java +++ b/src/main/java/net/runelite/deob/attributes/code/instruction/types/JumpingInstruction.java @@ -1,6 +1,6 @@ -package info.sigterm.deob.attributes.code.instruction.types; +package net.runelite.deob.attributes.code.instruction.types; -import info.sigterm.deob.attributes.code.Instruction; +import net.runelite.deob.attributes.code.Instruction; import java.util.List; public interface JumpingInstruction diff --git a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/LVTInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/LVTInstruction.java similarity index 53% rename from src/main/java/info/sigterm/deob/attributes/code/instruction/types/LVTInstruction.java rename to src/main/java/net/runelite/deob/attributes/code/instruction/types/LVTInstruction.java index 21a2be4953..24f0109534 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/LVTInstruction.java +++ b/src/main/java/net/runelite/deob/attributes/code/instruction/types/LVTInstruction.java @@ -1,6 +1,6 @@ -package info.sigterm.deob.attributes.code.instruction.types; +package net.runelite.deob.attributes.code.instruction.types; -import info.sigterm.deob.attributes.code.Instruction; +import net.runelite.deob.attributes.code.Instruction; public interface LVTInstruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/PushConstantInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/PushConstantInstruction.java similarity index 52% rename from src/main/java/info/sigterm/deob/attributes/code/instruction/types/PushConstantInstruction.java rename to src/main/java/net/runelite/deob/attributes/code/instruction/types/PushConstantInstruction.java index c7c7a32988..7aeda1f371 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/PushConstantInstruction.java +++ b/src/main/java/net/runelite/deob/attributes/code/instruction/types/PushConstantInstruction.java @@ -1,6 +1,6 @@ -package info.sigterm.deob.attributes.code.instruction.types; +package net.runelite.deob.attributes.code.instruction.types; -import info.sigterm.deob.pool.PoolEntry; +import net.runelite.deob.pool.PoolEntry; public interface PushConstantInstruction { 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 new file mode 100644 index 0000000000..85a982448f --- /dev/null +++ b/src/main/java/net/runelite/deob/attributes/code/instruction/types/ReturnInstruction.java @@ -0,0 +1,6 @@ +package net.runelite.deob.attributes.code.instruction.types; + +public interface ReturnInstruction +{ + +} diff --git a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/SetFieldInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/SetFieldInstruction.java similarity index 50% rename from src/main/java/info/sigterm/deob/attributes/code/instruction/types/SetFieldInstruction.java rename to src/main/java/net/runelite/deob/attributes/code/instruction/types/SetFieldInstruction.java index 2b3f264ba7..49a4707033 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/SetFieldInstruction.java +++ b/src/main/java/net/runelite/deob/attributes/code/instruction/types/SetFieldInstruction.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.attributes.code.instruction.types; +package net.runelite.deob.attributes.code.instruction.types; public interface SetFieldInstruction extends FieldInstruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/WideInstruction.java b/src/main/java/net/runelite/deob/attributes/code/instruction/types/WideInstruction.java similarity index 70% rename from src/main/java/info/sigterm/deob/attributes/code/instruction/types/WideInstruction.java rename to src/main/java/net/runelite/deob/attributes/code/instruction/types/WideInstruction.java index 441947ad39..753ddc509d 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instruction/types/WideInstruction.java +++ b/src/main/java/net/runelite/deob/attributes/code/instruction/types/WideInstruction.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.attributes.code.instruction.types; +package net.runelite.deob.attributes.code.instruction.types; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AALoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/AALoad.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/AALoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/AALoad.java index f4469a837b..7f103bac74 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/AALoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/AALoad.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class AALoad extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AAStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/AAStore.java similarity index 55% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/AAStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/AAStore.java index f385aeae0e..61c975566a 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/AAStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/AAStore.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class AAStore extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AConstNull.java b/src/main/java/net/runelite/deob/attributes/code/instructions/AConstNull.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/AConstNull.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/AConstNull.java index 1aa389db1f..50a1b16165 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/AConstNull.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/AConstNull.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad.java similarity index 73% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ALoad.java index e5d6475be4..19d09f8bda 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_0.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_0.java index 139e2d47b7..406eb9c535 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_0.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_1.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_1.java index 85c331e103..ebdc649f2e 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_1.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_2.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_2.java index 156688f74c..ad0cbec79d 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_2.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_3.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_3.java index 9cbbfd3493..8cb670b462 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ALoad_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ALoad_3.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ANewArray.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ANewArray.java similarity index 64% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ANewArray.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ANewArray.java index 8f97806551..2258188730 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ANewArray.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ANewArray.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.pool.Class; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -46,7 +46,7 @@ public class ANewArray extends Instruction ins.pop(count); - Type t = new Type(new info.sigterm.deob.signature.Type("[" + clazz.getName())); + Type t = new Type(new net.runelite.deob.signature.Type("[" + clazz.getName())); StackContext ctx = new StackContext(ins, t); stack.push(ctx); @@ -58,7 +58,7 @@ public class ANewArray extends Instruction @Override public void renameClass(ClassFile cf, String name) { - info.sigterm.deob.signature.Type t = new info.sigterm.deob.signature.Type(clazz.getName()); + net.runelite.deob.signature.Type t = new net.runelite.deob.signature.Type(clazz.getName()); if (t.getType().equals("L" + cf.getName() + ";") || t.getType().equals(cf.getName())) clazz = new Class(name, t.getArrayDims()); } diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/AStore.java similarity index 67% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/AStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/AStore.java index b23ae0fac5..c9be0e2871 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/AStore.java @@ -1,18 +1,18 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; -import info.sigterm.deob.pool.Class; +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.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.deob.pool.Class; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_0.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/AStore_0.java index 7281600e8a..b50facc376 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_0.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_1.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/AStore_1.java index 415fa60152..cdf7eef8bf 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_1.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_2.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/AStore_2.java index 76678313bc..0fe269e06c 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_2.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_3.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/AStore_3.java index c03e7cdfec..83a68173d3 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/AStore_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/AStore_3.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/AThrow.java b/src/main/java/net/runelite/deob/attributes/code/instructions/AThrow.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/AThrow.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/AThrow.java index ff83db2742..8f1b081b1c 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/AThrow.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/AThrow.java @@ -1,13 +1,13 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; +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 java.io.IOException; import java.util.List; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ArrayLength.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ArrayLength.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ArrayLength.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ArrayLength.java index 3bce31b7ef..8f9edc69f9 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ArrayLength.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ArrayLength.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/BALoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/BALoad.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/BALoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/BALoad.java index 3bdf5f92a8..7d4b19c325 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/BALoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/BALoad.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class BALoad extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/BAStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/BAStore.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/BAStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/BAStore.java index 41af93be6e..5e2f1738e5 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/BAStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/BAStore.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class BAStore extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/BiPush.java b/src/main/java/net/runelite/deob/attributes/code/instructions/BiPush.java similarity index 66% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/BiPush.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/BiPush.java index 448ae3a688..cb341e2bff 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/BiPush.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/BiPush.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -51,7 +51,7 @@ public class BiPush extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Integer(b); + return new net.runelite.deob.pool.Integer(b); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/CALoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/CALoad.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/CALoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/CALoad.java index 057cb0558d..29a9649e67 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/CALoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/CALoad.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class CALoad extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/CAStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/CAStore.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/CAStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/CAStore.java index ec37104843..0d591afade 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/CAStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/CAStore.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class CAStore extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java b/src/main/java/net/runelite/deob/attributes/code/instructions/CheckCast.java similarity index 67% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/CheckCast.java index f4ba4a17d5..8c424f5ea0 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/CheckCast.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/CheckCast.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.pool.Class; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/D2F.java b/src/main/java/net/runelite/deob/attributes/code/instructions/D2F.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/D2F.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/D2F.java index 4924893696..ed882d0139 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/D2F.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/D2F.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/D2I.java b/src/main/java/net/runelite/deob/attributes/code/instructions/D2I.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/D2I.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/D2I.java index 21167b5723..f515583359 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/D2I.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/D2I.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/D2L.java b/src/main/java/net/runelite/deob/attributes/code/instructions/D2L.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/D2L.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/D2L.java index 72c6d850bf..d7f149b432 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/D2L.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/D2L.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DALoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DALoad.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DALoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DALoad.java index 9cacaaf037..5f23c407ed 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DALoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DALoad.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class DALoad extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DAStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DAStore.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DAStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DAStore.java index bd787ac8bc..c6d2bea587 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DAStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DAStore.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class DAStore extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DAdd.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DAdd.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DAdd.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DAdd.java index 4ad963c0e6..567be24c0e 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DAdd.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DAdd.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class DAdd extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DCmpG.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DCmpG.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DCmpG.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DCmpG.java index f86aacf791..61647e2327 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DCmpG.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DCmpG.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DCmpL.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DCmpL.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DCmpL.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DCmpL.java index dfd9cbc200..376a9bc5a4 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DCmpL.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DCmpL.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DConst_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DConst_0.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DConst_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DConst_0.java index b0a76375fd..124752f07b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DConst_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DConst_0.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class DConst_0 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Double(0.0d); + return new net.runelite.deob.pool.Double(0.0d); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DConst_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DConst_1.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DConst_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DConst_1.java index a53276a650..6404d7df51 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DConst_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DConst_1.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class DConst_1 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Double(1.0d); + return new net.runelite.deob.pool.Double(1.0d); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DDiv.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DDiv.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DDiv.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DDiv.java index 4ef98f3e9d..54201eb69f 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DDiv.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DDiv.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class DDiv extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad.java similarity index 72% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DLoad.java index 5c812933d3..7968b6f7dc 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad.java @@ -1,17 +1,17 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_0.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_0.java index ad7e90510a..3e68cf5794 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_0.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_1.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_1.java index 4166dbca0f..4bc4ac1456 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_1.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_2.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_2.java index 7ee1bc41dc..edf3cf2030 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_2.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_3.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_3.java index e186f60a85..5822e2e8c7 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DLoad_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DLoad_3.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DMul.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DMul.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DMul.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DMul.java index a322432c1f..2692b1c46d 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DMul.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DMul.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class DMul extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DNeg.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DNeg.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DNeg.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DNeg.java index 3203c8c649..60017f7b16 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DNeg.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DNeg.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class DNeg extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DRem.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DRem.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DRem.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DRem.java index 05ae746b4d..b4ab513c9f 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DRem.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DRem.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class DRem extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DStore.java similarity index 69% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DStore.java index 622957dfd6..86aa156eb2 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DStore.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_0.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DStore_0.java index 403f662962..ebf6d23823 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_0.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_1.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DStore_1.java index 01a1dbb7fa..820414446c 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_1.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_2.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DStore_2.java index 37f159d914..e36647d59d 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_2.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_3.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DStore_3.java index 9ad2155d8e..6cf08eb68a 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DStore_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DStore_3.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/DSub.java b/src/main/java/net/runelite/deob/attributes/code/instructions/DSub.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/DSub.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/DSub.java index 2788b24531..5ddf28edd8 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/DSub.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/DSub.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class DSub extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup.java similarity index 73% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Dup.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Dup.java index bf3637a2f1..5c1743fae3 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2.java similarity index 72% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Dup2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Dup2.java index 92ee838b39..7a0698ed8a 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2.java @@ -1,13 +1,13 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup2_X1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X1.java similarity index 74% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Dup2_X1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X1.java index b84909b943..b7dbfaacf9 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup2_X1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X1.java @@ -1,13 +1,13 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup2_X2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X2.java similarity index 79% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Dup2_X2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X2.java index 1e7d7da866..367e86885f 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup2_X2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup2_X2.java @@ -1,13 +1,13 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup_X1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X1.java similarity index 67% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Dup_X1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X1.java index 7320cdf6c5..173f138e5b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup_X1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X1.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup_X2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X2.java similarity index 72% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Dup_X2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X2.java index 2839dc9b8f..55412a94a2 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Dup_X2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Dup_X2.java @@ -1,13 +1,13 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/F2D.java b/src/main/java/net/runelite/deob/attributes/code/instructions/F2D.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/F2D.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/F2D.java index c32207c190..4889e3d557 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/F2D.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/F2D.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/F2I.java b/src/main/java/net/runelite/deob/attributes/code/instructions/F2I.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/F2I.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/F2I.java index 39ddf6c698..049a0ce3fa 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/F2I.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/F2I.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/F2L.java b/src/main/java/net/runelite/deob/attributes/code/instructions/F2L.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/F2L.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/F2L.java index 4eebc18323..a4cac299fc 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/F2L.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/F2L.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FALoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FALoad.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FALoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FALoad.java index d21b238f9e..fcd0074012 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FALoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FALoad.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class FALoad extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FAStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FAStore.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FAStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FAStore.java index bc2ea085db..c0ec63105c 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FAStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FAStore.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class FAStore extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FAdd.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FAdd.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FAdd.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FAdd.java index f854a731b2..fe514e1c97 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FAdd.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FAdd.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class FAdd extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FCmpG.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FCmpG.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FCmpG.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FCmpG.java index f3e5f2871f..596443658c 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FCmpG.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FCmpG.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FCmpL.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FCmpL.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FCmpL.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FCmpL.java index 5e26dfb078..d96aee0362 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FCmpL.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FCmpL.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FConst_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_0.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FConst_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FConst_0.java index 87a2e0c134..afe0edde87 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FConst_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_0.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class FConst_0 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Float(0.0f); + return new net.runelite.deob.pool.Float(0.0f); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FConst_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_1.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FConst_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FConst_1.java index 44f95077b4..6045c2a192 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FConst_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_1.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class FConst_1 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Float(1.0f); + return new net.runelite.deob.pool.Float(1.0f); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FConst_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_2.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FConst_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FConst_2.java index ee6e1bd7a5..e342d96609 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FConst_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FConst_2.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class FConst_2 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Float(2.0f); + return new net.runelite.deob.pool.Float(2.0f); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FDiv.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FDiv.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FDiv.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FDiv.java index aaa2f188e6..57407afde7 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FDiv.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FDiv.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class FDiv extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad.java similarity index 72% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FLoad.java index 16e8e4b91a..cda5057067 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad.java @@ -1,17 +1,17 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_0.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_0.java index 94ffca1bf0..7365e45f03 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_0.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_1.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_1.java index cf513921f0..be1203acc2 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_1.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_2.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_2.java index 220fbeae25..212a6182ad 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_2.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_3.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_3.java index 3f5b964c0e..48fc451ae6 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FLoad_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FLoad_3.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FMul.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FMul.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FMul.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FMul.java index d797ddb4a8..7324f191ee 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FMul.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FMul.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class FMul extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FNeg.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FNeg.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FNeg.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FNeg.java index 4c3d1cac4d..7ef4bdc5e0 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FNeg.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FNeg.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class FNeg extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FRem.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FRem.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FRem.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FRem.java index 7ea9417b02..b75b0269fd 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FRem.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FRem.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class FRem extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FStore.java similarity index 69% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FStore.java index afb10f8ade..1d5fab31b6 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FStore.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_0.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FStore_0.java index 94c8616da6..3b0da59b63 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_0.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_1.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FStore_1.java index c25b24c79a..d0736386ed 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_1.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_2.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FStore_2.java index 65787860ae..84793108d6 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_2.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_3.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FStore_3.java index 2dfb153440..5c66bb1749 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FStore_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FStore_3.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/FSub.java b/src/main/java/net/runelite/deob/attributes/code/instructions/FSub.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/FSub.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/FSub.java index 0fdea7e19e..6a0e83363b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/FSub.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/FSub.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class FSub extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java b/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java similarity index 69% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java index f21a65cc8a..252f3aa2c4 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/GetField.java @@ -1,18 +1,18 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.GetFieldInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.pool.Class; -import info.sigterm.deob.pool.Field; -import info.sigterm.deob.pool.NameAndType; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -62,7 +62,7 @@ public class GetField extends Instruction implements GetFieldInstruction } @Override - public info.sigterm.deob.Field getMyField() + public net.runelite.deob.Field getMyField() { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -71,7 +71,7 @@ public class GetField extends Instruction implements GetFieldInstruction if (cf == null) return null; - info.sigterm.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.deob.Field f2 = cf.findFieldDeep(nat); return f2; } @@ -82,11 +82,11 @@ public class GetField extends Instruction implements GetFieldInstruction field = new Field(new Class(name), field.getNameAndType()); if (field.getNameAndType().getDescriptorType().getType().equals("L" + cf.getName() + ";")) - field = new Field(field.getClassEntry(), new NameAndType(field.getNameAndType().getName(), new info.sigterm.deob.signature.Type("L" + name + ";", field.getNameAndType().getDescriptorType().getArrayDims()))); + field = new Field(field.getClassEntry(), new NameAndType(field.getNameAndType().getName(), new net.runelite.deob.signature.Type("L" + name + ";", field.getNameAndType().getDescriptorType().getArrayDims()))); } @Override - public void renameField(info.sigterm.deob.Field f, Field newField) + public void renameField(net.runelite.deob.Field f, Field newField) { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -95,7 +95,7 @@ public class GetField extends Instruction implements GetFieldInstruction if (cf == null) return; - info.sigterm.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.deob.Field f2 = cf.findFieldDeep(nat); assert f2 != null; if (f2 == f) diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java b/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java similarity index 70% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java index 5db702abc2..f2b69e97c9 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/GetStatic.java @@ -1,18 +1,18 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.GetFieldInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.pool.Class; -import info.sigterm.deob.pool.Field; -import info.sigterm.deob.pool.NameAndType; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -62,7 +62,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction if (cf == null) return; - info.sigterm.deob.Field f = cf.findFieldDeep(nat); + net.runelite.deob.Field f = cf.findFieldDeep(nat); assert f != null; f.addReference(this); @@ -75,7 +75,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction } @Override - public info.sigterm.deob.Field getMyField() + public net.runelite.deob.Field getMyField() { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -84,7 +84,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction if (cf == null) return null; - info.sigterm.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.deob.Field f2 = cf.findFieldDeep(nat); return f2; } @@ -95,11 +95,11 @@ public class GetStatic extends Instruction implements GetFieldInstruction field = new Field(new Class(name), field.getNameAndType()); if (field.getNameAndType().getDescriptorType().getType().equals("L" + cf.getName() + ";")) - field = new Field(field.getClassEntry(), new NameAndType(field.getNameAndType().getName(), new info.sigterm.deob.signature.Type("L" + name + ";", field.getNameAndType().getDescriptorType().getArrayDims()))); + field = new Field(field.getClassEntry(), new NameAndType(field.getNameAndType().getName(), new net.runelite.deob.signature.Type("L" + name + ";", field.getNameAndType().getDescriptorType().getArrayDims()))); } @Override - public void renameField(info.sigterm.deob.Field f, Field newField) + public void renameField(net.runelite.deob.Field f, Field newField) { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -108,7 +108,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction if (cf == null) return; - info.sigterm.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.deob.Field f2 = cf.findFieldDeep(nat); assert f2 != null; if (f2 == f) diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Goto.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Goto.java similarity index 81% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Goto.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Goto.java index d3cfe12b35..38ddc9d37d 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Goto.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Goto.java @@ -1,11 +1,11 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.JumpingInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/GotoW.java b/src/main/java/net/runelite/deob/attributes/code/instructions/GotoW.java similarity index 76% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/GotoW.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/GotoW.java index 02ce1992f2..67263ae0ca 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/GotoW.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/GotoW.java @@ -1,11 +1,11 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.JumpingInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2B.java b/src/main/java/net/runelite/deob/attributes/code/instructions/I2B.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/I2B.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/I2B.java index bd6eb3bf63..d77c6c94ab 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2B.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/I2B.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2C.java b/src/main/java/net/runelite/deob/attributes/code/instructions/I2C.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/I2C.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/I2C.java index cd0b53614e..dd2fcd55ef 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2C.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/I2C.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2D.java b/src/main/java/net/runelite/deob/attributes/code/instructions/I2D.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/I2D.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/I2D.java index 78c2237797..0881ec96ee 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2D.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/I2D.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2F.java b/src/main/java/net/runelite/deob/attributes/code/instructions/I2F.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/I2F.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/I2F.java index 94ce2b8a0a..4adbeea524 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2F.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/I2F.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2L.java b/src/main/java/net/runelite/deob/attributes/code/instructions/I2L.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/I2L.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/I2L.java index d570f6a372..b8cadaf162 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2L.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/I2L.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2S.java b/src/main/java/net/runelite/deob/attributes/code/instructions/I2S.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/I2S.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/I2S.java index b2614588a7..8349ec7591 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/I2S.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/I2S.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IALoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IALoad.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IALoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IALoad.java index 58e35c2f89..cc94c5223b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IALoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IALoad.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IALoad extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IAStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IAStore.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IAStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IAStore.java index 2def7fcd95..ed4bb60642 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IAStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IAStore.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IAStore extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IAdd.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IAdd.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IAdd.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IAdd.java index acf4277186..286ff4e5c3 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IAdd.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IAdd.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IAdd extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IAnd.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IAnd.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IAnd.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IAnd.java index 9add15ec70..739319db8e 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IAnd.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IAnd.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IAnd extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_0.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IConst_0.java index 06d38049b4..268701a82f 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_0.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class IConst_0 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Integer(0); + return new net.runelite.deob.pool.Integer(0); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_1.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IConst_1.java index 522a900f13..ffaa661d0d 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_1.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class IConst_1 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Integer(1); + return new net.runelite.deob.pool.Integer(1); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_2.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IConst_2.java index 46513eab48..29b5bea5d2 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_2.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class IConst_2 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Integer(2); + return new net.runelite.deob.pool.Integer(2); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_3.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IConst_3.java index 088a6ba9b7..fb4b1d6464 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_3.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class IConst_3 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Integer(3); + return new net.runelite.deob.pool.Integer(3); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_4.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_4.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_4.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IConst_4.java index 8b7eac21eb..f548584ac9 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_4.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_4.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class IConst_4 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Integer(4); + return new net.runelite.deob.pool.Integer(4); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_5.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_5.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_5.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IConst_5.java index 25d40efc67..75d62b9fe8 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_5.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_5.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class IConst_5 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Integer(5); + return new net.runelite.deob.pool.Integer(5); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_M1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_M1.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_M1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IConst_M1.java index 59345bec12..8045437289 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IConst_M1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IConst_M1.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class IConst_M1 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Integer(-1); + return new net.runelite.deob.pool.Integer(-1); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IDiv.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IDiv.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IDiv.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IDiv.java index 40b5b89f17..37c001f8eb 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IDiv.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IDiv.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IDiv extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IInc.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IInc.java similarity index 75% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IInc.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IInc.java index 63ad066607..027623c711 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IInc.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IInc.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad.java similarity index 72% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ILoad.java index 8dd1864047..74cae101bf 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad.java @@ -1,17 +1,17 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_0.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_0.java index 638df0b1cc..00ebd45b4e 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_0.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_1.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_1.java index bd6e15fa81..984d5f3fc3 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_1.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_2.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_2.java index a63a281893..88af131853 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_2.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_3.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_3.java index e71a1d11d2..ff8150c0db 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ILoad_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ILoad_3.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IMul.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IMul.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IMul.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IMul.java index 6a8f041b43..c1688b0c9c 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IMul.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IMul.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IMul extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/INeg.java b/src/main/java/net/runelite/deob/attributes/code/instructions/INeg.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/INeg.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/INeg.java index 937a77d652..b3cf69bf63 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/INeg.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/INeg.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class INeg extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IOr.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IOr.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IOr.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IOr.java index 1a7469ff58..f9ffb31937 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IOr.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IOr.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IOr extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IRem.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IRem.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IRem.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IRem.java index eeb3643926..d0802680bf 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IRem.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IRem.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IRem extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IShL.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IShL.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IShL.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IShL.java index 8765dc81ac..879e419b60 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IShL.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IShL.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IShL extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IShR.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IShR.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IShR.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IShR.java index 3fc94c84a5..32b1abd52b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IShR.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IShR.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IShR extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IStore.java similarity index 72% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IStore.java index 3bdfade219..8361f18a08 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IStore.java @@ -1,17 +1,17 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_0.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IStore_0.java index 776a34ded0..f15f07b2db 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_0.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_1.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IStore_1.java index 809e905b81..418de02b5b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_1.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_2.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IStore_2.java index 3d9d5fa203..a8676da489 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_2.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_3.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IStore_3.java index 67e63c7df7..b267b2e363 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IStore_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IStore_3.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/ISub.java b/src/main/java/net/runelite/deob/attributes/code/instructions/ISub.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/ISub.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/ISub.java index dd2f2027c9..2b8519d509 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/ISub.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/ISub.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class ISub extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IUShR.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IUShR.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IUShR.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IUShR.java index 77b68e4b63..e2f25473c5 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IUShR.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IUShR.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IUShR extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/IXor.java b/src/main/java/net/runelite/deob/attributes/code/instructions/IXor.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/IXor.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/IXor.java index 48917a60e3..575fdbc6f1 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/IXor.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/IXor.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class IXor extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/If.java b/src/main/java/net/runelite/deob/attributes/code/instructions/If.java similarity index 72% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/If.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/If.java index c11186901d..33dea6a988 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/If.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/If.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.ComparisonInstruction; -import info.sigterm.deob.attributes.code.instruction.types.JumpingInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/If0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/If0.java similarity index 73% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/If0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/If0.java index b03ac3135e..a0d1a538e7 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/If0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/If0.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.ComparisonInstruction; -import info.sigterm.deob.attributes.code.instruction.types.JumpingInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InstanceOf.java similarity index 69% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/InstanceOf.java index d6f2398291..c73ec2c0e1 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/InstanceOf.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InstanceOf.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.Class; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeInterface.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeInterface.java similarity index 68% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeInterface.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/InvokeInterface.java index 218dd755e4..f6a02de4ae 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeInterface.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeInterface.java @@ -1,22 +1,22 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.InvokeInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.pool.Class; -import info.sigterm.deob.pool.InterfaceMethod; -import info.sigterm.deob.pool.Method; -import info.sigterm.deob.pool.NameAndType; -import info.sigterm.deob.pool.PoolEntry; -import info.sigterm.deob.signature.Signature; +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.Class; +import net.runelite.deob.pool.InterfaceMethod; +import net.runelite.deob.pool.Method; +import net.runelite.deob.pool.NameAndType; +import net.runelite.deob.pool.PoolEntry; +import net.runelite.deob.signature.Signature; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -50,7 +50,7 @@ public class InvokeInterface extends Instruction implements InvokeInstruction } @Override - public List getMethods() + public List getMethods() { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); @@ -59,14 +59,14 @@ public class InvokeInterface extends Instruction implements InvokeInstruction return new ArrayList<>(); // not our class // look up this method in this class and anything that inherits from it - List list = new ArrayList<>(); + List list = new ArrayList<>(); findMethodFromClass(list, otherClass); return list; } - private void findMethodFromClass(List list, ClassFile clazz) + private void findMethodFromClass(List list, ClassFile clazz) { - info.sigterm.deob.Method m = clazz.findMethodDeep(method.getNameAndType()); + net.runelite.deob.Method m = clazz.findMethodDeep(method.getNameAndType()); if (m != null) list.add(m); @@ -99,7 +99,7 @@ public class InvokeInterface extends Instruction implements InvokeInstruction ins.push(ctx); } - for (info.sigterm.deob.Method method : getMethods()) + for (net.runelite.deob.Method method : getMethods()) { ins.invoke(method); // add possible method call to execution @@ -112,7 +112,7 @@ public class InvokeInterface extends Instruction implements InvokeInstruction @Override public void removeParameter(int idx) { - info.sigterm.deob.pool.Class clazz = method.getClassEntry(); + net.runelite.deob.pool.Class clazz = method.getClassEntry(); NameAndType nat = method.getNameAndType(); // create new signature @@ -138,21 +138,21 @@ public class InvokeInterface extends Instruction implements InvokeInstruction Signature signature = method.getNameAndType().getDescriptor(); for (int i = 0; i < signature.size(); ++i) { - info.sigterm.deob.signature.Type type = signature.getTypeOfArg(i); + net.runelite.deob.signature.Type type = signature.getTypeOfArg(i); if (type.getType().equals("L" + cf.getName() + ";")) - signature.setTypeOfArg(i, new info.sigterm.deob.signature.Type("L" + name + ";", type.getArrayDims())); + signature.setTypeOfArg(i, new net.runelite.deob.signature.Type("L" + name + ";", type.getArrayDims())); } // rename return type if (signature.getReturnValue().getType().equals("L" + cf.getName() + ";")) - signature.setTypeOfReturnValue(new info.sigterm.deob.signature.Type("L" + name + ";", signature.getReturnValue().getArrayDims())); + signature.setTypeOfReturnValue(new net.runelite.deob.signature.Type("L" + name + ";", signature.getReturnValue().getArrayDims())); } @Override - public void renameMethod(info.sigterm.deob.Method m, Method newMethod) + public void renameMethod(net.runelite.deob.Method m, Method newMethod) { - for (info.sigterm.deob.Method m2 : getMethods()) + for (net.runelite.deob.Method m2 : getMethods()) if (m2.equals(m)) method = new InterfaceMethod(newMethod.getClassEntry(), newMethod.getNameAndType()); } diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeSpecial.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeSpecial.java similarity index 68% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeSpecial.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/InvokeSpecial.java index 25532cee1a..f5d08d2547 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeSpecial.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeSpecial.java @@ -1,21 +1,21 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.InvokeInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.pool.Class; -import info.sigterm.deob.pool.Method; -import info.sigterm.deob.pool.NameAndType; -import info.sigterm.deob.pool.PoolEntry; -import info.sigterm.deob.signature.Signature; +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.Class; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -44,7 +44,7 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction } @Override - public List getMethods() + public List getMethods() { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); @@ -52,10 +52,10 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction if (otherClass == null) return new ArrayList<>(); // not our class - info.sigterm.deob.Method other = otherClass.findMethod(method.getNameAndType()); + net.runelite.deob.Method other = otherClass.findMethod(method.getNameAndType()); assert other != null; - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(other); return list; } @@ -85,7 +85,7 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction ins.push(ctx); } - for (info.sigterm.deob.Method method : getMethods()) + for (net.runelite.deob.Method method : getMethods()) { ins.invoke(method); // add possible method call to execution @@ -104,7 +104,7 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction @Override public void removeParameter(int idx) { - info.sigterm.deob.pool.Class clazz = method.getClassEntry(); + net.runelite.deob.pool.Class clazz = method.getClassEntry(); NameAndType nat = method.getNameAndType(); // create new signature @@ -130,21 +130,21 @@ public class InvokeSpecial extends Instruction implements InvokeInstruction Signature signature = method.getNameAndType().getDescriptor(); for (int i = 0; i < signature.size(); ++i) { - info.sigterm.deob.signature.Type type = signature.getTypeOfArg(i); + net.runelite.deob.signature.Type type = signature.getTypeOfArg(i); if (type.getType().equals("L" + cf.getName() + ";")) - signature.setTypeOfArg(i, new info.sigterm.deob.signature.Type("L" + name + ";", type.getArrayDims())); + signature.setTypeOfArg(i, new net.runelite.deob.signature.Type("L" + name + ";", type.getArrayDims())); } // rename return type if (signature.getReturnValue().getType().equals("L" + cf.getName() + ";")) - signature.setTypeOfReturnValue(new info.sigterm.deob.signature.Type("L" + name + ";", signature.getReturnValue().getArrayDims())); + signature.setTypeOfReturnValue(new net.runelite.deob.signature.Type("L" + name + ";", signature.getReturnValue().getArrayDims())); } @Override - public void renameMethod(info.sigterm.deob.Method m, Method newMethod) + public void renameMethod(net.runelite.deob.Method m, Method newMethod) { - for (info.sigterm.deob.Method m2 : getMethods()) + for (net.runelite.deob.Method m2 : getMethods()) if (m2.equals(m)) method = newMethod; } diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeStatic.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeStatic.java similarity index 70% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeStatic.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/InvokeStatic.java index 6ca5fa4bdc..8b5532d352 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeStatic.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeStatic.java @@ -1,21 +1,21 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.InvokeInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.pool.Class; -import info.sigterm.deob.pool.Method; -import info.sigterm.deob.pool.NameAndType; -import info.sigterm.deob.pool.PoolEntry; -import info.sigterm.deob.signature.Signature; +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.Class; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -44,7 +44,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction } @Override - public List getMethods() + public List getMethods() { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); @@ -52,10 +52,10 @@ public class InvokeStatic extends Instruction implements InvokeInstruction if (otherClass == null) return new ArrayList<>(); // not our class - info.sigterm.deob.Method other = otherClass.findMethodDeepStatic(method.getNameAndType()); + net.runelite.deob.Method other = otherClass.findMethodDeepStatic(method.getNameAndType()); assert other != null; - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(other); return list; } @@ -82,7 +82,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction ins.push(ctx); } - for (info.sigterm.deob.Method method : getMethods()) + for (net.runelite.deob.Method method : getMethods()) { ins.invoke(method); // add possible method call to execution @@ -101,7 +101,7 @@ public class InvokeStatic extends Instruction implements InvokeInstruction @Override public void removeParameter(int idx) { - info.sigterm.deob.pool.Class clazz = method.getClassEntry(); + net.runelite.deob.pool.Class clazz = method.getClassEntry(); NameAndType nat = method.getNameAndType(); // create new signature @@ -127,26 +127,26 @@ public class InvokeStatic extends Instruction implements InvokeInstruction Signature signature = method.getNameAndType().getDescriptor(); for (int i = 0; i < signature.size(); ++i) { - info.sigterm.deob.signature.Type type = signature.getTypeOfArg(i); + net.runelite.deob.signature.Type type = signature.getTypeOfArg(i); if (type.getType().equals("L" + cf.getName() + ";")) - signature.setTypeOfArg(i, new info.sigterm.deob.signature.Type("L" + name + ";", type.getArrayDims())); + signature.setTypeOfArg(i, new net.runelite.deob.signature.Type("L" + name + ";", type.getArrayDims())); } // rename return type if (signature.getReturnValue().getType().equals("L" + cf.getName() + ";")) - signature.setTypeOfReturnValue(new info.sigterm.deob.signature.Type("L" + name + ";", signature.getReturnValue().getArrayDims())); + signature.setTypeOfReturnValue(new net.runelite.deob.signature.Type("L" + name + ";", signature.getReturnValue().getArrayDims())); } @Override - public void renameMethod(info.sigterm.deob.Method m, Method newMethod) + public void renameMethod(net.runelite.deob.Method m, Method newMethod) { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); ClassFile otherClass = group.findClass(method.getClassEntry().getName()); if (otherClass == null) return; // not our class - info.sigterm.deob.Method other = otherClass.findMethodDeepStatic(method.getNameAndType()); + net.runelite.deob.Method other = otherClass.findMethodDeepStatic(method.getNameAndType()); assert other.isStatic(); if (other.equals(m)) diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeVirtual.java b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java similarity index 69% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeVirtual.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java index 3401ed8c5f..4f1637fa4e 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/InvokeVirtual.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java @@ -1,21 +1,21 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.InvokeInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.pool.Class; -import info.sigterm.deob.pool.Method; -import info.sigterm.deob.pool.NameAndType; -import info.sigterm.deob.pool.PoolEntry; -import info.sigterm.deob.signature.Signature; +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.Class; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -68,7 +68,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction ins.push(ctx); } - for (info.sigterm.deob.Method method : getMethods()) + for (net.runelite.deob.Method method : getMethods()) { ins.invoke(method); // add possible method call to execution @@ -82,7 +82,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction // which method is being invoked without tracking the types of objects in fields and when // passed in parameters/return values. @Override - public List getMethods() + public List getMethods() { ClassGroup group = this.getInstructions().getCode().getAttributes().getClassFile().getGroup(); @@ -91,14 +91,14 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction return new ArrayList<>(); // not our class // look up this method in this class and anything that inherits from it - List list = new ArrayList<>(); + List list = new ArrayList<>(); findMethodFromClass(list, otherClass); return list; } - private void findMethodFromClass(List list, ClassFile clazz) + private void findMethodFromClass(List list, ClassFile clazz) { - info.sigterm.deob.Method m = clazz.findMethodDeep(method.getNameAndType()); + net.runelite.deob.Method m = clazz.findMethodDeep(method.getNameAndType()); if (m != null) list.add(m); @@ -109,7 +109,7 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction @Override public void removeParameter(int idx) { - info.sigterm.deob.pool.Class clazz = method.getClassEntry(); + net.runelite.deob.pool.Class clazz = method.getClassEntry(); NameAndType nat = method.getNameAndType(); // create new signature @@ -135,21 +135,21 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction Signature signature = method.getNameAndType().getDescriptor(); for (int i = 0; i < signature.size(); ++i) { - info.sigterm.deob.signature.Type type = signature.getTypeOfArg(i); + net.runelite.deob.signature.Type type = signature.getTypeOfArg(i); if (type.getType().equals("L" + cf.getName() + ";")) - signature.setTypeOfArg(i, new info.sigterm.deob.signature.Type("L" + name + ";", type.getArrayDims())); + signature.setTypeOfArg(i, new net.runelite.deob.signature.Type("L" + name + ";", type.getArrayDims())); } // rename return type if (signature.getReturnValue().getType().equals("L" + cf.getName() + ";")) - signature.setTypeOfReturnValue(new info.sigterm.deob.signature.Type("L" + name + ";", signature.getReturnValue().getArrayDims())); + signature.setTypeOfReturnValue(new net.runelite.deob.signature.Type("L" + name + ";", signature.getReturnValue().getArrayDims())); } @Override - public void renameMethod(info.sigterm.deob.Method m, Method newMethod) + public void renameMethod(net.runelite.deob.Method m, Method newMethod) { - for (info.sigterm.deob.Method m2 : getMethods()) + for (net.runelite.deob.Method m2 : getMethods()) if (m2.equals(m)) method = newMethod; } diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/L2D.java b/src/main/java/net/runelite/deob/attributes/code/instructions/L2D.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/L2D.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/L2D.java index f128dfeb69..3d974a1b0e 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/L2D.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/L2D.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/L2F.java b/src/main/java/net/runelite/deob/attributes/code/instructions/L2F.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/L2F.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/L2F.java index 63d75f225c..1f3e1dcb7e 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/L2F.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/L2F.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/L2I.java b/src/main/java/net/runelite/deob/attributes/code/instructions/L2I.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/L2I.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/L2I.java index ee27339ed0..1e41bfe555 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/L2I.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/L2I.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LALoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LALoad.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LALoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LALoad.java index 4c28abe878..68f7ff844c 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LALoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LALoad.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LALoad extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LAStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LAStore.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LAStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LAStore.java index 6737d4b89d..e7ae81c9b5 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LAStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LAStore.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LAStore extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LAdd.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LAdd.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LAdd.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LAdd.java index d0091e7556..8940463db4 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LAdd.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LAdd.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LAdd extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LAnd.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LAnd.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LAnd.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LAnd.java index dc75ec4b71..c8fd3f3dae 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LAnd.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LAnd.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LAnd extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LCmp.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LCmp.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LCmp.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LCmp.java index 37f01b6be2..5a02261c2a 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LCmp.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LCmp.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LConst_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LConst_0.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LConst_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LConst_0.java index 44dd51a527..7d55b1b7a1 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LConst_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LConst_0.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class LConst_0 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Long(0); + return new net.runelite.deob.pool.Long(0); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LConst_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LConst_1.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LConst_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LConst_1.java index 7ee65bd006..978d77f736 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LConst_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LConst_1.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.IOException; @@ -36,7 +36,7 @@ public class LConst_1 extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Long(1); + return new net.runelite.deob.pool.Long(1); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LDC2_W.java similarity index 67% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LDC2_W.java index 0724898c76..2a6425eba9 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC2_W.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LDC2_W.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LDC_W.java similarity index 80% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LDC_W.java index 9fbdd5e7ba..a80c87e2c7 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDC_W.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LDC_W.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDiv.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LDiv.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LDiv.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LDiv.java index 61e5c6c063..f82c048fe3 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LDiv.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LDiv.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LDiv extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad.java similarity index 72% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LLoad.java index a15607238a..85965b2b49 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad.java @@ -1,17 +1,17 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_0.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_0.java index 35c08639a3..9ee9a60bcd 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_0.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_1.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_1.java index dfab67040a..2a336f714c 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_1.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_2.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_2.java index 9ff38b7d39..412009f5b7 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_2.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_3.java similarity index 60% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_3.java index 3cef354910..45c64d698c 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LLoad_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LLoad_3.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LMul.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LMul.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LMul.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LMul.java index 7b4c6da780..f23014f3f0 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LMul.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LMul.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LMul extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LNeg.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LNeg.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LNeg.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LNeg.java index b7fc60355d..6dd0e5b04e 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LNeg.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LNeg.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LNeg extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LOr.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LOr.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LOr.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LOr.java index 906ee90e07..e1b19fb879 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LOr.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LOr.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LOr extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LRem.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LRem.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LRem.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LRem.java index aa1913478c..58eebf382f 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LRem.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LRem.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LRem extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LShL.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LShL.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LShL.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LShL.java index 4b978eaef4..9ef15ddcf0 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LShL.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LShL.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LShL extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LShR.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LShR.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LShR.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LShR.java index f3dbe7b7fb..abb5010f95 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LShR.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LShR.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LShR extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LStore.java similarity index 69% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LStore.java index e87a70ea09..b8b95937b8 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LStore.java @@ -1,17 +1,17 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_0.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_0.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_0.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LStore_0.java index 23ea6d0d76..2f7032d8c1 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_0.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_0.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_1.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_1.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_1.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LStore_1.java index 0d52b293a7..798be7d83d 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_1.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_1.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_2.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LStore_2.java index d972b203d7..879c116d9b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_2.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_3.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_3.java similarity index 59% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_3.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LStore_3.java index 4b0342a0ad..ba25d5acaf 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LStore_3.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LStore_3.java @@ -1,16 +1,16 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.execution.VariableContext; -import info.sigterm.deob.execution.Variables; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LSub.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LSub.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LSub.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LSub.java index 38cece1d7f..e7b5e627a8 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LSub.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LSub.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LSub extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LUShR.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LUShR.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LUShR.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LUShR.java index c2f5cc5929..76d0494910 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LUShR.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LUShR.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LUShR extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LXor.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LXor.java similarity index 56% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LXor.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LXor.java index 8c74029c84..69c48a5cd1 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LXor.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LXor.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class LXor extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/LookupSwitch.java b/src/main/java/net/runelite/deob/attributes/code/instructions/LookupSwitch.java similarity index 85% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/LookupSwitch.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/LookupSwitch.java index c1bfe7edbd..c1923d7d67 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/LookupSwitch.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/LookupSwitch.java @@ -1,13 +1,13 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.JumpingInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorEnter.java b/src/main/java/net/runelite/deob/attributes/code/instructions/MonitorEnter.java similarity index 50% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorEnter.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/MonitorEnter.java index 6bafb2d9dd..1a801edfc7 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorEnter.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/MonitorEnter.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class MonitorEnter extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorExit.java b/src/main/java/net/runelite/deob/attributes/code/instructions/MonitorExit.java similarity index 50% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorExit.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/MonitorExit.java index aef455cf98..37bf30c950 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/MonitorExit.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/MonitorExit.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class MonitorExit extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/MultiANewArray.java b/src/main/java/net/runelite/deob/attributes/code/instructions/MultiANewArray.java similarity index 67% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/MultiANewArray.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/MultiANewArray.java index 9254bc1ccb..37f3a9a773 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/MultiANewArray.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/MultiANewArray.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.pool.Class; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -50,7 +50,7 @@ public class MultiANewArray extends Instruction ins.pop(ctx); } - Type t = new Type(new info.sigterm.deob.signature.Type(clazz.getName())); + Type t = new Type(new net.runelite.deob.signature.Type(clazz.getName())); StackContext ctx = new StackContext(ins, t); stack.push(ctx); @@ -63,7 +63,7 @@ public class MultiANewArray extends Instruction public void renameClass(ClassFile cf, String name) { // class is an array type, ugh. - info.sigterm.deob.signature.Type t = new info.sigterm.deob.signature.Type(clazz.getName()); + net.runelite.deob.signature.Type t = new net.runelite.deob.signature.Type(clazz.getName()); if (t.getType().equals("L" + cf.getName() + ";")) clazz = new Class("L" + name + ";", t.getArrayDims()); } diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/NOP.java b/src/main/java/net/runelite/deob/attributes/code/instructions/NOP.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/NOP.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/NOP.java index 06a8eed7ae..9acc5b6211 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/NOP.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/NOP.java @@ -1,10 +1,10 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/New.java b/src/main/java/net/runelite/deob/attributes/code/instructions/New.java similarity index 67% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/New.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/New.java index 4c120de7d6..b972ab959f 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/New.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/New.java @@ -1,15 +1,15 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; -import info.sigterm.deob.pool.Class; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/NewArray.java b/src/main/java/net/runelite/deob/attributes/code/instructions/NewArray.java similarity index 74% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/NewArray.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/NewArray.java index e3242214de..153d07822b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/NewArray.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/NewArray.java @@ -1,13 +1,13 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.execution.Type; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Pop.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Pop.java similarity index 53% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Pop.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Pop.java index bb7cb8283c..03ede0dc36 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Pop.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Pop.java @@ -1,11 +1,11 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Pop2.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Pop2.java similarity index 58% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Pop2.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Pop2.java index 2f7b49fdf2..ba03d34cbe 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Pop2.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Pop2.java @@ -1,9 +1,9 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java b/src/main/java/net/runelite/deob/attributes/code/instructions/PutField.java similarity index 68% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/PutField.java index 6a2316c76b..400cc99524 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/PutField.java @@ -1,17 +1,17 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.SetFieldInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.Class; -import info.sigterm.deob.pool.Field; -import info.sigterm.deob.pool.NameAndType; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -57,7 +57,7 @@ public class PutField extends Instruction implements SetFieldInstruction } @Override - public info.sigterm.deob.Field getMyField() + public net.runelite.deob.Field getMyField() { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -66,7 +66,7 @@ public class PutField extends Instruction implements SetFieldInstruction if (cf == null) return null; - info.sigterm.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.deob.Field f2 = cf.findFieldDeep(nat); return f2; } @@ -77,11 +77,11 @@ public class PutField extends Instruction implements SetFieldInstruction field = new Field(new Class(name), field.getNameAndType()); if (field.getNameAndType().getDescriptorType().getType().equals("L" + cf.getName() + ";")) - field = new Field(field.getClassEntry(), new NameAndType(field.getNameAndType().getName(), new info.sigterm.deob.signature.Type("L" + name + ";", field.getNameAndType().getDescriptorType().getArrayDims()))); + field = new Field(field.getClassEntry(), new NameAndType(field.getNameAndType().getName(), new net.runelite.deob.signature.Type("L" + name + ";", field.getNameAndType().getDescriptorType().getArrayDims()))); } @Override - public void renameField(info.sigterm.deob.Field f, Field newField) + public void renameField(net.runelite.deob.Field f, Field newField) { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -90,7 +90,7 @@ public class PutField extends Instruction implements SetFieldInstruction if (cf == null) return; - info.sigterm.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.deob.Field f2 = cf.findFieldDeep(nat); if (f2 == f) { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java b/src/main/java/net/runelite/deob/attributes/code/instructions/PutStatic.java similarity index 68% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/PutStatic.java index 09212d4dd6..b49c30e1f4 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/PutStatic.java @@ -1,17 +1,17 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.SetFieldInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.Class; -import info.sigterm.deob.pool.Field; -import info.sigterm.deob.pool.NameAndType; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -56,7 +56,7 @@ public class PutStatic extends Instruction implements SetFieldInstruction } @Override - public info.sigterm.deob.Field getMyField() + public net.runelite.deob.Field getMyField() { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -65,7 +65,7 @@ public class PutStatic extends Instruction implements SetFieldInstruction if (cf == null) return null; - info.sigterm.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.deob.Field f2 = cf.findFieldDeep(nat); return f2; } @@ -76,11 +76,11 @@ public class PutStatic extends Instruction implements SetFieldInstruction field = new Field(new Class(name), field.getNameAndType()); if (field.getNameAndType().getDescriptorType().getType().equals("L" + cf.getName() + ";")) - field = new Field(field.getClassEntry(), new NameAndType(field.getNameAndType().getName(), new info.sigterm.deob.signature.Type("L" + name + ";", field.getNameAndType().getDescriptorType().getArrayDims()))); + field = new Field(field.getClassEntry(), new NameAndType(field.getNameAndType().getName(), new net.runelite.deob.signature.Type("L" + name + ";", field.getNameAndType().getDescriptorType().getArrayDims()))); } @Override - public void renameField(info.sigterm.deob.Field f, Field newField) + public void renameField(net.runelite.deob.Field f, Field newField) { Class clazz = field.getClassEntry(); NameAndType nat = field.getNameAndType(); @@ -89,7 +89,7 @@ public class PutStatic extends Instruction implements SetFieldInstruction if (cf == null) return; - info.sigterm.deob.Field f2 = cf.findFieldDeep(nat); + net.runelite.deob.Field f2 = cf.findFieldDeep(nat); if (f2 == f) { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Return.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Return.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Return.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Return.java index f1673d5cd4..b2620d001b 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Return.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Return.java @@ -1,13 +1,13 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.ReturnInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/SALoad.java b/src/main/java/net/runelite/deob/attributes/code/instructions/SALoad.java similarity index 57% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/SALoad.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/SALoad.java index 38ac39d086..9775c664a3 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/SALoad.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/SALoad.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class SALoad extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/SAStore.java b/src/main/java/net/runelite/deob/attributes/code/instructions/SAStore.java similarity index 54% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/SAStore.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/SAStore.java index d684f8e85b..322ee142d7 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/SAStore.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/SAStore.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class SAStore extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/SiPush.java b/src/main/java/net/runelite/deob/attributes/code/instructions/SiPush.java similarity index 66% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/SiPush.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/SiPush.java index eb9f8f36a2..daa4055694 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/SiPush.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/SiPush.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; -import info.sigterm.deob.pool.PoolEntry; +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 java.io.DataInputStream; import java.io.DataOutputStream; @@ -51,7 +51,7 @@ public class SiPush extends Instruction implements PushConstantInstruction @Override public PoolEntry getConstant() { - return new info.sigterm.deob.pool.Integer(s); + return new net.runelite.deob.pool.Integer(s); } @Override diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Swap.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Swap.java similarity index 63% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Swap.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Swap.java index 75a1aac35e..c80458cb9d 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Swap.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Swap.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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; public class Swap extends Instruction { diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/TableSwitch.java b/src/main/java/net/runelite/deob/attributes/code/instructions/TableSwitch.java similarity index 85% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/TableSwitch.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/TableSwitch.java index 83b8a7a947..2e097b6cb8 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/TableSwitch.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/TableSwitch.java @@ -1,13 +1,13 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.JumpingInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.Stack; -import info.sigterm.deob.execution.StackContext; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/VReturn.java b/src/main/java/net/runelite/deob/attributes/code/instructions/VReturn.java similarity index 53% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/VReturn.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/VReturn.java index ae110b4322..f9c2d92f40 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/VReturn.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/VReturn.java @@ -1,11 +1,11 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.ReturnInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; +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 java.io.IOException; diff --git a/src/main/java/info/sigterm/deob/attributes/code/instructions/Wide.java b/src/main/java/net/runelite/deob/attributes/code/instructions/Wide.java similarity index 79% rename from src/main/java/info/sigterm/deob/attributes/code/instructions/Wide.java rename to src/main/java/net/runelite/deob/attributes/code/instructions/Wide.java index a79da0def1..c9f42abcce 100644 --- a/src/main/java/info/sigterm/deob/attributes/code/instructions/Wide.java +++ b/src/main/java/net/runelite/deob/attributes/code/instructions/Wide.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.attributes.code.instructions; +package net.runelite.deob.attributes.code.instructions; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.InstructionType; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.WideInstruction; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; +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 java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/block/Block.java b/src/main/java/net/runelite/deob/block/Block.java similarity index 70% rename from src/main/java/info/sigterm/deob/block/Block.java rename to src/main/java/net/runelite/deob/block/Block.java index 3a2e069bcf..ac446c392e 100644 --- a/src/main/java/info/sigterm/deob/block/Block.java +++ b/src/main/java/net/runelite/deob/block/Block.java @@ -1,7 +1,7 @@ -package info.sigterm.deob.block; +package net.runelite.deob.block; -import info.sigterm.deob.attributes.code.Exception; -import info.sigterm.deob.attributes.code.Instruction; +import net.runelite.deob.attributes.code.Exception; +import net.runelite.deob.attributes.code.Instruction; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/info/sigterm/deob/deobfuscators/ConstantParameter.java b/src/main/java/net/runelite/deob/deobfuscators/ConstantParameter.java similarity index 89% rename from src/main/java/info/sigterm/deob/deobfuscators/ConstantParameter.java rename to src/main/java/net/runelite/deob/deobfuscators/ConstantParameter.java index fcefcc67c9..8a84e0e71d 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/ConstantParameter.java +++ b/src/main/java/net/runelite/deob/deobfuscators/ConstantParameter.java @@ -1,22 +1,22 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.ComparisonInstruction; -import info.sigterm.deob.attributes.code.instruction.types.InvokeInstruction; -import info.sigterm.deob.attributes.code.instruction.types.JumpingInstruction; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.attributes.code.instructions.Goto; -import info.sigterm.deob.attributes.code.instructions.If; -import info.sigterm.deob.attributes.code.instructions.If0; -import info.sigterm.deob.execution.Execution; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.StackContext; +import net.runelite.deob.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 java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/info/sigterm/deob/deobfuscators/FieldInliner.java b/src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java similarity index 80% rename from src/main/java/info/sigterm/deob/deobfuscators/FieldInliner.java rename to src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java index 1882981794..e1667a322f 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/FieldInliner.java +++ b/src/main/java/net/runelite/deob/deobfuscators/FieldInliner.java @@ -1,21 +1,21 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Field; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.AttributeType; -import info.sigterm.deob.attributes.Attributes; -import info.sigterm.deob.attributes.Code; -import info.sigterm.deob.attributes.ConstantValue; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.FieldInstruction; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.attributes.code.instruction.types.SetFieldInstruction; -import info.sigterm.deob.attributes.code.instructions.LDC_W; -import info.sigterm.deob.attributes.code.instructions.NOP; +import net.runelite.deob.ClassFile; +import net.runelite.deob.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 java.util.ArrayList; import java.util.List; diff --git a/src/main/java/info/sigterm/deob/deobfuscators/FieldMover.java b/src/main/java/net/runelite/deob/deobfuscators/FieldMover.java similarity index 77% rename from src/main/java/info/sigterm/deob/deobfuscators/FieldMover.java rename to src/main/java/net/runelite/deob/deobfuscators/FieldMover.java index 6e96c78be0..4ba592ff12 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/FieldMover.java +++ b/src/main/java/net/runelite/deob/deobfuscators/FieldMover.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Field; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.Code; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.instruction.types.FieldInstruction; -import info.sigterm.deob.pool.NameAndType; +import net.runelite.deob.ClassFile; +import net.runelite.deob.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 java.util.Collection; import org.apache.commons.collections4.map.MultiValueMap; @@ -87,8 +87,8 @@ public class FieldMover implements Deobfuscator { assert field.getFields().getClassFile() != to; - info.sigterm.deob.pool.Field newField = new info.sigterm.deob.pool.Field( - new info.sigterm.deob.pool.Class(to.getName()), + net.runelite.deob.pool.Field newField = new net.runelite.deob.pool.Field( + new net.runelite.deob.pool.Class(to.getName()), new NameAndType(field.getName(), field.getType()) ); diff --git a/src/main/java/info/sigterm/deob/deobfuscators/IllegalStateExceptions.java b/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java similarity index 73% rename from src/main/java/info/sigterm/deob/deobfuscators/IllegalStateExceptions.java rename to src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java index da21a02ab0..cdff714ad5 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/IllegalStateExceptions.java +++ b/src/main/java/net/runelite/deob/deobfuscators/IllegalStateExceptions.java @@ -1,24 +1,24 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; import java.util.List; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.Code; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.ComparisonInstruction; -import info.sigterm.deob.attributes.code.instruction.types.JumpingInstruction; -import info.sigterm.deob.attributes.code.instructions.AThrow; -import info.sigterm.deob.attributes.code.instructions.Goto; -import info.sigterm.deob.attributes.code.instructions.If; -import info.sigterm.deob.attributes.code.instructions.If0; -import info.sigterm.deob.attributes.code.instructions.New; -import info.sigterm.deob.execution.Execution; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; +import net.runelite.deob.ClassFile; +import net.runelite.deob.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; public class IllegalStateExceptions implements Deobfuscator { @@ -53,7 +53,7 @@ public class IllegalStateExceptions implements Deobfuscator continue; New new2 = (New) ins2; - info.sigterm.deob.pool.Class clazz = new2.getNewClass(); + net.runelite.deob.pool.Class clazz = new2.getNewClass(); if (!clazz.getName().equals("java/lang/IllegalStateException")) continue; diff --git a/src/main/java/info/sigterm/deob/deobfuscators/Jumps.java b/src/main/java/net/runelite/deob/deobfuscators/Jumps.java similarity index 79% rename from src/main/java/info/sigterm/deob/deobfuscators/Jumps.java rename to src/main/java/net/runelite/deob/deobfuscators/Jumps.java index 9da44e0764..29abed3f98 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/Jumps.java +++ b/src/main/java/net/runelite/deob/deobfuscators/Jumps.java @@ -1,14 +1,14 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instructions.Goto; -import info.sigterm.deob.attributes.code.instructions.GotoW; -import info.sigterm.deob.block.Block; +import net.runelite.deob.ClassFile; +import net.runelite.deob.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.instructions.Goto; +import net.runelite.deob.attributes.code.instructions.GotoW; +import net.runelite.deob.block.Block; import java.util.ArrayList; import java.util.List; @@ -74,7 +74,7 @@ public class Jumps implements Deobfuscator for (Instruction ins2 : ilist) ins2.replace(from, block.begin); - for (info.sigterm.deob.attributes.code.Exception e : m.getCode().getExceptions().getExceptions()) + for (net.runelite.deob.attributes.code.Exception e : m.getCode().getExceptions().getExceptions()) e.replace(from, block.begin); continue methods; diff --git a/src/main/java/info/sigterm/deob/deobfuscators/MethodInliner.java b/src/main/java/net/runelite/deob/deobfuscators/MethodInliner.java similarity index 83% rename from src/main/java/info/sigterm/deob/deobfuscators/MethodInliner.java rename to src/main/java/net/runelite/deob/deobfuscators/MethodInliner.java index c4a74bc83d..d4b8dd6ea4 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/MethodInliner.java +++ b/src/main/java/net/runelite/deob/deobfuscators/MethodInliner.java @@ -1,25 +1,25 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.Code; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instruction.types.InvokeInstruction; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.attributes.code.instruction.types.ReturnInstruction; -import info.sigterm.deob.attributes.code.instructions.AStore; -import info.sigterm.deob.attributes.code.instructions.DStore; -import info.sigterm.deob.attributes.code.instructions.FStore; -import info.sigterm.deob.attributes.code.instructions.Goto; -import info.sigterm.deob.attributes.code.instructions.IStore; -import info.sigterm.deob.attributes.code.instructions.InvokeStatic; -import info.sigterm.deob.attributes.code.instructions.LStore; -import info.sigterm.deob.attributes.code.instructions.NOP; -import info.sigterm.deob.signature.Signature; -import info.sigterm.deob.signature.Type; +import net.runelite.deob.ClassFile; +import net.runelite.deob.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 java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/info/sigterm/deob/deobfuscators/MethodMover.java b/src/main/java/net/runelite/deob/deobfuscators/MethodMover.java similarity index 79% rename from src/main/java/info/sigterm/deob/deobfuscators/MethodMover.java rename to src/main/java/net/runelite/deob/deobfuscators/MethodMover.java index de2e8491c5..c6112b894b 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/MethodMover.java +++ b/src/main/java/net/runelite/deob/deobfuscators/MethodMover.java @@ -1,13 +1,13 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.Code; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instructions.InvokeStatic; +import net.runelite.deob.ClassFile; +import net.runelite.deob.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 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; - info.sigterm.deob.pool.Method newMethod = new info.sigterm.deob.pool.Method( - new info.sigterm.deob.pool.Class(to.getName()), + net.runelite.deob.pool.Method newMethod = new net.runelite.deob.pool.Method( + new net.runelite.deob.pool.Class(to.getName()), method.getNameAndType() ); diff --git a/src/main/java/info/sigterm/deob/deobfuscators/ModularArithmeticDeobfuscation.java b/src/main/java/net/runelite/deob/deobfuscators/ModularArithmeticDeobfuscation.java similarity index 89% rename from src/main/java/info/sigterm/deob/deobfuscators/ModularArithmeticDeobfuscation.java rename to src/main/java/net/runelite/deob/deobfuscators/ModularArithmeticDeobfuscation.java index 83de6e2721..f644ae9f7e 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/ModularArithmeticDeobfuscation.java +++ b/src/main/java/net/runelite/deob/deobfuscators/ModularArithmeticDeobfuscation.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; import java.math.BigInteger; import java.util.ArrayList; @@ -8,21 +8,21 @@ import java.util.List; import java.util.Map; import java.util.Set; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Field; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.instruction.types.FieldInstruction; -import info.sigterm.deob.attributes.code.instruction.types.GetFieldInstruction; -import info.sigterm.deob.attributes.code.instruction.types.InvokeInstruction; -import info.sigterm.deob.attributes.code.instruction.types.PushConstantInstruction; -import info.sigterm.deob.attributes.code.instruction.types.SetFieldInstruction; -import info.sigterm.deob.attributes.code.instructions.IMul; -import info.sigterm.deob.execution.Execution; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.execution.StackContext; +import net.runelite.deob.ClassFile; +import net.runelite.deob.ClassGroup; +import net.runelite.deob.Deobfuscator; +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.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.execution.Execution; +import net.runelite.deob.execution.Frame; +import net.runelite.deob.execution.InstructionContext; +import net.runelite.deob.execution.StackContext; public class ModularArithmeticDeobfuscation implements Deobfuscator { @@ -118,7 +118,7 @@ public class ModularArithmeticDeobfuscation implements Deobfuscator } } - private Field convertFieldFromPool(ClassGroup group, info.sigterm.deob.pool.Field field) + private Field convertFieldFromPool(ClassGroup group, net.runelite.deob.pool.Field field) { ClassFile cf = group.findClass(field.getClassEntry().getName()); if (cf == null) @@ -126,9 +126,9 @@ public class ModularArithmeticDeobfuscation implements Deobfuscator return cf.findFieldDeep(field.getNameAndType()); } - private List checkDown(InstructionContext context) + private List checkDown(InstructionContext context) { - List fields = new ArrayList<>(); + List fields = new ArrayList<>(); if (context.getInstruction() instanceof FieldInstruction) { @@ -146,9 +146,9 @@ public class ModularArithmeticDeobfuscation implements Deobfuscator return fields; } - private List checkUp(InstructionContext context) + private List checkUp(InstructionContext context) { - List fields = new ArrayList<>(); + List fields = new ArrayList<>(); if (context.getInstruction() instanceof InvokeInstruction) { @@ -176,15 +176,15 @@ public class ModularArithmeticDeobfuscation implements Deobfuscator } /* check there are no other fields */ - private boolean checkFields(Magics goodMagics, ClassGroup group, Set obFields, info.sigterm.deob.pool.Field imulField, InstructionContext context) + private boolean checkFields(Magics goodMagics, ClassGroup group, Set obFields, net.runelite.deob.pool.Field imulField, InstructionContext context) { - List fields = new ArrayList<>(); + List fields = new ArrayList<>(); fields.addAll(checkUp(context)); fields.addAll(checkDown(context)); assert !fields.isEmpty(); - for (info.sigterm.deob.pool.Field f : fields) + for (net.runelite.deob.pool.Field f : fields) { if (f.equals(imulField)) continue; @@ -260,7 +260,7 @@ public class ModularArithmeticDeobfuscation implements Deobfuscator continue; // get Field from pool Field - info.sigterm.deob.pool.Field field = gf.getField(); + net.runelite.deob.pool.Field field = gf.getField(); Field f = group.findClass(field.getClassEntry().getName()).findFieldDeep(field.getNameAndType()); assert f != null; @@ -295,7 +295,7 @@ public class ModularArithmeticDeobfuscation implements Deobfuscator continue; // get Field from pool Field - info.sigterm.deob.pool.Field field = sf.getField(); + net.runelite.deob.pool.Field field = sf.getField(); Field f = group.findClass(field.getClassEntry().getName()).findFieldDeep(field.getNameAndType()); assert f != null; @@ -423,7 +423,7 @@ public class ModularArithmeticDeobfuscation implements Deobfuscator } // get Field from pool Field - info.sigterm.deob.pool.Field field = gf.getField(); + net.runelite.deob.pool.Field field = gf.getField(); Field f = group.findClass(field.getClassEntry().getName()).findFieldDeep(field.getNameAndType()); Magic magic = workMagics.getMagic(f); @@ -747,7 +747,7 @@ public class ModularArithmeticDeobfuscation implements Deobfuscator //assert m.setter == modInverse(m.getter); int newConstant = constant * m.setter; - pc.setConstant(new info.sigterm.deob.pool.Integer(newConstant)); + pc.setConstant(new net.runelite.deob.pool.Integer(newConstant)); if (newConstant != 1) System.out.println("new constant: " + newConstant); else @@ -775,7 +775,7 @@ public class ModularArithmeticDeobfuscation implements Deobfuscator // field = setter * value, solve for value by * modInverse(setter) int newConstant = constant * m.getter; - pi.setConstant(new info.sigterm.deob.pool.Integer(newConstant)); + pi.setConstant(new net.runelite.deob.pool.Integer(newConstant)); ++replaced; } else if (value.getPushed().getInstruction() instanceof IMul) @@ -810,7 +810,7 @@ public class ModularArithmeticDeobfuscation implements Deobfuscator // field = expression * constant int newConstant = constant * m.getter; - pc.setConstant(new info.sigterm.deob.pool.Integer(newConstant)); + pc.setConstant(new net.runelite.deob.pool.Integer(newConstant)); ++replaced; } } diff --git a/src/main/java/info/sigterm/deob/deobfuscators/RenameUnique.java b/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java similarity index 86% rename from src/main/java/info/sigterm/deob/deobfuscators/RenameUnique.java rename to src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java index 4cb75489b7..7ad8303a89 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/RenameUnique.java +++ b/src/main/java/net/runelite/deob/deobfuscators/RenameUnique.java @@ -1,20 +1,20 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; import java.util.ArrayList; import java.util.List; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Field; -import info.sigterm.deob.Interfaces; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.code.Exceptions; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.pool.Class; -import info.sigterm.deob.pool.NameAndType; -import info.sigterm.deob.signature.Signature; -import info.sigterm.deob.signature.Type; +import net.runelite.deob.ClassFile; +import net.runelite.deob.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.Exceptions; +import net.runelite.deob.attributes.code.Instructions; +import net.runelite.deob.pool.Class; +import net.runelite.deob.pool.NameAndType; +import net.runelite.deob.signature.Signature; +import net.runelite.deob.signature.Type; import java.util.HashSet; import java.util.Set; @@ -95,8 +95,8 @@ public class RenameUnique implements Deobfuscator if (method.getCode() != null) { Instructions instructions = method.getCode().getInstructions(); - info.sigterm.deob.pool.Field newField = new info.sigterm.deob.pool.Field( - new info.sigterm.deob.pool.Class(c.getName()), + net.runelite.deob.pool.Field newField = new net.runelite.deob.pool.Field( + new net.runelite.deob.pool.Class(c.getName()), new NameAndType(name, field.getType()) ); instructions.renameField(field, newField); @@ -179,8 +179,8 @@ public class RenameUnique implements Deobfuscator Instructions instructions = method.getCode().getInstructions(); for (Method m : methods) { - info.sigterm.deob.pool.Method newMethod = new info.sigterm.deob.pool.Method( - new info.sigterm.deob.pool.Class(m.getMethods().getClassFile().getName()), + net.runelite.deob.pool.Method newMethod = new net.runelite.deob.pool.Method( + new net.runelite.deob.pool.Class(m.getMethods().getClassFile().getName()), new NameAndType(name, m.getNameAndType().getDescriptor()) ); instructions.renameMethod(m, newMethod); diff --git a/src/main/java/info/sigterm/deob/deobfuscators/RuntimeExceptions.java b/src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java similarity index 64% rename from src/main/java/info/sigterm/deob/deobfuscators/RuntimeExceptions.java rename to src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java index 6023ca3e61..516f3e5764 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/RuntimeExceptions.java +++ b/src/main/java/net/runelite/deob/deobfuscators/RuntimeExceptions.java @@ -1,10 +1,10 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.Code; +import net.runelite.deob.ClassFile; +import net.runelite.deob.ClassGroup; +import net.runelite.deob.Deobfuscator; +import net.runelite.deob.Method; +import net.runelite.deob.attributes.Code; import java.util.ArrayList; @@ -22,7 +22,7 @@ public class RuntimeExceptions implements Deobfuscator if (c == null) continue; - for (info.sigterm.deob.attributes.code.Exception e : new ArrayList<>(c.getExceptions().getExceptions())) + for (net.runelite.deob.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/info/sigterm/deob/deobfuscators/UnreachedCode.java b/src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java similarity index 77% rename from src/main/java/info/sigterm/deob/deobfuscators/UnreachedCode.java rename to src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java index 640b71b3ed..7a603a2653 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/UnreachedCode.java +++ b/src/main/java/net/runelite/deob/deobfuscators/UnreachedCode.java @@ -1,12 +1,12 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.execution.Execution; +import net.runelite.deob.ClassFile; +import net.runelite.deob.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 java.util.ArrayList; import java.util.List; @@ -33,7 +33,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 (info.sigterm.deob.attributes.code.Exception e : new ArrayList<>(m.getCode().getExceptions().getExceptions())) + for (net.runelite.deob.attributes.code.Exception e : new ArrayList<>(m.getCode().getExceptions().getExceptions())) { if (e.getStart() == i) { diff --git a/src/main/java/info/sigterm/deob/deobfuscators/UnusedFields.java b/src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java similarity index 68% rename from src/main/java/info/sigterm/deob/deobfuscators/UnusedFields.java rename to src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java index 6f84c316b1..3e9a4afcf7 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/UnusedFields.java +++ b/src/main/java/net/runelite/deob/deobfuscators/UnusedFields.java @@ -1,17 +1,17 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; import java.util.ArrayList; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Field; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.Code; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.instruction.types.FieldInstruction; -import info.sigterm.deob.attributes.code.instruction.types.GetFieldInstruction; -import info.sigterm.deob.attributes.code.instruction.types.SetFieldInstruction; +import net.runelite.deob.ClassFile; +import net.runelite.deob.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; public class UnusedFields implements Deobfuscator { @@ -30,7 +30,7 @@ public class UnusedFields implements Deobfuscator if (ins instanceof FieldInstruction) { FieldInstruction fi = (FieldInstruction) ins; - info.sigterm.deob.pool.Field ff = fi.getField(); + net.runelite.deob.pool.Field ff = fi.getField(); // pool to Field ClassFile clazz = group.findClass(ff.getClassEntry().getName()); diff --git a/src/main/java/info/sigterm/deob/deobfuscators/UnusedMethods.java b/src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java similarity index 68% rename from src/main/java/info/sigterm/deob/deobfuscators/UnusedMethods.java rename to src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java index 63752e0aa5..34e9357139 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/UnusedMethods.java +++ b/src/main/java/net/runelite/deob/deobfuscators/UnusedMethods.java @@ -1,11 +1,11 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deob; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Method; -import info.sigterm.deob.execution.Execution; +import net.runelite.deob.ClassFile; +import net.runelite.deob.ClassGroup; +import net.runelite.deob.Deob; +import net.runelite.deob.Deobfuscator; +import net.runelite.deob.Method; +import net.runelite.deob.execution.Execution; import java.util.ArrayList; diff --git a/src/main/java/info/sigterm/deob/deobfuscators/UnusedParameters.java b/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java similarity index 85% rename from src/main/java/info/sigterm/deob/deobfuscators/UnusedParameters.java rename to src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java index 1ded55bd5b..a9a351ce81 100644 --- a/src/main/java/info/sigterm/deob/deobfuscators/UnusedParameters.java +++ b/src/main/java/net/runelite/deob/deobfuscators/UnusedParameters.java @@ -1,20 +1,20 @@ -package info.sigterm.deob.deobfuscators; +package net.runelite.deob.deobfuscators; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deob; -import info.sigterm.deob.Deobfuscator; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.Code; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.instruction.types.InvokeInstruction; -import info.sigterm.deob.attributes.code.instruction.types.LVTInstruction; -import info.sigterm.deob.execution.Execution; -import info.sigterm.deob.execution.Frame; -import info.sigterm.deob.execution.InstructionContext; -import info.sigterm.deob.pool.NameAndType; -import info.sigterm.deob.pool.PoolEntry; -import info.sigterm.deob.signature.Signature; +import net.runelite.deob.ClassFile; +import net.runelite.deob.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 java.util.ArrayList; import java.util.Collection; @@ -142,9 +142,9 @@ public class UnusedParameters implements Deobfuscator InvokeInstruction ii = (InvokeInstruction) i; PoolEntry pool = ii.getMethod(); - if (pool instanceof info.sigterm.deob.pool.Method) + if (pool instanceof net.runelite.deob.pool.Method) { - info.sigterm.deob.pool.Method pm = (info.sigterm.deob.pool.Method) pool; + net.runelite.deob.pool.Method pm = (net.runelite.deob.pool.Method) pool; if (pm.getClassEntry().getName().equals(method.getMethods().getClassFile().getName()) && pm.getNameAndType().equals(method.getNameAndType()) && !done.contains(i)) { @@ -153,9 +153,9 @@ public class UnusedParameters implements Deobfuscator //assert false; } } - else if (pool instanceof info.sigterm.deob.pool.InterfaceMethod) + else if (pool instanceof net.runelite.deob.pool.InterfaceMethod) { - info.sigterm.deob.pool.InterfaceMethod pm = (info.sigterm.deob.pool.InterfaceMethod) pool; + net.runelite.deob.pool.InterfaceMethod pm = (net.runelite.deob.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/info/sigterm/deob/execution/Execution.java b/src/main/java/net/runelite/deob/execution/Execution.java similarity index 87% rename from src/main/java/info/sigterm/deob/execution/Execution.java rename to src/main/java/net/runelite/deob/execution/Execution.java index ef8c71c3f1..c8966f6dba 100644 --- a/src/main/java/info/sigterm/deob/execution/Execution.java +++ b/src/main/java/net/runelite/deob/execution/Execution.java @@ -1,10 +1,10 @@ -package info.sigterm.deob.execution; +package net.runelite.deob.execution; -import info.sigterm.deob.ClassFile; -import info.sigterm.deob.ClassGroup; -import info.sigterm.deob.Deob; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.code.Instruction; +import net.runelite.deob.ClassFile; +import net.runelite.deob.ClassGroup; +import net.runelite.deob.Deob; +import net.runelite.deob.Method; +import net.runelite.deob.attributes.code.Instruction; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/info/sigterm/deob/execution/Frame.java b/src/main/java/net/runelite/deob/execution/Frame.java similarity index 90% rename from src/main/java/info/sigterm/deob/execution/Frame.java rename to src/main/java/net/runelite/deob/execution/Frame.java index 336e942ca0..efb9ecc243 100644 --- a/src/main/java/info/sigterm/deob/execution/Frame.java +++ b/src/main/java/net/runelite/deob/execution/Frame.java @@ -1,18 +1,18 @@ -package info.sigterm.deob.execution; +package net.runelite.deob.execution; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.Code; -import info.sigterm.deob.attributes.code.Exception; -import info.sigterm.deob.attributes.code.Instruction; -import info.sigterm.deob.attributes.code.Instructions; -import info.sigterm.deob.attributes.code.instructions.LookupSwitch; -import info.sigterm.deob.attributes.code.instructions.TableSwitch; -import info.sigterm.deob.pool.NameAndType; +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.attributes.code.instructions.LookupSwitch; +import net.runelite.deob.attributes.code.instructions.TableSwitch; +import net.runelite.deob.pool.NameAndType; import java.util.HashSet; import java.util.Set; import org.apache.commons.collections4.MultiMap; diff --git a/src/main/java/info/sigterm/deob/execution/InstructionContext.java b/src/main/java/net/runelite/deob/execution/InstructionContext.java similarity index 95% rename from src/main/java/info/sigterm/deob/execution/InstructionContext.java rename to src/main/java/net/runelite/deob/execution/InstructionContext.java index 672cdf63ae..ec1069b20d 100644 --- a/src/main/java/info/sigterm/deob/execution/InstructionContext.java +++ b/src/main/java/net/runelite/deob/execution/InstructionContext.java @@ -1,10 +1,10 @@ -package info.sigterm.deob.execution; +package net.runelite.deob.execution; import java.util.ArrayList; import java.util.List; -import info.sigterm.deob.Method; -import info.sigterm.deob.attributes.code.Instruction; +import net.runelite.deob.Method; +import net.runelite.deob.attributes.code.Instruction; import java.util.Objects; public class InstructionContext diff --git a/src/main/java/info/sigterm/deob/execution/Stack.java b/src/main/java/net/runelite/deob/execution/Stack.java similarity index 92% rename from src/main/java/info/sigterm/deob/execution/Stack.java rename to src/main/java/net/runelite/deob/execution/Stack.java index dbec46de6f..0cde672b51 100644 --- a/src/main/java/info/sigterm/deob/execution/Stack.java +++ b/src/main/java/net/runelite/deob/execution/Stack.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.execution; +package net.runelite.deob.execution; import java.util.Arrays; @@ -31,7 +31,7 @@ public class Stack { if (size == stack.length) { - info.sigterm.deob.Method m = i.getPushed().getInstruction().getInstructions().getCode().getAttributes().getMethod(); + net.runelite.deob.Method m = i.getPushed().getInstruction().getInstructions().getCode().getAttributes().getMethod(); System.err.println("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/info/sigterm/deob/execution/StackContext.java b/src/main/java/net/runelite/deob/execution/StackContext.java similarity index 88% rename from src/main/java/info/sigterm/deob/execution/StackContext.java rename to src/main/java/net/runelite/deob/execution/StackContext.java index a8b9d6ba49..72f14e52c7 100644 --- a/src/main/java/info/sigterm/deob/execution/StackContext.java +++ b/src/main/java/net/runelite/deob/execution/StackContext.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.execution; +package net.runelite.deob.execution; public class StackContext { @@ -18,7 +18,7 @@ public class StackContext type = new Type(clazz.getCanonicalName()); } - public StackContext(InstructionContext pushed, info.sigterm.deob.pool.Class c) + public StackContext(InstructionContext pushed, net.runelite.deob.pool.Class c) { this.pushed = pushed; type = new Type(c.getName()); diff --git a/src/main/java/info/sigterm/deob/execution/Type.java b/src/main/java/net/runelite/deob/execution/Type.java similarity index 90% rename from src/main/java/info/sigterm/deob/execution/Type.java rename to src/main/java/net/runelite/deob/execution/Type.java index 6eae8cf4b2..e21cfb5e63 100644 --- a/src/main/java/info/sigterm/deob/execution/Type.java +++ b/src/main/java/net/runelite/deob/execution/Type.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.execution; +package net.runelite.deob.execution; public class Type { @@ -11,7 +11,7 @@ public class Type this.type = type; } - public Type(info.sigterm.deob.signature.Type t) + public Type(net.runelite.deob.signature.Type t) { type = asmTypeToClass(t.getType()); for (int i = 0; i < t.getArrayDims(); ++i) diff --git a/src/main/java/info/sigterm/deob/execution/VariableContext.java b/src/main/java/net/runelite/deob/execution/VariableContext.java similarity index 85% rename from src/main/java/info/sigterm/deob/execution/VariableContext.java rename to src/main/java/net/runelite/deob/execution/VariableContext.java index 0a7e235417..737f49713f 100644 --- a/src/main/java/info/sigterm/deob/execution/VariableContext.java +++ b/src/main/java/net/runelite/deob/execution/VariableContext.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.execution; +package net.runelite.deob.execution; public class VariableContext { diff --git a/src/main/java/info/sigterm/deob/execution/Variables.java b/src/main/java/net/runelite/deob/execution/Variables.java similarity index 87% rename from src/main/java/info/sigterm/deob/execution/Variables.java rename to src/main/java/net/runelite/deob/execution/Variables.java index 995a3df55b..e6a90e683c 100644 --- a/src/main/java/info/sigterm/deob/execution/Variables.java +++ b/src/main/java/net/runelite/deob/execution/Variables.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.execution; +package net.runelite.deob.execution; import java.util.Arrays; diff --git a/src/main/java/info/sigterm/deob/pool/Class.java b/src/main/java/net/runelite/deob/pool/Class.java similarity index 91% rename from src/main/java/info/sigterm/deob/pool/Class.java rename to src/main/java/net/runelite/deob/pool/Class.java index 76a50565dc..b10b3b3f11 100644 --- a/src/main/java/info/sigterm/deob/pool/Class.java +++ b/src/main/java/net/runelite/deob/pool/Class.java @@ -1,7 +1,7 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; -import info.sigterm.deob.execution.Type; +import net.runelite.deob.ConstantPool; +import net.runelite.deob.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/pool/ConstantType.java b/src/main/java/net/runelite/deob/pool/ConstantType.java similarity index 96% rename from src/main/java/info/sigterm/deob/pool/ConstantType.java rename to src/main/java/net/runelite/deob/pool/ConstantType.java index 2873389c3b..b01e813cae 100644 --- a/src/main/java/info/sigterm/deob/pool/ConstantType.java +++ b/src/main/java/net/runelite/deob/pool/ConstantType.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; public enum ConstantType { diff --git a/src/main/java/info/sigterm/deob/pool/Double.java b/src/main/java/net/runelite/deob/pool/Double.java similarity index 88% rename from src/main/java/info/sigterm/deob/pool/Double.java rename to src/main/java/net/runelite/deob/pool/Double.java index 41f888aa20..79a5915d90 100644 --- a/src/main/java/info/sigterm/deob/pool/Double.java +++ b/src/main/java/net/runelite/deob/pool/Double.java @@ -1,7 +1,7 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; -import info.sigterm.deob.execution.Type; +import net.runelite.deob.ConstantPool; +import net.runelite.deob.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/pool/Field.java b/src/main/java/net/runelite/deob/pool/Field.java similarity index 95% rename from src/main/java/info/sigterm/deob/pool/Field.java rename to src/main/java/net/runelite/deob/pool/Field.java index cfcd37a95f..ee8adbd168 100644 --- a/src/main/java/info/sigterm/deob/pool/Field.java +++ b/src/main/java/net/runelite/deob/pool/Field.java @@ -1,6 +1,6 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; +import net.runelite.deob.ConstantPool; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/pool/Float.java b/src/main/java/net/runelite/deob/pool/Float.java similarity index 88% rename from src/main/java/info/sigterm/deob/pool/Float.java rename to src/main/java/net/runelite/deob/pool/Float.java index e66c0d781c..293db1a282 100644 --- a/src/main/java/info/sigterm/deob/pool/Float.java +++ b/src/main/java/net/runelite/deob/pool/Float.java @@ -1,7 +1,7 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; -import info.sigterm.deob.execution.Type; +import net.runelite.deob.ConstantPool; +import net.runelite.deob.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/pool/Integer.java b/src/main/java/net/runelite/deob/pool/Integer.java similarity index 89% rename from src/main/java/info/sigterm/deob/pool/Integer.java rename to src/main/java/net/runelite/deob/pool/Integer.java index f2708753cb..dd53b013f4 100644 --- a/src/main/java/info/sigterm/deob/pool/Integer.java +++ b/src/main/java/net/runelite/deob/pool/Integer.java @@ -1,7 +1,7 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; -import info.sigterm.deob.execution.Type; +import net.runelite.deob.ConstantPool; +import net.runelite.deob.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/pool/InterfaceMethod.java b/src/main/java/net/runelite/deob/pool/InterfaceMethod.java similarity index 95% rename from src/main/java/info/sigterm/deob/pool/InterfaceMethod.java rename to src/main/java/net/runelite/deob/pool/InterfaceMethod.java index 79f2e3b974..836e62b148 100644 --- a/src/main/java/info/sigterm/deob/pool/InterfaceMethod.java +++ b/src/main/java/net/runelite/deob/pool/InterfaceMethod.java @@ -1,6 +1,6 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; +import net.runelite.deob.ConstantPool; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/pool/Long.java b/src/main/java/net/runelite/deob/pool/Long.java similarity index 88% rename from src/main/java/info/sigterm/deob/pool/Long.java rename to src/main/java/net/runelite/deob/pool/Long.java index 927fe642b5..532dd049f2 100644 --- a/src/main/java/info/sigterm/deob/pool/Long.java +++ b/src/main/java/net/runelite/deob/pool/Long.java @@ -1,7 +1,7 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; -import info.sigterm.deob.execution.Type; +import net.runelite.deob.ConstantPool; +import net.runelite.deob.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/pool/Method.java b/src/main/java/net/runelite/deob/pool/Method.java similarity index 94% rename from src/main/java/info/sigterm/deob/pool/Method.java rename to src/main/java/net/runelite/deob/pool/Method.java index 881f826fe8..d7fa9d3c1b 100644 --- a/src/main/java/info/sigterm/deob/pool/Method.java +++ b/src/main/java/net/runelite/deob/pool/Method.java @@ -1,6 +1,6 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; +import net.runelite.deob.ConstantPool; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/pool/NameAndType.java b/src/main/java/net/runelite/deob/pool/NameAndType.java similarity index 94% rename from src/main/java/info/sigterm/deob/pool/NameAndType.java rename to src/main/java/net/runelite/deob/pool/NameAndType.java index de198c217e..85e6e2cede 100644 --- a/src/main/java/info/sigterm/deob/pool/NameAndType.java +++ b/src/main/java/net/runelite/deob/pool/NameAndType.java @@ -1,8 +1,8 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; -import info.sigterm.deob.signature.Signature; -import info.sigterm.deob.signature.Type; +import net.runelite.deob.ConstantPool; +import net.runelite.deob.signature.Signature; +import net.runelite.deob.signature.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/pool/PoolEntry.java b/src/main/java/net/runelite/deob/pool/PoolEntry.java similarity index 86% rename from src/main/java/info/sigterm/deob/pool/PoolEntry.java rename to src/main/java/net/runelite/deob/pool/PoolEntry.java index 3e6ad8940f..3760174d1d 100644 --- a/src/main/java/info/sigterm/deob/pool/PoolEntry.java +++ b/src/main/java/net/runelite/deob/pool/PoolEntry.java @@ -1,10 +1,10 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; import java.io.DataOutputStream; import java.io.IOException; -import info.sigterm.deob.ConstantPool; -import info.sigterm.deob.execution.Type; +import net.runelite.deob.ConstantPool; +import net.runelite.deob.execution.Type; public abstract class PoolEntry { diff --git a/src/main/java/info/sigterm/deob/pool/String.java b/src/main/java/net/runelite/deob/pool/String.java similarity index 90% rename from src/main/java/info/sigterm/deob/pool/String.java rename to src/main/java/net/runelite/deob/pool/String.java index e8ce6d56cd..5bab46875c 100644 --- a/src/main/java/info/sigterm/deob/pool/String.java +++ b/src/main/java/net/runelite/deob/pool/String.java @@ -1,7 +1,7 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; -import info.sigterm.deob.execution.Type; +import net.runelite.deob.ConstantPool; +import net.runelite.deob.execution.Type; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/pool/UTF8.java b/src/main/java/net/runelite/deob/pool/UTF8.java similarity index 92% rename from src/main/java/info/sigterm/deob/pool/UTF8.java rename to src/main/java/net/runelite/deob/pool/UTF8.java index 1adf819435..95f3ca8cf7 100644 --- a/src/main/java/info/sigterm/deob/pool/UTF8.java +++ b/src/main/java/net/runelite/deob/pool/UTF8.java @@ -1,6 +1,6 @@ -package info.sigterm.deob.pool; +package net.runelite.deob.pool; -import info.sigterm.deob.ConstantPool; +import net.runelite.deob.ConstantPool; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/info/sigterm/deob/signature/Signature.java b/src/main/java/net/runelite/deob/signature/Signature.java similarity index 92% rename from src/main/java/info/sigterm/deob/signature/Signature.java rename to src/main/java/net/runelite/deob/signature/Signature.java index 24d6bc6c74..d03abebd5d 100644 --- a/src/main/java/info/sigterm/deob/signature/Signature.java +++ b/src/main/java/net/runelite/deob/signature/Signature.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.signature; +package net.runelite.deob.signature; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/info/sigterm/deob/signature/Type.java b/src/main/java/net/runelite/deob/signature/Type.java similarity index 90% rename from src/main/java/info/sigterm/deob/signature/Type.java rename to src/main/java/net/runelite/deob/signature/Type.java index 3cfb2cd8e2..f3b9ee397d 100644 --- a/src/main/java/info/sigterm/deob/signature/Type.java +++ b/src/main/java/net/runelite/deob/signature/Type.java @@ -1,4 +1,4 @@ -package info.sigterm.deob.signature; +package net.runelite.deob.signature; public class Type {