diff --git a/src/main/java/net/runelite/asm/attributes/code/instruction/types/MappableInstruction.java b/src/main/java/net/runelite/asm/attributes/code/instruction/types/MappableInstruction.java index 424f66990d..2a9fd521b5 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instruction/types/MappableInstruction.java +++ b/src/main/java/net/runelite/asm/attributes/code/instruction/types/MappableInstruction.java @@ -1,6 +1,6 @@ package net.runelite.asm.attributes.code.instruction.types; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; public interface MappableInstruction diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java b/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java index 50e3e553d5..bc9aa81704 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/ArrayStore.java @@ -6,8 +6,8 @@ import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; import net.runelite.asm.attributes.code.instruction.types.ArrayStoreInstruction; import net.runelite.asm.attributes.code.instruction.types.GetFieldInstruction; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.StackContext; diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IDiv.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IDiv.java index 54b12c6af4..7ca3424db2 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IDiv.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IDiv.java @@ -11,8 +11,8 @@ import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.Stack; import net.runelite.asm.execution.StackContext; import net.runelite.asm.execution.Value; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class IDiv extends Instruction implements MappableInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/If.java b/src/main/java/net/runelite/asm/attributes/code/instructions/If.java index 513852a4e4..393662b121 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/If.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/If.java @@ -19,9 +19,9 @@ import net.runelite.asm.execution.Frame; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.Stack; import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.PacketHandler; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.PacketHandler; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public abstract class If extends Instruction implements JumpingInstruction, ComparisonInstruction, MappableInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/If0.java b/src/main/java/net/runelite/asm/attributes/code/instructions/If0.java index f60b7eeb15..e34a6144c5 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/If0.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/If0.java @@ -17,8 +17,8 @@ import net.runelite.asm.execution.Frame; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.Stack; import net.runelite.asm.execution.StackContext; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public abstract class If0 extends Instruction implements JumpingInstruction, ComparisonInstruction, MappableInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpEq.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpEq.java index 9853583ef6..4eef88f7bb 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpEq.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpEq.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.StackContext; diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpNe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpNe.java index e13f927f3f..3b42e5b013 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpNe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfACmpNe.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.StackContext; diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGe.java index 6330da88ee..9a8284d813 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGe.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; public class IfCmpGe extends If diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGt.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGt.java index d47161791f..0f44f40138 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGt.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpGt.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.Execution; import net.runelite.asm.execution.Frame; import net.runelite.asm.execution.InstructionContext; diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLe.java index b9ba48b674..7e25e71fc2 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLe.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; public class IfCmpLe extends If diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLt.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLt.java index 9246241c83..bd7a83a093 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLt.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfCmpLt.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; public class IfCmpLt extends If diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfEq.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfEq.java index ac0558dc3d..9f03e0f424 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfEq.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfEq.java @@ -5,7 +5,7 @@ import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; import static net.runelite.asm.attributes.code.instructions.IfICmpEq.isOne; import static net.runelite.asm.attributes.code.instructions.IfICmpEq.isZero; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.StackContext; diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfGt.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfGt.java index 36942d1cff..d71fcb4e75 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfGt.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfGt.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; public class IfGt extends If0 diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpEq.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpEq.java index 43cfa7613f..0081dc1eb9 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpEq.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpEq.java @@ -4,7 +4,7 @@ import net.runelite.asm.attributes.code.Instruction; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.StackContext; diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpNe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpNe.java index 7bf3f768f7..eef3228600 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpNe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfICmpNe.java @@ -3,7 +3,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.StackContext; diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfLe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfLe.java index ca0843463b..6bdee679d8 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfLe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfLe.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; public class IfLe extends If0 diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfLt.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfLt.java index ff6a8911ed..a431aeb9f6 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfLt.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfLt.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; public class IfLt extends If0 diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfNe.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNe.java index 45ccc5154c..77f91f1273 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfNe.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNe.java @@ -4,7 +4,7 @@ import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; import net.runelite.asm.attributes.code.instruction.types.MappableInstruction; import net.runelite.asm.attributes.code.instruction.types.PushConstantInstruction; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.StackContext; diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfNonNull.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNonNull.java index 1bb4dfa37a..d5c8adbb24 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfNonNull.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNonNull.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.StackContext; diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/IfNull.java b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNull.java index b8c231ec17..bf9beb8b4a 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/IfNull.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/IfNull.java @@ -2,7 +2,7 @@ package net.runelite.asm.attributes.code.instructions; import net.runelite.asm.attributes.code.InstructionType; import net.runelite.asm.attributes.code.Instructions; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.StackContext; diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java index 324a7d1c29..bd9c2d9d01 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeInterface.java @@ -25,8 +25,8 @@ import net.runelite.asm.pool.NameAndType; import net.runelite.asm.pool.PoolEntry; import net.runelite.asm.signature.Signature; import net.runelite.asm.signature.util.VirtualMethods; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class InvokeInterface extends Instruction implements InvokeInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java index 22853d1a76..2163128508 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeSpecial.java @@ -25,8 +25,8 @@ import net.runelite.asm.pool.Method; import net.runelite.asm.pool.NameAndType; import net.runelite.asm.pool.PoolEntry; import net.runelite.asm.signature.Signature; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class InvokeSpecial extends Instruction implements InvokeInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java index 570b502ebc..ecd08b4974 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeStatic.java @@ -24,8 +24,8 @@ import net.runelite.asm.pool.Method; import net.runelite.asm.pool.NameAndType; import net.runelite.asm.pool.PoolEntry; import net.runelite.asm.signature.Signature; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class InvokeStatic extends Instruction implements InvokeInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java index 76376d6009..e19022158b 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/InvokeVirtual.java @@ -25,8 +25,8 @@ import net.runelite.asm.pool.NameAndType; import net.runelite.asm.pool.PoolEntry; import net.runelite.asm.signature.Signature; import net.runelite.asm.signature.util.VirtualMethods; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class InvokeVirtual extends Instruction implements InvokeInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/LCmp.java b/src/main/java/net/runelite/asm/attributes/code/instructions/LCmp.java index 97a5bf1028..bf54ae49c4 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/LCmp.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/LCmp.java @@ -13,8 +13,8 @@ import net.runelite.asm.execution.InstructionContext; import net.runelite.asm.execution.Stack; import net.runelite.asm.execution.StackContext; import net.runelite.asm.execution.Value; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class LCmp extends Instruction implements MappableInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java b/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java index ef80e145fa..2368013266 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/PutField.java @@ -18,8 +18,8 @@ import net.runelite.asm.execution.StackContext; import net.runelite.asm.pool.Class; import net.runelite.asm.pool.Field; import net.runelite.asm.pool.NameAndType; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class PutField extends Instruction implements SetFieldInstruction { diff --git a/src/main/java/net/runelite/asm/attributes/code/instructions/PutStatic.java b/src/main/java/net/runelite/asm/attributes/code/instructions/PutStatic.java index 80fa8e7f82..b8777d0598 100644 --- a/src/main/java/net/runelite/asm/attributes/code/instructions/PutStatic.java +++ b/src/main/java/net/runelite/asm/attributes/code/instructions/PutStatic.java @@ -17,8 +17,8 @@ import net.runelite.asm.execution.StackContext; import net.runelite.asm.pool.Class; import net.runelite.asm.pool.Field; import net.runelite.asm.pool.NameAndType; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class PutStatic extends Instruction implements SetFieldInstruction { diff --git a/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java b/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java index ac8b50e455..7637c4f6c8 100644 --- a/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java +++ b/src/main/java/net/runelite/asm/execution/ParallellMappingExecutor.java @@ -9,8 +9,8 @@ import net.runelite.asm.Method; import net.runelite.asm.attributes.code.instruction.types.ReturnInstruction; import net.runelite.asm.attributes.code.instructions.InvokeStatic; import net.runelite.asm.attributes.code.instructions.Return; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; public class ParallellMappingExecutor { diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/AnnotationMapper.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationMapper.java similarity index 98% rename from src/main/java/net/runelite/deob/deobfuscators/rename/AnnotationMapper.java rename to src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationMapper.java index ab0e5debd3..4a11287be7 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/AnnotationMapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/AnnotationMapper.java @@ -1,4 +1,4 @@ -package net.runelite.deob.deobfuscators.rename; +package net.runelite.deob.deobfuscators.mapping; import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/ClassGroupMapper.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/ClassGroupMapper.java similarity index 94% rename from src/main/java/net/runelite/deob/deobfuscators/rename/ClassGroupMapper.java rename to src/main/java/net/runelite/deob/deobfuscators/mapping/ClassGroupMapper.java index 0a4170ad17..0dfb82d9a8 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/ClassGroupMapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/ClassGroupMapper.java @@ -1,4 +1,4 @@ -package net.runelite.deob.deobfuscators.rename; +package net.runelite.deob.deobfuscators.mapping; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/ClassMapper.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/ClassMapper.java similarity index 97% rename from src/main/java/net/runelite/deob/deobfuscators/rename/ClassMapper.java rename to src/main/java/net/runelite/deob/deobfuscators/mapping/ClassMapper.java index bb42d35368..e8cf1bdeed 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/ClassMapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/ClassMapper.java @@ -1,4 +1,4 @@ -package net.runelite.deob.deobfuscators.rename; +package net.runelite.deob.deobfuscators.mapping; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java index 8a00424daf..99d1da66c5 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/ExecutionMapper.java @@ -5,8 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import net.runelite.asm.Method; -import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; public class ExecutionMapper { diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/Mapper.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapper.java similarity index 99% rename from src/main/java/net/runelite/deob/deobfuscators/rename/Mapper.java rename to src/main/java/net/runelite/deob/deobfuscators/mapping/Mapper.java index 5da3c36e54..292931cb6c 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/Mapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapper.java @@ -1,4 +1,4 @@ -package net.runelite.deob.deobfuscators.rename; +package net.runelite.deob.deobfuscators.mapping; import com.google.common.collect.Multimap; import java.util.ArrayList; diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/Mapping.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapping.java similarity index 90% rename from src/main/java/net/runelite/deob/deobfuscators/rename/Mapping.java rename to src/main/java/net/runelite/deob/deobfuscators/mapping/Mapping.java index 4791029175..957ed87cb1 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/Mapping.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/Mapping.java @@ -1,4 +1,4 @@ -package net.runelite.deob.deobfuscators.rename; +package net.runelite.deob.deobfuscators.mapping; public class Mapping { diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/MappingExecutorUtil.java similarity index 99% rename from src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java rename to src/main/java/net/runelite/deob/deobfuscators/mapping/MappingExecutorUtil.java index cd2ed2edba..adf6666a1b 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/MappingExecutorUtil.java @@ -1,4 +1,4 @@ -package net.runelite.deob.deobfuscators.rename; +package net.runelite.deob.deobfuscators.mapping; import net.runelite.asm.ClassFile; import net.runelite.asm.ClassGroup; diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/MethodSignatureMapper.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/MethodSignatureMapper.java similarity index 96% rename from src/main/java/net/runelite/deob/deobfuscators/rename/MethodSignatureMapper.java rename to src/main/java/net/runelite/deob/deobfuscators/mapping/MethodSignatureMapper.java index 124f707981..2d545dbb3a 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/MethodSignatureMapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/MethodSignatureMapper.java @@ -1,4 +1,4 @@ -package net.runelite.deob.deobfuscators.rename; +package net.runelite.deob.deobfuscators.mapping; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/PacketHandler.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/PacketHandler.java similarity index 96% rename from src/main/java/net/runelite/deob/deobfuscators/rename/PacketHandler.java rename to src/main/java/net/runelite/deob/deobfuscators/mapping/PacketHandler.java index 86f8d1233f..ea524bda96 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/PacketHandler.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/PacketHandler.java @@ -1,4 +1,4 @@ -package net.runelite.deob.deobfuscators.rename; +package net.runelite.deob.deobfuscators.mapping; import java.util.List; import net.runelite.asm.attributes.code.Instruction; diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/ParallelExecutorMapping.java similarity index 98% rename from src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java rename to src/main/java/net/runelite/deob/deobfuscators/mapping/ParallelExecutorMapping.java index 6740348c6c..f49b802e74 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/ParallelExecutorMapping.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/ParallelExecutorMapping.java @@ -1,4 +1,4 @@ -package net.runelite.deob.deobfuscators.rename; +package net.runelite.deob.deobfuscators.mapping; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/src/main/java/net/runelite/deob/deobfuscators/rename/StaticMethodSignatureMapper.java b/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticMethodSignatureMapper.java similarity index 96% rename from src/main/java/net/runelite/deob/deobfuscators/rename/StaticMethodSignatureMapper.java rename to src/main/java/net/runelite/deob/deobfuscators/mapping/StaticMethodSignatureMapper.java index f941fec8a7..afaa64b830 100644 --- a/src/main/java/net/runelite/deob/deobfuscators/rename/StaticMethodSignatureMapper.java +++ b/src/main/java/net/runelite/deob/deobfuscators/mapping/StaticMethodSignatureMapper.java @@ -1,4 +1,4 @@ -package net.runelite.deob.deobfuscators.rename; +package net.runelite.deob.deobfuscators.mapping; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; diff --git a/src/main/java/net/runelite/deob/updater/UpdateMappings.java b/src/main/java/net/runelite/deob/updater/UpdateMappings.java index 30f6c26798..47e3ee6984 100644 --- a/src/main/java/net/runelite/deob/updater/UpdateMappings.java +++ b/src/main/java/net/runelite/deob/updater/UpdateMappings.java @@ -3,9 +3,9 @@ package net.runelite.deob.updater; import java.io.File; import java.io.IOException; import net.runelite.asm.ClassGroup; -import net.runelite.deob.deobfuscators.rename.AnnotationMapper; -import net.runelite.deob.deobfuscators.rename.Mapper; -import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.AnnotationMapper; +import net.runelite.deob.deobfuscators.mapping.Mapper; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; import net.runelite.deob.util.JarUtil; public class UpdateMappings diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/ClassGroupMapperTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/ClassGroupMapperTest.java index a06dd055d2..8bd0f862e2 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/ClassGroupMapperTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/ClassGroupMapperTest.java @@ -1,5 +1,6 @@ package net.runelite.deob.deobfuscators.rename; +import net.runelite.deob.deobfuscators.mapping.ClassGroupMapper; import java.io.File; import java.io.IOException; import java.util.Map; diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/ClassMapperTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/ClassMapperTest.java index 35c1e22e0b..fad8c0012d 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/ClassMapperTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/ClassMapperTest.java @@ -1,5 +1,6 @@ package net.runelite.deob.deobfuscators.rename; +import net.runelite.deob.deobfuscators.mapping.ClassMapper; import java.io.File; import java.io.IOException; import net.runelite.asm.ClassGroup; diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java index c73f391434..117d2a2bf0 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/MapStaticTest.java @@ -1,5 +1,9 @@ package net.runelite.deob.deobfuscators.rename; +import net.runelite.deob.deobfuscators.mapping.PacketHandler; +import net.runelite.deob.deobfuscators.mapping.Mapper; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; import com.google.common.collect.Multimap; import java.io.File; import java.io.IOException; diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/MapTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/MapTest.java index bfa88ba729..7e2eee8897 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/MapTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/MapTest.java @@ -1,5 +1,8 @@ package net.runelite.deob.deobfuscators.rename; +import net.runelite.deob.deobfuscators.mapping.Mapper; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.MappingExecutorUtil; import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/src/test/java/net/runelite/deob/deobfuscators/rename/MapperTest.java b/src/test/java/net/runelite/deob/deobfuscators/rename/MapperTest.java index 8530ef688a..3ec5fb32c1 100644 --- a/src/test/java/net/runelite/deob/deobfuscators/rename/MapperTest.java +++ b/src/test/java/net/runelite/deob/deobfuscators/rename/MapperTest.java @@ -1,5 +1,7 @@ package net.runelite.deob.deobfuscators.rename; +import net.runelite.deob.deobfuscators.mapping.ParallelExecutorMapping; +import net.runelite.deob.deobfuscators.mapping.Mapper; import java.io.File; import java.io.IOException; import net.runelite.asm.ClassFile; diff --git a/src/test/java/net/runelite/deob/injection/InjectTest.java b/src/test/java/net/runelite/deob/injection/InjectTest.java index 98e1cf5d19..3c9b3ab439 100644 --- a/src/test/java/net/runelite/deob/injection/InjectTest.java +++ b/src/test/java/net/runelite/deob/injection/InjectTest.java @@ -10,8 +10,8 @@ import org.junit.Test; public class InjectTest { - private static final File DEOBFUSCATED = new File("d:/rs/07/gamepack_v20_mapped.jar"); - private static final File VANILLA = new File(InjectTest.class.getResource("/gamepack_v20.jar").getFile()); + private static final File DEOBFUSCATED = new File("d:/rs/07/gamepack_v21_mapped.jar");//C:\\Users\\Adam\\.m2\\repository\\net\\runelite\\rs\\rs-client\\1.0-SNAPSHOT\\rs-client-1.0-SNAPSHOT.jar"); + private static final File VANILLA = new File(InjectTest.class.getResource("/gamepack_v21.jar").getFile()); private static final File OUT = new File("d:/rs/07/adamout.jar"); private ClassGroup deob, vanilla;