From 7d4e9ad9ada671f0a941deab7dc6a0fdd395874f Mon Sep 17 00:00:00 2001
From: Raven Szewczyk <git@eigenraven.me>
Date: Sat, 6 Apr 2024 10:25:35 +0100
Subject: [PATCH] Relauncher: do not use disable-atfiles for wider
 compatibility

---
 .../java/me/eigenraven/lwjgl3ify/relauncher/Relauncher.java  | 3 +--
 .../lwjgl3ify/relauncherstub/RelauncherStubMain.java         | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/eigenraven/lwjgl3ify/relauncher/Relauncher.java b/src/main/java/me/eigenraven/lwjgl3ify/relauncher/Relauncher.java
index 6b80d3a7..b9f74adb 100644
--- a/src/main/java/me/eigenraven/lwjgl3ify/relauncher/Relauncher.java
+++ b/src/main/java/me/eigenraven/lwjgl3ify/relauncher/Relauncher.java
@@ -253,12 +253,11 @@ public void run() throws IOException {
             bootstrapCmd.add("-Xmx256M");
             bootstrapCmd.add("-cp");
             bootstrapCmd.add(forgePatchesJarPath + File.pathSeparator + myJarPath);
-            bootstrapCmd.add("--disable-@files");
             bootstrapCmd.add("me.eigenraven.lwjgl3ify.relauncherstub.RelauncherStubMain");
             bootstrapCmd.add(Long.toString(getCurrentPid()));
             bootstrapCmd.add("true");
             bootstrapCmd.add(javaPath);
-            bootstrapCmd.add("@" + argFile);
+            bootstrapCmd.add(argFile.toString());
         }
 
         final ProcessBuilder pb = new ProcessBuilder(bootstrapCmd);
diff --git a/src/relauncherStub/java/me/eigenraven/lwjgl3ify/relauncherstub/RelauncherStubMain.java b/src/relauncherStub/java/me/eigenraven/lwjgl3ify/relauncherstub/RelauncherStubMain.java
index 1384861d..7c8a6300 100644
--- a/src/relauncherStub/java/me/eigenraven/lwjgl3ify/relauncherstub/RelauncherStubMain.java
+++ b/src/relauncherStub/java/me/eigenraven/lwjgl3ify/relauncherstub/RelauncherStubMain.java
@@ -2,7 +2,6 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Arrays;
 
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
@@ -22,7 +21,9 @@ public void run(String[] args) throws Throwable {
         }
         final long parentPid = Long.parseLong(args[0]);
         final boolean showConsole = Boolean.parseBoolean(args[1]);
-        final String[] javaCmdline = Arrays.copyOfRange(args, 2, args.length);
+        final String javaBinary = args[2];
+        final String javaArgFile = args[3];
+        final String[] javaCmdline = new String[] { javaBinary, "@" + javaArgFile };
         final ProcessHandle myProcess = ProcessHandle.current();
         final ProcessHandle parentProcess = ProcessHandle.of(parentPid)
             .orElse(