TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-18 09:07:48 -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()); javaArgList.add(modFile.getAbsolutePath());
} }
// Enable Caciocavallo
Tools.getCacioJavaArgs(javaArgList);
// System.out.println(Arrays.toString(javaArgList.toArray(new String[0]))); // System.out.println(Arrays.toString(javaArgList.toArray(new String[0])));
appendlnToLog("Info: Java arguments: " + Arrays.toString(javaArgList.toArray(new String[0]))); appendlnToLog("Info: Java arguments: " + Arrays.toString(javaArgList.toArray(new String[0])));

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

@ -72,26 +72,7 @@ public final class Tools
// 13w18a: 20130502 // 13w18a: 20130502
if (mcReleaseDate < 20130502 && versionInfo.minimumLauncherVersion < 9){ if (mcReleaseDate < 20130502 && versionInfo.minimumLauncherVersion < 9){
ctx.appendlnToLog("AWT-enabled version detected! ("+mcReleaseDate+")"); ctx.appendlnToLog("AWT-enabled version detected! ("+mcReleaseDate+")");
javaArgList.add("-Djava.awt.headless=false"); getCacioJavaArgs(javaArgList);
// Caciocavallo config AWT-enabled version
javaArgList.add("-Dcacio.managed.screensize=" + CallbackBridge.windowWidth + "x" + CallbackBridge.windowHeight);
javaArgList.add("-Dcacio.font.fontmanager=net.java.openjdk.cacio.ctc.CTCFontManager");
// javaArgList.add("-Dcacio.font.fontscaler=sun.font.FreetypeFontScaler");
javaArgList.add("-Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel");
javaArgList.add("-Dawt.toolkit=net.java.openjdk.cacio.ctc.CTCToolkit");
javaArgList.add("-Djava.awt.graphicsenv=net.java.openjdk.cacio.ctc.CTCGraphicsEnvironment");
StringBuilder cacioClasspath = new StringBuilder();
cacioClasspath.append("-Xbootclasspath/p");
File cacioDir = new File(DIR_GAME_NEW + "/caciocavallo");
if (cacioDir.exists() && cacioDir.isDirectory()) {
for (File file : cacioDir.listFiles()) {
if (file.getName().endsWith(".jar")) {
cacioClasspath.append(":" + file.getAbsolutePath());
}
}
}
javaArgList.add(cacioClasspath.toString());
}else{ }else{
ctx.appendlnToLog("Headless version detected! ("+mcReleaseDate+")"); ctx.appendlnToLog("Headless version detected! ("+mcReleaseDate+")");
} }
@ -105,6 +86,29 @@ public final class Tools
JREUtils.launchJavaVM(ctx, javaArgList); 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);
javaArgList.add("-Dcacio.font.fontmanager=net.java.openjdk.cacio.ctc.CTCFontManager");
// javaArgList.add("-Dcacio.font.fontscaler=sun.font.FreetypeFontScaler");
javaArgList.add("-Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel");
javaArgList.add("-Dawt.toolkit=net.java.openjdk.cacio.ctc.CTCToolkit");
javaArgList.add("-Djava.awt.graphicsenv=net.java.openjdk.cacio.ctc.CTCGraphicsEnvironment");
StringBuilder cacioClasspath = new StringBuilder();
cacioClasspath.append("-Xbootclasspath/p");
File cacioDir = new File(DIR_GAME_NEW + "/caciocavallo");
if (cacioDir.exists() && cacioDir.isDirectory()) {
for (File file : cacioDir.listFiles()) {
if (file.getName().endsWith(".jar")) {
cacioClasspath.append(":" + file.getAbsolutePath());
}
}
}
javaArgList.add(cacioClasspath.toString());
}
public static void getJavaArgs(Context ctx, List<String> javaArgList) { public static void getJavaArgs(Context ctx, List<String> javaArgList) {
List<String> overrideableArgList = new ArrayList<String>(); List<String> overrideableArgList = new ArrayList<String>();