Add initial client bundler

.idea/runConfigurations/Bundler.xml

@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Bundler" type="JetRunConfigurationType" factoryName="Kotlin">
+    <module name="openrs2-bundler" />
+    <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="dev.openrs2.bundler.BundlerKt" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

all/src/bin/openrs2-bundle

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+cd `dirname "$0"`/..
+exec java -cp lib/openrs2.jar dev.openrs2.bundler.BundlerKt "$@"

all/src/bin/openrs2-bundle.cmd

@@ -0,0 +1,3 @@
+@echo off
+cd /d %~dp0\..
+java -cp lib\openrs2.jar dev.openrs2.bundler.BundlerKt %*

bundler/src/main/java/dev/openrs2/bundler/Bundler.kt

@@ -1,5 +1,8 @@
 package dev.openrs2.bundler
 
+import com.github.michaelbull.logging.InlineLogger
+import dev.openrs2.asm.classpath.ClassPath
+import dev.openrs2.asm.classpath.Library
 import dev.openrs2.bundler.transform.BufferSizeTransformer
 import dev.openrs2.bundler.transform.CachePathTransformer
 import dev.openrs2.bundler.transform.HostCheckTransformer
@@ -8,9 +11,110 @@ import dev.openrs2.bundler.transform.MacResizeTransformer
 import dev.openrs2.bundler.transform.PlatformDetectionTransformer
 import dev.openrs2.bundler.transform.ResourceTransformer
 import dev.openrs2.bundler.transform.RightClickTransformer
+import java.nio.file.Path
+import java.nio.file.Paths
+
+fun main() {
+    val bundler = Bundler(Paths.get("nonfree/code"), Paths.get("nonfree/code/bundle"))
+    bundler.run()
+}
+
+class Bundler(private val input: Path, private val output: Path) {
+    fun run() {
+        // read input jars/packs
+        logger.info { "Reading input jars" }
+        val unpacker = Library.readJar(input.resolve("game_unpacker.dat"))
+        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"))
+        val client = Library.readJar(input.resolve("runescape.jar"))
+        val glClient = Library.readPack(input.resolve("runescape_gl.pack200"))
+
+        // bundle libraries together into a common classpath
+        val runtime = ClassLoader.getSystemClassLoader()
+        val classPath = ClassPath(
+            runtime,
+            dependencies = listOf(unpacker),
+            libraries = listOf(client, loader)
+        )
+        val glClassPath = ClassPath(
+            runtime,
+            dependencies = listOf(gl, unpacker),
+            libraries = listOf(glClient, glLoader)
+        )
+
+        // run simple transformers
+        logger.info { "Transforming client" }
+        for (transformer in TRANSFORMERS) {
+            logger.info { "Running transformer ${transformer.javaClass.simpleName} " }
+            transformer.transform(classPath)
+        }
+
+        logger.info { "Transforming client_gl" }
+        for (transformer in TRANSFORMERS) {
+            logger.info { "Running transformer ${transformer.javaClass.simpleName} " }
+            transformer.transform(glClassPath)
+        }
+
+        // compress resources
+        logger.info { "Compressing resources" }
+
+        val unpackerJar = Resource.compressJar("unpackclass.pack", "game_unpacker.dat", unpacker)
+        val clientPack = Resource.compressPack("runescape.pack200", "main_file_cache.dat0", client)
+        val clientJs5 = Resource.compressJs5("runescape.js5", "main_file_cache.dat1", client)
+        val glClientPack = Resource.compressPack("runescape_gl.pack200", "main_file_cache.dat3", glClient)
+        val glClientJs5 = Resource.compressJs5("runescape_gl.js5", "main_file_cache.dat4", glClient)
+        val glPack = Resource.compressPack("jaggl.pack200", "main_file_cache.dat5", gl)
+        val glJs5 = Resource.compressJs5("jaggl.js5", "main_file_cache.dat6", gl)
+
+        val glNatives = Resource.compressGlResources()
+        val miscNatives = Resource.compressMiscResources()
+
+        // update checksums in the loader
+        logger.info { "Updating checksums" }
+
+        val resourceTransformer = ResourceTransformer(
+            resources = listOf(unpackerJar, clientPack, clientJs5),
+            glResources = glNatives,
+            miscResources = miscNatives
+        )
+        resourceTransformer.transform(classPath)
+
+        val glResourceTransformer = ResourceTransformer(
+            resources = listOf(unpackerJar, glClientPack, glClientJs5, glPack, glJs5),
+            glResources = glNatives,
+            miscResources = miscNatives
+        )
+        glResourceTransformer.transform(glClassPath)
+
+        // write all resources to disk
+        logger.info { "Writing resources" }
+
+        val resources = listOf(
+            unpackerJar,
+            clientPack,
+            clientJs5,
+            glClientPack,
+            glClientJs5,
+            glPack,
+            glJs5,
+            *glNatives.flatten().toTypedArray(),
+            *miscNatives.toTypedArray()
+        )
+        resources.forEach { it.write(output) }
+
+        // write unsigned client and loaders
+        client.writeJar(output.resolve("runescape.jar"))
+        loader.writeJar(output.resolve("loader.jar"))
+        glLoader.writeJar(output.resolve("loader_gl.jar"))
+
+        // sign loaders
+        logger.info { "Signing loaders" }
+        // TODO(gpe): implement
+    }
 
-class Bundler {
     companion object {
+        val logger = InlineLogger()
         val TRANSFORMERS = listOf(
             BufferSizeTransformer(),
             CachePathTransformer(),
@@ -18,8 +122,7 @@ class Bundler {
             MacResizeTransformer(),
             RightClickTransformer(),
             LoadLibraryTransformer(),
-            PlatformDetectionTransformer(),
-            ResourceTransformer()
+            PlatformDetectionTransformer()
         )
     }
 }

deob/src/main/java/dev/openrs2/deob/Deobfuscator.kt

@@ -6,6 +6,7 @@ import dev.openrs2.asm.classpath.Library
 import dev.openrs2.asm.classpath.Library.Companion.readJar
 import dev.openrs2.asm.classpath.Library.Companion.readPack
 import dev.openrs2.bundler.Bundler
+import dev.openrs2.bundler.transform.ResourceTransformer
 import dev.openrs2.deob.SignedClassUtils.move
 import dev.openrs2.deob.remap.PrefixRemapper.create
 import dev.openrs2.deob.transform.AccessTransformer
@@ -146,6 +147,7 @@ class Deobfuscator(private val input: Path, private val output: Path) {
         private val TRANSFORMERS = listOf(
             OriginalNameTransformer(),
             *Bundler.TRANSFORMERS.toTypedArray(),
+            ResourceTransformer(),
             OpaquePredicateTransformer(),
             ExceptionTracingTransformer(),
             BitShiftTransformer(),