TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-13 14:51:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Forge crash

Browse Source
This commit is contained in:
khanhduytran0 2020-09-11 13:38:09 +07:00
parent 16550344e7
commit 6a9b99953b
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@ -310,22 +310,12 @@ public class PojavLoginActivity extends AppCompatActivity
mkdirs(Tools.libraries); mkdirs(Tools.libraries);
mkdirs(Tools.mpProfiles); mkdirs(Tools.mpProfiles);
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){}
try {
mkdirs(Tools.MAIN_PATH); mkdirs(Tools.MAIN_PATH);
mkdirs(Tools.CTRLMAP_PATH); mkdirs(Tools.CTRLMAP_PATH);
mkdirs(Tools.MAIN_PATH + "/mods");
try {
new CustomControls(this).save(Tools.CTRLDEF_FILE); new CustomControls(this).save(Tools.CTRLDEF_FILE);
Tools.copyAssetFile(this, "options.txt", Tools.MAIN_PATH, false); Tools.copyAssetFile(this, "options.txt", Tools.MAIN_PATH, false);

9
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -615,6 +615,15 @@ public final class Tools
inheritsVer.libraries = libList.toArray(new DependentLibrary[0]); 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; return inheritsVer;
} }
} catch (Exception e) { } catch (Exception e) {