Merge remote-tracking branch 'official/main' into prs-base

.github/workflows/gradle.yml

@@ -17,11 +17,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 8
       uses: actions/setup-java@v4
       with:
         distribution: 'zulu'
-        java-version: '11'
+        java-version: 8
         java-package: 'jdk+fx'
     - name: Build with Gradle
       run: ./gradlew build --no-daemon

HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java

@@ -244,9 +244,9 @@ public void onStop(boolean success, TaskExecutor executor) {
                                 } else if (ex instanceof PermissionException) {
                                     message = i18n("launch.failed.executable_permission");
                                 } else if (ex instanceof ProcessCreationException) {
-                                    message = i18n("launch.failed.creating_process") + ex.getLocalizedMessage();
+                                    message = i18n("launch.failed.creating_process") + "\n" + ex.getLocalizedMessage();
                                 } else if (ex instanceof NotDecompressingNativesException) {
-                                    message = i18n("launch.failed.decompressing_natives") + ex.getLocalizedMessage();
+                                    message = i18n("launch.failed.decompressing_natives") + "\n" + ex.getLocalizedMessage();
                                 } else if (ex instanceof LibraryDownloadException) {
                                     message = i18n("launch.failed.download_library", ((LibraryDownloadException) ex).getLibrary().getName()) + "\n";
                                     if (ex.getCause() instanceof ResponseCodeException) {
@@ -881,8 +881,8 @@ public void onExit(int exitCode, ExitType exitType) {
 
     }
 
-    private static final String ORACLEJDK_DOWNLOAD_LINK = "https://www.java.com/download";
-    private static final String OPENJDK_DOWNLOAD_LINK = "https://docs.microsoft.com/java/openjdk/download";
+    private static final String ORACLEJDK_DOWNLOAD_LINK = "https://www.java.com/download/";
+    private static final String OPENJDK_DOWNLOAD_LINK = "https://learn.microsoft.com/java/openjdk/download";
 
     public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
 

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

@@ -23,11 +23,9 @@
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.WeakInvalidationListener;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.Property;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.beans.value.WeakChangeListener;
-import javafx.beans.value.WritableValue;
+import javafx.beans.value.*;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -657,6 +655,61 @@ public static void unbindEnum(JFXComboBox<? extends Enum<?>> comboBox) {
             comboBox.getSelectionModel().selectedIndexProperty().removeListener(listener);
     }
 
+    public static void bindAllEnabled(BooleanProperty allEnabled, BooleanProperty... children) {
+        int itemCount = children.length;
+        int childSelectedCount = 0;
+        for (BooleanProperty child : children) {
+            if (child.get())
+                childSelectedCount++;
+        }
+
+        allEnabled.set(childSelectedCount == itemCount);
+
+        class Listener implements InvalidationListener {
+            private int childSelectedCount;
+            private boolean updating = false;
+
+            public Listener(int childSelectedCount) {
+                this.childSelectedCount = childSelectedCount;
+            }
+
+            @Override
+            public void invalidated(Observable observable) {
+                if (updating)
+                    return;
+
+                updating = true;
+                try {
+                    boolean value = ((BooleanProperty) observable).get();
+
+                    if (observable == allEnabled) {
+                        for (BooleanProperty child : children) {
+                            child.setValue(value);
+                        }
+                        childSelectedCount = value ? itemCount : 0;
+                    } else {
+                        if (value)
+                            childSelectedCount++;
+                        else
+                            childSelectedCount--;
+
+                        allEnabled.set(childSelectedCount == itemCount);
+                    }
+                } finally {
+                    updating = false;
+                }
+            }
+        }
+
+        InvalidationListener listener = new Listener(childSelectedCount);
+
+        WeakInvalidationListener weakListener = new WeakInvalidationListener(listener);
+        allEnabled.addListener(listener);
+        for (BooleanProperty child : children) {
+            child.addListener(weakListener);
+        }
+    }
+
     public static void setIcon(Stage stage) {
         String icon;
         if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
@@ -925,7 +978,7 @@ public static List<Node> parseSegment(String segment, Consumer<String> hyperlink
             Element r = doc.getDocumentElement();
 
             NodeList children = r.getChildNodes();
-            List<javafx.scene.Node> texts = new ArrayList<>();
+            List<Node> texts = new ArrayList<>();
             for (int i = 0; i < children.getLength(); i++) {
                 org.w3c.dom.Node node = children.item(i);
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java

@@ -44,6 +44,7 @@
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
 import java.net.URI;
+import java.util.Locale;
 
 import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
 import static org.jackhuang.hmcl.util.logging.Logger.LOG;
@@ -95,7 +96,7 @@ public AccountListPageSkin(AccountListPage skinnable) {
                 VBox boxMethods = new VBox();
                 {
                     boxMethods.getStyleClass().add("advanced-list-box-content");
-                    boxMethods.getChildren().add(new ClassTitle(i18n("account.create")));
+                    boxMethods.getChildren().add(new ClassTitle(i18n("account.create").toUpperCase(Locale.ROOT)));
                     FXUtils.setLimitWidth(boxMethods, 200);
 
                     AdvancedListItem offlineItem = new AdvancedListItem();

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java

@@ -55,6 +55,7 @@
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Locale;
 import java.util.concurrent.CancellationException;
 import java.util.function.Supplier;
 
@@ -101,7 +102,7 @@ public DownloadPage() {
 
         {
             AdvancedListBox sideBar = new AdvancedListBox()
-                    .startCategory(i18n("download.game"))
+                    .startCategory(i18n("download.game").toUpperCase(Locale.ROOT))
                     .addNavigationDrawerItem(item -> {
                         item.setTitle(i18n("game"));
                         item.setLeftGraphic(wrap(SVG.GAMEPAD));
@@ -114,7 +115,7 @@ public DownloadPage() {
                         settingsItem.activeProperty().bind(tab.getSelectionModel().selectedItemProperty().isEqualTo(modpackTab));
                         settingsItem.setOnAction(e -> tab.select(modpackTab));
                     })
-                    .startCategory(i18n("download.content"))
+                    .startCategory(i18n("download.content").toUpperCase(Locale.ROOT))
                     .addNavigationDrawerItem(item -> {
                         item.setTitle(i18n("mods"));
                         item.setLeftGraphic(wrap(SVG.PUZZLE));

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java

@@ -36,6 +36,7 @@
 import org.jackhuang.hmcl.ui.construct.RequiredValidator;
 import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
@@ -79,6 +80,8 @@ public LocalModpackPage(WizardController controller) {
             });
         }
 
+        btnDescription.setVisible(false);
+
         File selectedFile;
         Optional<File> filePath = tryCast(controller.getSettings().get(MODPACK_FILE), File.class);
         if (filePath.isPresent()) {
@@ -134,6 +137,8 @@ public LocalModpackPage(WizardController controller) {
                             // trim: https://github.com/HMCL-dev/HMCL/issues/962
                             txtModpackName.setText(manifest.getName().trim());
                         }
+
+                        btnDescription.setVisible(StringUtils.isNotBlank(manifest.getDescription()));
                     }
                 }).start();
     }

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java

@@ -24,6 +24,7 @@ public abstract class ModpackPage extends SpinnerPane implements WizardPage {
     protected final Label lblAuthor;
     protected final JFXTextField txtModpackName;
     protected final JFXButton btnInstall;
+    protected final JFXButton btnDescription;
 
     protected ModpackPage(WizardController controller) {
         this.controller = controller;
@@ -77,7 +78,7 @@ protected ModpackPage(WizardController controller) {
 
             BorderPane descriptionPane = new BorderPane();
             {
-                JFXButton btnDescription = new JFXButton(i18n("modpack.description"));
+                btnDescription = new JFXButton(i18n("modpack.description"));
                 btnDescription.getStyleClass().add("jfx-button-border");
                 btnDescription.setOnAction(e -> onDescribe());
                 descriptionPane.setLeft(btnDescription);

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/RemoteModpackPage.java

@@ -27,6 +27,7 @@
 import org.jackhuang.hmcl.ui.construct.RequiredValidator;
 import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
+import org.jackhuang.hmcl.util.StringUtils;
 
 import java.io.IOException;
 import java.util.Map;
@@ -69,6 +70,8 @@ public RemoteModpackPage(WizardController controller) {
                     new Validator(i18n("install.new_game.already_exists"), str -> !profile.getRepository().versionIdConflicts(str)),
                     new Validator(i18n("install.new_game.malformed"), HMCLGameRepository::isValidVersionId));
         }
+
+        btnDescription.setVisible(StringUtils.isNotBlank(manifest.getDescription()));
     }
 
     @Override

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

@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.ui.main;
 
 import com.jfoenix.controls.*;
-import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
@@ -100,7 +99,7 @@ public DownloadSettingsPage() {
                 downloadSource.getChildren().setAll(chooseWrapper, versionListSourcePane, downloadSourcePane);
             }
 
-            content.getChildren().addAll(ComponentList.createComponentListTitle(i18n("settings.launcher.version_list_source")), downloadSource);
+            content.getChildren().addAll(ComponentList.createComponentListTitle(i18n("settings.launcher.download_source")), downloadSource);
         }
 
         {
@@ -204,7 +203,6 @@ public DownloadSettingsPage() {
                         Label host = new Label(i18n("settings.launcher.proxy.host"));
                         GridPane.setRowIndex(host, 1);
                         GridPane.setColumnIndex(host, 0);
-                        GridPane.setHalignment(host, HPos.RIGHT);
                         gridPane.getChildren().add(host);
                     }
 
@@ -220,7 +218,6 @@ public DownloadSettingsPage() {
                         Label port = new Label(i18n("settings.launcher.proxy.port"));
                         GridPane.setRowIndex(port, 2);
                         GridPane.setColumnIndex(port, 0);
-                        GridPane.setHalignment(port, HPos.RIGHT);
                         gridPane.getChildren().add(port);
                     }
 

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

@@ -33,6 +33,8 @@
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.ui.versions.VersionSettingsPage;
 
+import java.util.Locale;
+
 import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap;
 import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -83,7 +85,7 @@ public LauncherSettingsPage() {
                         javaItem.activeProperty().bind(tab.getSelectionModel().selectedItemProperty().isEqualTo(javaManagementTab));
                         javaItem.setOnAction(e -> tab.select(javaManagementTab));
                     })
-                    .startCategory(i18n("launcher"))
+                    .startCategory(i18n("launcher").toUpperCase(Locale.ROOT))
                     .addNavigationDrawerItem(settingsItem -> {
                         settingsItem.setTitle(i18n("settings.launcher.general"));
                         settingsItem.setLeftGraphic(wrap(SVG.APPLICATION_OUTLINE));
@@ -102,7 +104,7 @@ public LauncherSettingsPage() {
                         downloadItem.activeProperty().bind(tab.getSelectionModel().selectedItemProperty().isEqualTo(downloadTab));
                         downloadItem.setOnAction(e -> tab.select(downloadTab));
                     })
-                    .startCategory(i18n("help"))
+                    .startCategory(i18n("help").toUpperCase(Locale.ROOT))
                     .addNavigationDrawerItem(helpItem -> {
                         helpItem.setTitle(i18n("help"));
                         helpItem.setLeftGraphic(wrap(SVG.HELP_CIRCLE_OUTLINE));

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModUpdatesPage.java

@@ -24,6 +24,7 @@
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.CheckBoxTableCell;
@@ -73,6 +74,8 @@ public ModUpdatesPage(ModManager modManager, List<LocalModFile.ModUpdate> update
         getStyleClass().add("gray-background");
 
         TableColumn<ModUpdateObject, Boolean> enabledColumn = new TableColumn<>();
+        CheckBox allEnabledBox = new CheckBox();
+        enabledColumn.setGraphic(allEnabledBox);
         enabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(enabledColumn));
         setupCellValueFactory(enabledColumn, ModUpdateObject::enabledProperty);
         enabledColumn.setEditable(true);
@@ -95,6 +98,7 @@ public ModUpdatesPage(ModManager modManager, List<LocalModFile.ModUpdate> update
         setupCellValueFactory(sourceColumn, ModUpdateObject::sourceProperty);
 
         objects = FXCollections.observableList(updates.stream().map(ModUpdateObject::new).collect(Collectors.toList()));
+        FXUtils.bindAllEnabled(allEnabledBox.selectedProperty(), objects.stream().map(o -> o.enabled).toArray(BooleanProperty[]::new));
 
         TableView<ModUpdateObject> table = new TableView<>(objects);
         table.setEditable(true);
@@ -170,7 +174,7 @@ private void exportList() {
             csvTable.write(Files.newOutputStream(path));
 
             FXUtils.showFileInExplorer(path);
-        }).whenComplete(Schedulers.javafx() ,exception -> {
+        }).whenComplete(Schedulers.javafx(), exception -> {
             if (exception == null) {
                 Controllers.dialog(path.toString(), i18n("message.success"));
             } else {

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

@@ -578,7 +578,7 @@ There are some keywords that might contain some Mod Names. You can search them o
 %s
 game.crash.reason.too_old_java=The game crashed because you are using a historical Java VM version.\n\
 \n\
-You need to switch to a newer version (%1$s) of Java in the game settings and then relaunch the game. You can download Java from <a href="https://docs.microsoft.com/en-US/java/openjdk/download">here</a>.
+You need to switch to a newer version (%1$s) of Java in the game settings and then relaunch the game. You can download Java from <a href="https://learn.microsoft.com/java/openjdk/download">here</a>.
 game.crash.reason.unknown=We are not able to figure out why the game crashed, please refer to the game logs.
 game.crash.reason.unsatisfied_link_error=Unable to launch Minecraft due to missing libraries: %1$s.\n\
 \n\

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

@@ -153,7 +153,7 @@ button.edit=Editar
 button.install=Instalar
 button.export=Exportar
 button.no=No
-botón.ok=Aceptar
+button.ok=Aceptar
 button.refresh=Refrescar
 button.remove=Eliminar
 button.remove.confirm=¿Está seguro de querer eliminarlo definitivamente? Esta acción no se puede deshacer.
@@ -517,12 +517,12 @@ game.crash.reason.shaders_mod=El juego actual no puede seguir ejecutándose porq
 game.crash.reason.rtss_forest_sodium=El juego actual se bloquea debido a una incompatibilidad entre RivaTuner Statistics Server (RTSS) y Sodium, lo que provoca el fallo del juego. Haz clic <a href="https://github.com/CaffeineMC/sodium-fabric/wiki/Known-Issues#rtss-incompatible">aquí</a> para obtener más detalles.
 game.crash.reason.stacktrace=El motivo del fallo es desconocido. Puede ver los detalles haciendo clic en el botón "Registros".\n\
 \n\
-Hay algunas palabras clave que pueden contener algunos Mod IDs. Puedes buscarlas en Internet para averiguar el problema por ti mismo..\n\
+Hay algunas palabras clave que pueden contener algunos Mod IDs. Puedes buscarlas en Internet para averiguar el problema por ti mismo.\n\
 \n\
 %s
 game.crash.reason.too_old_java=El juego se ha bloqueado porque estás utilizando una versión histórica de Java VM..\n\
 \n\
-Tienes que cambiar a una versión más reciente (%1$s) de Java en la configuración del juego y luego volver a ejecutar el juego. Puedes descargar Java desde <a href="https://docs.microsoft.com/java/openjdk/download">here</a>.
+Tienes que cambiar a una versión más reciente (%1$s) de Java en la configuración del juego y luego volver a ejecutar el juego. Puedes descargar Java desde <a href="https://learn.microsoft.com/java/openjdk/download">here</a>.
 game.crash.reason.unknown=No somos capaces de averiguar por qué el juego se estrelló, por favor refiérase a los registros del juego.\n\
 \n\
 <b>Cuando pidas ayuda a otra persona, por favor, comparte con ella el registro completo del juego y el archivo de informe de fallos relacionado.</b>\n\

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

@@ -128,9 +128,9 @@ archive.date=公開日
 archive.file.name=名前
 archive.version=バージョン
 
-Assets.download=アセットのダウンロード
-Assets.download_all=アセットの整合性チェック
-Assets.index.malformed=アセットインデックスの形式が正しくありません。バージョン設定の[ゲームアセットファイルの更新]で再試行できます。
+assets.download=アセットのダウンロード
+assets.download_all=アセットの整合性チェック
+assets.index.malformed=アセットインデックスの形式が正しくありません。バージョン設定の[ゲームアセットファイルの更新]で再試行できます。
 
 button.cancel=キャンセル
 button.change_source=ダウンロードソースの変更
@@ -152,8 +152,8 @@ button.yes=はい
 color.recent=推奨
 color.custom=カスタムカラー
 
-crack.NoClassDefFound=「HelloMinecraft！Launcher」ソフトウェアが破損していないことを確認してください。
-crack.user_fault=OSまたはJava環境が正しくインストールされていない可能性があり、クラッシュする可能性があります。Javaランタイム環境またはコンピュータを確認してください。
+crash.NoClassDefFound=「HelloMinecraft！Launcher」ソフトウェアが破損していないことを確認してください。
+crash.user_fault=OSまたはJava環境が正しくインストールされていない可能性があり、クラッシュする可能性があります。Javaランタイム環境またはコンピュータを確認してください。
 
 curse.category.0=すべて