From 061e01d57faa05d9e786886d0d135c83e55852b0 Mon Sep 17 00:00:00 2001 From: Graham Date: Wed, 25 Mar 2020 16:52:16 +0000 Subject: [PATCH] Rename game_unpacker.dat to unpackclass.pack for consistency game_unpacker.dat is the name of the file when downloaded in the .jagex_cache_32/runescape directory. However, the other files containing code are all named after the files on the web/JAGGRAB server. This commit uses unpackclass.pack for consistency with all the other files. Signed-off-by: Graham --- README.md | 6 +++--- bundler/src/main/java/dev/openrs2/bundler/Bundler.kt | 2 +- deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b5eacd88e7..e4a8c6e8b2 100644 --- a/README.md +++ b/README.md @@ -26,23 +26,23 @@ beneath the root of the repository), in the following structure: ``` nonfree └── code -    ├── game_unpacker.dat    ├── jaggl.pack200    ├── loader_gl.jar    ├── loader.jar    ├── runescape_gl.pack200 -    └── runescape.jar +    ├── runescape.jar +    └── unpackclass.pack ``` The SHA-256 checksums of the correct files are: ``` -7c090e07f8d754d09804ff6e9733ef3ba227893b6b639436db90977b39122590 nonfree/code/game_unpacker.dat d39578f4a88a376bcb2571f05da1939a14a80d8c4ed89a4eb172d9e525795fe2 nonfree/code/jaggl.pack200 31182683ba04dc0ad45859161c13f66424b10deb0b2df10aa58b48bba57402db nonfree/code/loader_gl.jar ccdfaa86be07452ddd69f869ade86ea900dbb916fd853db16602edf2eb54211b nonfree/code/loader.jar 4a5032ea8079d2154617ae1f21dfcc46a10e023c8ba23a4827d5e25e75c73045 nonfree/code/runescape_gl.pack200 0ab28a95e7c5993860ff439ebb331c0df02ad40aa1f544777ed91b46d30d3d24 nonfree/code/runescape.jar +7c090e07f8d754d09804ff6e9733ef3ba227893b6b639436db90977b39122590 nonfree/code/unpackclass.pack ``` The `nonfree` directory is included in the `.gitignore` file to prevent any diff --git a/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt b/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt index 7a0f3713c3..58a4e3ff04 100644 --- a/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt +++ b/bundler/src/main/java/dev/openrs2/bundler/Bundler.kt @@ -36,7 +36,7 @@ class Bundler @Inject constructor(publicKeyTransformer: PublicKeyTransformer) { fun run(input: Path, output: Path, keyStorePath: Path) { // read input jars/packs logger.info { "Reading input jars" } - val unpacker = Library.readJar(input.resolve("game_unpacker.dat")) + val unpacker = Library.readJar(input.resolve("unpackclass.pack")) val loader = Library.readJar(input.resolve("loader.jar")) val glLoader = Library.readJar(input.resolve("loader_gl.jar")) val gl = Library.readPack(input.resolve("jaggl.pack200")) diff --git a/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt b/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt index 9feb9fd365..88392415cc 100644 --- a/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt +++ b/deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt @@ -48,7 +48,7 @@ class Deobfuscator(private val input: Path, private val output: Path) { fun run() { // read input jars/packs logger.info { "Reading input jars" } - val unpacker = readJar(input.resolve("game_unpacker.dat")) + val unpacker = readJar(input.resolve("unpackclass.pack")) val glUnpacker = Library(unpacker) val loader = readJar(input.resolve("loader.jar")) val glLoader = readJar(input.resolve("loader_gl.jar"))