Move original client back to nonfree/lib

I think it's actually fine to stick the jars in the nonfree/lib folder.
When we package up the entire OpenRS2 distribution, the fat jar is
placed in the lib folder, so using nonfree/lib is consistent with that.

Signed-off-by: Graham <gpe@openrs2.org>
bzip2
Graham 4 years ago
parent 36e4fa474b
commit 72e9107900
  1. 3
      README.md
  2. 2
      deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt
  3. 2
      patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt

@ -25,8 +25,7 @@ the root of the repository), in the following structure:
``` ```
nonfree nonfree
└── share └── lib
└── client
├── jaggl.pack200 ├── jaggl.pack200
├── loader_gl.jar ├── loader_gl.jar
├── loader.jar ├── loader.jar

@ -11,7 +11,7 @@ public class DeobfuscateBytecodeCommand : CliktCommand(name = "deob-bytecode") {
val injector = Guice.createInjector(BytecodeDeobfuscatorModule) val injector = Guice.createInjector(BytecodeDeobfuscatorModule)
val deobfuscator = injector.getInstance(BytecodeDeobfuscator::class.java) val deobfuscator = injector.getInstance(BytecodeDeobfuscator::class.java)
deobfuscator.run( deobfuscator.run(
input = Paths.get("nonfree/share/client"), input = Paths.get("nonfree/lib"),
output = Paths.get("nonfree/var/cache/deob") output = Paths.get("nonfree/var/cache/deob")
) )
} }

@ -11,7 +11,7 @@ public class PatchCommand : CliktCommand(name = "patch") {
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( patcher.run(
input = Paths.get("nonfree/share/client"), input = Paths.get("nonfree/lib"),
output = Paths.get("nonfree/var/cache/client"), output = Paths.get("nonfree/var/cache/client"),
keyStorePath = Paths.get("etc/loader.p12") keyStorePath = Paths.get("etc/loader.p12")
) )

Loading…
Cancel
Save