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

Clean up JREUtils a bit

Browse Source
This commit is contained in:
SerpentSpirale 2021-08-11 15:32:10 +02:00
parent baf48509c5
commit 142e658299
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
View File

@ -292,23 +292,24 @@ public class JREUtils
} }
List<String> javaArgList = new ArrayList<String>(); List<String> javaArgList = new ArrayList<String>();
//Remove arguments that can interfere with the good working of the launcher
purgeArg(javaArgList,"-Xms");
purgeArg(javaArgList,"-Xmx");
purgeArg(javaArgList,"-d32");
purgeArg(javaArgList,"-d64");
//Add automatically generated args
javaArgList.add(Tools.DIR_HOME_JRE + "/bin/java"); javaArgList.add(Tools.DIR_HOME_JRE + "/bin/java");
Tools.getJavaArgs(ctx, javaArgList,graphicsLib); Tools.getJavaArgs(ctx, javaArgList,graphicsLib);
purgeArg(javaArgList,"-Xms");
purgeArg(javaArgList,"-Xmx"); javaArgList.add("-Xms" + LauncherPreferences.PREF_RAM_ALLOCATION + "M");
/*if(Tools.CURRENT_ARCHITECTURE.contains("32") && ((mi.availMem / 1048576L)-50) > 300) { javaArgList.add("-Xmx" + LauncherPreferences.PREF_RAM_ALLOCATION + "M");
javaArgList.add("-Xms300M");
javaArgList.add("-Xmx300M"); ctx.runOnUiThread(() -> Toast.makeText(ctx, ctx.getString(R.string.autoram_info_msg,LauncherPreferences.PREF_RAM_ALLOCATION), Toast.LENGTH_SHORT).show());
}else {*/ System.out.println(javaArgList);
javaArgList.add("-Xms" + LauncherPreferences.PREF_RAM_ALLOCATION + "M");
javaArgList.add("-Xmx" + LauncherPreferences.PREF_RAM_ALLOCATION + "M");
//}
ctx.runOnUiThread(new Runnable() {
public void run() {
Toast.makeText(ctx, ctx.getString(R.string.autoram_info_msg,LauncherPreferences.PREF_RAM_ALLOCATION), Toast.LENGTH_SHORT).show();
}
});
System.out.println(javaArgList);
javaArgList.addAll(args); javaArgList.addAll(args);
// For debugging only! // For debugging only!
@ -328,21 +329,13 @@ public class JREUtils
final int exitCode = VMLauncher.launchJVM(javaArgList.toArray(new String[0])); final int exitCode = VMLauncher.launchJVM(javaArgList.toArray(new String[0]));
ctx.appendlnToLog("Java Exit code: " + exitCode); ctx.appendlnToLog("Java Exit code: " + exitCode);
if (exitCode != 0) { if (exitCode != 0) {
ctx.runOnUiThread(new Runnable(){ ctx.runOnUiThread(() -> {
@Override AlertDialog.Builder dialog = new AlertDialog.Builder(ctx);
public void run() { dialog.setMessage(ctx.getString(R.string.mcn_exit_title, exitCode));
AlertDialog.Builder dialog = new AlertDialog.Builder(ctx);
dialog.setMessage(ctx.getString(R.string.mcn_exit_title, exitCode));
dialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
@Override dialog.setPositiveButton(android.R.string.ok, (p1, p2) -> BaseMainActivity.fullyExit());
public void onClick(DialogInterface p1, int p2){ dialog.show();
BaseMainActivity.fullyExit(); });
}
});
dialog.show();
}
});
} }
return exitCode; return exitCode;
} }
@ -350,7 +343,7 @@ public class JREUtils
/** /**
* Parse and separate java arguments in a user friendly fashion * Parse and separate java arguments in a user friendly fashion
* It supports multi line and absence of spaces between arguments * It supports multi line and absence of spaces between arguments
* The function also supports auto-removal of improper arguments. * The function also supports auto-removal of improper arguments, although it may miss some.
* *
* @param args The un-parsed argument list. * @param args The un-parsed argument list.
* @return Parsed args as an ArrayList * @return Parsed args as an ArrayList