From cdd293a865f3feb74924ca714e9476a346994d65 Mon Sep 17 00:00:00 2001 From: TheRealNull Date: Sat, 2 Jan 2021 04:16:57 -0500 Subject: [PATCH] injector: loadJar -> load, small cleanups in main --- .../src/main/java/net/runelite/deob/Deob.java | 2 +- .../runelite/deob/updater/UpdateMappings.java | 4 +- .../java/net/runelite/deob/util/JarUtil.java | 6 ++- .../runelite/asm/execution/ExecutionTest.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/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 +- .../deobfuscators/mapping/MappingDumper.java | 8 ++-- .../MenuActionDeobfuscatorTest.java | 2 +- .../packethandler/PacketTypeFinderTest.java | 2 +- .../PacketWriteDeobfuscatorTest.java | 2 +- .../ClientErrorTransformerTest.java | 2 +- .../transformers/buffer/BufferFinderTest.java | 2 +- .../deob/updater/AnnotationCleaner.java | 4 +- .../deob/updater/AnnotationCopierTest.java | 4 +- .../deob/updater/AnnotationRenamerTest.java | 2 +- .../deob/updater/UpdateMappingsTest.java | 10 ++--- .../java/net/runelite/osb/HookImporter.java | 2 +- .../runelite/runeloader/MappingImporter.java | 2 +- .../net/runelite/runesuite/HookImporter.java | 2 +- .../java/com/openosrs/injector/Injector.java | 44 ++++++++----------- 33 files changed, 64 insertions(+), 68 deletions(-) diff --git a/deobfuscator/src/main/java/net/runelite/deob/Deob.java b/deobfuscator/src/main/java/net/runelite/deob/Deob.java index ebe8aca6df..da0a7f7391 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/Deob.java +++ b/deobfuscator/src/main/java/net/runelite/deob/Deob.java @@ -77,7 +77,7 @@ public class Deob Stopwatch stopwatch = Stopwatch.createStarted(); - ClassGroup group = JarUtil.loadJar(new File(args[0])); + ClassGroup group = JarUtil.load(new File(args[0])); // remove except RuntimeException run(group, new RuntimeExceptions()); 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 456eef2c8f..4209e0863d 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java @@ -93,8 +93,8 @@ public class UpdateMappings } UpdateMappings u = new UpdateMappings( - JarUtil.loadJar(new File(args[0])), - JarUtil.loadJar(new File(args[1])) + JarUtil.load(new File(args[0])), + JarUtil.load(new File(args[1])) ); u.update(); u.save(new File(args[2])); 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 40c77200e7..766c7bd934 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java +++ b/deobfuscator/src/main/java/net/runelite/deob/util/JarUtil.java @@ -49,7 +49,7 @@ public class JarUtil { private static final Logger logger = LoggerFactory.getLogger(JarUtil.class); - public static ClassGroup loadJar(File jarfile) throws IOException + public static ClassGroup load(File jarfile) { ClassGroup group = new ClassGroup(); @@ -74,6 +74,10 @@ public class JarUtil group.addClass(cv.getClassFile()); } } + catch (IOException e) + { + e.printStackTrace(); + } group.initialize(); diff --git a/deobfuscator/src/test/java/net/runelite/asm/execution/ExecutionTest.java b/deobfuscator/src/test/java/net/runelite/asm/execution/ExecutionTest.java index ddc8c728f5..df7c3d20e3 100644 --- a/deobfuscator/src/test/java/net/runelite/asm/execution/ExecutionTest.java +++ b/deobfuscator/src/test/java/net/runelite/asm/execution/ExecutionTest.java @@ -39,7 +39,7 @@ public class ExecutionTest @Test public void test() throws Exception { - ClassGroup group1 = JarUtil.loadJar(new File(properties.getVanillaClient())); + ClassGroup group1 = JarUtil.load(new File(properties.getVanillaClient())); Execution e = new Execution(group1); e.populateInitialMethods(); e.run(); 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 6c9ec91978..1376cc591f 100644 --- a/deobfuscator/src/test/java/net/runelite/asm/visitors/ClassFileVisitorTest.java +++ b/deobfuscator/src/test/java/net/runelite/asm/visitors/ClassFileVisitorTest.java @@ -45,7 +45,7 @@ public class ClassFileVisitorTest @Test public void test() throws Exception { - ClassGroup group = JarUtil.loadJar(new File(properties.getVanillaClient())); + ClassGroup group = JarUtil.load(new File(properties.getVanillaClient())); JarUtil.saveJar(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 e601721f10..a31d914403 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/EnumDeobfuscatorTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/EnumDeobfuscatorTest.java @@ -50,7 +50,7 @@ public class EnumDeobfuscatorTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getRsClient())); + group = JarUtil.load(new File(properties.getRsClient())); } @After 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 873bc2fea8..60b3f5cce2 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/FieldInlinerTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/FieldInlinerTest.java @@ -50,7 +50,7 @@ public class FieldInlinerTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 a377150da4..45632a3b77 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/IllegalStateExceptionsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/IllegalStateExceptionsTest.java @@ -50,7 +50,7 @@ public class IllegalStateExceptionsTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 99ea7e14f9..259cbda611 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/OrderTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/OrderTest.java @@ -50,7 +50,7 @@ public class OrderTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 cbe09d27b1..ed0b9b2d6a 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/PacketHandlerOrderTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/PacketHandlerOrderTest.java @@ -50,7 +50,7 @@ public class PacketHandlerOrderTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getRsClient())); + group = JarUtil.load(new File(properties.getRsClient())); } @After 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 5082b90737..54fcc9c9fc 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RenameUniqueTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RenameUniqueTest.java @@ -58,7 +58,7 @@ public class RenameUniqueTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 90dcf26624..7876df519f 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RuntimeExceptionsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/RuntimeExceptionsTest.java @@ -50,7 +50,7 @@ public class RuntimeExceptionsTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 58a92d69ba..fc0f847c50 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedFieldsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedFieldsTest.java @@ -50,7 +50,7 @@ public class UnusedFieldsTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 d76e5a929b..0854708704 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedMethodsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedMethodsTest.java @@ -50,7 +50,7 @@ public class UnusedMethodsTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 584c96315a..d848c55fc2 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedParametersTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedParametersTest.java @@ -50,7 +50,7 @@ public class UnusedParametersTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 3b9a386d16..75bb884589 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 @@ -51,7 +51,7 @@ public class ModArithTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 038276978c..68e5f5c5d6 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 @@ -51,7 +51,7 @@ public class MultiplyZeroDeobfuscatorTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 0b79273ff0..ebc1286cd7 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 @@ -50,7 +50,7 @@ public class ControlFlowDeobfuscatorTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After 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 e2b5d6f7a4..d1344ccd29 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 @@ -50,7 +50,7 @@ public class ConstantParameterTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getVanillaClient())); + group = JarUtil.load(new File(properties.getVanillaClient())); } @After diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java index 7818f9cf7e..8941ca2eb3 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/mapping/MappingDumper.java @@ -59,7 +59,7 @@ public class MappingDumper @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getRsClient())); + group = JarUtil.load(new File(properties.getRsClient())); } @Test @@ -72,7 +72,7 @@ public class MappingDumper @Test public void dump() throws IOException { - ClassGroup group = JarUtil.loadJar(new File(properties.getRsClient())); + ClassGroup group = JarUtil.load(new File(properties.getRsClient())); final String GAP = "%-40s"; int classes = 0, methods = 0, fields = 0; @@ -321,7 +321,7 @@ public class MappingDumper @Test public void dumpTiny() throws IOException { - ClassGroup group = JarUtil.loadJar(new File(properties.getRsClient())); + ClassGroup group = JarUtil.load(new File(properties.getRsClient())); System.out.println("v1\tofficial\tintermediary"); for (ClassFile clazz : group.getClasses()) { @@ -379,7 +379,7 @@ public class MappingDumper @Test public void dumpJson() throws IOException { - ClassGroup group = JarUtil.loadJar(new File(properties.getRsClient())); + ClassGroup group = JarUtil.load(new File(properties.getRsClient())); Gson gson = new GsonBuilder().setPrettyPrinting().create(); JsonObject jObject = new JsonObject(); 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 04cac6d48b..d7e91c6015 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 @@ -50,7 +50,7 @@ public class MenuActionDeobfuscatorTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getRsClient())); + group = JarUtil.load(new File(properties.getRsClient())); } @After diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/packethandler/PacketTypeFinderTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/packethandler/PacketTypeFinderTest.java index 7d99526284..bae9445ed5 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/packethandler/PacketTypeFinderTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/packethandler/PacketTypeFinderTest.java @@ -49,7 +49,7 @@ public class PacketTypeFinderTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getRsClient())); + group = JarUtil.load(new File(properties.getRsClient())); } @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 690994ec9b..0ac5d3a39a 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 @@ -51,7 +51,7 @@ public class PacketWriteDeobfuscatorTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getRsClient())); + group = JarUtil.load(new File(properties.getRsClient())); group.removeClass(group.findClass("net/runelite/rs/Reflection")); } 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 e6652df964..7ed711252b 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 @@ -51,7 +51,7 @@ public class ClientErrorTransformerTest @Before public void before() throws IOException { - group = JarUtil.loadJar(GAMEPACK); + group = JarUtil.load(GAMEPACK); } @After diff --git a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferFinderTest.java b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferFinderTest.java index b15af465e1..29e874f2ae 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferFinderTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferFinderTest.java @@ -49,7 +49,7 @@ public class BufferFinderTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getRsClient())); + group = JarUtil.load(new File(properties.getRsClient())); } @Test 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 04571a31b3..9c84de216e 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java @@ -31,7 +31,7 @@ public class AnnotationCleaner { final List missing = new ArrayList<>(); File client = new File(properties.getRsClient()); - ClassGroup group = JarUtil.loadJar(client); + ClassGroup group = JarUtil.load(client); for (ClassFile c : group.getClasses()) { @@ -113,7 +113,7 @@ public class AnnotationCleaner { File client = new File(properties.getRsClient()); - ClassGroup group = JarUtil.loadJar(client); + ClassGroup group = JarUtil.load(client); new AnnotationAdder(group).run(); 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 da8f3938d3..9709138491 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCopierTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCopierTest.java @@ -47,8 +47,8 @@ public class AnnotationCopierTest @Before public void before() throws IOException { - group1 = JarUtil.loadJar(new File(JAR1)); - group2 = JarUtil.loadJar(new File(JAR2)); + group1 = JarUtil.load(new File(JAR1)); + group2 = JarUtil.load(new File(JAR2)); } @After 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 b13f0754d3..7132952611 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationRenamerTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationRenamerTest.java @@ -42,7 +42,7 @@ public class AnnotationRenamerTest @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(JAR)); + group = JarUtil.load(new File(JAR)); } @After 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 eea6cea7ab..abe6f4cd3a 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/UpdateMappingsTest.java @@ -62,8 +62,8 @@ public class UpdateMappingsTest { File client = new File(properties.getRsClient()); - ClassGroup group1 = JarUtil.loadJar(client); - ClassGroup group2 = JarUtil.loadJar(new File(JAR)); + ClassGroup group1 = JarUtil.load(client); + ClassGroup group2 = JarUtil.load(new File(JAR)); map(group1, group2); @@ -76,8 +76,8 @@ public class UpdateMappingsTest { File client = new File(properties.getRsClient()); - ClassGroup group1 = JarUtil.loadJar(client); - ClassGroup group2 = JarUtil.loadJar(client); + ClassGroup group1 = JarUtil.load(client); + ClassGroup group2 = JarUtil.load(client); // Remove existing annotations unannotate(group2); @@ -94,7 +94,7 @@ public class UpdateMappingsTest { File client = new File("C:\\Users\\Lucas\\IdeaProjects\\runelitexxx\\client.jar"); - ClassGroup group = JarUtil.loadJar(client); + ClassGroup group = JarUtil.load(client); new ScriptOpcodesTransformer().transform(group); diff --git a/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java b/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java index 5475b69558..1141f4fa67 100644 --- a/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/osb/HookImporter.java @@ -72,7 +72,7 @@ public class HookImporter java.lang.reflect.Type type = new TypeToken>() {}.getType(); hooks = gson.fromJson(new InputStreamReader(is), type); - group = JarUtil.loadJar(IN); + group = JarUtil.load(IN); } @After diff --git a/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java b/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java index 62c23e3651..bfdf5cc944 100644 --- a/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java +++ b/deobfuscator/src/test/java/net/runelite/runeloader/MappingImporter.java @@ -64,7 +64,7 @@ public class MappingImporter @Before public void before() throws IOException { - group = JarUtil.loadJar(IN); + group = JarUtil.load(IN); } @After diff --git a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java index 0c661b69df..913cb6e503 100644 --- a/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java +++ b/deobfuscator/src/test/java/net/runelite/runesuite/HookImporter.java @@ -75,7 +75,7 @@ public class HookImporter @Before public void before() throws IOException { - group = JarUtil.loadJar(new File(properties.getRsClient())); + group = JarUtil.load(new File(properties.getRsClient())); InputStream is = getClass().getResourceAsStream("hooks.json"); Gson gson = new Gson(); diff --git a/injector/src/main/java/com/openosrs/injector/Injector.java b/injector/src/main/java/com/openosrs/injector/Injector.java index d1b2944c32..f9e781e865 100644 --- a/injector/src/main/java/com/openosrs/injector/Injector.java +++ b/injector/src/main/java/com/openosrs/injector/Injector.java @@ -35,33 +35,25 @@ public class Injector extends InjectData implements InjectTaskHandler private static final Logger log = Logging.getLogger(Injector.class); private static Injector injector; - static File injectedClientOutput = new File("../runelite-client/src/main/resources/net/runelite/client/injected-client.oprs"); + static File injectedClient = new File("../runelite-client/src/main/resources/net/runelite/client/injected-client.oprs"); public static void main(String[] args) { - try - { - File vanilla = new File(args[0]); - File rsClient = new File("../runescape-client/build/libs/runescape-client-" + args[1] + ".jar"); - File mixins = new File("../runelite-mixins/build/libs/runelite-mixins-" + args[1] + ".jar"); - RSApi rsApi = new RSApi(Objects.requireNonNull( - new File("../runescape-api/build/classes/java/main/net/runelite/rs/api/") - .listFiles())); - - injector = new Injector(); - injector.vanilla = JarUtil.loadJar(vanilla); - injector.deobfuscated = JarUtil.loadJar(rsClient); - injector.rsApi = rsApi; - injector.mixins = JarUtil.loadJar(mixins); - injector.initToVanilla(); - injector.inject(); - save(injectedClientOutput); - } - catch (Exception e) - { - e.printStackTrace(); - } + 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( + 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.initToVanilla(); + injector.inject(); + save(); } public void inject() @@ -104,11 +96,11 @@ public class Injector extends InjectData implements InjectTaskHandler transform(new SourceChanger(this)); } - public static void save(File outputJar) + public static void save() { - log.info("[INFO] Saving jar to {}", outputJar.toString()); + log.info("[INFO] Saving jar to {}", injectedClient.toString()); - JarUtil.saveJar(injector.getVanilla(), outputJar); + JarUtil.saveJar(injector.getVanilla(), injectedClient); } private void inject(com.openosrs.injector.injectors.Injector injector)