Fix Forge crash

PojavLauncherTeam · Sep 11, 2020 · 6df31a7 · 6df31a7
1 parent 93055a2
commit 6df31a7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -310,23 +310,13 @@ private void initMain()
 		mkdirs(Tools.versnDir);
 		mkdirs(Tools.libraries);
 		mkdirs(Tools.mpProfiles);
+
+        mkdirs(Tools.MAIN_PATH);
+        mkdirs(Tools.CTRLMAP_PATH);
 
-		File file0 = new File(Tools.mpProfiles);
-		File file1 = new File(Tools.mpModEnable);
-		File file2 = new File(Tools.mpModDisable);
-		File file3 = new File(Tools.mpModAddNewMo);
-
-		file0.mkdir();
-		file1.mkdirs();
-		file2.mkdir();
-		try {
-			file3.createNewFile();
-		} catch (IOException e){}
-
+        mkdirs(Tools.MAIN_PATH + "/mods");
+
 		try {
-			mkdirs(Tools.MAIN_PATH);
-
-			mkdirs(Tools.CTRLMAP_PATH);
 			new CustomControls(this).save(Tools.CTRLDEF_FILE);
 
 			Tools.copyAssetFile(this, "options.txt", Tools.MAIN_PATH, false);

diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -389,6 +389,15 @@ public static JMinecraftVersionList.Version getVersionInfo(String versionName) {
 					inheritsVer.libraries = libList.toArray(new DependentLibrary[0]);
 				}
 
+                // Inheriting Minecraft 1.13+ with append custom args
+                if (inheritsVer.arguments != null && customVer.arguments != null) {
+                    List totalArgList = new ArrayList();
+                    totalArgList.addAll(Arrays.asList(inheritsVer.arguments.game));
+                    totalArgList.addAll(Arrays.asList(customVer.arguments.game));
+
+                    customVer.arguments.game = totalArgList.toArray(new Object[0]);
+                }
+
 				return inheritsVer;
 			}
 		} catch (Exception e) {