From c24d9ceb3502d28f4e96c99dd13a152292dac345 Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.org>
Date: Fri, 25 Dec 2020 11:35:03 +0000
Subject: [PATCH] Rename bundler to patcher

Closes #116.

This commit also changes the output directory from
nonfree/var/cache/bundle to nonfree/var/cache/client.

Signed-off-by: Graham <gpe@openrs2.org>
---
 .../{Bundler.xml => Patcher.xml}              |  6 ++--
 all/build.gradle.kts                          |  2 +-
 all/src/main/kotlin/org/openrs2/Command.kt    |  6 ++--
 .../org/openrs2/bundler/BundleCommand.kt      | 15 ---------
 deob/build.gradle.kts                         |  2 +-
 .../org/openrs2/deob/DeobfuscatorModule.kt    | 10 +++---
 ...erTransformer.kt => PatcherTransformer.kt} |  6 ++--
 {bundler => patcher}/build.gradle.kts         |  4 +--
 .../org/openrs2/patcher/PatchCommand.kt       | 15 +++++++++
 .../kotlin/org/openrs2/patcher/Patcher.kt     |  8 ++---
 .../org/openrs2/patcher/PatcherModule.kt      | 32 +++++++++----------
 .../org/openrs2/patcher/PatcherQualifier.kt   |  4 +--
 .../kotlin/org/openrs2/patcher}/Resource.kt   |  2 +-
 .../transform/BufferSizeTransformer.kt        |  2 +-
 .../transform/CachePathTransformer.kt         |  2 +-
 .../patcher}/transform/DomainTransformer.kt   |  2 +-
 .../patcher}/transform/HighDpiTransformer.kt  |  2 +-
 .../transform/HostCheckTransformer.kt         |  2 +-
 .../transform/LoadLibraryTransformer.kt       |  2 +-
 .../transform/MacResizeTransformer.kt         |  2 +-
 .../transform/MemoryAllocationTransformer.kt  |  2 +-
 .../patcher}/transform/NameTransformer.kt     |  2 +-
 .../transform/PlatformDetectionTransformer.kt |  2 +-
 .../transform/PublicKeyTransformer.kt         |  2 +-
 .../patcher}/transform/ResourceTransformer.kt |  4 +--
 .../transform/RightClickTransformer.kt        |  2 +-
 .../patcher}/transform/TypoTransformer.kt     |  2 +-
 settings.gradle.kts                           |  2 +-
 28 files changed, 72 insertions(+), 72 deletions(-)
 rename .idea/runConfigurations/{Bundler.xml => Patcher.xml} (69%)
 delete mode 100644 bundler/src/main/kotlin/org/openrs2/bundler/BundleCommand.kt
 rename deob/src/main/kotlin/org/openrs2/deob/transform/{BundlerTransformer.kt => PatcherTransformer.kt} (78%)
 rename {bundler => patcher}/build.gradle.kts (89%)
 create mode 100644 patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt
 rename bundler/src/main/kotlin/org/openrs2/bundler/Bundler.kt => patcher/src/main/kotlin/org/openrs2/patcher/Patcher.kt (96%)
 rename bundler/src/main/kotlin/org/openrs2/bundler/BundlerModule.kt => patcher/src/main/kotlin/org/openrs2/patcher/PatcherModule.kt (58%)
 rename bundler/src/main/kotlin/org/openrs2/bundler/BundlerQualifier.kt => patcher/src/main/kotlin/org/openrs2/patcher/PatcherQualifier.kt (71%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/Resource.kt (99%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/BufferSizeTransformer.kt (98%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/CachePathTransformer.kt (97%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/DomainTransformer.kt (97%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/HighDpiTransformer.kt (99%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/HostCheckTransformer.kt (98%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/LoadLibraryTransformer.kt (98%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/MacResizeTransformer.kt (98%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/MemoryAllocationTransformer.kt (98%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/NameTransformer.kt (97%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/PlatformDetectionTransformer.kt (99%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/PublicKeyTransformer.kt (98%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/ResourceTransformer.kt (99%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/RightClickTransformer.kt (97%)
 rename {bundler/src/main/kotlin/org/openrs2/bundler => patcher/src/main/kotlin/org/openrs2/patcher}/transform/TypoTransformer.kt (96%)

diff --git a/.idea/runConfigurations/Bundler.xml b/.idea/runConfigurations/Patcher.xml
similarity index 69%
rename from .idea/runConfigurations/Bundler.xml
rename to .idea/runConfigurations/Patcher.xml
index e719ff24..8e627229 100644
--- a/.idea/runConfigurations/Bundler.xml
+++ b/.idea/runConfigurations/Patcher.xml
@@ -1,12 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Bundler" type="JetRunConfigurationType">
-    <module name="openrs2.bundler.main" />
+  <configuration default="false" name="Patcher" type="JetRunConfigurationType">
+    <module name="openrs2.patcher.main" />
     <option name="VM_PARAMETERS" value="" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
     <option name="ALTERNATIVE_JRE_PATH" />
     <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="MAIN_CLASS_NAME" value="org.openrs2.bundler.BundleCommandKt" />
+    <option name="MAIN_CLASS_NAME" value="org.openrs2.patcher.PatchCommandKt" />
     <option name="WORKING_DIRECTORY" value="" />
     <method v="2">
       <option name="Make" enabled="true" />
diff --git a/all/build.gradle.kts b/all/build.gradle.kts
index 015a2b3f..65a8d691 100644
--- a/all/build.gradle.kts
+++ b/all/build.gradle.kts
@@ -16,13 +16,13 @@ application {
 
 dependencies {
     implementation(project(":archive"))
-    implementation(project(":bundler"))
     implementation(project(":compress-cli"))
     implementation(project(":crc32"))
     implementation(project(":decompiler"))
     implementation(project(":deob"))
     implementation(project(":deob-ast"))
     implementation(project(":game"))
+    implementation(project(":patcher"))
 }
 
 tasks.shadowJar {
diff --git a/all/src/main/kotlin/org/openrs2/Command.kt b/all/src/main/kotlin/org/openrs2/Command.kt
index d264479f..79c8b2af 100644
--- a/all/src/main/kotlin/org/openrs2/Command.kt
+++ b/all/src/main/kotlin/org/openrs2/Command.kt
@@ -3,13 +3,13 @@ package org.openrs2
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
 import org.openrs2.archive.ArchiveCommand
-import org.openrs2.bundler.BundleCommand
 import org.openrs2.compress.cli.CompressCommand
 import org.openrs2.crc32.Crc32Command
 import org.openrs2.decompiler.DecompileCommand
 import org.openrs2.deob.DeobfuscateCommand
 import org.openrs2.deob.ast.DeobfuscateAstCommand
 import org.openrs2.game.GameCommand
+import org.openrs2.patcher.PatchCommand
 
 public fun main(args: Array<String>): Unit = Command().main(args)
 
@@ -17,13 +17,13 @@ public class Command : NoOpCliktCommand(name = "openrs2") {
     init {
         subcommands(
             ArchiveCommand(),
-            BundleCommand(),
             CompressCommand(),
             Crc32Command(),
             DecompileCommand(),
             DeobfuscateCommand(),
             DeobfuscateAstCommand(),
-            GameCommand()
+            GameCommand(),
+            PatchCommand()
         )
     }
 }
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/BundleCommand.kt b/bundler/src/main/kotlin/org/openrs2/bundler/BundleCommand.kt
deleted file mode 100644
index 6db3f8f5..00000000
--- a/bundler/src/main/kotlin/org/openrs2/bundler/BundleCommand.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.openrs2.bundler
-
-import com.github.ajalt.clikt.core.CliktCommand
-import com.google.inject.Guice
-import java.nio.file.Paths
-
-public fun main(args: Array<String>): Unit = BundleCommand().main(args)
-
-public class BundleCommand : CliktCommand(name = "bundle") {
-    override fun run() {
-        val injector = Guice.createInjector(BundlerModule)
-        val bundler = injector.getInstance(Bundler::class.java)
-        bundler.run(Paths.get("nonfree/lib"), Paths.get("nonfree/var/cache/bundle"), Paths.get("etc/loader.p12"))
-    }
-}
diff --git a/deob/build.gradle.kts b/deob/build.gradle.kts
index ed283c69..cb47c45d 100644
--- a/deob/build.gradle.kts
+++ b/deob/build.gradle.kts
@@ -11,9 +11,9 @@ application {
 dependencies {
     api("com.github.ajalt.clikt:clikt:${Versions.clikt}")
 
-    implementation(project(":bundler"))
     implementation(project(":deob-annotations"))
     implementation(project(":deob-util"))
+    implementation(project(":patcher"))
     implementation(project(":yaml"))
     implementation("com.google.guava:guava:${Versions.guava}")
     implementation("it.unimi.dsi:fastutil:${Versions.fastutil}")
diff --git a/deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorModule.kt b/deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorModule.kt
index 13a4fe86..8a128c30 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorModule.kt
+++ b/deob/src/main/kotlin/org/openrs2/deob/DeobfuscatorModule.kt
@@ -4,11 +4,8 @@ import com.google.inject.AbstractModule
 import com.google.inject.Scopes
 import com.google.inject.multibindings.Multibinder
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.bundler.BundlerModule
-import org.openrs2.bundler.transform.ResourceTransformer
 import org.openrs2.deob.transform.BitShiftTransformer
 import org.openrs2.deob.transform.BitwiseOpTransformer
-import org.openrs2.deob.transform.BundlerTransformer
 import org.openrs2.deob.transform.CanvasTransformer
 import org.openrs2.deob.transform.ClassLiteralTransformer
 import org.openrs2.deob.transform.ConstantArgTransformer
@@ -28,6 +25,7 @@ import org.openrs2.deob.transform.OriginalNameTransformer
 import org.openrs2.deob.transform.OriginalPcRestoreTransformer
 import org.openrs2.deob.transform.OriginalPcSaveTransformer
 import org.openrs2.deob.transform.OverrideTransformer
+import org.openrs2.deob.transform.PatcherTransformer
 import org.openrs2.deob.transform.RedundantGotoTransformer
 import org.openrs2.deob.transform.RemapTransformer
 import org.openrs2.deob.transform.ResetTransformer
@@ -36,10 +34,12 @@ import org.openrs2.deob.transform.UnusedLocalTransformer
 import org.openrs2.deob.transform.UnusedMethodTransformer
 import org.openrs2.deob.transform.VisibilityTransformer
 import org.openrs2.deob.util.DeobfuscatorUtilModule
+import org.openrs2.patcher.PatcherModule
+import org.openrs2.patcher.transform.ResourceTransformer
 
 public object DeobfuscatorModule : AbstractModule() {
     override fun configure() {
-        install(BundlerModule)
+        install(PatcherModule)
         install(DeobfuscatorUtilModule)
 
         bind(Profile::class.java)
@@ -52,7 +52,7 @@ public object DeobfuscatorModule : AbstractModule() {
         binder.addBinding().to(ClassLiteralTransformer::class.java)
         binder.addBinding().to(InvokeSpecialTransformer::class.java)
         binder.addBinding().to(RemapTransformer::class.java)
-        binder.addBinding().to(BundlerTransformer::class.java)
+        binder.addBinding().to(PatcherTransformer::class.java)
         binder.addBinding().to(ResourceTransformer::class.java)
         binder.addBinding().to(OpaquePredicateTransformer::class.java)
         binder.addBinding().to(ExceptionTracingTransformer::class.java)
diff --git a/deob/src/main/kotlin/org/openrs2/deob/transform/BundlerTransformer.kt b/deob/src/main/kotlin/org/openrs2/deob/transform/PatcherTransformer.kt
similarity index 78%
rename from deob/src/main/kotlin/org/openrs2/deob/transform/BundlerTransformer.kt
rename to deob/src/main/kotlin/org/openrs2/deob/transform/PatcherTransformer.kt
index 9a5aa405..7338e068 100644
--- a/deob/src/main/kotlin/org/openrs2/deob/transform/BundlerTransformer.kt
+++ b/deob/src/main/kotlin/org/openrs2/deob/transform/PatcherTransformer.kt
@@ -3,13 +3,13 @@ package org.openrs2.deob.transform
 import com.github.michaelbull.logging.InlineLogger
 import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.bundler.BundlerQualifier
+import org.openrs2.patcher.PatcherQualifier
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-public class BundlerTransformer @Inject constructor(
-    @BundlerQualifier private val transformers: Set<Transformer>
+public class PatcherTransformer @Inject constructor(
+    @PatcherQualifier private val transformers: Set<Transformer>
 ) : Transformer() {
     override fun transform(classPath: ClassPath) {
         for (transformer in transformers) {
diff --git a/bundler/build.gradle.kts b/patcher/build.gradle.kts
similarity index 89%
rename from bundler/build.gradle.kts
rename to patcher/build.gradle.kts
index 509341ab..13256f6e 100644
--- a/bundler/build.gradle.kts
+++ b/patcher/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 application {
-    mainClass.set("org.openrs2.bundler.BundleCommandKt")
+    mainClass.set("org.openrs2.patcher.PatchCommandKt")
 }
 
 dependencies {
@@ -24,7 +24,7 @@ publishing {
 
         pom {
             packaging = "jar"
-            name.set("OpenRS2 Bundler")
+            name.set("OpenRS2 Patcher")
             description.set(
                 """
                 A tool for patching the RuneScape client to allow it to connect
diff --git a/patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt b/patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt
new file mode 100644
index 00000000..46bc9d95
--- /dev/null
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/PatchCommand.kt
@@ -0,0 +1,15 @@
+package org.openrs2.patcher
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.google.inject.Guice
+import java.nio.file.Paths
+
+public fun main(args: Array<String>): Unit = PatchCommand().main(args)
+
+public class PatchCommand : CliktCommand(name = "patch") {
+    override fun run() {
+        val injector = Guice.createInjector(PatcherModule)
+        val patcher = injector.getInstance(Patcher::class.java)
+        patcher.run(Paths.get("nonfree/lib"), Paths.get("nonfree/var/cache/client"), Paths.get("etc/loader.p12"))
+    }
+}
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/Bundler.kt b/patcher/src/main/kotlin/org/openrs2/patcher/Patcher.kt
similarity index 96%
rename from bundler/src/main/kotlin/org/openrs2/bundler/Bundler.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/Patcher.kt
index d0b0c4d6..a78b4373 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/Bundler.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/Patcher.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler
+package org.openrs2.patcher
 
 import com.github.michaelbull.logging.InlineLogger
 import org.openrs2.asm.classpath.ClassPath
@@ -11,9 +11,9 @@ import org.openrs2.asm.io.Pack200LibraryWriter
 import org.openrs2.asm.io.PackClassLibraryWriter
 import org.openrs2.asm.io.SignedJarLibraryWriter
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.bundler.transform.ResourceTransformer
 import org.openrs2.conf.Config
 import org.openrs2.crypto.Pkcs12KeyStore
+import org.openrs2.patcher.transform.ResourceTransformer
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.jar.Attributes
@@ -23,8 +23,8 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-public class Bundler @Inject constructor(
-    @BundlerQualifier private val transformers: Set<Transformer>,
+public class Patcher @Inject constructor(
+    @PatcherQualifier private val transformers: Set<Transformer>,
     private val config: Config
 ) {
     private val unsignedManifest = Manifest().apply {
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/BundlerModule.kt b/patcher/src/main/kotlin/org/openrs2/patcher/PatcherModule.kt
similarity index 58%
rename from bundler/src/main/kotlin/org/openrs2/bundler/BundlerModule.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/PatcherModule.kt
index 13218f1e..e3ed3ab5 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/BundlerModule.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/PatcherModule.kt
@@ -1,30 +1,30 @@
-package org.openrs2.bundler
+package org.openrs2.patcher
 
 import com.google.inject.AbstractModule
 import com.google.inject.multibindings.Multibinder
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.bundler.transform.BufferSizeTransformer
-import org.openrs2.bundler.transform.CachePathTransformer
-import org.openrs2.bundler.transform.DomainTransformer
-import org.openrs2.bundler.transform.HighDpiTransformer
-import org.openrs2.bundler.transform.HostCheckTransformer
-import org.openrs2.bundler.transform.LoadLibraryTransformer
-import org.openrs2.bundler.transform.MacResizeTransformer
-import org.openrs2.bundler.transform.MemoryAllocationTransformer
-import org.openrs2.bundler.transform.NameTransformer
-import org.openrs2.bundler.transform.PlatformDetectionTransformer
-import org.openrs2.bundler.transform.PublicKeyTransformer
-import org.openrs2.bundler.transform.RightClickTransformer
-import org.openrs2.bundler.transform.TypoTransformer
 import org.openrs2.conf.ConfigModule
 import org.openrs2.crypto.CryptoModule
+import org.openrs2.patcher.transform.BufferSizeTransformer
+import org.openrs2.patcher.transform.CachePathTransformer
+import org.openrs2.patcher.transform.DomainTransformer
+import org.openrs2.patcher.transform.HighDpiTransformer
+import org.openrs2.patcher.transform.HostCheckTransformer
+import org.openrs2.patcher.transform.LoadLibraryTransformer
+import org.openrs2.patcher.transform.MacResizeTransformer
+import org.openrs2.patcher.transform.MemoryAllocationTransformer
+import org.openrs2.patcher.transform.NameTransformer
+import org.openrs2.patcher.transform.PlatformDetectionTransformer
+import org.openrs2.patcher.transform.PublicKeyTransformer
+import org.openrs2.patcher.transform.RightClickTransformer
+import org.openrs2.patcher.transform.TypoTransformer
 
-public object BundlerModule : AbstractModule() {
+public object PatcherModule : AbstractModule() {
     override fun configure() {
         install(ConfigModule)
         install(CryptoModule)
 
-        val binder = Multibinder.newSetBinder(binder(), Transformer::class.java, BundlerQualifier::class.java)
+        val binder = Multibinder.newSetBinder(binder(), Transformer::class.java, PatcherQualifier::class.java)
         binder.addBinding().to(BufferSizeTransformer::class.java)
         binder.addBinding().to(CachePathTransformer::class.java)
         binder.addBinding().to(HostCheckTransformer::class.java)
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/BundlerQualifier.kt b/patcher/src/main/kotlin/org/openrs2/patcher/PatcherQualifier.kt
similarity index 71%
rename from bundler/src/main/kotlin/org/openrs2/bundler/BundlerQualifier.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/PatcherQualifier.kt
index 9234740f..2ef3aba5 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/BundlerQualifier.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/PatcherQualifier.kt
@@ -1,8 +1,8 @@
-package org.openrs2.bundler
+package org.openrs2.patcher
 
 import javax.inject.Qualifier
 
 @Qualifier
 @Retention(AnnotationRetention.RUNTIME)
 @Target(AnnotationTarget.FIELD, AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.FUNCTION)
-public annotation class BundlerQualifier
+public annotation class PatcherQualifier
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/Resource.kt b/patcher/src/main/kotlin/org/openrs2/patcher/Resource.kt
similarity index 99%
rename from bundler/src/main/kotlin/org/openrs2/bundler/Resource.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/Resource.kt
index 06b72ec4..e02b2090 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/Resource.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/Resource.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler
+package org.openrs2.patcher
 
 import com.github.michaelbull.logging.InlineLogger
 import org.openrs2.asm.classpath.ClassPath
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/BufferSizeTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/BufferSizeTransformer.kt
similarity index 98%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/BufferSizeTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/BufferSizeTransformer.kt
index 820e9ff3..5d20e1da 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/BufferSizeTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/BufferSizeTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/CachePathTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/CachePathTransformer.kt
similarity index 97%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/CachePathTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/CachePathTransformer.kt
index 63344d01..10cde788 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/CachePathTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/CachePathTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/DomainTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/DomainTransformer.kt
similarity index 97%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/DomainTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/DomainTransformer.kt
index 8353b72f..0e20011a 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/DomainTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/DomainTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/HighDpiTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/HighDpiTransformer.kt
similarity index 99%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/HighDpiTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/HighDpiTransformer.kt
index 1d4a5fbd..61b4c721 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/HighDpiTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/HighDpiTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/HostCheckTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/HostCheckTransformer.kt
similarity index 98%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/HostCheckTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/HostCheckTransformer.kt
index adaed0a0..a144041a 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/HostCheckTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/HostCheckTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/LoadLibraryTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/LoadLibraryTransformer.kt
similarity index 98%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/LoadLibraryTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/LoadLibraryTransformer.kt
index 0dc1b484..040e0f27 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/LoadLibraryTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/LoadLibraryTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/MacResizeTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/MacResizeTransformer.kt
similarity index 98%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/MacResizeTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/MacResizeTransformer.kt
index 18fa5ed5..9be54e99 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/MacResizeTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/MacResizeTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/MemoryAllocationTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/MemoryAllocationTransformer.kt
similarity index 98%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/MemoryAllocationTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/MemoryAllocationTransformer.kt
index af41dcb2..26e6c6a7 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/MemoryAllocationTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/MemoryAllocationTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/NameTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/NameTransformer.kt
similarity index 97%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/NameTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/NameTransformer.kt
index d86e08b8..6594a4a6 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/NameTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/NameTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/PlatformDetectionTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/PlatformDetectionTransformer.kt
similarity index 99%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/PlatformDetectionTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/PlatformDetectionTransformer.kt
index 56f27d10..871f061d 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/PlatformDetectionTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/PlatformDetectionTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/PublicKeyTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/PublicKeyTransformer.kt
similarity index 98%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/PublicKeyTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/PublicKeyTransformer.kt
index 2be9da0c..a22a0748 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/PublicKeyTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/PublicKeyTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/ResourceTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/ResourceTransformer.kt
similarity index 99%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/ResourceTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/ResourceTransformer.kt
index 95329427..e554e530 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/ResourceTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/ResourceTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
@@ -15,7 +15,7 @@ import org.openrs2.asm.classpath.ClassPath
 import org.openrs2.asm.classpath.Library
 import org.openrs2.asm.toAbstractInsnNode
 import org.openrs2.asm.transform.Transformer
-import org.openrs2.bundler.Resource
+import org.openrs2.patcher.Resource
 
 public class ResourceTransformer(
     private val resources: List<Resource>? = null,
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/RightClickTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/RightClickTransformer.kt
similarity index 97%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/RightClickTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/RightClickTransformer.kt
index 63cbcbfe..c9f60f2c 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/RightClickTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/RightClickTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.Opcodes
diff --git a/bundler/src/main/kotlin/org/openrs2/bundler/transform/TypoTransformer.kt b/patcher/src/main/kotlin/org/openrs2/patcher/transform/TypoTransformer.kt
similarity index 96%
rename from bundler/src/main/kotlin/org/openrs2/bundler/transform/TypoTransformer.kt
rename to patcher/src/main/kotlin/org/openrs2/patcher/transform/TypoTransformer.kt
index 52bc0d0f..fcfc388e 100644
--- a/bundler/src/main/kotlin/org/openrs2/bundler/transform/TypoTransformer.kt
+++ b/patcher/src/main/kotlin/org/openrs2/patcher/transform/TypoTransformer.kt
@@ -1,4 +1,4 @@
-package org.openrs2.bundler.transform
+package org.openrs2.patcher.transform
 
 import com.github.michaelbull.logging.InlineLogger
 import org.objectweb.asm.tree.ClassNode
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1d8c3ac8..f4755198 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,7 +5,6 @@ include(
     "archive",
     "asm",
     "buffer",
-    "bundler",
     "cache",
     "compress",
     "compress-cli",
@@ -28,6 +27,7 @@ include(
     "nonfree:signlink",
     "nonfree:unpack",
     "nonfree:unpackclass",
+    "patcher",
     "protocol",
     "util",
     "yaml"