Additional MC args

Refitted-Team · Aug 5, 2024 · 3d930e6 · 3d930e6
1 parent 27ab49c
commit 3d930e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/pojlib/API.java b/src/main/java/pojlib/API.java
@@ -45,7 +45,8 @@ public static void startGame(
             String memoryValue,
             String questModel,
             String mainClass,
-            String[] additionalArgs
+            String[] additionalArgs,
+            String[] mcAdditionalArgs
     ) {
         String[] mcArgs = {"--username", username, "--version", versionName, "--gameDir", gameDir,
                 "--assetsDir", assetsDir, "--assetIndex", assetIndex, "--uuid", formattedUuid,
@@ -55,7 +56,7 @@ public static void startGame(
         JREUtils.redirectAndPrintJRELog(activity);
         VLoader.setAndroidInitInfo(activity);
         try {
-            JREUtils.launchJavaVM(activity, allArgs, mcArgs, gameDir, memoryValue, questModel, mainClass);
+            JREUtils.launchJavaVM(activity, allArgs, mcArgs, mcAdditionalArgs, gameDir, memoryValue, questModel, mainClass);
         } catch (Throwable t) {
             throw new RuntimeException("JVM has stopped.", t);
         }

diff --git a/src/main/java/pojlib/util/JREUtils.java b/src/main/java/pojlib/util/JREUtils.java
@@ -168,7 +168,7 @@ public static void setJavaEnvironment(Activity activity, String gameDir, String
         setLdLibraryPath(jvmLibraryPath+":"+LD_LIBRARY_PATH);
     }
 
-    public static int launchJavaVM(Activity activity, List<String> JVMArgs, String[] mcArgs, String gameDir, String memoryValue, String questModel, String mainClass) throws Throwable {
+    public static int launchJavaVM(Activity activity, List<String> JVMArgs, String[] mcArgs, String[] mcAdditionalArgs, String gameDir, String memoryValue, String questModel, String mainClass) throws Throwable {
         relocateLibPath(activity);
         setJavaEnvironment(activity, gameDir, questModel);
 
@@ -200,6 +200,7 @@ public static int launchJavaVM(Activity activity, List<String> JVMArgs, String[]
         userArgs.add(0,"java"); //argv[0] is the program name according to C standard.
         userArgs.add(mainClass);
         userArgs.addAll(Arrays.asList(mcArgs));
+        userArgs.addAll(Arrays.asList(mcAdditionalArgs));
 
         int exitCode = VMLauncher.launchJVM(userArgs.toArray(new String[0]));
         Logger.getInstance(activity).appendToLog("Java Exit code: " + exitCode);