修复 InstallersPage 意外地显示滚动条的问题 (#4097)

This reverts commit c669026312.

HMCL/build.gradle.kts

@@ -44,7 +44,7 @@ dependencies {
     implementation(libs.java.info)
 
     if (launcherExe == null) {
-        implementation("org.glavo.hmcl:HMCLauncher:3.6.0.4")
+        implementation(libs.hmclauncher)
     }
 }
 

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

@@ -19,10 +19,13 @@ 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.
@@ -35,6 +38,9 @@ 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;
 
@@ -93,4 +99,32 @@ public final class Metadata {
     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/FontManager.java

@@ -26,6 +26,8 @@ import org.jackhuang.hmcl.util.Lazy;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 import org.jackhuang.hmcl.util.platform.SystemUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -35,6 +37,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Locale;
+import java.util.Objects;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -78,7 +81,7 @@ public final class FontManager {
             return null;
     });
 
-    private static final ObjectProperty<Font> fontProperty;
+    private static final ObjectProperty<FontReference> fontProperty;
 
     static {
         String fontFamily = config().getLauncherFontFamily();
@@ -87,10 +90,16 @@ public final class FontManager {
         if (fontFamily == null)
             fontFamily = System.getenv("HMCL_FONT");
 
-        Font font = fontFamily == null ? DEFAULT_FONT.get() : Font.font(fontFamily, DEFAULT_FONT_SIZE);
-        fontProperty = new SimpleObjectProperty<>(font);
+        FontReference fontReference;
+        if (fontFamily == null) {
+            Font defaultFont = DEFAULT_FONT.get();
+            fontReference = defaultFont != null ? new FontReference(defaultFont) : null;
+        } else
+            fontReference = new FontReference(fontFamily);
 
-        LOG.info("Font: " + (font != null ? font.getName() : Font.getDefault().getName()));
+        fontProperty = new SimpleObjectProperty<>(fontReference);
+
+        LOG.info("Font: " + (fontReference != null ? fontReference.getFamily() : "System"));
         fontProperty.addListener((obs, oldValue, newValue) -> {
             if (newValue != null)
                 config().setLauncherFontFamily(newValue.getFamily());
@@ -163,6 +172,16 @@ public final class FontManager {
                         }
                     }
 
+                    if (family.indexOf(',') >= 0) {
+                        for (String candidateFamily : family.split(",")) {
+                            for (Font font : fonts) {
+                                if (font.getFamily().equalsIgnoreCase(candidateFamily)) {
+                                    return font;
+                                }
+                            }
+                        }
+                    }
+
                     LOG.warning(String.format("Family '%s' not found in font file '%s'", family, path));
                     return fonts[0];
                 } catch (NoSuchMethodException | IllegalAccessException ignored) {
@@ -179,20 +198,62 @@ public final class FontManager {
         }
     }
 
-    public static ObjectProperty<Font> fontProperty() {
+    public static ObjectProperty<FontReference> fontProperty() {
         return fontProperty;
     }
 
-    public static Font getFont() {
+    public static FontReference getFont() {
         return fontProperty.get();
     }
 
-    public static void setFont(Font font) {
+    public static void setFont(FontReference font) {
         fontProperty.set(font);
     }
 
     public static void setFontFamily(String fontFamily) {
-        setFont(fontFamily != null ? Font.font(fontFamily, DEFAULT_FONT_SIZE) : null);
+        setFont(fontFamily != null ? new FontReference(fontFamily) : null);
+    }
+
+    // https://github.com/HMCL-dev/HMCL/issues/4072
+    public static final class FontReference {
+        private final @NotNull String family;
+        private final @Nullable String style;
+
+        public FontReference(@NotNull String family) {
+            this.family = Objects.requireNonNull(family);
+            this.style = null;
+        }
+
+        public FontReference(@NotNull Font font) {
+            this.family = font.getFamily();
+            this.style = font.getStyle();
+        }
+
+        public @NotNull String getFamily() {
+            return family;
+        }
+
+        public @Nullable String getStyle() {
+            return style;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof FontReference))
+                return false;
+            FontReference that = (FontReference) o;
+            return Objects.equals(family, that.family) && Objects.equals(style, that.style);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(family, style);
+        }
+
+        @Override
+        public String toString() {
+            return String.format("FontReference[family='%s', style='%s']", family, style);
+        }
     }
 
     private FontManager() {

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

@@ -22,7 +22,6 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
@@ -80,9 +79,9 @@ public final class StyleSheets {
 
     private static String getFontStyleSheet() {
         final String defaultCss = "/assets/css/font.css";
-        final Font font = FontManager.getFont();
+        final FontManager.FontReference font = FontManager.getFont();
 
-        if (font == null || font == Font.getDefault())
+        if (font == null || "System".equals(font.getFamily()))
             return defaultCss;
 
         String fontFamily = font.getFamily();
@@ -115,11 +114,7 @@ public final class StyleSheets {
 
         StringBuilder builder = new StringBuilder();
         builder.append(".root {");
-        if (fontFamily == null)
-            // https://github.com/HMCL-dev/HMCL/pull/3423
-            builder.append("-fx-font-family: -fx-base-font-family;");
-        else
-            builder.append("-fx-font-family:\"").append(fontFamily).append("\";");
+        builder.append("-fx-font-family:\"").append(fontFamily).append("\";");
 
         if (weight != null)
             builder.append("-fx-font-weight:").append(weight).append(";");

HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java

@@ -63,7 +63,6 @@ import org.jackhuang.hmcl.util.platform.Architecture;
 import org.jackhuang.hmcl.util.platform.OperatingSystem;
 
 import java.io.File;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
@@ -320,39 +319,13 @@ public final class Controllers {
                 LOG.warning("Invalid type for shown tips key: " + JAVA_VERSION_TIP, e);
             }
 
-            if (shownTipVersion == null || shownTipVersion.intValue() < 11) {
-                String downloadLink = null;
-
-                if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX && Architecture.SYSTEM_ARCH == Architecture.LOONGARCH64_OW)
-                    downloadLink = "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))
-                        downloadLink = String.format("https://docs.hmcl.net/downloads/%s/%s.html",
-                                OperatingSystem.CURRENT_OS.getCheckedName(),
-                                Architecture.SYSTEM_ARCH.getCheckedName()
-                        );
-                }
-
+            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, 11))
+                        .ok(() -> config().getShownTips().put(JAVA_VERSION_TIP, Metadata.MINIMUM_SUPPORTED_JAVA_VERSION))
                         .build());
             }
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java

@@ -307,8 +307,8 @@ public final class LogWindow extends Stage {
                         listView.scrollTo(listView.getItems().size() - 1);
                 });
 
-                listView.setStyle("-fx-font-family: " + Lang.requireNonNullElse(config().getFontFamily(), FXUtils.DEFAULT_MONOSPACE_FONT)
-                        + "; -fx-font-size: " + config().getFontSize() + "px;");
+                listView.setStyle("-fx-font-family: \"" + Lang.requireNonNullElse(config().getFontFamily(), FXUtils.DEFAULT_MONOSPACE_FONT)
+                        + "\"; -fx-font-size: " + config().getFontSize() + "px;");
                 Holder<Object> lastCell = new Holder<>();
                 listView.setCellFactory(x -> new ListCell<Log>() {
                     {

HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfilePage.java

@@ -61,6 +61,8 @@ public final class ProfilePage extends BorderPane implements DecoratorPage {
      * @param profile null if creating a new profile.
      */
     public ProfilePage(Profile profile) {
+        getStyleClass().add("gray-background");
+
         this.profile = profile;
         String profileDisplayName = Optional.ofNullable(profile).map(Profiles::getProfileDisplayName).orElse("");
 

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateHandler.java

@@ -27,6 +27,7 @@ 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;
@@ -102,6 +103,16 @@ 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 {

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -403,6 +403,10 @@ fatal.deprecated_java_version=HMCL will require Java 11 or later to run in the f
   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.

HMCL/src/main/resources/assets/lang/I18N_es.properties

@@ -404,7 +404,12 @@ fatal.deprecated_java_version=HMCL requerirá Java 11 o posterior para funcionar
   \n\
   Se recomienda instalar la última versión de Java para garantizar el correcto funcionamiento de HMCL.\n\
   \n\
-  Puede seguir manteniendo 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.
+  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\
@@ -441,6 +446,7 @@ 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=<b>¡Por favor, no comparta capturas de pantalla de esta interfaz con otras personas!</b> Si pide ayuda a otras personas, haga clic en <b>Exportar registros de colgado</b> y envíe el archivo exportado a otras personas para que lo analicen.
@@ -938,11 +944,16 @@ 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
@@ -952,19 +963,25 @@ 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
@@ -974,13 +991,21 @@ 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
@@ -991,6 +1016,7 @@ 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
@@ -1078,7 +1104,12 @@ 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.datapack=Gestionar paquetes de datos
+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.datetime=Jugado por última vez en %s
 world.download=Descargar Mundo
 world.download.title=Descargar mundo - %1s
@@ -1123,7 +1154,8 @@ world.info.time=Tiempo de juego
 world.info.time.format=%s días
 world.locked=En uso
 world.manage=Mundos
-world.manage.title=Mundos - %s
+world.manage.button=Administrar
+world.manage.title=Mundo - %s
 world.name=Nombre del mundo
 world.name.enter=Introducir el nombre del mundo
 world.show_all=Mostrar todo

HMCL/src/main/resources/assets/lang/I18N_ru.properties

@@ -403,6 +403,11 @@ fatal.deprecated_java_version=В будущем для работы HMCL пот
   Рекомендуется установить последнюю версию 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\
@@ -439,6 +444,7 @@ folder.shaderpacks=Пакеты шейдеров
 folder.saves=Миры
 folder.schematics=Схемы
 folder.screenshots=Снимки экрана
+folder.world=Папка мира
 
 game=Игры
 game.crash.feedback=<b>Пожалуйста, не делитесь скриншотами этого интерфейса с другими!</b> Если вы просите помощи у других, нажмите <b>«Экспорт журналов с ошибками»</b> и отправьте экспортированный файл другим для анализа.
@@ -937,11 +943,16 @@ 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
@@ -951,19 +962,25 @@ 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=Разное
@@ -973,13 +990,21 @@ 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
@@ -990,6 +1015,7 @@ 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
@@ -1077,7 +1103,12 @@ world.backup.create.locked=В настоящее время мир находи
 world.backup.create.success=Успешно создано новое резервное копирование: %s
 world.backup.delete=Удалить эту резервную копию
 world.backup.processing=Создание новой резервной копии ...
-world.datapack=Управлять наборами данных
+world.chunkbase=Chunk Base
+world.chunkbase.end_city=Город Края
+world.chunkbase.seed_map=Предпросмотр генерации мира
+world.chunkbase.stronghold=Крепость
+world.chunkbase.nether_fortress=Крепость Нижнего мира
+world.datapack=Наборы данных
 world.datetime=Последний запуск игры %s
 world.download=Скачать мир
 world.download.title=Скачать мир - %1s
@@ -1122,7 +1153,8 @@ world.info.time=Время игры
 world.info.time.format=%s дн.
 world.locked=В эксплуатации
 world.manage=Миры
-world.manage.title=Миры - %s
+world.manage.button=Управлять
+world.manage.title=Мир - %s
 world.name=Название мира
 world.name.enter=Введите название мира
 world.show_all=Показать все

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -381,6 +381,7 @@ fatal.migration_requires_manual_reboot=Hello Minecraft! Launcher 即將升級完
 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=由於您的使用者目錄路徑中存在無效字元『=』，您將無法使用外部登入帳戶以及離線登入更換外觀功能。

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ -390,6 +390,7 @@ fatal.migration_requires_manual_reboot=Hello Minecraft! Launcher 即将完成升
 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 页面寻求帮助。

HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoJavaDistribution.java

@@ -41,6 +41,8 @@ public enum DiscoJavaDistribution implements JavaDistribution<DiscoJavaRemoteVer
             pair(WINDOWS, EnumSet.of(X86_64, X86, ARM64)),
             pair(LINUX, EnumSet.of(X86_64, X86, ARM64, ARM32, RISCV64, PPC64, PPC64LE, S390X, SPARCV9)),
             pair(MACOS, EnumSet.of(X86_64, ARM64))),
+    // Fucking javac generates an anonymous inner class here, whose constructor takes no @SafeVarargs annotation, causing a compile-time warning.
+    @SuppressWarnings({"unchecked", "RedundantSuppression"})
     LIBERICA("BellSoft Liberica", "liberica", "BellSoft",
             EnumSet.of(JDK, JRE, JDKFX, JREFX),
             pair(WINDOWS, EnumSet.of(X86_64, X86, ARM64)),

HMCLCore/src/main/resources/assets/game/versions.txt

@@ -826,4 +826,9 @@
 1.21.6-pre3
 1.21.6-pre4
 1.21.6-rc1
-1.21.6
+1.21.6
+1.21.7-rc1
+1.21.7-rc2
+1.21.7
+1.21.8-rc1
+1.21.8

PLATFORM.md

@@ -4,13 +4,13 @@
 
 |                            | Windows                                           | Linux                      | macOS                                                                   | FreeBSD                    |
 |----------------------------|:--------------------------------------------------|:---------------------------|:------------------------------------------------------------------------|:---------------------------|
-| x86-64                     | ✅️                                                | ✅️                         | ✅️                                                                      | 👌 (Minecraft 1.13~1.21.4) |
+| x86-64                     | ✅️                                                | ✅️                         | ✅️                                                                      | 👌 (Minecraft 1.13~1.21.7) |
 | x86                        | ✅️ (~1.20.4)                                      | ✅️ (~1.20.4)               | /                                                                       | /                          |
-| ARM64                      | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.21.4)  | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (use Rosetta 2) | ❔                          |
+| ARM64                      | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.21.7)  | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (use Rosetta 2) | ❔                          |
 | ARM32                      | /️                                                | 👌 (Minecraft 1.8~1.20.1)  | /                                                                       | /                          |
 | MIPS64el                   | /                                                 | 👌 (Minecraft 1.8~1.20.1)  | /                                                                       | /                          |
-| RISC-V 64                  | /                                                 | 👌 (Minecraft 1.13~1.21.4) | /                                                                       | /                          |
-| LoongArch64                | /                                                 | 👌 (Minecraft 1.6~1.21.4)  | /                                                                       | /                          |
+| RISC-V 64                  | /                                                 | 👌 (Minecraft 1.13~1.21.7) | /                                                                       | /                          |
+| LoongArch64                | /                                                 | 👌 (Minecraft 1.6~1.21.7)  | /                                                                       | /                          |
 | LoongArch64 (Old World)    | /                                                 | 👌 (Minecraft 1.6~1.20.1)  | /                                                                       | /                          |
 | PowerPC-64 (Little-Endian) | /                                                 | ❔                          | /                                                                       | /                          |
 | S390x                      | /                                                 | ❔                          | /                                                                       | /                          |

PLATFORM_cn.md

@@ -4,13 +4,13 @@
 
 |                            | Windows                                           | Linux                      | macOS                                                                  | FreeBSD                   |
 |----------------------------|:--------------------------------------------------|:---------------------------|:-----------------------------------------------------------------------|:--------------------------|
-| x86-64                     | ✅️                                                | ✅️                         | ✅️                                                                     | 👌(Minecraft 1.13~1.21.4) |
+| x86-64                     | ✅️                                                | ✅️                         | ✅️                                                                     | 👌(Minecraft 1.13~1.21.7) |
 | x86                        | ✅️ (~1.20.4)                                      | ✅️ (~1.20.4)               | /                                                                      | /                         |
-| ARM64                      | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.21.4)  | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (使用 Rosetta 2) | ❔                         |
+| ARM64                      | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.21.7)  | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (使用 Rosetta 2) | ❔                         |
 | ARM32                      | /️                                                | 👌 (Minecraft 1.8~1.20.1)  | /                                                                      | /                         |
 | MIPS64el                   | /                                                 | 👌 (Minecraft 1.8~1.20.1)  | /                                                                      | /                         |
-| RISC-V 64                  | /                                                 | 👌 (Minecraft 1.13~1.21.4) | /                                                                      | /                         |
-| LoongArch64                | /                                                 | 👌 (Minecraft 1.6~1.21.4)  | /                                                                      | /                         |
+| RISC-V 64                  | /                                                 | 👌 (Minecraft 1.13~1.21.7) | /                                                                      | /                         |
+| LoongArch64                | /                                                 | 👌 (Minecraft 1.6~1.21.7)  | /                                                                      | /                         |
 | LoongArch64 (旧世界)          | /                                                 | 👌 (Minecraft 1.6~1.20.1)  | /                                                                      | /                         |
 | PowerPC-64 (Little-Endian) | /                                                 | ❔                          | /                                                                      | /                         |
 | S390x                      | /                                                 | ❔                          | /                                                                      | /                         |

PLATFORM_tw.md

@@ -4,13 +4,13 @@
 
 |                            | Windows                                           | Linux                      | macOS                                                                  | FreeBSD                   |
 |----------------------------|:--------------------------------------------------|:---------------------------|:-----------------------------------------------------------------------|:--------------------------|
-| x86-64                     | ✅️                                                | ✅️                         | ✅️                                                                     | 👌(Minecraft 1.13~1.21.4) |
+| x86-64                     | ✅️                                                | ✅️                         | ✅️                                                                     | 👌(Minecraft 1.13~1.21.7) |
 | x86                        | ✅️ (~1.20.4)                                      | ✅️ (~1.20.4)               | /                                                                      | /                         |
-| ARM64                      | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.21.4)  | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (使用 Rosetta 2) | ❔                         |
+| ARM64                      | 👌 (Minecraft 1.8~1.18.2)<br/>✅ (Minecraft 1.19+) | 👌 (Minecraft 1.8~1.21.7)  | 👌 (Minecraft 1.6~1.18.2)<br/>✅ (Minecraft 1.19+)<br/>✅ (使用 Rosetta 2) | ❔                         |
 | ARM32                      | /️                                                | 👌 (Minecraft 1.8~1.20.1)  | /                                                                      | /                         |
 | MIPS64el                   | /                                                 | 👌 (Minecraft 1.8~1.20.1)  | /                                                                      | /                         |
-| RISC-V 64                  | /                                                 | 👌 (Minecraft 1.13~1.21.4) | /                                                                      | /                         |
-| LoongArch64                | /                                                 | 👌 (Minecraft 1.6~1.21.4)  | /                                                                      | /                         |
+| RISC-V 64                  | /                                                 | 👌 (Minecraft 1.13~1.21.7) | /                                                                      | /                         |
+| LoongArch64                | /                                                 | 👌 (Minecraft 1.6~1.21.7)  | /                                                                      | /                         |
 | LoongArch64 (舊世界)          | /                                                 | 👌 (Minecraft 1.6~1.20.1)  | /                                                                      | /                         |
 | PowerPC-64 (Little-Endian) | /                                                 | ❔                          | /                                                                      | /                         |
 | S390x                      | /                                                 | ❔                          | /                                                                      | /                         |

buildSrc/src/main/java/org/jackhuang/hmcl/gradle/mod/ParseModDataTask.java

@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2025 huangyuhui <huanghongxun2008@126.com> 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 <https://www.gnu.org/licenses/>.
+ */
 package org.jackhuang.hmcl.gradle.mod;
 
 import com.google.gson.*;
@@ -24,6 +41,9 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+/**
+ * @author Glavo
+ */
 public abstract class ParseModDataTask extends DefaultTask {
 
     @InputFile
@@ -44,15 +64,12 @@ public abstract class ParseModDataTask extends DefaultTask {
             Pattern.compile("^/projects/(?<modid>[\\w-]+)(/(.*?))?$"),
             Pattern.compile("^/mc-mods/minecraft/(?<modid>[\\w-]+)(/(.*?))?$"),
             Pattern.compile("^/legacy/mc-mods/minecraft/(\\d+)-(?<modid>[\\w-]+)"),
-            Pattern.compile("^//minecraft/mc-mods/(?<modid>eyes-mod)$") // Workaround for Eye Blocks
     };
 
     private static String parseCurseforge(String url) {
         URI res = URI.create(url);
 
-        if (!"http".equals(res.getScheme())
-                && !"https".equals(res.getScheme())
-                && !"www.curseforge.com".equals(res.getHost())) { // Workaround for DakerACG
+        if (!"http".equals(res.getScheme()) && !"https".equals(res.getScheme())) {
             return "";
         }
 
@@ -77,10 +94,10 @@ public abstract class ParseModDataTask extends DefaultTask {
         return "";
     }
 
-    private static final Set<String> skip = new HashSet<>(Arrays.asList(
+    private static final Set<String> skip = Set.of(
             "Minecraft",
             "The Building Game"
-    ));
+    );
 
     @TaskAction
     public void run() throws IOException {

gradle/libs.versions.toml

@@ -1,4 +1,5 @@
 [versions]
+hmclauncher = "3.6.0.6"
 jetbrains-annotations = "26.0.1"
 kala-compress = "1.27.1-1"
 simple-png-javafx = "0.3.0"
@@ -20,6 +21,7 @@ java-info = "1.0"
 shadow = "8.3.6"
 
 [libraries]
+hmclauncher = { module = "org.glavo.hmcl:HMCLauncher", version.ref = "hmclauncher" }
 jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
 kala-compress-zip = { module = "org.glavo.kala:kala-compress-archivers-zip", version.ref = "kala-compress" }
 kala-compress-tar = { module = "org.glavo.kala:kala-compress-archivers-tar", version.ref = "kala-compress" }