From 1564ef613892775b4cd674dd87aa719ed22abebd Mon Sep 17 00:00:00 2001 From: artdeell Date: Sun, 31 Jan 2021 15:42:16 +0300 Subject: [PATCH] Enable Caciocavallo for all versions --- .../net/kdt/pojavlaunch/JavaGUILauncherActivity.java | 2 +- .../src/main/java/net/kdt/pojavlaunch/Tools.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java index 3e8436dd0..933a1412c 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java @@ -191,7 +191,7 @@ public class JavaGUILauncherActivity extends LoggableActivity { List javaArgList = new ArrayList(); // Enable Caciocavallo - Tools.getCacioJavaArgs(javaArgList); + Tools.getCacioJavaArgs(javaArgList,false); if (javaArgs != null) { javaArgList.addAll(Arrays.asList(javaArgs.split(" "))); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java index ebea3ded4..54f4f2b6c 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -75,8 +75,9 @@ public final class Tools // 13w18a: 20130502 if (mcReleaseDate < 20130502 && versionInfo.minimumLauncherVersion < 9){ ctx.appendlnToLog("AWT-enabled version detected! ("+mcReleaseDate+")"); - getCacioJavaArgs(javaArgList); + getCacioJavaArgs(javaArgList,false); }else{ + getCacioJavaArgs(javaArgList,true); ctx.appendlnToLog("Headless version detected! ("+mcReleaseDate+")"); } @@ -89,12 +90,13 @@ public final class Tools JREUtils.launchJavaVM(ctx, javaArgList); } - public static void getCacioJavaArgs(List javaArgList) { - javaArgList.add("-Djava.awt.headless=false"); + public static void getCacioJavaArgs(List javaArgList, boolean isHeadless) { + javaArgList.add("-Djava.awt.headless="+isHeadless); // Caciocavallo config AWT-enabled version 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.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("-Dawt.toolkit=net.java.openjdk.cacio.ctc.CTCToolkit"); javaArgList.add("-Djava.awt.graphicsenv=net.java.openjdk.cacio.ctc.CTCGraphicsEnvironment");