Move original client code to nonfree/share/client

This is slightly per correct than nonfree/lib, as the /lib
directory is for architecture-specific code. The original client code is
not architecture-specific.

Signed-off-by: Graham <gpe@openrs2.org>
Graham 4 years ago
parent c24d9ceb35
commit ded1d99924
  1. 31
      README.md
  2. 5
      deob/src/main/kotlin/org/openrs2/deob/DeobfuscateCommand.kt
  3. 6
      patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt

@ -25,25 +25,26 @@ the root of the repository), in the following structure:
``` ```
nonfree nonfree
└── lib └── share
├── jaggl.pack200 └── client
├── loader_gl.jar ├── jaggl.pack200
├── loader.jar ├── loader_gl.jar
├── runescape_gl.pack200 ├── loader.jar
├── runescape.jar ├── runescape_gl.pack200
└── unpackclass.pack ├── runescape.jar
└── unpackclass.pack
``` ```
The CRC-32 checksums and SHA-256 digests of the correct files are: The CRC-32 checksums and SHA-256 digests of the correct files are:
| CRC-32 checksum | SHA-256 digest | File | | CRC-32 checksum | SHA-256 digest | File |
|----------------:|--------------------------------------------------------------------|------------------------------------| |----------------:|--------------------------------------------------------------------|------------------------|
| `-1418094567` | `d39578f4a88a376bcb2571f05da1939a14a80d8c4ed89a4eb172d9e525795fe2` | `nonfree/lib/jaggl.pack200` | | `-1418094567` | `d39578f4a88a376bcb2571f05da1939a14a80d8c4ed89a4eb172d9e525795fe2` | `jaggl.pack200` |
| `-2129469231` | `31182683ba04dc0ad45859161c13f66424b10deb0b2df10aa58b48bba57402db` | `nonfree/lib/loader_gl.jar` | | `-2129469231` | `31182683ba04dc0ad45859161c13f66424b10deb0b2df10aa58b48bba57402db` | `loader_gl.jar` |
| `-1516355035` | `ccdfaa86be07452ddd69f869ade86ea900dbb916fd853db16602edf2eb54211b` | `nonfree/lib/loader.jar` | | `-1516355035` | `ccdfaa86be07452ddd69f869ade86ea900dbb916fd853db16602edf2eb54211b` | `loader.jar` |
| `-132784534` | `4a5032ea8079d2154617ae1f21dfcc46a10e023c8ba23a4827d5e25e75c73045` | `nonfree/lib/runescape_gl.pack200` | | `-132784534` | `4a5032ea8079d2154617ae1f21dfcc46a10e023c8ba23a4827d5e25e75c73045` | `runescape_gl.pack200` |
| `1692522675` | `0ab28a95e7c5993860ff439ebb331c0df02ad40aa1f544777ed91b46d30d3d24` | `nonfree/lib/runescape.jar` | | `1692522675` | `0ab28a95e7c5993860ff439ebb331c0df02ad40aa1f544777ed91b46d30d3d24` | `runescape.jar` |
| `-1911426584` | `7c090e07f8d754d09804ff6e9733ef3ba227893b6b639436db90977b39122590` | `nonfree/lib/unpackclass.pack` | | `-1911426584` | `7c090e07f8d754d09804ff6e9733ef3ba227893b6b639436db90977b39122590` | `unpackclass.pack` |
The `.gitignore` file includes the `nonfree` directory to prevent any non-free The `.gitignore` file includes the `nonfree` directory to prevent any non-free
material from being accidentally included in the repository. material from being accidentally included in the repository.

@ -10,6 +10,9 @@ public class DeobfuscateCommand : CliktCommand(name = "deob") {
override fun run() { override fun run() {
val injector = Guice.createInjector(DeobfuscatorModule) val injector = Guice.createInjector(DeobfuscatorModule)
val deobfuscator = injector.getInstance(Deobfuscator::class.java) val deobfuscator = injector.getInstance(Deobfuscator::class.java)
deobfuscator.run(Paths.get("nonfree/lib"), Paths.get("nonfree/var/cache/deob")) deobfuscator.run(
input = Paths.get("nonfree/share/client"),
output = Paths.get("nonfree/var/cache/deob")
)
} }
} }

@ -10,6 +10,10 @@ public class PatchCommand : CliktCommand(name = "patch") {
override fun run() { override fun run() {
val injector = Guice.createInjector(PatcherModule) val injector = Guice.createInjector(PatcherModule)
val patcher = injector.getInstance(Patcher::class.java) val patcher = injector.getInstance(Patcher::class.java)
patcher.run(Paths.get("nonfree/lib"), Paths.get("nonfree/var/cache/client"), Paths.get("etc/loader.p12")) patcher.run(
input = Paths.get("nonfree/share/client"),
output = Paths.get("nonfree/var/cache/client"),
keyStorePath = Paths.get("etc/loader.p12")
)
} }
} }

Loading…
Cancel
Save