diff --git a/src/test/java/net/runelite/deob/runeloader/CheckMappings.java b/src/test/java/net/runelite/deob/runeloader/CheckMappings.java new file mode 100644 index 0000000000..a3aac12b78 --- /dev/null +++ b/src/test/java/net/runelite/deob/runeloader/CheckMappings.java @@ -0,0 +1,18 @@ +package net.runelite.deob.runeloader; + +import java.io.File; +import java.io.IOException; +import net.runelite.deob.runeloader.inject.InjectionModscript; +import org.junit.Test; + +public class CheckMappings +{ + private static final File CLIENT = new File("/Users/adam/w/rs/07/rs-client-1.0-SNAPSHOT.jar"); + private static final File RL_INJECTION = new File("/Users/adam/w/rs/07/rl/injection.json"); + + @Test + public void checkMappings() throws IOException + { + InjectionModscript mod = InjectionModscript.load(RL_INJECTION); + } +} diff --git a/src/main/java/net/runelite/deob/inject/AddFieldInstruction.java b/src/test/java/net/runelite/deob/runeloader/inject/AddFieldInstruction.java similarity index 74% rename from src/main/java/net/runelite/deob/inject/AddFieldInstruction.java rename to src/test/java/net/runelite/deob/runeloader/inject/AddFieldInstruction.java index 79d7eca2fb..c50f23a413 100644 --- a/src/main/java/net/runelite/deob/inject/AddFieldInstruction.java +++ b/src/test/java/net/runelite/deob/runeloader/inject/AddFieldInstruction.java @@ -1,4 +1,4 @@ -package net.runelite.deob.inject; +package net.runelite.deob.runeloader.inject; public class AddFieldInstruction { public static String owner; diff --git a/src/main/java/net/runelite/deob/inject/AddInterfaceInstruction.java b/src/test/java/net/runelite/deob/runeloader/inject/AddInterfaceInstruction.java similarity index 93% rename from src/main/java/net/runelite/deob/inject/AddInterfaceInstruction.java rename to src/test/java/net/runelite/deob/runeloader/inject/AddInterfaceInstruction.java index 376f7ea799..2474de142d 100644 --- a/src/main/java/net/runelite/deob/inject/AddInterfaceInstruction.java +++ b/src/test/java/net/runelite/deob/runeloader/inject/AddInterfaceInstruction.java @@ -1,4 +1,4 @@ -package net.runelite.deob.inject; +package net.runelite.deob.runeloader.inject; import org.objectweb.asm.tree.ClassNode; diff --git a/src/main/java/net/runelite/deob/inject/AddMethodInstruction.java b/src/test/java/net/runelite/deob/runeloader/inject/AddMethodInstruction.java similarity index 96% rename from src/main/java/net/runelite/deob/inject/AddMethodInstruction.java rename to src/test/java/net/runelite/deob/runeloader/inject/AddMethodInstruction.java index e356158a13..c4a2c5a3c1 100644 --- a/src/main/java/net/runelite/deob/inject/AddMethodInstruction.java +++ b/src/test/java/net/runelite/deob/runeloader/inject/AddMethodInstruction.java @@ -1,4 +1,4 @@ -package net.runelite.deob.inject; +package net.runelite.deob.runeloader.inject; import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.ClassNode; diff --git a/src/main/java/net/runelite/deob/inject/GetterInjectInstruction.java b/src/test/java/net/runelite/deob/runeloader/inject/GetterInjectInstruction.java similarity index 91% rename from src/main/java/net/runelite/deob/inject/GetterInjectInstruction.java rename to src/test/java/net/runelite/deob/runeloader/inject/GetterInjectInstruction.java index 923f494b7e..413b6b008b 100644 --- a/src/main/java/net/runelite/deob/inject/GetterInjectInstruction.java +++ b/src/test/java/net/runelite/deob/runeloader/inject/GetterInjectInstruction.java @@ -1,14 +1,4 @@ -package net.runelite.deob.inject; - -import java.util.Iterator; -import org.objectweb.asm.Type; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.FieldNode; -import org.objectweb.asm.tree.InsnNode; -import org.objectweb.asm.tree.LdcInsnNode; -import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.tree.VarInsnNode; +package net.runelite.deob.runeloader.inject; public class GetterInjectInstruction { private final String className; diff --git a/src/main/java/net/runelite/deob/inject/InjectionModscript.java b/src/test/java/net/runelite/deob/runeloader/inject/InjectionModscript.java similarity index 92% rename from src/main/java/net/runelite/deob/inject/InjectionModscript.java rename to src/test/java/net/runelite/deob/runeloader/inject/InjectionModscript.java index e1694f5e00..6e2b9c3719 100644 --- a/src/main/java/net/runelite/deob/inject/InjectionModscript.java +++ b/src/test/java/net/runelite/deob/runeloader/inject/InjectionModscript.java @@ -1,9 +1,7 @@ -package net.runelite.deob.inject; +package net.runelite.deob.runeloader.inject; import com.google.common.io.Files; import com.google.gson.GsonBuilder; -import com.runeloader.RuneLoader; -import com.runeloader.api.inject.InstructionDeserializer; import java.io.File; import java.io.IOException; import java.util.LinkedList; diff --git a/src/main/java/net/runelite/deob/inject/InstructionDeserializer.java b/src/test/java/net/runelite/deob/runeloader/inject/InstructionDeserializer.java similarity index 98% rename from src/main/java/net/runelite/deob/inject/InstructionDeserializer.java rename to src/test/java/net/runelite/deob/runeloader/inject/InstructionDeserializer.java index 7d8ff3f03a..f35e30bf56 100644 --- a/src/main/java/net/runelite/deob/inject/InstructionDeserializer.java +++ b/src/test/java/net/runelite/deob/runeloader/inject/InstructionDeserializer.java @@ -1,4 +1,4 @@ -package net.runelite.deob.inject; +package net.runelite.deob.runeloader.inject; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/src/main/java/net/runelite/deob/inject/MethodModInstruction.java b/src/test/java/net/runelite/deob/runeloader/inject/MethodModInstruction.java similarity index 97% rename from src/main/java/net/runelite/deob/inject/MethodModInstruction.java rename to src/test/java/net/runelite/deob/runeloader/inject/MethodModInstruction.java index a2a0edc658..caab09cfee 100644 --- a/src/main/java/net/runelite/deob/inject/MethodModInstruction.java +++ b/src/test/java/net/runelite/deob/runeloader/inject/MethodModInstruction.java @@ -1,4 +1,4 @@ -package net.runelite.deob.inject; +package net.runelite.deob.runeloader.inject; import java.util.Iterator; import org.objectweb.asm.tree.AbstractInsnNode; diff --git a/src/main/java/net/runelite/deob/inject/SuperChangeInstruction.java b/src/test/java/net/runelite/deob/runeloader/inject/SuperChangeInstruction.java similarity index 93% rename from src/main/java/net/runelite/deob/inject/SuperChangeInstruction.java rename to src/test/java/net/runelite/deob/runeloader/inject/SuperChangeInstruction.java index 76754bd9fe..82abf72df6 100644 --- a/src/main/java/net/runelite/deob/inject/SuperChangeInstruction.java +++ b/src/test/java/net/runelite/deob/runeloader/inject/SuperChangeInstruction.java @@ -1,4 +1,4 @@ -package net.runelite.deob.inject; +package net.runelite.deob.runeloader.inject; import org.objectweb.asm.tree.ClassNode; diff --git a/src/main/java/net/runelite/deob/inject/TableJumpInstruction$TableJump.java b/src/test/java/net/runelite/deob/runeloader/inject/TableJumpInstruction$TableJump.java similarity index 89% rename from src/main/java/net/runelite/deob/inject/TableJumpInstruction$TableJump.java rename to src/test/java/net/runelite/deob/runeloader/inject/TableJumpInstruction$TableJump.java index 96dcea7c8a..f01de42582 100644 --- a/src/main/java/net/runelite/deob/inject/TableJumpInstruction$TableJump.java +++ b/src/test/java/net/runelite/deob/runeloader/inject/TableJumpInstruction$TableJump.java @@ -1,4 +1,4 @@ -package net.runelite.deob.inject; +package net.runelite.deob.runeloader.inject; import org.objectweb.asm.Label; diff --git a/src/main/java/net/runelite/deob/inject/TableJumpInstruction.java b/src/test/java/net/runelite/deob/runeloader/inject/TableJumpInstruction.java similarity index 98% rename from src/main/java/net/runelite/deob/inject/TableJumpInstruction.java rename to src/test/java/net/runelite/deob/runeloader/inject/TableJumpInstruction.java index bd4289c5b4..cfe7487017 100644 --- a/src/main/java/net/runelite/deob/inject/TableJumpInstruction.java +++ b/src/test/java/net/runelite/deob/runeloader/inject/TableJumpInstruction.java @@ -1,4 +1,4 @@ -package net.runelite.deob.inject; +package net.runelite.deob.runeloader.inject; import java.util.Iterator; import org.objectweb.asm.Label;