Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 03:31:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FEATURE] Backport 'Support build-in javafx in Java 9+'

Browse source
This commit is contained in:
Gravita 2023-09-18 16:34:27 +07:00
parent dd102572d8
commit 42ea52fb49
1 changed files with 58 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
LauncherCore/src/main/java/pro/gravit/utils/helper/JavaHelper.java
View file

@ -6,12 +6,23 @@
import java.nio.file.InvalidPathException; import java.nio.file.InvalidPathException;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Properties;
public class JavaHelper { public class JavaHelper {
private static List<JavaVersion> javaVersionsCache; private static List<JavaVersion> javaVersionsCache;
public static final List<String> javaFxModules;
static {
List<String> modules = new ArrayList<>();
modules.add("javafx.base");
modules.add("javafx.graphics");
modules.add("javafx.fxml");
modules.add("javafx.controls");
modules.add("javafx.swing");
modules.add("javafx.media");
modules.add("javafx.web");
javaFxModules = Collections.unmodifiableList(modules);
}
public static Path tryGetOpenJFXPath(Path jvmDir) { public static Path tryGetOpenJFXPath(Path jvmDir) {
String dirName = jvmDir.getFileName().toString(); String dirName = jvmDir.getFileName().toString();
@ -187,30 +198,29 @@ public static class JavaVersion {
public final int version; public final int version;
public final int build; public final int build;
public final JVMHelper.ARCH arch; public final JVMHelper.ARCH arch;
public final List<String> modules;
public boolean enabledJavaFX; public boolean enabledJavaFX;
public JavaVersion(Path jvmDir, int version) {
this.jvmDir = jvmDir;
this.version = version;
this.build = 0;
this.arch = JVMHelper.ARCH_TYPE;
this.enabledJavaFX = true;
}
public JavaVersion(Path jvmDir, int version, int build, boolean enabledJavaFX) {
this.jvmDir = jvmDir;
this.version = version;
this.build = build;
this.arch = JVMHelper.ARCH_TYPE;
this.enabledJavaFX = enabledJavaFX;
}
public JavaVersion(Path jvmDir, int version, int build, JVMHelper.ARCH arch, boolean enabledJavaFX) { public JavaVersion(Path jvmDir, int version, int build, JVMHelper.ARCH arch, boolean enabledJavaFX) {
this.jvmDir = jvmDir; this.jvmDir = jvmDir;
this.version = version; this.version = version;
this.build = build; this.build = build;
this.arch = arch; this.arch = arch;
this.enabledJavaFX = enabledJavaFX; this.enabledJavaFX = enabledJavaFX;
if(version > 8) {
this.modules = javaFxModules;
} else {
this.modules = Collections.unmodifiableList(new ArrayList<>());
}
}
public JavaVersion(Path jvmDir, int version, int build, JVMHelper.ARCH arch, List<String> modules, boolean enabledJavaFX) {
this.jvmDir = jvmDir;
this.version = version;
this.build = build;
this.arch = arch;
this.modules = modules;
this.enabledJavaFX = enabledJavaFX;
} }
public static JavaVersion getCurrentJavaVersion() { public static JavaVersion getCurrentJavaVersion() {
@ -239,17 +249,28 @@ public static JavaVersion getByPath(Path jvmDir) {
} }
Path releaseFile = jvmDir.resolve("release"); Path releaseFile = jvmDir.resolve("release");
JavaVersionAndBuild versionAndBuild = null; JavaVersionAndBuild versionAndBuild = null;
List<String> modules = null;
JVMHelper.ARCH arch = JVMHelper.ARCH_TYPE; JVMHelper.ARCH arch = JVMHelper.ARCH_TYPE;
if (IOHelper.isFile(releaseFile)) { if (IOHelper.isFile(releaseFile)) {
try { try {
Properties properties = new Properties(); Properties properties = new Properties();
properties.load(IOHelper.newReader(releaseFile)); properties.load(IOHelper.newReader(releaseFile));
versionAndBuild = getJavaVersion(properties.getProperty("JAVA_VERSION").replaceAll("\"", "")); String versionProperty = getProperty(properties, "JAVA_VERSION");
if(versionProperty != null) {
versionAndBuild = getJavaVersion(versionProperty);
}
try { try {
arch = JVMHelper.getArch(properties.getProperty("OS_ARCH").replaceAll("\"", "")); String archProperty = getProperty(properties, "OS_ARCH");
if(archProperty != null) {
arch = JVMHelper.getArch(archProperty);
}
} catch (Throwable ignored) { } catch (Throwable ignored) {
arch = null; arch = null;
} }
String modulesProperty = getProperty(properties, "MODULES");
if(modulesProperty != null) {
modules = new ArrayList<>(Arrays.asList(modulesProperty.split(" ")));
}
} catch (IOException ignored) { } catch (IOException ignored) {
} }
@ -261,13 +282,26 @@ public static JavaVersion getByPath(Path jvmDir) {
if (versionAndBuild.version <= 8) { if (versionAndBuild.version <= 8) {
resultJavaVersion.enabledJavaFX = isExistExtJavaLibrary(jvmDir, "jfxrt"); resultJavaVersion.enabledJavaFX = isExistExtJavaLibrary(jvmDir, "jfxrt");
} else { } else {
resultJavaVersion.enabledJavaFX = tryFindModule(jvmDir, "javafx.base") != null; if(modules != null) {
if (!resultJavaVersion.enabledJavaFX) resultJavaVersion.enabledJavaFX = modules.contains("javafx.base");
resultJavaVersion.enabledJavaFX = tryFindModule(jvmDir.resolve("jre"), "javafx.base") != null; }
if(!resultJavaVersion.enabledJavaFX) {
resultJavaVersion.enabledJavaFX = tryFindModule(jvmDir, "javafx.base") != null;
if (!resultJavaVersion.enabledJavaFX)
resultJavaVersion.enabledJavaFX = tryFindModule(jvmDir.resolve("jre"), "javafx.base") != null;
}
} }
return resultJavaVersion; return resultJavaVersion;
} }
private static String getProperty(Properties properties, String name) {
String prop = properties.getProperty(name);
if(prop == null) {
return null;
}
return prop.replaceAll("\"", "");
}
public static boolean isExistExtJavaLibrary(Path jvmDir, String name) { public static boolean isExistExtJavaLibrary(Path jvmDir, String name) {
Path jrePath = jvmDir.resolve("lib").resolve("ext").resolve(name.concat(".jar")); Path jrePath = jvmDir.resolve("lib").resolve("ext").resolve(name.concat(".jar"));
Path jrePathLin = jvmDir.resolve("lib").resolve(name.concat(".jar")); Path jrePathLin = jvmDir.resolve("lib").resolve(name.concat(".jar"));