From d60a9238411441698ecd044749d8e1ad5bc5f460 Mon Sep 17 00:00:00 2001 From: Glavo Date: Fri, 25 Jul 2025 16:05:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20Java=2011=20=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=20HMCL=20(#4078)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com> --- .gitignore | 1 + HMCL/build.gradle.kts | 22 ++-- .../hmcl/{Main.java => EntryPoint.java} | 111 +++--------------- .../java/org/jackhuang/hmcl/Launcher.java | 13 +- .../java/org/jackhuang/hmcl/Metadata.java | 33 ------ .../jackhuang/hmcl/setting/ConfigHolder.java | 1 + .../org/jackhuang/hmcl/ui/Controllers.java | 21 ---- .../jackhuang/hmcl/upgrade/UpdateHandler.java | 16 +-- .../jackhuang/hmcl/util/JavaFXPatcher.java | 49 +++++++- .../org/jackhuang/hmcl/util/ModuleHelper.java | 17 ++- .../hmcl/util/SelfDependencyPatcher.java | 11 +- .../org/jackhuang/hmcl/util/i18n/Locales.java | 4 - .../jackhuang/hmcl/util/JavaFXPatcher.java | 78 ------------ .../org/jackhuang/hmcl/util/ModuleHelper.java | 46 -------- .../hmcl/util/logging/CallerFinder.java | 23 ---- .../resources/assets/lang/I18N.properties | 10 -- .../resources/assets/lang/I18N_es.properties | 42 +------ .../resources/assets/lang/I18N_ru.properties | 42 +------ .../resources/assets/lang/I18N_zh.properties | 3 - .../assets/lang/I18N_zh_CN.properties | 3 - HMCL/src/main/resources/assets/lekeystore.jks | Bin 1453 -> 0 bytes HMCLBoot/build.gradle.kts | 7 ++ .../org/jackhuang/hmcl/BootProperties.java | 38 ++++++ .../java/org/jackhuang/hmcl/EntryPoint.java | 30 +++++ .../main/java/org/jackhuang/hmcl/Main.java | 73 ++++++++++++ .../org/jackhuang/hmcl/util}/SwingUtils.java | 22 +++- .../org/jackhuang/hmcl/util}/UTF8Control.java | 10 +- .../resources/assets/lang/boot.properties | 19 +++ .../resources/assets/lang/boot_zh.properties | 19 +++ .../assets/lang/boot_zh_CN.properties | 19 +++ .../java/org/jackhuang/hmcl/MainTest.java | 39 ++++++ HMCLCore/build.gradle.kts | 9 ++ .../hmcl/util/logging/CallerFinder.java | 45 ++++--- build.gradle.kts | 3 - settings.gradle.kts | 1 + 35 files changed, 409 insertions(+), 471 deletions(-) rename HMCL/src/main/java/org/jackhuang/hmcl/{Main.java => EntryPoint.java} (58%) delete mode 100644 HMCL/src/main/java11/org/jackhuang/hmcl/util/JavaFXPatcher.java delete mode 100644 HMCL/src/main/java11/org/jackhuang/hmcl/util/ModuleHelper.java delete mode 100644 HMCL/src/main/java11/org/jackhuang/hmcl/util/logging/CallerFinder.java delete mode 100644 HMCL/src/main/resources/assets/lekeystore.jks create mode 100644 HMCLBoot/build.gradle.kts create mode 100644 HMCLBoot/src/main/java/org/jackhuang/hmcl/BootProperties.java create mode 100644 HMCLBoot/src/main/java/org/jackhuang/hmcl/EntryPoint.java create mode 100644 HMCLBoot/src/main/java/org/jackhuang/hmcl/Main.java rename {HMCL/src/main/java/org/jackhuang/hmcl/ui => HMCLBoot/src/main/java/org/jackhuang/hmcl/util}/SwingUtils.java (52%) rename {HMCL/src/main/java/org/jackhuang/hmcl/util/i18n => HMCLBoot/src/main/java/org/jackhuang/hmcl/util}/UTF8Control.java (89%) create mode 100644 HMCLBoot/src/main/resources/assets/lang/boot.properties create mode 100644 HMCLBoot/src/main/resources/assets/lang/boot_zh.properties create mode 100644 HMCLBoot/src/main/resources/assets/lang/boot_zh_CN.properties create mode 100644 HMCLBoot/src/test/java/org/jackhuang/hmcl/MainTest.java diff --git a/.gitignore b/.gitignore index 8896894c0..58bd5e5e3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ minecraft-exported-crash-info* /build/ /HMCL/build/ /HMCLCore/build/ +/HMCLBoot/build/ /HMCLTransformerDiscoveryService/build/ /minecraft/libraries/HMCLTransformerDiscoveryService/build/ /buildSrc/build/ diff --git a/HMCL/build.gradle.kts b/HMCL/build.gradle.kts index a86c6b085..8f35d5c2b 100644 --- a/HMCL/build.gradle.kts +++ b/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,18 +90,15 @@ fun attachSignature(jar: File) { } } -val java11 = sourceSets.create("java11") { - java { - srcDir("src/main/java11") - } -} - -tasks.getByName(java11.compileJavaTaskName) { - options.compilerArgs.add("--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED") +tasks.withType { sourceCompatibility = "11" targetCompatibility = "11" } +tasks.compileJava { + options.compilerArgs.add("--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED") +} + tasks.jar { enabled = false dependsOn(tasks["shadowJar"]) @@ -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") diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java b/HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java similarity index 58% rename from HMCL/src/main/java/org/jackhuang/hmcl/Main.java rename to HMCL/src/main/java/org/jackhuang/hmcl/EntryPoint.java index 886ac1bc1..8b9fe5cb5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java +++ b/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 final class Main { 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 @@ public final class Main { } } } 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,16 +94,17 @@ public final class Main { } 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); } } @@ -129,10 +112,10 @@ public final class Main { 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 @@ public final class Main { 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 @@ public final class Main { 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,7 +157,7 @@ public final class Main { trySetMemoryAccessWarned.setAccessible(true); trySetMemoryAccessWarned.invoke(null); } catch (Throwable e) { - e.printStackTrace(System.err); + LOG.warning("Failed to enable unsafe memory access", e); } } } @@ -182,70 +165,8 @@ public final class Main { /** * 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); - } - } } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java index 548c3c368..8d0d8c183 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java @@ -81,13 +81,14 @@ public final class Launcher extends Application { 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 final class Launcher extends Application { } 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 @@ public final class Launcher extends Application { 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 @@ public final class Launcher extends Application { Clipboard.getSystemClipboard() .setContent(Collections.singletonMap(DataFormat.PLAIN_TEXT, command)); } - Main.exit(1); + EntryPoint.exit(1); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java b/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java index 7b545d35f..2e630a942 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/Metadata.java @@ -19,13 +19,10 @@ package org.jackhuang.hmcl; 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 @@ public final class 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 final class Metadata { 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 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; - } - } } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java index 7bc0f1a64..003a085e3 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/ConfigHolder.java @@ -101,6 +101,7 @@ public final class ConfigHolder { 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 { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java index 2661f1261..6b7a5d7bd 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java @@ -42,7 +42,6 @@ import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.game.ModpackHelper; import org.jackhuang.hmcl.java.JavaManager; -import org.jackhuang.hmcl.java.JavaRuntime; import org.jackhuang.hmcl.setting.*; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskExecutor; @@ -310,26 +309,6 @@ public final class Controllers { } } - if (JavaRuntime.CURRENT_VERSION < 10) { - Number shownTipVersion = null; - - try { - shownTipVersion = (Number) config().getShownTips().get(JAVA_VERSION_TIP); - } catch (ClassCastException e) { - LOG.warning("Invalid type for shown tips key: " + JAVA_VERSION_TIP, e); - } - - if (shownTipVersion == null || shownTipVersion.intValue() < Metadata.MINIMUM_SUPPORTED_JAVA_VERSION) { - MessageDialogPane.Builder builder = new MessageDialogPane.Builder(i18n("fatal.deprecated_java_version"), null, MessageType.WARNING); - String downloadLink = Metadata.getSuggestedJavaDownloadLink(); - if (downloadLink != null) - builder.addHyperLink(i18n("fatal.deprecated_java_version.download_link", 21), downloadLink); - Controllers.dialog(builder - .ok(() -> config().getShownTips().put(JAVA_VERSION_TIP, Metadata.MINIMUM_SUPPORTED_JAVA_VERSION)) - .build()); - } - } - if (globalConfig().getAgreementVersion() < 1) { JFXDialogLayout agreementPane = new JFXDialogLayout(); agreementPane.setHeading(new Label(i18n("launcher.agreement"))); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java index 9a25dd1bc..dd56f2abb 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java @@ -21,16 +21,16 @@ import com.google.gson.Gson; import com.google.gson.JsonParseException; import javafx.application.Platform; +import org.jackhuang.hmcl.EntryPoint; import org.jackhuang.hmcl.Main; import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.TaskExecutor; import org.jackhuang.hmcl.ui.Controllers; import org.jackhuang.hmcl.ui.UpgradeDialog; -import org.jackhuang.hmcl.ui.construct.MessageDialogPane; import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType; import org.jackhuang.hmcl.util.StringUtils; -import org.jackhuang.hmcl.ui.SwingUtils; +import org.jackhuang.hmcl.util.SwingUtils; import org.jackhuang.hmcl.util.TaskCancellationAction; import org.jackhuang.hmcl.util.io.FileUtils; import org.jackhuang.hmcl.util.io.JarUtils; @@ -103,16 +103,6 @@ public final class UpdateHandler { return; } - if (JavaRuntime.CURRENT_VERSION < Metadata.MINIMUM_SUPPORTED_JAVA_VERSION) { - MessageDialogPane.Builder builder = new MessageDialogPane.Builder(i18n("fatal.deprecated_java_version.update"), i18n("message.error"), MessageType.ERROR); - String downloadLink = Metadata.getSuggestedJavaDownloadLink(); - if (downloadLink != null) - builder.addHyperLink(i18n("fatal.deprecated_java_version.download_link", 21), downloadLink); - builder.ok(null); - Controllers.dialog(builder.build()); - return; - } - Controllers.dialog(new UpgradeDialog(version, () -> { Path downloaded; try { @@ -136,7 +126,7 @@ public final class UpdateHandler { } requestUpdate(downloaded, getCurrentLocation()); - Main.exit(0); + EntryPoint.exit(0); } catch (IOException e) { LOG.warning("Failed to update to " + version, e); Platform.runLater(() -> Controllers.dialog(StringUtils.getStackTrace(e), i18n("update.failed"), MessageType.ERROR)); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/JavaFXPatcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/JavaFXPatcher.java index e870d5c56..9eb03d8ed 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/JavaFXPatcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/JavaFXPatcher.java @@ -17,11 +17,16 @@ */ package org.jackhuang.hmcl.util; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.module.Configuration; +import java.lang.module.ModuleFinder; +import java.lang.module.ModuleReference; import java.nio.file.Path; +import java.util.List; import java.util.Set; -import static org.jackhuang.hmcl.util.logging.Logger.LOG; - /** * Utility for Adding JavaFX to module path. * @@ -31,7 +36,43 @@ public final class JavaFXPatcher { private JavaFXPatcher() { } - public static void patch(Set modules, Path[] jarPaths, String[] addOpens) { - LOG.info("No need to patch JavaFX with Java 8"); + /** + * Add JavaFX to module path at runtime. + * + * @param modules All module names + * @param jarPaths All jar paths + * @throws ReflectiveOperationException When the call to add these jars to the system module path failed. + */ + public static void patch(Set modules, Path[] jarPaths, String[] addOpens) throws ReflectiveOperationException { + // Find all modules + ModuleFinder finder = ModuleFinder.of(jarPaths); + + // Load all modules as unnamed module + for (ModuleReference mref : finder.findAll()) { + ((jdk.internal.loader.BuiltinClassLoader) ClassLoader.getSystemClassLoader()).loadModule(mref); + } + + // Define all modules + Configuration config = Configuration.resolveAndBind(finder, List.of(ModuleLayer.boot().configuration()), finder, modules); + ModuleLayer layer = ModuleLayer.defineModules(config, List.of(ModuleLayer.boot()), name -> ClassLoader.getSystemClassLoader()).layer(); + + // Add-Exports and Add-Opens + try { + // Some hacks + MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(Module.class, MethodHandles.lookup()); + MethodHandle handle = lookup.findVirtual(Module.class, "implAddOpensToAllUnnamed", MethodType.methodType(void.class, String.class)); + for (String target : addOpens) { + String[] name = target.split("/", 2); // / + layer.findModule(name[0]).ifPresent(m -> { + try { + handle.invokeWithArguments(m, name[1]); + } catch (Throwable throwable) { + throw new RuntimeException(throwable); + } + }); + } + } catch (Throwable t) { + throw new ReflectiveOperationException(t); + } } } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/ModuleHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/ModuleHelper.java index 6df44a17c..f578d11dc 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/ModuleHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/ModuleHelper.java @@ -17,13 +17,28 @@ */ package org.jackhuang.hmcl.util; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; + /** * @author Glavo */ public final class ModuleHelper { public static void addEnableNativeAccess(Class clazzInModule) { - // do nothing + Module module = clazzInModule.getModule(); + if (module.isNamed()) { + try { + MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(Module.class, MethodHandles.lookup()); + MethodHandle implAddEnableNativeAccess = lookup.findVirtual(Module.class, "implAddEnableNativeAccess", MethodType.methodType(Module.class)); + Module ignored = (Module) implAddEnableNativeAccess.invokeExact(module); + } catch (Throwable e) { + e.printStackTrace(System.err); + } + } else { + System.err.println("TODO: Add enable native access for anonymous modules is not yet supported"); + } } private ModuleHelper() { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java index 43ff12688..a5c762a62 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java @@ -41,9 +41,8 @@ */ package org.jackhuang.hmcl.util; -import org.jackhuang.hmcl.Main; +import org.jackhuang.hmcl.EntryPoint; import org.jackhuang.hmcl.Metadata; -import org.jackhuang.hmcl.ui.SwingUtils; import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.io.ChecksumMismatchException; import org.jackhuang.hmcl.util.io.IOUtils; @@ -181,12 +180,6 @@ public final class SelfDependencyPatcher { // We are probably on 8 and its on 11 throw new IncompatibleVersionException(); } - // So the problem with Java 8 is that some distributions DO NOT BUNDLE JAVAFX - // Why is this a problem? OpenJFX does not come in public bundles prior to Java 11 - // So you're out of luck unless you change your JDK or update Java. - if (JavaRuntime.CURRENT_VERSION < 11) { - throw new IncompatibleVersionException(); - } SelfDependencyPatcher patcher = new SelfDependencyPatcher(); @@ -246,7 +239,7 @@ public final class SelfDependencyPatcher { } } else { LOG.info("User choose not to download JavaFX"); - Main.exit(0); + EntryPoint.exit(0); } throw new AssertionError(); } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java index 868371dce..45cf4c4b2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java @@ -20,7 +20,6 @@ package org.jackhuang.hmcl.util.i18n; import com.google.gson.annotations.JsonAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; -import org.jackhuang.hmcl.java.JavaInfo; import org.jackhuang.hmcl.util.Lang; import java.io.IOException; @@ -116,10 +115,7 @@ public final class Locales { if (resourceBundle == null) { if (this != DEFAULT && this.locale == DEFAULT.locale) { bundle = DEFAULT.getResourceBundle(); - } else if (JavaInfo.CURRENT_ENVIRONMENT.getParsedVersion() < 9) { - bundle = ResourceBundle.getBundle("assets.lang.I18N", locale, UTF8Control.INSTANCE); } else { - // Java 9+ uses UTF-8 as the default encoding for resource bundles bundle = ResourceBundle.getBundle("assets.lang.I18N", locale); } diff --git a/HMCL/src/main/java11/org/jackhuang/hmcl/util/JavaFXPatcher.java b/HMCL/src/main/java11/org/jackhuang/hmcl/util/JavaFXPatcher.java deleted file mode 100644 index 9eb03d8ed..000000000 --- a/HMCL/src/main/java11/org/jackhuang/hmcl/util/JavaFXPatcher.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Hello Minecraft! Launcher - * Copyright (C) 2021 huangyuhui and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.jackhuang.hmcl.util; - -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.invoke.MethodType; -import java.lang.module.Configuration; -import java.lang.module.ModuleFinder; -import java.lang.module.ModuleReference; -import java.nio.file.Path; -import java.util.List; -import java.util.Set; - -/** - * Utility for Adding JavaFX to module path. - * - * @author ZekerZhayard - */ -public final class JavaFXPatcher { - private JavaFXPatcher() { - } - - /** - * Add JavaFX to module path at runtime. - * - * @param modules All module names - * @param jarPaths All jar paths - * @throws ReflectiveOperationException When the call to add these jars to the system module path failed. - */ - public static void patch(Set modules, Path[] jarPaths, String[] addOpens) throws ReflectiveOperationException { - // Find all modules - ModuleFinder finder = ModuleFinder.of(jarPaths); - - // Load all modules as unnamed module - for (ModuleReference mref : finder.findAll()) { - ((jdk.internal.loader.BuiltinClassLoader) ClassLoader.getSystemClassLoader()).loadModule(mref); - } - - // Define all modules - Configuration config = Configuration.resolveAndBind(finder, List.of(ModuleLayer.boot().configuration()), finder, modules); - ModuleLayer layer = ModuleLayer.defineModules(config, List.of(ModuleLayer.boot()), name -> ClassLoader.getSystemClassLoader()).layer(); - - // Add-Exports and Add-Opens - try { - // Some hacks - MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(Module.class, MethodHandles.lookup()); - MethodHandle handle = lookup.findVirtual(Module.class, "implAddOpensToAllUnnamed", MethodType.methodType(void.class, String.class)); - for (String target : addOpens) { - String[] name = target.split("/", 2); // / - layer.findModule(name[0]).ifPresent(m -> { - try { - handle.invokeWithArguments(m, name[1]); - } catch (Throwable throwable) { - throw new RuntimeException(throwable); - } - }); - } - } catch (Throwable t) { - throw new ReflectiveOperationException(t); - } - } -} diff --git a/HMCL/src/main/java11/org/jackhuang/hmcl/util/ModuleHelper.java b/HMCL/src/main/java11/org/jackhuang/hmcl/util/ModuleHelper.java deleted file mode 100644 index f578d11dc..000000000 --- a/HMCL/src/main/java11/org/jackhuang/hmcl/util/ModuleHelper.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Hello Minecraft! Launcher - * Copyright (C) 2025 huangyuhui and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.jackhuang.hmcl.util; - -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.invoke.MethodType; - -/** - * @author Glavo - */ -public final class ModuleHelper { - - public static void addEnableNativeAccess(Class clazzInModule) { - Module module = clazzInModule.getModule(); - if (module.isNamed()) { - try { - MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(Module.class, MethodHandles.lookup()); - MethodHandle implAddEnableNativeAccess = lookup.findVirtual(Module.class, "implAddEnableNativeAccess", MethodType.methodType(Module.class)); - Module ignored = (Module) implAddEnableNativeAccess.invokeExact(module); - } catch (Throwable e) { - e.printStackTrace(System.err); - } - } else { - System.err.println("TODO: Add enable native access for anonymous modules is not yet supported"); - } - } - - private ModuleHelper() { - } -} diff --git a/HMCL/src/main/java11/org/jackhuang/hmcl/util/logging/CallerFinder.java b/HMCL/src/main/java11/org/jackhuang/hmcl/util/logging/CallerFinder.java deleted file mode 100644 index 8c934cdaa..000000000 --- a/HMCL/src/main/java11/org/jackhuang/hmcl/util/logging/CallerFinder.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.jackhuang.hmcl.util.logging; - -import java.util.Optional; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Stream; - -/** - * @author Glavo - */ -final class CallerFinder { - private static final String PACKAGE_PREFIX = CallerFinder.class.getPackageName() + "."; - private static final Predicate PREDICATE = stackFrame -> !stackFrame.getClassName().startsWith(PACKAGE_PREFIX); - private static final Function, Optional> FUNCTION = stream -> stream.filter(PREDICATE).findFirst(); - private static final Function FRAME_MAPPING = frame -> frame.getClassName() + "." + frame.getMethodName(); - - static String getCaller() { - return StackWalker.getInstance().walk(FUNCTION).map(FRAME_MAPPING).orElse(null); - } - - private CallerFinder() { - } -} diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 09f9932cc..b980594cc 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -398,16 +398,6 @@ fatal.apply_update_failure=We are sorry, but Hello Minecraft! Launcher is unable fatal.apply_update_need_win7=Hello Minecraft! Launcher cannot automatically update on Windows XP/Vista.\n\ \n\ You can update manually by downloading a newer launcher version from %s. -fatal.deprecated_java_version=HMCL will require Java 11 or later to run in the future, but will still support launching games with Java 8.\n\ - \n\ - It is recommended to install the latest version of Java to ensure that HMCL works properly.\n\ - \n\ - You can continue to keep the old version of Java. HMCL can recognize and manage multiple Java versions and will automatically select the appropriate Java for you based on the game version. -fatal.deprecated_java_version.update=HMCL will require Java 11 or later to run in the future. Please install the latest version of Java to ensure that HMCL can complete the upgrade.\n\ - \n\ - You can continue to keep the old version of Java.\ - HMCL can recognize and manage multiple Java versions and will automatically select the appropriate Java for you based on the game version. -fatal.deprecated_java_version.download_link=Download Java %d fatal.samba=If you opened Hello Minecraft! Launcher from a Samba network drive, some features might not be working. Please try updating your Java or moving the launcher to another directory. fatal.illegal_char=Your user path contains an illegal character "=". You will not be able to use authlib-injector or change the skin of your offline account. fatal.unsupported_platform=Minecraft is not fully supported on your platform yet, so you may experience missing features or even be unable to launch the game.\n\ diff --git a/HMCL/src/main/resources/assets/lang/I18N_es.properties b/HMCL/src/main/resources/assets/lang/I18N_es.properties index 615771d22..14ab218c6 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_es.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_es.properties @@ -400,17 +400,6 @@ fatal.apply_update_failure=Lo sentimos, pero Hello Minecraft! Launcher no puede fatal.apply_update_need_win7=Hello Minecraft! Launcher no puede actualizarse automáticamente en Windows XP/Vista.\n\ \n\ Puedes actualizar manualmente descargando una versión más reciente del launcher desde %s. -fatal.deprecated_java_version=HMCL requerirá Java 11 o posterior para funcionar en el futuro, pero seguirá siendo compatible con el lanzamiento de juegos con Java 8.\n\ - \n\ - Se recomienda instalar la última versión de Java para garantizar el correcto funcionamiento de HMCL.\n\ - \n\ - Puedes conservar la versión antigua de Java. HMCL puede reconocer y gestionar varias versiones de Java y elegirá automáticamente la adecuada para usted en función de la versión del juego. -fatal.deprecated_java_version.update=HMCL requerirá Java 11 o posterior para funcionar en el futuro. Por favor, instalar la última versión de Java para asegurarse de que el lanzador puede completar la actualización.\n\ - \n\ - Puedes conservar la versión antigua de Java.\ - HMCL puede reconocer y gestionar varias versiones de Java \ - y elegirá automáticamente la adecuada para usted en función de la versión del juego. -fatal.deprecated_java_version.download_link=Descargar Java %d fatal.samba=Si ha abierto Hello Minecraft! Launcher desde una unidad de red Samba, es posible que algunas funciones no funcionen. Intenta actualizar tu Java o mover el launcher a otro directorio. fatal.illegal_char=Su ruta de usuario contiene un carácter ilegal «=», por lo que algunas características podrían no funcionar correctamente.\n\ Por ejemplo, no podrá utilizar authlib-injector o cambiar el skin de su cuenta offline. @@ -446,7 +435,6 @@ folder.shaderpacks=Paquetes de sombreados folder.saves=Mundos folder.schematics=Esquemas folder.screenshots=Capturas de pantalla -folder.world=Directorio del mundo game=Juegos game.crash.feedback=¡Por favor, no comparta capturas de pantalla de esta interfaz con otras personas! Si pide ayuda a otras personas, haga clic en Exportar registros de colgado y envíe el archivo exportado a otras personas para que lo analicen. @@ -944,16 +932,11 @@ modpack.wizard.step.initialization.warning=Antes de hacer un modpack, por favor modpack.wizard.step.initialization.server=Haga clic aquí para ver más tutoriales para hacer un modpack de servidor que se pueda actualizar automáticamente. modrinth.category.adventure=Aventura -modrinth.category.atmosphere=Atmósfera modrinth.category.audio=Audio modrinth.category.blocks=Bloqueos -modrinth.category.bloom=Resplandor modrinth.category.bukkit=Bukkit modrinth.category.bungeecord=BungeeCord -modrinth.category.canvas=Canvas -modrinth.category.cartoon=Caricatura modrinth.category.challenging=Desafío -modrinth.category.colored-lighting=Iluminación de color modrinth.category.core-shaders=Sombreadores de núcleo modrinth.category.combat=Combate modrinth.category.cursed=Maldición @@ -963,25 +946,19 @@ modrinth.category.entities=Entidades modrinth.category.environment=Medio ambiente modrinth.category.equipment=Equipo modrinth.category.fabric=Fabric -modrinth.category.fantasy=Fantasía -modrinth.category.foliage=Vegetación modrinth.category.fonts=Fonts modrinth.category.food=Alimentos modrinth.category.forge=Forge modrinth.category.game-mechanics=Mecánica de juego modrinth.category.gui=GUI -modrinth.category.high=Alto -modrinth.category.iris=Iris modrinth.category.items=Objetos modrinth.category.kitchen-sink=Fregadero de cocina modrinth.category.library=Biblioteca modrinth.category.lightweight=Peso ligero modrinth.category.liteloader=LiteLoader modrinth.category.locale=Locale -modrinth.category.low=Bajo modrinth.category.magic=Magia modrinth.category.management=Gestión -modrinth.category.medium=Medio modrinth.category.minecraft=Minecraft modrinth.category.minigame=Minijuego modrinth.category.misc=Misceláneo @@ -991,21 +968,13 @@ modrinth.category.models=Modelos modrinth.category.modloader=Cargador de mods modrinth.category.multiplayer=Multijugador modrinth.category.neoforge=NeoForge -modrinth.category.optifine=OptiFine modrinth.category.optimization=Optimización modrinth.category.paper=Paper -modrinth.category.path-tracing=Trazado de rutas -modrinth.category.pbr=PBR -modrinth.category.potato=Mínimo modrinth.category.purpur=Purpur modrinth.category.quests=Misiones modrinth.category.quilt=Quilt modrinth.category.realistic=Realista -modrinth.category.reflections=Reflexiones modrinth.category.rift=Rift -modrinth.category.screenshot=Extremo -modrinth.category.semi-realistic=Semirrealista -modrinth.category.shadows=Sombras modrinth.category.simplistic=Simplista modrinth.category.social=Social modrinth.category.spigot=Spigot @@ -1016,7 +985,6 @@ modrinth.category.themed=Temática modrinth.category.transportation=Transporte modrinth.category.tweaks=Ajustes modrinth.category.utility=Utilidad -modrinth.category.vanilla=Vainilla modrinth.category.vanilla-like=Similar a la vainilla modrinth.category.velocity=Velocity modrinth.category.waterfall=Waterfall @@ -1104,12 +1072,7 @@ world.backup.create.locked=El mundo está actualmente en uso. Por favor, cierra world.backup.create.success=Creada con éxito una nueva copia de seguridad: %s world.backup.delete=Eliminar esta copia de seguridad world.backup.processing=Creando nueva copia de seguridad ... -world.chunkbase=Chunk Base -world.chunkbase.end_city=Ciudad del End -world.chunkbase.seed_map=Vista previa de la generación mundial -world.chunkbase.stronghold=Fortaleza -world.chunkbase.nether_fortress=Fortaleza del Nether -world.datapack=Paquetes de datos +world.datapack=Gestionar paquetes de datos world.datetime=Jugado por última vez en %s world.download=Descargar Mundo world.download.title=Descargar mundo - %1s @@ -1154,8 +1117,7 @@ world.info.time=Tiempo de juego world.info.time.format=%s días world.locked=En uso world.manage=Mundos -world.manage.button=Administrar -world.manage.title=Mundo - %s +world.manage.title=Mundos - %s world.name=Nombre del mundo world.name.enter=Introducir el nombre del mundo world.show_all=Mostrar todo diff --git a/HMCL/src/main/resources/assets/lang/I18N_ru.properties b/HMCL/src/main/resources/assets/lang/I18N_ru.properties index 3ac7d4ef1..d466a3614 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ru.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ru.properties @@ -398,17 +398,6 @@ fatal.apply_update_failure=Мы сожалеем, лаунчер не смог Вы можете обновить программу вручную, скачав более новую версию с %s. fatal.apply_update_need_win7=Лаунчер не может автоматически обновляться на Windows XP/Vista.\n\ Вы можете обновить программу вручную, скачав более новую версию с %s. -fatal.deprecated_java_version=В будущем для работы HMCL потребуется Java 11 или более поздняя версия, однако запуск игр будет поддерживаться и на Java 8.\n\ - \n\ - Рекомендуется установить последнюю версию Java, чтобы обеспечить правильную работу HMCL.\n\ - \n\ - Вы можете продолжать использовать старую версию Java. HMCL может распознавать и управлять несколькими версиями Java и автоматически выбирать подходящую Java в зависимости от версии игры. -fatal.deprecated_java_version.update=В будущем для работы HMCL потребуется Java 11 или более поздняя версия. Пожалуйста, установить последнюю версию Java, чтобы убедиться, что приложение сможет завершить обновление.\n\ - \n\ - Вы можете продолжать использовать старую версию Java.\ - HMCL может распознавать и управлять несколькими версиями Java \ - и автоматически выбирать подходящую Java в зависимости от версии игры. -fatal.deprecated_java_version.download_link=Скачать Java %d fatal.samba=Если вы пытаетесь открыть лаунчер в общей папке Samba, он может не работать, попробуйте обновить Java или запустить лаунчер из локальной папки. fatal.illegal_char=Недопустимый символ «=» в пути к папке пользователя. Лаунчер может работать, но некоторые функции не будут работать.\n\ Вы не сможете использовать аккаунт authlib-injector или изменить скин для аккаунта в режиме офлайн. @@ -444,7 +433,6 @@ folder.shaderpacks=Пакеты шейдеров folder.saves=Миры folder.schematics=Схемы folder.screenshots=Снимки экрана -folder.world=Папка мира game=Игры game.crash.feedback=Пожалуйста, не делитесь скриншотами этого интерфейса с другими! Если вы просите помощи у других, нажмите «Экспорт журналов с ошибками» и отправьте экспортированный файл другим для анализа. @@ -943,16 +931,11 @@ modpack.wizard.step.initialization.warning=Перед созданием мод modpack.wizard.step.initialization.server=Нажмите здесь для получения дополнительных руководств по созданию модпака на сервере, который может автообновляться. modrinth.category.adventure=Приключение -modrinth.category.atmosphere=Атмосфера modrinth.category.audio=Аудио modrinth.category.blocks=Блоки -modrinth.category.bloom=Свечение modrinth.category.bukkit=Bukkit modrinth.category.bungeecord=BungeeCord -modrinth.category.canvas=Canvas -modrinth.category.cartoon=Мультяшный modrinth.category.challenging=Вызов -modrinth.category.colored-lighting=Цветное освещение modrinth.category.core-shaders=Ядро шейдеров modrinth.category.combat=Бой modrinth.category.cursed=Cursed @@ -962,25 +945,19 @@ modrinth.category.entities=Сущности modrinth.category.environment=Окружающая среда modrinth.category.equipment=Оборудование modrinth.category.fabric=Fabric -modrinth.category.fantasy=Фэнтези -modrinth.category.foliage=Растительность modrinth.category.fonts=Шрифты modrinth.category.food=Еда modrinth.category.forge=Forge modrinth.category.game-mechanics=Игровая механика modrinth.category.gui=ГИП -modrinth.category.high=Высокий -modrinth.category.iris=Iris modrinth.category.items=Предметы modrinth.category.kitchen-sink=Kitchen-Sink modrinth.category.library=Библиотека modrinth.category.lightweight=Легкий modrinth.category.liteloader=LiteLoader modrinth.category.locale=Язык -modrinth.category.low=Низкий modrinth.category.magic=Магия modrinth.category.management=Управление -modrinth.category.medium=Средний modrinth.category.minecraft=Minecraft modrinth.category.minigame=Мини-игра modrinth.category.misc=Разное @@ -990,21 +967,13 @@ modrinth.category.models=Модели modrinth.category.modloader=Мод-загрузчик modrinth.category.multiplayer=Сетевая игра modrinth.category.neoforge=NeoForge -modrinth.category.optifine=OptiFine modrinth.category.optimization=Оптимизация modrinth.category.paper=Paper -modrinth.category.path-tracing=Трассировка пути -modrinth.category.pbr=PBR -modrinth.category.potato=Минимум modrinth.category.purpur=Purpur modrinth.category.quests=Квесты modrinth.category.quilt=Quilt modrinth.category.realistic=Реалистичный -modrinth.category.reflections=Отражения modrinth.category.rift=Rift -modrinth.category.screenshot=Экстрим -modrinth.category.semi-realistic=Полуреалистичный -modrinth.category.shadows=Тени modrinth.category.simplistic=Упрощенный modrinth.category.social=Социальная modrinth.category.spigot=Spigot @@ -1015,7 +984,6 @@ modrinth.category.themed=Тематический modrinth.category.transportation=Транспорт modrinth.category.tweaks=Усовершенствование modrinth.category.utility=Утилиты -modrinth.category.vanilla=Ванильное modrinth.category.vanilla-like=Ванильное modrinth.category.velocity=Velocity modrinth.category.waterfall=Waterfall @@ -1103,12 +1071,7 @@ world.backup.create.locked=В настоящее время мир находи world.backup.create.success=Успешно создано новое резервное копирование: %s world.backup.delete=Удалить эту резервную копию world.backup.processing=Создание новой резервной копии ... -world.chunkbase=Chunk Base -world.chunkbase.end_city=Город Края -world.chunkbase.seed_map=Предпросмотр генерации мира -world.chunkbase.stronghold=Крепость -world.chunkbase.nether_fortress=Крепость Нижнего мира -world.datapack=Наборы данных +world.datapack=Управлять наборами данных world.datetime=Последний запуск игры %s world.download=Скачать мир world.download.title=Скачать мир - %1s @@ -1153,8 +1116,7 @@ world.info.time=Время игры world.info.time.format=%s дн. world.locked=В эксплуатации world.manage=Миры -world.manage.button=Управлять -world.manage.title=Мир - %s +world.manage.title=Миры - %s world.name=Название мира world.name.enter=Введите название мира world.show_all=Показать все diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 4a7459a84..093be9232 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -380,9 +380,6 @@ fatal.mac_app_translocation=由於 macOS 的安全機制，Hello Minecraft! Laun fatal.migration_requires_manual_reboot=Hello Minecraft! Launcher 即將升級完成，請重新開啟 HMCL。 fatal.apply_update_failure=我們很抱歉 Hello Minecraft! Launcher 無法自動完成升級程式，因為出現了一些問題。\n但你依然可以從 %s 處手動下載 HMCL 來完成升級。 fatal.apply_update_need_win7=Hello Minecraft! Launcher 無法在 Windows XP/Vista 上進行自動更新。請從 %s 處手動下載 HMCL 來完成升級。 -fatal.deprecated_java_version=HMCL 未來需要 Java 11 或更高版本才能執行，但依然支援使用 Java 8 啟動遊戲。建議安裝最新版本的 Java 以確保 HMCL 正常執行。\n你可以繼續保留舊版本 Java。HMCL 能夠識別與管理多個 Java，並會自動根據遊戲版本為你選取合適的 Java。 -fatal.deprecated_java_version.update=更高版本的 HMCL 需要 Java 11 或更高版本才能執行，請安裝最新版本的 Java 以確保 HMCL 能夠完成升級。\n你可以繼續保留舊版本 Java。HMCL 能夠識別與管理多個 Java，並會自動根據遊戲版本為你選取合適的 Java。 -fatal.deprecated_java_version.download_link=下載 Java %d fatal.samba=如果您正在透過 Samba 共亯的目錄中開啟 Hello Minecraft! Launcher，啟動器可能無法正常工作，請嘗試更新您的 Java 或在本機目錄內開啟 HMCL。 fatal.illegal_char=由於您的使用者目錄路徑中存在無效字元『=』，您將無法使用外部登入帳戶以及離線登入更換外觀功能。 fatal.unsupported_platform=Minecraft 尚未你您的平臺提供完善支援，所以可能影響遊戲體驗或無法啟動遊戲。\n若無法啟動 Minecraft 1.17 及更高版本，可以嘗試在「(全域/實例特定) 遊戲設定 → 進階設定 → 除錯選項」中將「繪製器」切換為「軟繪製器」，以獲得更好的相容性。 diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index b39b8064b..ecff01608 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -389,9 +389,6 @@ fatal.mac_app_translocation=由于 macOS 的安全机制，Hello Minecraft! Laun fatal.migration_requires_manual_reboot=Hello Minecraft! Launcher 即将完成升级，请重新打开 HMCL。\n如遇到问题，你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。 fatal.apply_update_failure=我们很抱歉 Hello Minecraft! Launcher 无法自动完成升级，因为出现了一些问题。\n但你依可以从 %s 手动下载 HMCL 来完成升级。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。 fatal.apply_update_need_win7=Hello Minecraft! Launcher 无法在 Windows XP/Vista 上进行自动更新。请从 %s 手动下载 HMCL 来完成升级。 -fatal.deprecated_java_version=HMCL 未来需要 Java 11 或更高版本才能运行，但依然支持使用 Java 8 启动游戏。建议安装最新版本的 Java 以确保 HMCL 能正常工作。\n你可以继续保留旧版本 Java。HMCL 能够识别与管理多个 Java，并会自动根据游戏版本为你选择合适的 Java。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。 -fatal.deprecated_java_version.update=更高版本的 HMCL 需要 Java 11 或更高版本才能运行，请安装最新版本的 Java 以确保 HMCL 能够完成升级。\n你可以继续保留旧版本 Java。HMCL 能够识别与管理多个 Java，并会自动根据游戏版本为你选择合适的 Java。 -fatal.deprecated_java_version.download_link=下载 Java %d fatal.samba=如果你正在通过 Samba 共享的文件夹中运行 Hello Minecraft! Launcher，启动器可能无法正常工作。请尝试更新你的 Java 或在本地文件夹内运行 HMCL。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。 fatal.illegal_char=由于你的用户文件夹路径中存在非法字符“=”，你将无法使用外置登录账户以及离线登录更换皮肤功能。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。 fatal.unsupported_platform=Minecraft 尚未对你的平台提供完善支持，所以可能影响游戏体验或无法启动游戏。\n若无法启动 Minecraft 1.17 及更高版本，可以尝试在“(全局/版本特定) 游戏设置 → 高级设置 → 调试选项”中将“渲染器”切换为“软渲染器”，以获得更好的兼容性。\n如遇到问题，你可以点击右上角帮助按钮进行求助。 diff --git a/HMCL/src/main/resources/assets/lekeystore.jks b/HMCL/src/main/resources/assets/lekeystore.jks deleted file mode 100644 index 931eed825c32408b873466a9e4429fb6d83fea73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1453 zcmb`G`#aMM9LIMx_uFDh&KSpr;=5<=lWV!>w#1^Or4!c1Y-(X?ISXMrMOc*ENl!Sr ziz1$KDTg6)zvV7Tg;Og#oS*sw&JUmG{k-1K=XpNQ=Xu`m?bYp75C{a>8SsA!zrYR; zVee3Ep=s;BkCUbkozB$s#{<8ht&-niz zoH#%{iM?HM2wu16wk8*f3x^EdT(BkwGtQwp*#@Ulq^$!7OKF2Dexl9iu@p<<7e0=$g8^11_a~pcE-|0?lwzD>A(Y)MKntsi&*TpX-o>@C$ zBs5QrfktSlvpxY<-}vR@Ba}xgs-CTBN^YDUnMHBUMZ+(ZF|JeY%D>7+q(b%XPm^@s zBZoiiZC0#uO|eNT4ECNVy^gs3g%bJRaE2a`b#*!^(3nk)UL&TTVb6~i>3 zPYf%jsfy~hO19ePAc!o!sbt2&j9I3fDJxGTH4JcWLBfe&3Bhga(l+AWoWqcfxx zh9(D|DWgq{a42eDR!fQ0*^4wMvxe?c@~QK=R~UmyFD2~stjX5nx*Iy3N)JvHy4#{1 z^RsInSbEcV#Jo7h17-Ln@~XA>B^4PcKUHW1ue6SF-R~9!SN`6%JmrOqb-2Z>dc|Bw zLxUxSz?*}|D$h{Q6F`QaOuZR1#P zn)vD24T6Iw1PTU$3+(}0Kz=8$8VX>r7zW#EhXkOo%g9}Z1JE4-G=u}zbfFo~YxW5ySsy-yM>p&TXyMuWD~ me(@{#+cuYT1~W3Dh7Bh4%<9i{eC7N#CM0xtP{!TCeg6WIMs5KB diff --git a/HMCLBoot/build.gradle.kts b/HMCLBoot/build.gradle.kts new file mode 100644 index 000000000..37332a9dd --- /dev/null +++ b/HMCLBoot/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + id("java-library") +} + +tasks.withType { + options.release.set(8) +} diff --git a/HMCLBoot/src/main/java/org/jackhuang/hmcl/BootProperties.java b/HMCLBoot/src/main/java/org/jackhuang/hmcl/BootProperties.java new file mode 100644 index 000000000..a5eaf6028 --- /dev/null +++ b/HMCLBoot/src/main/java/org/jackhuang/hmcl/BootProperties.java @@ -0,0 +1,38 @@ +/* + * Hello Minecraft! Launcher + * Copyright (C) 2025 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.jackhuang.hmcl; + +import org.jackhuang.hmcl.util.UTF8Control; + +import java.util.ResourceBundle; + +final class BootProperties { + + private static ResourceBundle resourceBundle; + + static ResourceBundle getResourceBundle() { + if (resourceBundle == null) { + resourceBundle = ResourceBundle.getBundle("assets.lang.boot", new UTF8Control()); + } + + return resourceBundle; + } + + private BootProperties() { + } +} diff --git a/HMCLBoot/src/main/java/org/jackhuang/hmcl/EntryPoint.java b/HMCLBoot/src/main/java/org/jackhuang/hmcl/EntryPoint.java new file mode 100644 index 000000000..003971fac --- /dev/null +++ b/HMCLBoot/src/main/java/org/jackhuang/hmcl/EntryPoint.java @@ -0,0 +1,30 @@ +/* + * Hello Minecraft! Launcher + * Copyright (C) 2025 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.jackhuang.hmcl; + +/** + * This is a dummy class and will be overwritten in the shadow jar. + */ +public final class EntryPoint { + private EntryPoint() { + } + + public static void main(String[] args) { + throw new AssertionError("This method should not be called, please verify that the HMCL is complete."); + } +} diff --git a/HMCLBoot/src/main/java/org/jackhuang/hmcl/Main.java b/HMCLBoot/src/main/java/org/jackhuang/hmcl/Main.java new file mode 100644 index 000000000..af1ef361f --- /dev/null +++ b/HMCLBoot/src/main/java/org/jackhuang/hmcl/Main.java @@ -0,0 +1,73 @@ +/* + * Hello Minecraft! Launcher + * Copyright (C) 2025 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.jackhuang.hmcl; + +import org.jackhuang.hmcl.util.SwingUtils; + +/** + * @author Glavo + */ +public final class Main { + private static final int MINIMUM_JAVA_VERSION = 11; + + private Main() { + } + + /** + * Check if the current Java version is compatible with HMCL. + */ + static boolean checkJavaVersion(String javaVersion) { + if (javaVersion == null) { + return false; + } + + try { + int major; + int dot = javaVersion.indexOf('.'); + + if (dot >= 0) { + major = Integer.parseInt(javaVersion.substring(0, dot)); + if (major == 1 && dot < javaVersion.length() - 1) { + int begin = dot + 1; + dot = javaVersion.indexOf('.', begin); + + major = dot > begin + ? Integer.parseInt(javaVersion.substring(begin, dot)) + : Integer.parseInt(javaVersion.substring(begin)); + } + } else { + major = Integer.parseInt(javaVersion); + } + + return major >= MINIMUM_JAVA_VERSION; + } catch (NumberFormatException e) { + return false; + } + } + + public static void main(String[] args) throws Throwable { + if (checkJavaVersion(System.getProperty("java.version"))) { + EntryPoint.main(args); + } else { + String errorMessage = BootProperties.getResourceBundle().getString("boot.unsupported_java_version"); + System.err.println(errorMessage); + SwingUtils.showErrorDialog(errorMessage); + System.exit(1); + } + } +} diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SwingUtils.java b/HMCLBoot/src/main/java/org/jackhuang/hmcl/util/SwingUtils.java similarity index 52% rename from HMCL/src/main/java/org/jackhuang/hmcl/ui/SwingUtils.java rename to HMCLBoot/src/main/java/org/jackhuang/hmcl/util/SwingUtils.java index b1377385d..9cddeb30c 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SwingUtils.java +++ b/HMCLBoot/src/main/java/org/jackhuang/hmcl/util/SwingUtils.java @@ -1,7 +1,27 @@ -package org.jackhuang.hmcl.ui; +/* + * Hello Minecraft! Launcher + * Copyright (C) 2025 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.jackhuang.hmcl.util; import javax.swing.*; +/** + * @author Glavo + */ public final class SwingUtils { static { if (System.getProperty("swing.defaultlaf") == null) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/UTF8Control.java b/HMCLBoot/src/main/java/org/jackhuang/hmcl/util/UTF8Control.java similarity index 89% rename from HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/UTF8Control.java rename to HMCLBoot/src/main/java/org/jackhuang/hmcl/util/UTF8Control.java index c194c4e8a..f034dd3f2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/UTF8Control.java +++ b/HMCLBoot/src/main/java/org/jackhuang/hmcl/util/UTF8Control.java @@ -1,6 +1,6 @@ /* * Hello Minecraft! Launcher - * Copyright (C) 2020 huangyuhui and contributors + * Copyright (C) 2025 huangyuhui and contributors * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.jackhuang.hmcl.util.i18n; +package org.jackhuang.hmcl.util; import java.io.IOException; import java.io.InputStream; @@ -28,11 +28,9 @@ import java.util.ResourceBundle; import static java.nio.charset.StandardCharsets.UTF_8; -final class UTF8Control extends ResourceBundle.Control { +public final class UTF8Control extends ResourceBundle.Control { - public static final UTF8Control INSTANCE = new UTF8Control(); - - private UTF8Control() {} + public UTF8Control() {} @Override public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload) throws IOException { diff --git a/HMCLBoot/src/main/resources/assets/lang/boot.properties b/HMCLBoot/src/main/resources/assets/lang/boot.properties new file mode 100644 index 000000000..e0432f66e --- /dev/null +++ b/HMCLBoot/src/main/resources/assets/lang/boot.properties @@ -0,0 +1,19 @@ +# +# Hello Minecraft! Launcher +# Copyright (C) 2025 huangyuhui and contributors +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +boot.unsupported_java_version=HMCL requires Java 11 or later to run, but still supports launching games with Java 8. Please install the latest version of Java and try opening HMCL again.\nYou can keep your old version of Java. HMCL can detect and manage multiple Java installations, and will automatically select the appropriate Java version for your game. diff --git a/HMCLBoot/src/main/resources/assets/lang/boot_zh.properties b/HMCLBoot/src/main/resources/assets/lang/boot_zh.properties new file mode 100644 index 000000000..a03782ace --- /dev/null +++ b/HMCLBoot/src/main/resources/assets/lang/boot_zh.properties @@ -0,0 +1,19 @@ +# +# Hello Minecraft! Launcher +# Copyright (C) 2025 huangyuhui and contributors +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +boot.unsupported_java_version=HMCL 需要 Java 11 或更高版本才能執行，但依然支援使用 Java 8 啟動遊戲。請安裝最新版本的 Java 再嘗試開啟 HMCL。\n你可以繼續保留舊版本 Java。HMCL 能夠識別與管理多個 Java，並會自動根據遊戲版本為你選取合適的 Java。 diff --git a/HMCLBoot/src/main/resources/assets/lang/boot_zh_CN.properties b/HMCLBoot/src/main/resources/assets/lang/boot_zh_CN.properties new file mode 100644 index 000000000..31a2ae08a --- /dev/null +++ b/HMCLBoot/src/main/resources/assets/lang/boot_zh_CN.properties @@ -0,0 +1,19 @@ +# +# Hello Minecraft! Launcher +# Copyright (C) 2025 huangyuhui and contributors +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +boot.unsupported_java_version=HMCL 需要 Java 11 或更高版本才能运行，但依然支持使用 Java 8 启动游戏。请安装最新版本的 Java 再尝试启动 HMCL。\n你可以继续保留旧版本 Java。HMCL 能够识别与管理多个 Java，并会自动根据游戏版本为你选择合适的 Java。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。 diff --git a/HMCLBoot/src/test/java/org/jackhuang/hmcl/MainTest.java b/HMCLBoot/src/test/java/org/jackhuang/hmcl/MainTest.java new file mode 100644 index 000000000..1fdd7f5af --- /dev/null +++ b/HMCLBoot/src/test/java/org/jackhuang/hmcl/MainTest.java @@ -0,0 +1,39 @@ +/* + * Hello Minecraft! Launcher + * Copyright (C) 2025 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.jackhuang.hmcl; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public final class MainTest { + @Test + public void testCheckJavaVersion() { + assertFalse(Main.checkJavaVersion("1.6.0")); + assertFalse(Main.checkJavaVersion("1.6.0_45")); + assertFalse(Main.checkJavaVersion("1.7.0")); + assertFalse(Main.checkJavaVersion("1.7.0_80")); + assertFalse(Main.checkJavaVersion("1.8")); + assertFalse(Main.checkJavaVersion("1.8.0_321")); + + assertTrue(Main.checkJavaVersion("11")); + assertTrue(Main.checkJavaVersion("11.0.26")); + assertTrue(Main.checkJavaVersion("21")); + } +} diff --git a/HMCLCore/build.gradle.kts b/HMCLCore/build.gradle.kts index a7e92aa9d..1fc707005 100644 --- a/HMCLCore/build.gradle.kts +++ b/HMCLCore/build.gradle.kts @@ -2,6 +2,15 @@ plugins { `java-library` } +tasks.withType { + sourceCompatibility = "11" + targetCompatibility = "11" +} + +tasks.compileJava { + options.compilerArgs.add("--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED") +} + dependencies { api(libs.kala.compress.zip) api(libs.kala.compress.tar) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/CallerFinder.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/CallerFinder.java index c6b99f7ba..6fefe6f3e 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/CallerFinder.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/logging/CallerFinder.java @@ -1,27 +1,38 @@ +/* + * Hello Minecraft! Launcher + * Copyright (C) 2025 huangyuhui and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package org.jackhuang.hmcl.util.logging; +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Stream; + /** * @author Glavo */ final class CallerFinder { + private static final String PACKAGE_PREFIX = CallerFinder.class.getPackageName() + "."; + private static final Predicate PREDICATE = stackFrame -> !stackFrame.getClassName().startsWith(PACKAGE_PREFIX); + private static final Function, Optional> FUNCTION = stream -> stream.filter(PREDICATE).findFirst(); + private static final Function FRAME_MAPPING = frame -> frame.getClassName() + "." + frame.getMethodName(); + static String getCaller() { - StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); - - int i = 0; - while (i++ < stackTrace.length) { - if (stackTrace[i].getClassName().equals(Logger.CLASS_NAME)) - break; - } - - while (i++ < stackTrace.length) { - StackTraceElement element = stackTrace[i]; - String cname = element.getClassName(); - if (!cname.equals(Logger.CLASS_NAME) && !cname.startsWith("java.lang.reflect.") && !cname.startsWith("sun.reflect.")) { - return cname + '.' + element.getMethodName(); - } - } - - return null; + return StackWalker.getInstance().walk(FUNCTION).map(FRAME_MAPPING).orElse(null); } private CallerFinder() { diff --git a/build.gradle.kts b/build.gradle.kts index b5ac81ab6..94d159280 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,9 +24,6 @@ subprojects { } tasks.withType { - sourceCompatibility = "1.8" - targetCompatibility = "1.8" - options.encoding = "UTF-8" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 6cb5238d6..7831e3da1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,6 +2,7 @@ rootProject.name = "HMCL3" include( "HMCL", "HMCLCore", + "HMCLBoot", "HMCLTransformerDiscoveryService" )