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

Enable Caciocavallo for all versions

Browse Source
This commit is contained in:
artdeell 2021-01-31 15:42:16 +03:00
parent a9925c3f28
commit 1564ef6138
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,7 +191,7 @@ public class JavaGUILauncherActivity extends LoggableActivity {
List<String> javaArgList = new ArrayList<String>(); List<String> javaArgList = new ArrayList<String>();
// Enable Caciocavallo // Enable Caciocavallo
Tools.getCacioJavaArgs(javaArgList); Tools.getCacioJavaArgs(javaArgList,false);
if (javaArgs != null) { if (javaArgs != null) {
javaArgList.addAll(Arrays.asList(javaArgs.split(" "))); javaArgList.addAll(Arrays.asList(javaArgs.split(" ")));

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

@ -75,8 +75,9 @@ 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+")");
getCacioJavaArgs(javaArgList); getCacioJavaArgs(javaArgList,false);
}else{ }else{
getCacioJavaArgs(javaArgList,true);
ctx.appendlnToLog("Headless version detected! ("+mcReleaseDate+")"); ctx.appendlnToLog("Headless version detected! ("+mcReleaseDate+")");
} }
@ -89,12 +90,13 @@ public final class Tools
JREUtils.launchJavaVM(ctx, javaArgList); JREUtils.launchJavaVM(ctx, javaArgList);
} }
public static void getCacioJavaArgs(List<String> javaArgList) { public static void getCacioJavaArgs(List<String> javaArgList, boolean isHeadless) {
javaArgList.add("-Djava.awt.headless=false"); javaArgList.add("-Djava.awt.headless="+isHeadless);
// Caciocavallo config AWT-enabled version // Caciocavallo config AWT-enabled version
javaArgList.add("-Dcacio.managed.screensize=" + CallbackBridge.physicalWidth + "x" + CallbackBridge.physicalHeight); javaArgList.add("-Dcacio.managed.screensize=" + CallbackBridge.physicalWidth + "x" + CallbackBridge.physicalHeight);
javaArgList.add("-Dcacio.font.fontmanager=net.java.openjdk.cacio.ctc.CTCFontManager"); javaArgList.add("-Dcacio.font.fontmanager=net.java.openjdk.cacio.ctc.CTCFontManager");
// javaArgList.add("-Dcacio.font.fontscaler=sun.font.FreetypeFontScaler"); if(isHeadless) javaArgList.add("-Dcacio.font.fontscaler=sun.font.FreetypeFontScaler"); //safe to use it when running in headless mode
//else javaArgList.add("-Dcacio.font.fontscaler=sun.font.NullFontScaler"); // it will literally disable the text rendering, so...
javaArgList.add("-Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel"); javaArgList.add("-Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel");
javaArgList.add("-Dawt.toolkit=net.java.openjdk.cacio.ctc.CTCToolkit"); javaArgList.add("-Dawt.toolkit=net.java.openjdk.cacio.ctc.CTCToolkit");
javaArgList.add("-Djava.awt.graphicsenv=net.java.openjdk.cacio.ctc.CTCGraphicsEnvironment"); javaArgList.add("-Djava.awt.graphicsenv=net.java.openjdk.cacio.ctc.CTCGraphicsEnvironment");