From 72e9107900943747d41aa021221d325cb7d6f72c Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Thu, 31 Dec 2020 12:03:33 +0000
Subject: [PATCH] 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>
---
 README.md                                         | 15 +++++++--------
 .../deob/bytecode/DeobfuscateBytecodeCommand.kt   |  2 +-
 .../kotlin/org/openrs2/patcher/PatchCommand.kt    |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 6dd25998..2f195b9d 100644
--- a/README.md
+++ b/README.md
@@ -25,14 +25,13 @@ the root of the repository), in the following structure:
 
 ```
 nonfree
-└── share
-    └── client
-        ├── jaggl.pack200
-        ├── loader_gl.jar
-        ├── loader.jar
-        ├── runescape_gl.pack200
-        ├── runescape.jar
-        └── unpackclass.pack
+└── lib
+    ├── jaggl.pack200
+    ├── loader_gl.jar
+    ├── loader.jar
+    ├── runescape_gl.pack200
+    ├── runescape.jar
+    └── unpackclass.pack
 ```
 
 The CRC-32 checksums and SHA-256 digests of the correct files are:
diff --git a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt
index 5b8adb17..6af23451 100644
--- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt
+++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/DeobfuscateBytecodeCommand.kt
@@ -11,7 +11,7 @@ public class DeobfuscateBytecodeCommand : CliktCommand(name = "deob-bytecode") {
         val injector = Guice.createInjector(BytecodeDeobfuscatorModule)
         val deobfuscator = injector.getInstance(BytecodeDeobfuscator::class.java)
         deobfuscator.run(
-            input = Paths.get("nonfree/share/client"),
+            input = Paths.get("nonfree/lib"),
             output = Paths.get("nonfree/var/cache/deob")
         )
     }
diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt b/patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt
index 3028d140..eb29101d 100644
--- a/patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt
@@ -11,7 +11,7 @@ public class PatchCommand : CliktCommand(name = "patch") {
         val injector = Guice.createInjector(PatcherModule)
         val patcher = injector.getInstance(Patcher::class.java)
         patcher.run(
-            input = Paths.get("nonfree/share/client"),
+            input = Paths.get("nonfree/lib"),
             output = Paths.get("nonfree/var/cache/client"),
             keyStorePath = Paths.get("etc/loader.p12")
         )