[Enhancement] 支持持久化自定义实例图标 reforged

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

@@ -34,18 +34,7 @@
 import org.jackhuang.hmcl.modpack.Modpack;
 import org.jackhuang.hmcl.modpack.ModpackConfiguration;
 import org.jackhuang.hmcl.modpack.ModpackProvider;
-import org.jackhuang.hmcl.setting.LauncherSettings;
-import org.jackhuang.hmcl.setting.SettingsManager;
-import org.jackhuang.hmcl.setting.DefaultIsolationType;
-import org.jackhuang.hmcl.setting.DownloadProviders;
-import org.jackhuang.hmcl.setting.GameSettings;
-import org.jackhuang.hmcl.setting.GameWindowType;
-import org.jackhuang.hmcl.setting.LegacyGameSettingsMigrator;
-import org.jackhuang.hmcl.setting.GameDirectory;
-import org.jackhuang.hmcl.setting.ProxyType;
-import org.jackhuang.hmcl.setting.SettingFileUtils;
-import org.jackhuang.hmcl.setting.GameSettingsPresetID;
-import org.jackhuang.hmcl.setting.VersionIconType;
+import org.jackhuang.hmcl.setting.*;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.util.FileSaver;
 import org.jackhuang.hmcl.util.Lang;
@@ -584,6 +573,9 @@ public void setVersionIconFile(String id, Path iconFile) throws IOException {
             throw new IllegalArgumentException("Unsupported icon file: " + ext);
         }
 
+        var dest = getVersionRoot(id).resolve("icon." + ext);
+        if (dest.equals(iconFile)) return;
+
         deleteIconFile(id);
 
         FileUtils.copyFile(iconFile, getVersionRoot(id).resolve("icon." + ext));
@@ -603,12 +595,12 @@ public void deleteIconFile(String id) {
 
     public Image getVersionIconImage(@Nullable String id) {
         if (id == null || !isLoaded())
-            return VersionIconType.DEFAULT.getIcon();
+            return InstanceIconType.DEFAULT.getIcon();
 
         GameSettings.Instance setting = getInstanceGameSettings(id);
-        VersionIconType iconType = setting != null ? Lang.requireNonNullElse(setting.iconProperty().getValue(), VersionIconType.DEFAULT) : VersionIconType.DEFAULT;
+        InstanceIconType iconType = setting != null ? Lang.requireNonNullElse(setting.iconProperty().getValue(), InstanceIconType.DEFAULT) : InstanceIconType.DEFAULT;
 
-        if (iconType == VersionIconType.DEFAULT) {
+        if (iconType == InstanceIconType.DEFAULT) {
             Version version = getVersion(id).resolve(this);
             Optional<Path> iconFile = getVersionIconFile(id);
             if (iconFile.isPresent()) {
@@ -622,35 +614,35 @@ public Image getVersionIconImage(@Nullable String id) {
             if (LibraryAnalyzer.isModded(this, version)) {
                 LibraryAnalyzer libraryAnalyzer = LibraryAnalyzer.analyze(version, null);
                 if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.FABRIC))
-                    return VersionIconType.FABRIC.getIcon();
+                    return InstanceIconType.FABRIC.getIcon();
                 else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.QUILT))
-                    return VersionIconType.QUILT.getIcon();
+                    return InstanceIconType.QUILT.getIcon();
                 else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.LEGACY_FABRIC))
-                    return VersionIconType.LEGACY_FABRIC.getIcon();
+                    return InstanceIconType.LEGACY_FABRIC.getIcon();
                 else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.NEO_FORGE))
-                    return VersionIconType.NEO_FORGE.getIcon();
+                    return InstanceIconType.NEO_FORGE.getIcon();
                 else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.FORGE))
-                    return VersionIconType.FORGE.getIcon();
+                    return InstanceIconType.FORGE.getIcon();
                 else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.CLEANROOM))
-                    return VersionIconType.CLEANROOM.getIcon();
+                    return InstanceIconType.CLEANROOM.getIcon();
                 else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.LITELOADER))
-                    return VersionIconType.CHICKEN.getIcon();
+                    return InstanceIconType.CHICKEN.getIcon();
                 else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.OPTIFINE))
-                    return VersionIconType.OPTIFINE.getIcon();
+                    return InstanceIconType.OPTIFINE.getIcon();
             }
 
             String gameVersion = getGameVersion(version).orElse(null);
             if (gameVersion != null) {
                 GameVersionNumber versionNumber = GameVersionNumber.asGameVersion(gameVersion);
                 if (versionNumber.isAprilFools()) {
-                    return VersionIconType.APRIL_FOOLS.getIcon();
+                    return InstanceIconType.APRIL_FOOLS.getIcon();
                 } else if (versionNumber instanceof GameVersionNumber.LegacySnapshot) {
-                    return VersionIconType.COMMAND.getIcon();
+                    return InstanceIconType.COMMAND.getIcon();
                 } else if (versionNumber instanceof GameVersionNumber.Old) {
-                    return VersionIconType.CRAFT_TABLE.getIcon();
+                    return InstanceIconType.CRAFT_TABLE.getIcon();
                 }
             }
-            return VersionIconType.GRASS.getIcon();
+            return InstanceIconType.GRASS.getIcon();
         } else {
             return iconType.getIcon();
         }

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

@@ -152,10 +152,10 @@ public void setBackupOnNextSave(boolean backupOnNextSave) {
 
         /// The icon of the instance.
         @SerializedName("icon")
-        private final SettingProperty<VersionIconType> icon = newSettingProperty("icon", VersionIconType.DEFAULT);
+        private final SettingProperty<InstanceIconType> icon = newSettingProperty("icon", InstanceIconType.DEFAULT);
 
         /// Returns the instance icon property.
-        public SettingProperty<VersionIconType> iconProperty() {
+        public SettingProperty<InstanceIconType> iconProperty() {
             return icon;
         }
 

HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionIconType.java → HMCL/src/main/java/org/jackhuang/hmcl/setting/InstanceIconType.java

@@ -21,7 +21,7 @@
 import org.jackhuang.hmcl.addon.mod.ModLoaderType;
 import org.jackhuang.hmcl.ui.FXUtils;
 
-public enum VersionIconType {
+public enum InstanceIconType {
     DEFAULT("/assets/img/grass.png"),
 
     GRASS("/assets/img/grass.png"),
@@ -42,21 +42,21 @@ public enum VersionIconType {
 
     // Please append new items at last
 
-    public static VersionIconType getIconType(ModLoaderType modLoaderType) {
+    public static InstanceIconType getIconType(ModLoaderType modLoaderType) {
         return switch (modLoaderType) {
-            case FORGE -> VersionIconType.FORGE;
-            case NEO_FORGE -> VersionIconType.NEO_FORGE;
-            case FABRIC -> VersionIconType.FABRIC;
-            case QUILT -> VersionIconType.QUILT;
-            case LITE_LOADER -> VersionIconType.CHICKEN;
-            case CLEANROOM -> VersionIconType.CLEANROOM;
-            default -> VersionIconType.COMMAND;
+            case FORGE -> InstanceIconType.FORGE;
+            case NEO_FORGE -> InstanceIconType.NEO_FORGE;
+            case FABRIC -> InstanceIconType.FABRIC;
+            case QUILT -> InstanceIconType.QUILT;
+            case LITE_LOADER -> InstanceIconType.CHICKEN;
+            case CLEANROOM -> InstanceIconType.CLEANROOM;
+            default -> InstanceIconType.COMMAND;
         };
     }
 
     private final String resourceUrl;
 
-    VersionIconType(String resourceUrl) {
+    InstanceIconType(String resourceUrl) {
         this.resourceUrl = resourceUrl;
     }
 

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

@@ -218,6 +218,14 @@ public BooleanProperty disableAprilFoolsProperty() {
         return disableAprilFools;
     }
 
+    /// User preference for saving custom game icons.
+    @SerializedName("saveCustomGameIcons")
+    private final ObjectProperty<TriPreference> saveCustomGameIcons = new SimpleObjectProperty<>(TriPreference.CONFIRM_EACH_TIME);
+
+    public ObjectProperty<TriPreference> saveCustomGameIconsProperty() {
+        return saveCustomGameIcons;
+    }
+
     /// The common Minecraft directory selection mode.
     @SerializedName("commonDirectoryType")
     private final ObjectProperty<EnumCommonDirectory> commonDirectoryType = new RawPreservingObjectProperty<>(EnumCommonDirectory.DEFAULT);

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

@@ -72,23 +72,23 @@ private enum GameDirectoryType {
         CUSTOM
     }
 
-    /// Legacy `VersionIconType` ordinal order used by old local settings.
-    private static final VersionIconType @Unmodifiable [] LEGACY_VERSION_ICON_TYPES = {
-            VersionIconType.DEFAULT,
-            VersionIconType.GRASS,
-            VersionIconType.CHEST,
-            VersionIconType.CHICKEN,
-            VersionIconType.COMMAND,
-            VersionIconType.OPTIFINE,
-            VersionIconType.CRAFT_TABLE,
-            VersionIconType.FABRIC,
-            VersionIconType.FORGE,
-            VersionIconType.NEO_FORGE,
-            VersionIconType.FURNACE,
-            VersionIconType.QUILT,
-            VersionIconType.APRIL_FOOLS,
-            VersionIconType.CLEANROOM,
-            VersionIconType.LEGACY_FABRIC
+    /// Legacy `InstanceIconType` ordinal order used by old local settings.
+    private static final InstanceIconType @Unmodifiable [] LEGACY_INSTANCE_ICON_TYPES = {
+            InstanceIconType.DEFAULT,
+            InstanceIconType.GRASS,
+            InstanceIconType.CHEST,
+            InstanceIconType.CHICKEN,
+            InstanceIconType.COMMAND,
+            InstanceIconType.OPTIFINE,
+            InstanceIconType.CRAFT_TABLE,
+            InstanceIconType.FABRIC,
+            InstanceIconType.FORGE,
+            InstanceIconType.NEO_FORGE,
+            InstanceIconType.FURNACE,
+            InstanceIconType.QUILT,
+            InstanceIconType.APRIL_FOOLS,
+            InstanceIconType.CLEANROOM,
+            InstanceIconType.LEGACY_FABRIC
     };
 
     /// Legacy `JavaVersionType` ordinal order used by old game settings.
@@ -488,30 +488,30 @@ private static GraphicsAPI parseGraphicsBackend(JsonObject source, Renderer rend
     }
 
     /// Parses the legacy icon selection with frozen ordinal order.
-    private static VersionIconType parseLegacyVersionIconType(@Nullable JsonObject source) {
+    private static InstanceIconType parseLegacyVersionIconType(@Nullable JsonObject source) {
         JsonPrimitive primitive = JsonUtils.getPrimitive(source, "versionIcon");
         if (primitive == null) {
-            return VersionIconType.DEFAULT;
+            return InstanceIconType.DEFAULT;
         }
 
         try {
             if (primitive.isNumber()) {
                 int index = primitive.getAsInt();
-                return index >= 0 && index < LEGACY_VERSION_ICON_TYPES.length
-                        ? LEGACY_VERSION_ICON_TYPES[index]
-                        : VersionIconType.DEFAULT;
+                return index >= 0 && index < LEGACY_INSTANCE_ICON_TYPES.length
+                        ? LEGACY_INSTANCE_ICON_TYPES[index]
+                        : InstanceIconType.DEFAULT;
             }
 
             String value = primitive.getAsString();
-            for (VersionIconType iconType : LEGACY_VERSION_ICON_TYPES) {
+            for (InstanceIconType iconType : LEGACY_INSTANCE_ICON_TYPES) {
                 if (iconType.name().equalsIgnoreCase(value)) {
                     return iconType;
                 }
             }
         } catch (RuntimeException ignored) {
         }
 
-        return VersionIconType.DEFAULT;
+        return InstanceIconType.DEFAULT;
     }
 
     /// Reads an enum property from either ordinal or name.

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

@@ -0,0 +1,30 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2026 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.setting;
+
+public enum TriPreference {
+
+    /// Always perform the action without asking
+    ALWAYS,
+
+    /// Skip the action without asking
+    NEVER,
+
+    /// Let the user decide whether to perform the action each time the event is triggered
+    CONFIRM_EACH_TIME
+}

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

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXDialogLayout;
 import com.jfoenix.validation.base.ValidatorBase;
 import javafx.animation.KeyFrame;
@@ -75,7 +76,9 @@
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
 
 import static org.jackhuang.hmcl.setting.SettingsManager.settings;
 import static org.jackhuang.hmcl.setting.SettingsManager.getAuthlibInjectorServers;
@@ -651,6 +654,24 @@ public static void dialogLater(Region content) {
             decorator.showDialogLater(content);
     }
 
+    public static void askTriPreference(String text, @Nullable Consumer<Boolean> resConsumer, @Nullable Consumer<TriPreference> prefConsumer) {
+        var r = Objects.requireNonNullElse(resConsumer, (__) -> {});
+        var p = Objects.requireNonNullElse(prefConsumer, (__) -> {});
+
+        var check = new JFXCheckBox(i18n("button.do_not_show_again"));
+        var dialog = new MessageDialogPane.Builder(text, i18n("message.question"), MessageDialogPane.MessageType.QUESTION)
+                .addActionNoClosing(check)
+                .yesOrNo(() -> {
+                    r.accept(true);
+                    p.accept(check.isSelected() ? TriPreference.ALWAYS : TriPreference.CONFIRM_EACH_TIME);
+                }, () -> {
+                    r.accept(false);
+                    p.accept(check.isSelected() ? TriPreference.NEVER : TriPreference.CONFIRM_EACH_TIME);
+                })
+                .build();
+        dialog(dialog);
+    }
+
     public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult) {
         return prompt(title, onResult, "");
     }

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

@@ -35,7 +35,7 @@
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.*;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
-import org.jackhuang.hmcl.setting.VersionIconType;
+import org.jackhuang.hmcl.setting.InstanceIconType;
 import org.jackhuang.hmcl.ui.construct.ImageContainer;
 import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.util.i18n.I18n;
@@ -54,7 +54,7 @@
  */
 public class InstallerItem extends Control {
     private final String id;
-    private final VersionIconType iconType;
+    private final InstanceIconType iconType;
     private final Style style;
     private final ObjectProperty<InstalledState> versionProperty = new SimpleObjectProperty<>(this, "version", null);
     private final ObjectProperty<State> resolvedStateProperty = new SimpleObjectProperty<>(this, "resolvedState", InstallableState.INSTANCE);
@@ -92,15 +92,15 @@ public InstallerItem(String id, Style style) {
         this.style = style;
 
         iconType = switch (id) {
-            case "game" -> VersionIconType.GRASS;
-            case "fabric", "fabric-api" -> VersionIconType.FABRIC;
-            case "legacyfabric", "legacyfabric-api" -> VersionIconType.LEGACY_FABRIC;
-            case "forge" -> VersionIconType.FORGE;
-            case "cleanroom" -> VersionIconType.CLEANROOM;
-            case "liteloader" -> VersionIconType.CHICKEN;
-            case "optifine" -> VersionIconType.OPTIFINE;
-            case "quilt", "quilt-api" -> VersionIconType.QUILT;
-            case "neoforge" -> VersionIconType.NEO_FORGE;
+            case "game" -> InstanceIconType.GRASS;
+            case "fabric", "fabric-api" -> InstanceIconType.FABRIC;
+            case "legacyfabric", "legacyfabric-api" -> InstanceIconType.LEGACY_FABRIC;
+            case "forge" -> InstanceIconType.FORGE;
+            case "cleanroom" -> InstanceIconType.CLEANROOM;
+            case "liteloader" -> InstanceIconType.CHICKEN;
+            case "optifine" -> InstanceIconType.OPTIFINE;
+            case "quilt", "quilt-api" -> InstanceIconType.QUILT;
+            case "neoforge" -> InstanceIconType.NEO_FORGE;
             default -> null;
         };
     }

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/ImageContainer.java

@@ -64,6 +64,11 @@ public ImageContainer(double width, double height) {
         this.getChildren().setAll(imageView);
     }
 
+    public ImageContainer(double size, Image image) {
+        this(size);
+        setImage(image);
+    }
+
     private void updateCornerRadius(double radius) {
         clip.setArcWidth(radius);
         clip.setArcHeight(radius);

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java

@@ -169,6 +169,11 @@ public Builder addAction(String text, @Nullable Runnable action) {
             return this;
         }
 
+        public Builder addActionNoClosing(Node actionNode) {
+            dialog.actions.getChildren().add(actionNode);
+            return this;
+        }
+
         public Builder ok(@Nullable Runnable ok) {
             JFXButton btnOk = new JFXButton(i18n("button.ok"));
             btnOk.getStyleClass().add("dialog-accept");