From de95668590b06a1d5a70bf492e58a3238ab2898e Mon Sep 17 00:00:00 2001 From: TheRealNull Date: Sat, 2 Jan 2021 04:45:43 -0500 Subject: [PATCH] injector: saveJar -> save, finish main cleanup --- .../src/main/java/net/runelite/deob/Deob.java | 2 +- .../runelite/deob/updater/UpdateMappings.java | 2 +- .../java/net/runelite/deob/util/JarUtil.java | 2 +- .../asm/visitors/ClassFileVisitorTest.java | 2 +- .../deobfuscators/EnumDeobfuscatorTest.java | 2 +- .../deob/deobfuscators/FieldInlinerTest.java | 2 +- .../IllegalStateExceptionsTest.java | 2 +- .../deob/deobfuscators/OrderTest.java | 2 +- .../deobfuscators/PacketHandlerOrderTest.java | 2 +- .../deob/deobfuscators/RenameUniqueTest.java | 2 +- .../deobfuscators/RuntimeExceptionsTest.java | 2 +- .../deob/deobfuscators/UnreachedCodeTest.java | 2 +- .../deob/deobfuscators/UnusedClassTest.java | 2 +- .../deob/deobfuscators/UnusedFieldsTest.java | 2 +- .../deob/deobfuscators/UnusedMethodsTest.java | 2 +- .../deobfuscators/UnusedParametersTest.java | 2 +- .../arithmetic/ModArithTest.java | 2 +- .../MultiplyZeroDeobfuscatorTest.java | 2 +- .../cfg/ControlFlowDeobfuscatorTest.java | 2 +- .../constparam/ConstantParameterTest.java | 2 +- .../MenuActionDeobfuscatorTest.java | 2 +- .../PacketWriteDeobfuscatorTest.java | 2 +- .../ClientErrorTransformerTest.java | 2 +- .../deob/updater/AnnotationCleaner.java | 2 +- .../deob/updater/AnnotationCopierTest.java | 2 +- .../deob/updater/AnnotationRenamerTest.java | 2 +- .../deob/updater/UpdateMappingsTest.java | 4 +- .../java/net/runelite/osb/HookImporter.java | 2 +- .../runelite/runeloader/MappingImporter.java | 2 +- .../net/runelite/runesuite/HookImporter.java | 2 +- .../java/com/openosrs/injector/Injector.java | 40 +++++++------------ .../injector/injection/InjectTaskHandler.java | 2 +- 32 files changed, 47 insertions(+), 57 deletions(-) diff --git a/deobfuscator/src/main/java/net/runelite/deob/Deob.java b/deobfuscator/src/main/java/net/runelite/deob/Deob.java index da0a7f7391..ae6e4a71a5 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/Deob.java +++ b/deobfuscator/src/main/java/net/runelite/deob/Deob.java @@ -137,7 +137,7 @@ public class Deob //new MaxMemoryTransformer().transform(group); //new RuneliteBufferTransformer().transform(group); - JarUtil.saveJar(group, new File(args[1])); + JarUtil.save(group, new File(args[1])); stopwatch.stop(); logger.info("Done in {}", stopwatch); diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java index 4209e0863d..e1bb33be68 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java @@ -82,7 +82,7 @@ public class UpdateMappings public void save(File out) throws IOException { - JarUtil.saveJar(group2, out); + JarUtil.save(group2, out); } public static void main(String[] args) throws IOException diff --git a/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java b/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java index 766c7bd934..eeac2fdf71 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java +++ b/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java @@ -119,7 +119,7 @@ public class JarUtil return group; } - public static void saveJar(ClassGroup group, File jarfile) + public static void save(ClassGroup group, File jarfile) { try (JarOutputStream jout = new JarOutputStream(new FileOutputStream(jarfile))) { diff --git a/deobfuscator/src/test/java/net/runelite/asm/visitors/ClassFileVisitorTest.java b/deobfuscator/src/test/java/net/runelite/asm/visitors/ClassFileVisitorTest.java index 1376cc591f..4c19f8bc00 100644 --- a/deobfuscator/src/test/java/net/runelite/asm/visitors/ClassFileVisitorTest.java +++ b/deobfuscator/src/test/java/net/runelite/asm/visitors/ClassFileVisitorTest.java @@ -47,7 +47,7 @@ public class ClassFileVisitorTest { ClassGroup group = JarUtil.load(new File(properties.getVanillaClient())); - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } } diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/EnumDeobfuscatorTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/EnumDeobfuscatorTest.java index a31d914403..3ff974e67e 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/EnumDeobfuscatorTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/EnumDeobfuscatorTest.java @@ -56,7 +56,7 @@ public class EnumDeobfuscatorTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/FieldInlinerTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/FieldInlinerTest.java index 60b3f5cce2..330ad80257 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/FieldInlinerTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/FieldInlinerTest.java @@ -56,7 +56,7 @@ public class FieldInlinerTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/IllegalStateExceptionsTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/IllegalStateExceptionsTest.java index 45632a3b77..f11fa566ba 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/IllegalStateExceptionsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/IllegalStateExceptionsTest.java @@ -56,7 +56,7 @@ public class IllegalStateExceptionsTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/OrderTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/OrderTest.java index 259cbda611..bfd1bb3f95 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/OrderTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/OrderTest.java @@ -56,7 +56,7 @@ public class OrderTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/PacketHandlerOrderTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/PacketHandlerOrderTest.java index ed0b9b2d6a..cc8bb41fee 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/PacketHandlerOrderTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/PacketHandlerOrderTest.java @@ -56,7 +56,7 @@ public class PacketHandlerOrderTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RenameUniqueTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RenameUniqueTest.java index 54fcc9c9fc..fc0c556d52 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RenameUniqueTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RenameUniqueTest.java @@ -64,7 +64,7 @@ public class RenameUniqueTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RuntimeExceptionsTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RuntimeExceptionsTest.java index 7876df519f..f0f0311a1d 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RuntimeExceptionsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RuntimeExceptionsTest.java @@ -56,7 +56,7 @@ public class RuntimeExceptionsTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnreachedCodeTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnreachedCodeTest.java index fe018ccca6..d20f72641c 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnreachedCodeTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnreachedCodeTest.java @@ -59,7 +59,7 @@ public class UnreachedCodeTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedClassTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedClassTest.java index 7944334633..da2ae00fb9 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedClassTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedClassTest.java @@ -75,7 +75,7 @@ public class UnusedClassTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedFieldsTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedFieldsTest.java index fc0f847c50..653e1f0a4a 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedFieldsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedFieldsTest.java @@ -56,7 +56,7 @@ public class UnusedFieldsTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedMethodsTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedMethodsTest.java index 0854708704..ee016e3294 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedMethodsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedMethodsTest.java @@ -56,7 +56,7 @@ public class UnusedMethodsTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedParametersTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedParametersTest.java index d848c55fc2..36d6894dfc 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedParametersTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedParametersTest.java @@ -56,7 +56,7 @@ public class UnusedParametersTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/arithmetic/ModArithTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/arithmetic/ModArithTest.java index 75bb884589..7cab6cb79e 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/arithmetic/ModArithTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/arithmetic/ModArithTest.java @@ -57,7 +57,7 @@ public class ModArithTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscatorTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscatorTest.java index 68e5f5c5d6..7efdbc72b0 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscatorTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/arithmetic/MultiplyZeroDeobfuscatorTest.java @@ -57,7 +57,7 @@ public class MultiplyZeroDeobfuscatorTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscatorTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscatorTest.java index ebc1286cd7..87e5386bde 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscatorTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/cfg/ControlFlowDeobfuscatorTest.java @@ -56,7 +56,7 @@ public class ControlFlowDeobfuscatorTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/constparam/ConstantParameterTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/constparam/ConstantParameterTest.java index d1344ccd29..6499f781b1 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/constparam/ConstantParameterTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/constparam/ConstantParameterTest.java @@ -56,7 +56,7 @@ public class ConstantParameterTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/menuaction/MenuActionDeobfuscatorTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/menuaction/MenuActionDeobfuscatorTest.java index d7e91c6015..f301a1a550 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/menuaction/MenuActionDeobfuscatorTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/menuaction/MenuActionDeobfuscatorTest.java @@ -56,7 +56,7 @@ public class MenuActionDeobfuscatorTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/packetwrite/PacketWriteDeobfuscatorTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/packetwrite/PacketWriteDeobfuscatorTest.java index 0ac5d3a39a..0db78f67fa 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/packetwrite/PacketWriteDeobfuscatorTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/packetwrite/PacketWriteDeobfuscatorTest.java @@ -58,7 +58,7 @@ public class PacketWriteDeobfuscatorTest @After public void after() throws IOException { - JarUtil.saveJar(group, folder.newFile()); + JarUtil.save(group, folder.newFile()); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/ClientErrorTransformerTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/ClientErrorTransformerTest.java index 7ed711252b..4e66d5517b 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/ClientErrorTransformerTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/ClientErrorTransformerTest.java @@ -59,7 +59,7 @@ public class ClientErrorTransformerTest { File out = folder.newFile(); - JarUtil.saveJar(group, out); + JarUtil.save(group, out); logger.info("Wrote to {}", out); } diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java index 9c84de216e..0971830c5b 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java @@ -117,7 +117,7 @@ public class AnnotationCleaner new AnnotationAdder(group).run(); - JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/niec.jar")); + JarUtil.save(group, new File("C:/Users/Lucas/Desktop/niec.jar")); } private static class OhNoException extends Exception diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCopierTest.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCopierTest.java index 9709138491..5462708b59 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCopierTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCopierTest.java @@ -54,7 +54,7 @@ public class AnnotationCopierTest @After public void after() throws IOException { - JarUtil.saveJar(group2, new File(OUT)); + JarUtil.save(group2, new File(OUT)); } //@Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationRenamerTest.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationRenamerTest.java index 7132952611..f47251d1c2 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationRenamerTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationRenamerTest.java @@ -48,7 +48,7 @@ public class AnnotationRenamerTest @After public void after() throws IOException { - JarUtil.saveJar(group, new File(OUT)); + JarUtil.save(group, new File(OUT)); } //@Test diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java index abe6f4cd3a..677549b692 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java @@ -67,7 +67,7 @@ public class UpdateMappingsTest map(group1, group2); - JarUtil.saveJar(group2, new File(OUT)); + JarUtil.save(group2, new File(OUT)); } @Test @@ -98,7 +98,7 @@ public class UpdateMappingsTest new ScriptOpcodesTransformer().transform(group); - JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/Apapapapapap.jar")); + JarUtil.save(group, new File("C:/Users/Lucas/Desktop/Apapapapapap.jar")); } private void unannotate(ClassGroup group) diff --git a/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java b/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java index 1141f4fa67..79a6b823da 100644 --- a/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java @@ -78,7 +78,7 @@ public class HookImporter @After public void after() throws IOException { - JarUtil.saveJar(group, OUT); + JarUtil.save(group, OUT); } @Test diff --git a/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java b/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java index bfdf5cc944..5ae4e13b2c 100644 --- a/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java +++ b/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java @@ -70,7 +70,7 @@ public class MappingImporter @After public void after() throws IOException { - JarUtil.saveJar(group, OUT); + JarUtil.save(group, OUT); } private boolean hasObfuscatedName(Annotated an, String name) diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java index 913cb6e503..c15b5336b0 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java @@ -87,7 +87,7 @@ public class HookImporter public void after() throws IOException { File out = folder.newFile("client.jar"); - JarUtil.saveJar(group, out); + JarUtil.save(group, out); logger.info("Wrote to {}", out); } diff --git a/injector/src/main/java/com/openosrs/injector/Injector.java b/injector/src/main/java/com/openosrs/injector/Injector.java index f9e781e865..08294eb0d1 100644 --- a/injector/src/main/java/com/openosrs/injector/Injector.java +++ b/injector/src/main/java/com/openosrs/injector/Injector.java @@ -24,39 +24,36 @@ import com.openosrs.injector.injectors.raw.ScriptVM; import com.openosrs.injector.rsapi.RSApi; import com.openosrs.injector.transformers.InjectTransformer; import com.openosrs.injector.transformers.SourceChanger; +import static net.runelite.deob.util.JarUtil.load; +import static net.runelite.deob.util.JarUtil.save; import java.io.File; import java.util.Objects; -import net.runelite.deob.util.JarUtil; import org.gradle.api.logging.Logger; import org.gradle.api.logging.Logging; public class Injector extends InjectData implements InjectTaskHandler { - private static final Logger log = Logging.getLogger(Injector.class); - - private static Injector injector; - static File injectedClient = new File("../runelite-client/src/main/resources/net/runelite/client/injected-client.oprs"); + static final Logger log = Logging.getLogger(Injector.class); + static Injector injector = new Injector(); + static File injectedClient = + new File("../runelite-client/src/main/resources/net/runelite/client/injected-client.oprs"); public static void main(String[] args) { - File vanillaJar = new File(args[0]); - File rsClientJar = new File("../runescape-client/build/libs/runescape-client-" + args[1] + ".jar"); - File mixinsJar = new File("../runelite-mixins/build/libs/runelite-mixins-" + args[1] + ".jar"); - RSApi rsApiClasses = new RSApi(Objects.requireNonNull( + injector.vanilla = load(new File(args[0])); + injector.deobfuscated = load( + new File("../runescape-client/build/libs/runescape-client-" + args[1] + ".jar")); + injector.rsApi = new RSApi(Objects.requireNonNull( new File("../runescape-api/build/classes/java/main/net/runelite/rs/api/") .listFiles())); - - injector = new Injector(); - injector.vanilla = JarUtil.load(vanillaJar); - injector.deobfuscated = JarUtil.load(rsClientJar); - injector.rsApi = rsApiClasses; - injector.mixins = JarUtil.load(mixinsJar); + injector.mixins = load( + new File("../runelite-mixins/build/libs/runelite-mixins-" + args[1] + ".jar")); injector.initToVanilla(); - injector.inject(); - save(); + injector.injectVanilla(); + save(injector.getVanilla(), injectedClient); } - public void inject() + public void injectVanilla() { log.debug("[DEBUG] Starting injection"); @@ -96,13 +93,6 @@ public class Injector extends InjectData implements InjectTaskHandler transform(new SourceChanger(this)); } - public static void save() - { - log.info("[INFO] Saving jar to {}", injectedClient.toString()); - - JarUtil.saveJar(injector.getVanilla(), injectedClient); - } - private void inject(com.openosrs.injector.injectors.Injector injector) { final String name = injector.getName(); diff --git a/injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java b/injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java index e6a309822f..a6f29b6f3e 100644 --- a/injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java +++ b/injector/src/main/java/com/openosrs/injector/injection/InjectTaskHandler.java @@ -15,5 +15,5 @@ public interface InjectTaskHandler /** * The actual method that does all the work */ - void inject(); + void injectVanilla(); }