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

Swap the broken parser for a java argument

Browse Source
This commit is contained in:
Boulay Mathias 2022-05-15 22:52:15 +02:00
parent 61388903bd
commit f966a153fc
1 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,6 +296,7 @@ public class JREUtils {
//Add automatically generated args //Add automatically generated args
userArgs.add("-Xms" + LauncherPreferences.PREF_RAM_ALLOCATION + "M"); userArgs.add("-Xms" + LauncherPreferences.PREF_RAM_ALLOCATION + "M");
userArgs.add("-Xmx" + LauncherPreferences.PREF_RAM_ALLOCATION + "M"); userArgs.add("-Xmx" + LauncherPreferences.PREF_RAM_ALLOCATION + "M");
userArgs.add(" -XX:+IgnoreUnrecognizedVMOptions ");
if(LOCAL_RENDERER != null) userArgs.add("-Dorg.lwjgl.opengl.libname=" + graphicsLib); if(LOCAL_RENDERER != null) userArgs.add("-Dorg.lwjgl.opengl.libname=" + graphicsLib);
userArgs.addAll(JVMArgs); userArgs.addAll(JVMArgs);
@ -389,39 +390,7 @@ public class JREUtils {
* @return Parsed args as an ArrayList * @return Parsed args as an ArrayList
*/ */
public static ArrayList<String> parseJavaArguments(String args){ public static ArrayList<String> parseJavaArguments(String args){
ArrayList<String> parsedArguments = new ArrayList<>(0); return new ArrayList<>(Arrays.asList(args.split(" ")));
args = args.trim().replace(" ", "");
//For each prefixes, we separate args.
for(String prefix : new String[]{"-XX:-","-XX:+", "-XX:","--","-"}){
while (true){
int start = args.indexOf(prefix);
if(start == -1) break;
//Get the end of the current argument
int end = args.indexOf("-", start + prefix.length());
if(end == -1) end = args.length();
//Extract it
String parsedSubString = args.substring(start, end);
args = args.replace(parsedSubString, "");
//Check if two args aren't bundled together by mistake
if(parsedSubString.indexOf('=') == parsedSubString.lastIndexOf('=')) {
int arraySize = parsedArguments.size();
if(arraySize > 0){
String lastString = parsedArguments.get(arraySize - 1);
// Looking for list elements
if(lastString.charAt(lastString.length() - 1) == ',' ||
parsedSubString.contains(",")){
parsedArguments.set(arraySize - 1, lastString + parsedSubString);
continue;
}
}
parsedArguments.add(parsedSubString);
}
else Log.w("JAVA ARGS PARSER", "Removed improper arguments: " + parsedSubString);
}
}
return parsedArguments;
} }
/** /**