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

Enable Caciocavallo for mod install launcher

Browse Source
This commit is contained in:
khanhduytran0 2021-01-28 14:17:28 +07:00
parent f5b81b5a49
commit 31b44a830e
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
View File

@ -195,6 +195,9 @@ public class JavaGUILauncherActivity extends LoggableActivity {
javaArgList.add(modFile.getAbsolutePath());
}
// Enable Caciocavallo
Tools.getCacioJavaArgs(javaArgList);
// System.out.println(Arrays.toString(javaArgList.toArray(new String[0])));
appendlnToLog("Info: Java arguments: " + Arrays.toString(javaArgList.toArray(new String[0])));

26
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -72,6 +72,21 @@ public final class Tools
// 13w18a: 20130502
if (mcReleaseDate < 20130502 && versionInfo.minimumLauncherVersion < 9){
ctx.appendlnToLog("AWT-enabled version detected! ("+mcReleaseDate+")");
getCacioJavaArgs(javaArgList);
}else{
ctx.appendlnToLog("Headless version detected! ("+mcReleaseDate+")");
}
javaArgList.add("-cp");
javaArgList.add(getLWJGL3ClassPath() + ":" + launchClassPath);
javaArgList.add(versionInfo.mainClass);
javaArgList.addAll(Arrays.asList(launchArgs));
// ctx.appendlnToLog("full args: "+javaArgList.toString());
JREUtils.launchJavaVM(ctx, javaArgList);
}
public static void getCacioJavaArgs(List<String> javaArgList) {
javaArgList.add("-Djava.awt.headless=false");
// Caciocavallo config AWT-enabled version
javaArgList.add("-Dcacio.managed.screensize=" + CallbackBridge.windowWidth + "x" + CallbackBridge.windowHeight);
@ -92,17 +107,6 @@ public final class Tools
}
}
javaArgList.add(cacioClasspath.toString());
}else{
ctx.appendlnToLog("Headless version detected! ("+mcReleaseDate+")");
}
javaArgList.add("-cp");
javaArgList.add(getLWJGL3ClassPath() + ":" + launchClassPath);
javaArgList.add(versionInfo.mainClass);
javaArgList.addAll(Arrays.asList(launchArgs));
// ctx.appendlnToLog("full args: "+javaArgList.toString());
JREUtils.launchJavaVM(ctx, javaArgList);
}
public static void getJavaArgs(Context ctx, List<String> javaArgList) {