From 6a9b99953b886382efa2d49b96ccde6a00dac842 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Fri, 11 Sep 2020 13:38:09 +0700
Subject: [PATCH] Fix Forge crash

---
 .../kdt/pojavlaunch/PojavLoginActivity.java   | 20 +++++--------------
 .../main/java/net/kdt/pojavlaunch/Tools.java  |  9 +++++++++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index 4bd6c1860..d7e0618dd 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -309,23 +309,13 @@ public class PojavLoginActivity extends AppCompatActivity
 		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();
+        mkdirs(Tools.MAIN_PATH + "/mods");
+
 		try {
-			file3.createNewFile();
-		} catch (IOException e){}
-	
-		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
index 95705a867..eb1eb5af2 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java
@@ -615,6 +615,15 @@ public final class Tools
 					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) {