使用 Java 11 构建 HMCL (#4078)

Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com>

Author: Glavo

.gitignore

@@ -18,6 +18,7 @@ minecraft-exported-crash-info*
 /build/
 /HMCL/build/
 /HMCLCore/build/
+/HMCLBoot/build/
 /HMCLTransformerDiscoveryService/build/
 /minecraft/libraries/HMCLTransformerDiscoveryService/build/
 /buildSrc/build/

HMCL/build.gradle.kts

@@ -39,6 +39,7 @@ version = "$versionRoot.$buildNumber"
 
 dependencies {
     implementation(project(":HMCLCore"))
+    implementation(project(":HMCLBoot"))
     implementation("libs:JFoenix")
     implementation(libs.twelvemonkeys.imageio.webp)
     implementation(libs.java.info)
@@ -89,16 +90,13 @@ fun attachSignature(jar: File) {
     }
 }
 
-val java11 = sourceSets.create("java11") {
-    java {
-        srcDir("src/main/java11")
-    }
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "11"
+    targetCompatibility = "11"
 }
 
-tasks.getByName<JavaCompile>(java11.compileJavaTaskName) {
+tasks.compileJava {
     options.compilerArgs.add("--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED")
-    sourceCompatibility = "11"
-    targetCompatibility = "11"
 }
 
 tasks.jar {
@@ -126,6 +124,7 @@ tasks.shadowJar {
         exclude(dependency("com.google.code.gson:.*:.*"))
         exclude(dependency("net.java.dev.jna:jna:.*"))
         exclude(dependency("libs:JFoenix:.*"))
+        exclude(project(":HMCLBoot"))
     }
 
     manifest {
@@ -174,13 +173,6 @@ tasks.shadowJar {
     }
 }
 
-tasks.processResources {
-    into("META-INF/versions/11") {
-        from(sourceSets["java11"].output)
-    }
-    dependsOn(tasks["java11Classes"])
-}
-
 val makeExecutables by tasks.registering {
     val extensions = listOf("exe", "sh")
 

…c/main/java/org/jackhuang/hmcl/Main.java …/java/org/jackhuang/hmcl/EntryPoint.javaHMCL/src/main/java/org/jackhuang/hmcl/Main.java renamed to HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java HMCL/src/main/java/org/jackhuang/hmcl/Main.java renamed to HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java

@@ -17,41 +17,25 @@
  */
 package org.jackhuang.hmcl;
 
-import javafx.application.Platform;
-import javafx.scene.control.Alert;
 import org.jackhuang.hmcl.util.FileSaver;
 import org.jackhuang.hmcl.ui.AwtUtils;
 import org.jackhuang.hmcl.util.ModuleHelper;
 import org.jackhuang.hmcl.util.SelfDependencyPatcher;
-import org.jackhuang.hmcl.ui.SwingUtils;
+import org.jackhuang.hmcl.util.SwingUtils;
 import org.jackhuang.hmcl.java.JavaRuntime;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManagerFactory;
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.util.Collections;
 import java.util.concurrent.CancellationException;
 
-import static org.jackhuang.hmcl.util.Lang.thread;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-public final class Main {
+public final class EntryPoint {
 
-    private Main() {
+    private EntryPoint() {
     }
 
     public static void main(String[] args) {
@@ -64,10 +48,6 @@ public static void main(String[] args) {
 
         checkDirectoryPath();
 
-        if (JavaRuntime.CURRENT_VERSION < 9)
-            // This environment check will take ~300ms
-            thread(Main::fixLetsEncrypt, "CA Certificate Check", true);
-
         if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS)
             initIcon();
 
@@ -97,6 +77,8 @@ private static void createHMCLDirectories() {
                     }
                 }
             } catch (IOException e) {
+                // Logger has not been started yet, so print directly to System.err
+                System.err.println("Failed to create HMCL directory: " + Metadata.HMCL_CURRENT_DIRECTORY);
                 e.printStackTrace(System.err);
                 showErrorAndExit(i18n("fatal.create_hmcl_current_directory_failure", Metadata.HMCL_CURRENT_DIRECTORY));
             }
@@ -112,27 +94,28 @@ private static void createHMCLDirectories() {
     }
 
     private static void initIcon() {
-        java.awt.Image image = java.awt.Toolkit.getDefaultToolkit().getImage(Main.class.getResource("/assets/img/icon-mac.png"));
+        java.awt.Image image = java.awt.Toolkit.getDefaultToolkit().getImage(EntryPoint.class.getResource("/assets/img/icon-mac.png"));
         AwtUtils.setAppleIcon(image);
     }
 
     private static void checkDirectoryPath() {
-        String currentDirectory = new File("").getAbsolutePath();
-        if (currentDirectory.contains("!")) {
+        String currentDir = System.getProperty("user.dir", "");
+        if (currentDir.contains("!")) {
+            LOG.error("The current working path contains an exclamation mark: " + currentDir);
             // No Chinese translation because both Swing and JavaFX cannot render Chinese character properly when exclamation mark exists in the path.
             showErrorAndExit("Exclamation mark(!) is not allowed in the path where HMCL is in.\n"
-                    + "The path is " + currentDirectory);
+                    + "The path is " + currentDir);
         }
     }
 
     private static void checkJavaFX() {
         try {
             SelfDependencyPatcher.patch();
         } catch (SelfDependencyPatcher.PatchException e) {
-            LOG.error("unable to patch JVM", e);
+            LOG.error("Unable to patch JVM", e);
             showErrorAndExit(i18n("fatal.javafx.missing"));
         } catch (SelfDependencyPatcher.IncompatibleVersionException e) {
-            LOG.error("unable to patch JVM", e);
+            LOG.error("Unable to patch JVM", e);
             showErrorAndExit(i18n("fatal.javafx.incompatible"));
         } catch (CancellationException e) {
             LOG.error("User cancels downloading JavaFX", e);
@@ -149,7 +132,7 @@ private static void verifyJavaFX() {
             Class.forName("javafx.stage.Stage");           // javafx.graphics
             Class.forName("javafx.scene.control.Skin");    // javafx.controls
         } catch (Exception e) {
-            e.printStackTrace(System.err);
+            LOG.warning("JavaFX is incomplete or not found", e);
             showErrorAndExit(i18n("fatal.javafx.incomplete"));
         }
     }
@@ -159,7 +142,7 @@ private static void addEnableNativeAccess() {
             try {
                 ModuleHelper.addEnableNativeAccess(Class.forName("javafx.stage.Stage")); // javafx.graphics
             } catch (ClassNotFoundException e) {
-                e.printStackTrace(System.err);
+                LOG.error("Failed to add enable native access for JavaFX", e);
                 showErrorAndExit(i18n("fatal.javafx.incomplete"));
             }
         }
@@ -174,78 +157,16 @@ private static void enableUnsafeMemoryAccess() {
                 trySetMemoryAccessWarned.setAccessible(true);
                 trySetMemoryAccessWarned.invoke(null);
             } catch (Throwable e) {
-                e.printStackTrace(System.err);
+                LOG.warning("Failed to enable unsafe memory access", e);
             }
         }
     }
 
     /**
      * Indicates that a fatal error has occurred, and that the application cannot start.
      */
-    static void showErrorAndExit(String message) {
-        System.err.println(message);
-        System.err.println("A fatal error has occurred, forcibly exiting.");
-
-        try {
-            if (Platform.isFxApplicationThread()) {
-                new Alert(Alert.AlertType.ERROR, message).showAndWait();
-                exit(1);
-            }
-        } catch (Throwable ignored) {
-        }
-
+    private static void showErrorAndExit(String message) {
         SwingUtils.showErrorDialog(message);
         exit(1);
     }
-
-    /**
-     * Indicates that potential issues have been detected, and that the application may not function properly (but it can still run).
-     */
-    static void showWarningAndContinue(String message) {
-        System.err.println(message);
-        System.err.println("Potential issues have been detected.");
-
-        try {
-            if (Platform.isFxApplicationThread()) {
-                new Alert(Alert.AlertType.WARNING, message).showAndWait();
-                return;
-            }
-        } catch (Throwable ignored) {
-        }
-
-        SwingUtils.showWarningDialog(message);
-    }
-
-    private static void fixLetsEncrypt() {
-        try {
-            KeyStore defaultKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            Path ksPath = Paths.get(System.getProperty("java.home"), "lib", "security", "cacerts");
-
-            try (InputStream ksStream = Files.newInputStream(ksPath)) {
-                defaultKeyStore.load(ksStream, "changeit".toCharArray());
-            }
-
-            KeyStore letsEncryptKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            try (InputStream letsEncryptFile = Main.class.getResourceAsStream("/assets/lekeystore.jks")) {
-                letsEncryptKeyStore.load(letsEncryptFile, "supersecretpassword".toCharArray());
-            }
-
-            KeyStore merged = KeyStore.getInstance(KeyStore.getDefaultType());
-            merged.load(null, new char[0]);
-            for (String alias : Collections.list(letsEncryptKeyStore.aliases()))
-                merged.setCertificateEntry(alias, letsEncryptKeyStore.getCertificate(alias));
-            for (String alias : Collections.list(defaultKeyStore.aliases()))
-                merged.setCertificateEntry(alias, defaultKeyStore.getCertificate(alias));
-
-            TrustManagerFactory instance = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-            instance.init(merged);
-            SSLContext tls = SSLContext.getInstance("TLS");
-            tls.init(null, instance.getTrustManagers(), null);
-            HttpsURLConnection.setDefaultSSLSocketFactory(tls.getSocketFactory());
-            LOG.info("Added Lets Encrypt root certificates as additional trust");
-        } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException |
-                 KeyManagementException e) {
-            LOG.error("Failed to load lets encrypt certificate. Expect problems", e);
-        }
-    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java

@@ -81,13 +81,14 @@ public void start(Stage primaryStage) {
         try {
             try {
                 ConfigHolder.init();
-            } catch (SambaException ignored) {
-                Main.showWarningAndContinue(i18n("fatal.samba"));
+            } catch (SambaException e) {
+                showAlert(AlertType.WARNING, i18n("fatal.samba"));
             } catch (IOException e) {
                 LOG.error("Failed to load config", e);
                 checkConfigInTempDir();
                 checkConfigOwner();
-                Main.showErrorAndExit(i18n("fatal.config_loading_failure", ConfigHolder.configLocation().getParent()));
+                showAlert(AlertType.ERROR, i18n("fatal.config_loading_failure", ConfigHolder.configLocation().getParent()));
+                EntryPoint.exit(1);
             }
 
             // https://lapcatsoftware.com/articles/app-translocation.html
@@ -106,7 +107,7 @@ public void start(Stage primaryStage) {
             }
 
             if (Metadata.HMCL_CURRENT_DIRECTORY.toString().indexOf('=') >= 0) {
-                Main.showWarningAndContinue(i18n("fatal.illegal_char"));
+                showAlert(AlertType.WARNING, i18n("fatal.illegal_char"));
             }
 
             // runLater to ensure ConfigHolder.init() finished initialization
@@ -169,7 +170,7 @@ private static boolean isConfigInTempDir() {
     private static void checkConfigInTempDir() {
         if (ConfigHolder.isNewlyCreated() && isConfigInTempDir()
                 && showAlert(AlertType.WARNING, i18n("fatal.config_in_temp_dir"), ButtonType.YES, ButtonType.NO) == ButtonType.NO) {
-            Main.exit(0);
+            EntryPoint.exit(0);
         }
     }
 
@@ -209,7 +210,7 @@ private static void checkConfigOwner() {
             Clipboard.getSystemClipboard()
                     .setContent(Collections.singletonMap(DataFormat.PLAIN_TEXT, command));
         }
-        Main.exit(1);
+        EntryPoint.exit(1);
     }
 
     @Override

HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java

@@ -19,13 +19,10 @@
 
 import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.JarUtils;
-import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
-import org.jetbrains.annotations.Nullable;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.EnumSet;
 
 /**
  * Stores metadata about this application.
@@ -38,9 +35,6 @@ private Metadata() {
     public static final String FULL_NAME = "Hello Minecraft! Launcher";
     public static final String VERSION = System.getProperty("hmcl.version.override", JarUtils.getManifestAttribute("Implementation-Version", "@develop@"));
 
-    public static final int MINIMUM_REQUIRED_JAVA_VERSION = 8;
-    public static final int MINIMUM_SUPPORTED_JAVA_VERSION = 11;
-
     public static final String TITLE = NAME + " " + VERSION;
     public static final String FULL_TITLE = FULL_NAME + " v" + VERSION;
 
@@ -100,31 +94,4 @@ public static boolean isNightly() {
         return !isStable() && !isDev();
     }
 
-    public static @Nullable String getSuggestedJavaDownloadLink() {
-        if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX && Architecture.SYSTEM_ARCH == Architecture.LOONGARCH64_OW)
-            return "https://www.loongnix.cn/zh/api/java/downloads-jdk21/index.html";
-        else {
-            EnumSet<Architecture> supportedArchitectures;
-            if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
-                supportedArchitectures = EnumSet.of(Architecture.X86_64, Architecture.X86, Architecture.ARM64);
-            else if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX)
-                supportedArchitectures = EnumSet.of(
-                        Architecture.X86_64, Architecture.X86,
-                        Architecture.ARM64, Architecture.ARM32,
-                        Architecture.RISCV64, Architecture.LOONGARCH64
-                );
-            else if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS)
-                supportedArchitectures = EnumSet.of(Architecture.X86_64, Architecture.ARM64);
-            else
-                supportedArchitectures = EnumSet.noneOf(Architecture.class);
-
-            if (supportedArchitectures.contains(Architecture.SYSTEM_ARCH))
-                return String.format("https://docs.hmcl.net/downloads/%s/%s.html",
-                        OperatingSystem.CURRENT_OS.getCheckedName(),
-                        Architecture.SYSTEM_ARCH.getCheckedName()
-                );
-            else
-                return null;
-        }
-    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java

@@ -101,6 +101,7 @@ public static void init() throws IOException {
             if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
                     && configLocation.getFileSystem() == FileSystems.getDefault()
                     && configLocation.toFile().canWrite()) {
+                LOG.warning("Config at " + configLocation + " is not writable, but it seems to be a Samba share or OpenJDK bug");
                 // There are some serious problems with the implementation of Samba or OpenJDK
                 throw new SambaException();
             } else {