feat: forward launcher arguments to runelite process

blurite · Nov 17, 2024 · c7caa08 · c7caa08
1 parent 05d4f88
commit c7caa08
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/gui/proxy-tool/src/main/kotlin/net/rsprox/gui/ProxyToolGui.kt b/gui/proxy-tool/src/main/kotlin/net/rsprox/gui/ProxyToolGui.kt
@@ -5,7 +5,10 @@ import javax.swing.ImageIcon
 import javax.swing.SwingUtilities
 import javax.swing.UIManager
 
-public fun main() {
+public fun main(args: Array<String>) {
+    if (args.isNotEmpty()) {
+        System.setProperty("net.rsprox.gui.args", args.joinToString("|"))
+    }
     Locale.setDefault(Locale.US)
     SplashScreen.init()
     SplashScreen.stage(0.0, "Preparing", "Setting up environment")

diff --git a/launcher/src/main/kotlin/net/rsprox/launcher/Launcher.kt b/launcher/src/main/kotlin/net/rsprox/launcher/Launcher.kt
@@ -20,7 +20,7 @@ import java.util.Locale
 import kotlin.io.path.Path
 import kotlin.io.path.absolutePathString
 
-public fun main() {
+public fun main(args: Array<String>) {
     Locale.setDefault(Locale.US)
     SplashScreen.init()
     SplashScreen.stage(0.0, "Preparing", "Setting up environment")
@@ -29,7 +29,7 @@ public fun main() {
     val builder =
         ProcessBuilder()
             .inheritIO()
-            .command(launcher.getLaunchArgs())
+            .command(launcher.getLaunchArgs(args))
 
     SplashScreen.stop()
     builder.start()
@@ -61,7 +61,7 @@ public class Launcher {
         Files.createDirectories(artifactRepo)
     }
 
-    public fun getLaunchArgs(): List<String> {
+    public fun getLaunchArgs(launcherArgs: Array<String>): List<String> {
         clean()
         download()
 
@@ -78,6 +78,7 @@ public class Launcher {
             "-cp",
             classpath.toString(),
             bootstrap.proxy.mainClass,
+            *launcherArgs
         )
     }
 

diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/runelite/RuneliteLauncher.kt b/proxy/src/main/kotlin/net/rsprox/proxy/runelite/RuneliteLauncher.kt
@@ -46,6 +46,7 @@ public class RuneliteLauncher {
         clean()
         download()
 
+        val guiArgs = System.getProperty("net.rsprox.gui.args")?.split("|") ?: emptyList()
         val classpath = StringBuilder()
         for (artifact in bootstrap.artifacts) {
             if (classpath.isNotEmpty()) {
@@ -55,7 +56,6 @@ public class RuneliteLauncher {
         }
 
         return listOf(
-            "java",
             "-cp",
             classpath.toString(),
             bootstrap.launcher.mainClass,
@@ -64,6 +64,7 @@ public class RuneliteLauncher {
             "--jav_config=$javConfig",
             "--socket_id=$socket",
             "--developer-mode",
+            *guiArgs.toTypedArray(),
         )
     }