From b44f1a81301a589653851695e96c968498ba06ab Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Thu, 2 Jul 2026 18:08:28 +0800
Subject: [PATCH 01/18] Fix #6280

---
 .../hmcl/ui/construct/TwoLineListItem.java    | 22 ++++++---
 .../hmcl/ui/versions/DownloadPage.java        | 46 ++++++++++---------
 .../hmcl/ui/versions/ModListPageSkin.java     | 42 ++++++++---------
 .../org/jackhuang/hmcl/addon/RemoteAddon.java |  3 +-
 .../hmcl/addon/mod/LocalModFile.java          |  3 +-
 .../hmcl/addon/mod/ModLoaderType.java         | 18 +++++++-
 .../CurseForgeRemoteAddonRepository.java      | 13 +-----
 .../ModrinthRemoteAddonRepository.java        |  9 +---
 .../java/org/jackhuang/hmcl/util/Either.java  | 38 +++++++++++++++
 .../org/jackhuang/hmcl/util/StringUtils.java  | 10 ++++
 10 files changed, 132 insertions(+), 72 deletions(-)
 create mode 100644 HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
index f9f90e95904..0c9f5387fb2 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
@@ -30,6 +30,8 @@
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.ui.FXUtils;
 
+import java.util.Collection;
+
 public class TwoLineListItem extends VBox {
     private static final String DEFAULT_STYLE_CLASS = "two-line-list-item";
 
@@ -158,6 +160,15 @@ public Label getSubtitleLabel() {
         return lblSubtitle;
     }
 
+    private static Label createTag(String tag, PseudoClass pseudoClass) {
+        var tagLabel = new Label(tag);
+        tagLabel.getStyleClass().add("tag");
+        tagLabel.setMinWidth(Label.USE_PREF_SIZE);
+        if (pseudoClass != null)
+            tagLabel.pseudoClassStateChanged(pseudoClass, true);
+        return tagLabel;
+    }
+
     private ObservableList<Label> tags;
 
     public ObservableList<Label> getTags() {
@@ -183,18 +194,17 @@ public ObservableList<Label> getTags() {
     }
 
     public void addTag(String tag, PseudoClass pseudoClass) {
-        var tagLabel = new Label(tag);
-        tagLabel.getStyleClass().add("tag");
-        tagLabel.setMinWidth(Label.USE_PREF_SIZE);
-        if (pseudoClass != null)
-            tagLabel.pseudoClassStateChanged(pseudoClass, true);
-        getTags().add(tagLabel);
+        getTags().add(createTag(tag, pseudoClass));
     }
 
     public void addTag(String tag) {
         addTag(tag, null);
     }
 
+    public void addTags(Collection<String> tags) {
+        getTags().addAll(tags.stream().map(tag -> createTag(tag, null)).toList());
+    }
+
     private static final PseudoClass WARNING_PSEUDO_CLASS = PseudoClass.getPseudoClass("warning");
 
     public void addTagWarning(String tag) {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
index fb06c3ca0fe..3bfcc01ab65 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
@@ -282,8 +282,8 @@ protected DownloadPageSkin(DownloadPage control) {
                                 resolve:
                                 for (RemoteAddon.Version modVersion : modVersions) {
                                     if (getSkinnable().type == RemoteAddonRepository.Type.MOD) {
-                                        for (ModLoaderType loader : modVersion.loaders()) {
-                                            if (targetLoaders.contains(loader)) {
+                                        for (Either<ModLoaderType, String> loader : modVersion.loaders()) {
+                                            if (loader.hasLeft() && targetLoaders.contains(loader.left())) {
                                                 list.getContent().addAll(
                                                         ComponentList.createComponentListTitle(i18n("mods.download.recommend", gameVersion)),
                                                         new AddonItem(control.addon, modVersion, control)
@@ -452,28 +452,30 @@ private static final class AddonItem extends StackPane {
                             break;
                     }
 
-                    for (ModLoaderType modLoaderType : dataItem.loaders()) {
-                        switch (modLoaderType) {
-                            case FORGE:
-                                content.addTag(i18n("install.installer.forge"));
-                                break;
-                            case CLEANROOM:
-                                content.addTag(i18n("install.installer.cleanroom"));
-                                break;
-                            case NEO_FORGE:
-                                content.addTag(i18n("install.installer.neoforge"));
-                                break;
-                            case FABRIC:
-                                content.addTag(i18n("install.installer.fabric"));
-                                break;
-                            case LITE_LOADER:
-                                content.addTag(i18n("install.installer.liteloader"));
-                                break;
-                            case QUILT:
-                                content.addTag(i18n("install.installer.quilt"));
-                                break;
+                    Set<String> tags = new LinkedHashSet<>();
+                    for (Either<ModLoaderType, String> loader : dataItem.loaders()) {
+                        if (loader.hasLeft()) {
+                            var modLoaderType = loader.left();
+                            String tag = switch (modLoaderType) {
+                                case FORGE -> i18n("install.installer.forge");
+                                case CLEANROOM -> i18n("install.installer.cleanroom");
+                                case NEO_FORGE -> i18n("install.installer.neoforge");
+                                case FABRIC -> i18n("install.installer.fabric");
+                                case LITE_LOADER -> i18n("install.installer.liteloader");
+                                case QUILT -> i18n("install.installer.quilt");
+                                case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
+                                default -> null;
+                            };
+                            if (tag != null) tags.add(tag);
+                        } else if (loader.hasRight()) {
+                            if ("bungeecord".equalsIgnoreCase(loader.right())) {
+                                tags.add("BungeeCord");
+                            } else {
+                                tags.add(StringUtils.removeDashAndCapitalizeWords(loader.right()));
+                            }
                         }
                     }
+                    content.addTags(tags);
 
                     descPane.getChildren().setAll(graphicPane, content);
                 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
index aaf2f8055d5..2ff5974f800 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
@@ -53,10 +53,7 @@
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionPane;
 import org.jackhuang.hmcl.ui.construct.*;
-import org.jackhuang.hmcl.util.FXThread;
-import org.jackhuang.hmcl.util.Lazy;
-import org.jackhuang.hmcl.util.Pair;
-import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
@@ -477,25 +474,26 @@ final class ModInfoDialog extends JFXDialogLayout {
                         if (versionOptional.isPresent()) {
                             RemoteAddon remoteAddon = repository.getModById(DownloadProviders.getDownloadProvider(), versionOptional.get().modid());
                             FXUtils.runInFX(() -> {
-                                for (ModLoaderType modLoaderType : versionOptional.get().loaders()) {
-                                    String loaderName = switch (modLoaderType) {
-                                        case FORGE -> i18n("install.installer.forge");
-                                        case CLEANROOM -> i18n("install.installer.cleanroom");
-                                        case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
-                                        case NEO_FORGE -> i18n("install.installer.neoforge");
-                                        case FABRIC -> i18n("install.installer.fabric");
-                                        case LITE_LOADER -> i18n("install.installer.liteloader");
-                                        case QUILT -> i18n("install.installer.quilt");
-                                        default -> null;
-                                    };
-                                    if (loaderName == null)
-                                        continue;
-                                    if (title.getTags()
-                                            .stream()
-                                            .noneMatch(it -> it.getText().equals(loaderName))) {
-                                        title.addTag(loaderName);
-                                    }
+                                Set<String> tags = new LinkedHashSet<>();
+                                for (Either<ModLoaderType, String> loader : versionOptional.get().loaders()) {
+                                    String loaderName;
+                                    if (loader.hasLeft()) {
+                                        loaderName = switch (loader.left()) {
+                                            case FORGE -> i18n("install.installer.forge");
+                                            case CLEANROOM -> i18n("install.installer.cleanroom");
+                                            case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
+                                            case NEO_FORGE -> i18n("install.installer.neoforge");
+                                            case FABRIC -> i18n("install.installer.fabric");
+                                            case LITE_LOADER -> i18n("install.installer.liteloader");
+                                            case QUILT -> i18n("install.installer.quilt");
+                                            default -> null;
+                                        };
+                                    } else if (loader.hasRight()) {
+                                        loaderName = StringUtils.removeDashAndCapitalizeWords(loader.right());
+                                    } else continue;
+                                    if (loaderName != null) tags.add(loaderName);
                                 }
+                                title.addTags(tags);
 
                                 button.setOnAction(e -> {
                                     fireEvent(new DialogCloseEvent());
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java
index e4b700a5284..714c8bad6cf 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java
@@ -22,6 +22,7 @@
 import org.jackhuang.hmcl.addon.repository.ModrinthRemoteAddonRepository;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.util.Either;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
@@ -204,7 +205,7 @@ public interface IVersion {
 
     public record Version(IVersion self, String modid, String name, String version, String changelog,
                           Instant datePublished, VersionType versionType, File file, List<Dependency> dependencies,
-                          List<String> gameVersions, List<ModLoaderType> loaders) {
+                          List<String> gameVersions, List<Either<ModLoaderType, String>> loaders) {
     }
 
     public record File(Map<String, String> hashes, String url, String filename) {
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/LocalModFile.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/LocalModFile.java
index f4bfafab115..12cb547485a 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/LocalModFile.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/LocalModFile.java
@@ -24,6 +24,7 @@
 import org.jackhuang.hmcl.addon.RemoteAddon;
 import org.jackhuang.hmcl.addon.RemoteAddonRepository;
 import org.jackhuang.hmcl.download.DownloadProvider;
+import org.jackhuang.hmcl.util.Either;
 import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.io.IOException;
@@ -202,7 +203,7 @@ public AddonUpdate checkUpdates(DownloadProvider downloadProvider, String gameVe
         if (currentVersion.isEmpty()) return null;
         List<RemoteAddon.Version> remoteVersions = repository.getRemoteVersionsById(downloadProvider, currentVersion.get().modid())
                 .filter(version -> version.gameVersions().contains(gameVersion))
-                .filter(version -> version.loaders().contains(getModLoaderType()))
+                .filter(version -> version.loaders().contains(Either.left(getModLoaderType())))
                 .filter(version -> version.datePublished().compareTo(currentVersion.get().datePublished()) > 0)
                 .sorted(Comparator.comparing(RemoteAddon.Version::datePublished).reversed())
                 .toList();
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
index 61ba46cea84..d04d81b6bd5 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
@@ -17,6 +17,10 @@
  */
 package org.jackhuang.hmcl.addon.mod;
 
+import org.jackhuang.hmcl.util.Either;
+
+import java.util.Locale;
+
 public enum ModLoaderType {
     UNKNOWN,
     FORGE,
@@ -25,5 +29,17 @@ public enum ModLoaderType {
     FABRIC,
     QUILT,
     LITE_LOADER,
-    LEGACY_FABRIC
+    LEGACY_FABRIC;
+
+    public static Either<ModLoaderType, String> fromString(String loader) {
+        return switch (loader.toLowerCase(Locale.ROOT)) {
+            case "fabric" -> Either.left(ModLoaderType.FABRIC);
+            case "forge" -> Either.left(ModLoaderType.FORGE);
+            case "neoforge" -> Either.left(ModLoaderType.NEO_FORGE);
+            case "quilt" -> Either.left(ModLoaderType.QUILT);
+            case "liteloader" -> Either.left(ModLoaderType.LITE_LOADER);
+            case "legacy-fabric" -> Either.left(ModLoaderType.LEGACY_FABRIC);
+            default -> Either.right(loader);
+        };
+    }
 }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
index 3d12959d30f..3a1b63475ac 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
@@ -22,10 +22,7 @@
 import org.jackhuang.hmcl.addon.RemoteAddonRepository;
 import org.jackhuang.hmcl.addon.mod.ModLoaderType;
 import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.util.Immutable;
-import org.jackhuang.hmcl.util.MurmurHash2;
-import org.jackhuang.hmcl.util.Pair;
-import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.io.HttpRequest;
 import org.jackhuang.hmcl.util.io.JarUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
@@ -482,13 +479,7 @@ public RemoteAddon.Version toVersion() {
                             return RemoteAddon.Dependency.ofGeneral(RELATION_TYPE.get(dependency.relationType()), MODS, Integer.toString(dependency.modId()));
                         }).distinct().filter(Objects::nonNull).collect(Collectors.toList()),
                         gameVersions.stream().filter(GameVersionNumber::isKnown).toList(),
-                        gameVersions.stream().flatMap(version -> {
-                            if ("fabric".equalsIgnoreCase(version)) return Stream.of(ModLoaderType.FABRIC);
-                            else if ("forge".equalsIgnoreCase(version)) return Stream.of(ModLoaderType.FORGE);
-                            else if ("quilt".equalsIgnoreCase(version)) return Stream.of(ModLoaderType.QUILT);
-                            else if ("neoforge".equalsIgnoreCase(version)) return Stream.of(ModLoaderType.NEO_FORGE);
-                            else return Stream.empty();
-                        }).collect(Collectors.toList())
+                        gameVersions.stream().flatMap(loader -> Stream.of(ModLoaderType.fromString(loader))).toList()
                 );
             }
         }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java
index c4deb57d091..8a2fa8af425 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java
@@ -417,14 +417,7 @@ public Optional<RemoteAddon.Version> toVersion() {
                         return RemoteAddon.Dependency.ofGeneral(DEPENDENCY_TYPE.get(dependency.dependencyType), MODS, dependency.projectId);
                     }).filter(Objects::nonNull).collect(Collectors.toList()),
                     gameVersions,
-                    loaders.stream().flatMap(loader -> {
-                        if ("fabric".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.FABRIC);
-                        else if ("forge".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.FORGE);
-                        else if ("neoforge".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.NEO_FORGE);
-                        else if ("quilt".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.QUILT);
-                        else if ("liteloader".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.LITE_LOADER);
-                        else return Stream.empty();
-                    }).collect(Collectors.toList())
+                    loaders.stream().flatMap(loader -> Stream.of(ModLoaderType.fromString(loader))).toList()
             ));
         }
     }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
new file mode 100644
index 00000000000..b157d6a77f7
--- /dev/null
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
@@ -0,0 +1,38 @@
+/*
+ * 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.util;
+
+public record Either<T, U>(T left, U right) {
+
+    public static <T, U> Either<T, U> left(T left) {
+        return new Either<>(left, null);
+    }
+
+    public static <T, U> Either<T, U> right(U right) {
+        return new Either<>(null, right);
+    }
+
+    public boolean hasLeft() {
+        return left != null;
+    }
+
+    public boolean hasRight() {
+        return right != null;
+    }
+
+}
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
index 297a768ea79..15bcd0168b6 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
@@ -116,6 +116,16 @@ public static String capitalizeFirst(String str) {
         return Character.toUpperCase(str.charAt(0)) + str.substring(1);
     }
 
+    public static String removeDashAndCapitalizeWords(String str) {
+        if (str == null || str.isEmpty())
+            return str;
+        String[] words = str.replace('-', ' ').split(" ");
+        for (int i = 0; i < words.length; i++) {
+            words[i] = capitalizeFirst(words[i]);
+        }
+        return String.join(" ", words);
+    }
+
     public static String substringBeforeLast(String str, char delimiter) {
         return substringBeforeLast(str, delimiter, str);
     }

From 352f2e1f38bc91c6814a12f01811279775ea0e7e Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Thu, 2 Jul 2026 18:13:43 +0800
Subject: [PATCH 02/18] update

---
 .../main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java   | 2 +-
 .../hmcl/addon/repository/CurseForgeRemoteAddonRepository.java  | 2 +-
 .../hmcl/addon/repository/ModrinthRemoteAddonRepository.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
index d04d81b6bd5..96608cb6177 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
@@ -31,7 +31,7 @@ public enum ModLoaderType {
     LITE_LOADER,
     LEGACY_FABRIC;
 
-    public static Either<ModLoaderType, String> fromString(String loader) {
+    public static Either<ModLoaderType, String> toEither(String loader) {
         return switch (loader.toLowerCase(Locale.ROOT)) {
             case "fabric" -> Either.left(ModLoaderType.FABRIC);
             case "forge" -> Either.left(ModLoaderType.FORGE);
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
index 3a1b63475ac..af529118c9d 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
@@ -479,7 +479,7 @@ public RemoteAddon.Version toVersion() {
                             return RemoteAddon.Dependency.ofGeneral(RELATION_TYPE.get(dependency.relationType()), MODS, Integer.toString(dependency.modId()));
                         }).distinct().filter(Objects::nonNull).collect(Collectors.toList()),
                         gameVersions.stream().filter(GameVersionNumber::isKnown).toList(),
-                        gameVersions.stream().flatMap(loader -> Stream.of(ModLoaderType.fromString(loader))).toList()
+                        gameVersions.stream().map(ModLoaderType::toEither).toList()
                 );
             }
         }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java
index 8a2fa8af425..d49fb3bc9a4 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java
@@ -417,7 +417,7 @@ public Optional<RemoteAddon.Version> toVersion() {
                         return RemoteAddon.Dependency.ofGeneral(DEPENDENCY_TYPE.get(dependency.dependencyType), MODS, dependency.projectId);
                     }).filter(Objects::nonNull).collect(Collectors.toList()),
                     gameVersions,
-                    loaders.stream().flatMap(loader -> Stream.of(ModLoaderType.fromString(loader))).toList()
+                    loaders.stream().map(ModLoaderType::toEither).toList()
             ));
         }
     }

From e50ceb535a0e8f98d89badfc67e99edf3305126f Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Thu, 2 Jul 2026 21:52:10 +0800
Subject: [PATCH 03/18] Update Either.java

---
 .../java/org/jackhuang/hmcl/util/Either.java  | 79 ++++++++++++++++---
 1 file changed, 70 insertions(+), 9 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
index b157d6a77f7..703938adcc9 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
@@ -17,22 +17,83 @@
  */
 package org.jackhuang.hmcl.util;
 
-public record Either<T, U>(T left, U right) {
+import org.jetbrains.annotations.NotNull;
 
-    public static <T, U> Either<T, U> left(T left) {
-        return new Either<>(left, null);
+import java.util.Objects;
+
+/// @author Calboot
+public sealed abstract class Either<L, R> {
+
+    public static <L, R> Either<L, R> left(@NotNull L left) {
+        return new Left<>(left);
     }
 
-    public static <T, U> Either<T, U> right(U right) {
-        return new Either<>(null, right);
+    public static <L, R> Either<L, R> right(@NotNull R right) {
+        return new Right<>(right);
     }
 
-    public boolean hasLeft() {
-        return left != null;
+    public abstract boolean hasLeft();
+    public abstract boolean hasRight();
+
+    public abstract L left();
+    public abstract R right();
+
+    private static final class Left<L, R> extends Either<L, R> {
+
+        private final L value;
+
+        private Left(L value) {
+            this.value = Objects.requireNonNull(value);
+        }
+
+        @Override
+        public boolean hasLeft() {
+            return true;
+        }
+
+        @Override
+        public boolean hasRight() {
+            return false;
+        }
+
+        @Override
+        public L left() {
+            return value;
+        }
+
+        @Override
+        public R right() {
+            return null;
+        }
     }
 
-    public boolean hasRight() {
-        return right != null;
+    private static final class Right<L, R> extends Either<L, R> {
+
+        private final R value;
+
+        private Right(R value) {
+            this.value = Objects.requireNonNull(value);
+        }
+
+        @Override
+        public boolean hasLeft() {
+            return false;
+        }
+
+        @Override
+        public boolean hasRight() {
+            return true;
+        }
+
+        @Override
+        public L left() {
+            return null;
+        }
+
+        @Override
+        public R right() {
+            return value;
+        }
     }
 
 }

From 2a7b61c49c3eab40a3f6478845621b5600a688df Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Thu, 2 Jul 2026 21:54:05 +0800
Subject: [PATCH 04/18] Update Either.java

---
 HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
index 703938adcc9..6a1bd88c356 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
@@ -33,9 +33,11 @@ public static <L, R> Either<L, R> right(@NotNull R right) {
     }
 
     public abstract boolean hasLeft();
+
     public abstract boolean hasRight();
 
     public abstract L left();
+
     public abstract R right();
 
     private static final class Left<L, R> extends Either<L, R> {

From d0e31c1def11bd75e361376b75db021a80999b57 Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Thu, 2 Jul 2026 22:22:52 +0800
Subject: [PATCH 05/18] update

---
 .../hmcl/ui/versions/DownloadPage.java        | 34 ++++++++-----------
 .../hmcl/ui/versions/ModListPageSkin.java     | 30 ++++++++--------
 .../java/org/jackhuang/hmcl/util/Either.java  | 14 +++++++-
 3 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
index 3bfcc01ab65..5303e2da1cc 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
@@ -454,26 +454,20 @@ private static final class AddonItem extends StackPane {
 
                     Set<String> tags = new LinkedHashSet<>();
                     for (Either<ModLoaderType, String> loader : dataItem.loaders()) {
-                        if (loader.hasLeft()) {
-                            var modLoaderType = loader.left();
-                            String tag = switch (modLoaderType) {
-                                case FORGE -> i18n("install.installer.forge");
-                                case CLEANROOM -> i18n("install.installer.cleanroom");
-                                case NEO_FORGE -> i18n("install.installer.neoforge");
-                                case FABRIC -> i18n("install.installer.fabric");
-                                case LITE_LOADER -> i18n("install.installer.liteloader");
-                                case QUILT -> i18n("install.installer.quilt");
-                                case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
-                                default -> null;
-                            };
-                            if (tag != null) tags.add(tag);
-                        } else if (loader.hasRight()) {
-                            if ("bungeecord".equalsIgnoreCase(loader.right())) {
-                                tags.add("BungeeCord");
-                            } else {
-                                tags.add(StringUtils.removeDashAndCapitalizeWords(loader.right()));
-                            }
-                        }
+                        String tag = loader.map(
+                                loaderType -> switch (loaderType) {
+                                    case FORGE -> i18n("install.installer.forge");
+                                    case CLEANROOM -> i18n("install.installer.cleanroom");
+                                    case NEO_FORGE -> i18n("install.installer.neoforge");
+                                    case FABRIC -> i18n("install.installer.fabric");
+                                    case LITE_LOADER -> i18n("install.installer.liteloader");
+                                    case QUILT -> i18n("install.installer.quilt");
+                                    case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
+                                    default -> null;
+                                },
+                                s -> "bungeecord".equalsIgnoreCase(s) ? "BungeeCord" : StringUtils.removeDashAndCapitalizeWords(s)
+                        );
+                        if (tag != null) tags.add(tag);
                     }
                     content.addTags(tags);
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
index 2ff5974f800..5f245c6c72d 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
@@ -476,22 +476,20 @@ final class ModInfoDialog extends JFXDialogLayout {
                             FXUtils.runInFX(() -> {
                                 Set<String> tags = new LinkedHashSet<>();
                                 for (Either<ModLoaderType, String> loader : versionOptional.get().loaders()) {
-                                    String loaderName;
-                                    if (loader.hasLeft()) {
-                                        loaderName = switch (loader.left()) {
-                                            case FORGE -> i18n("install.installer.forge");
-                                            case CLEANROOM -> i18n("install.installer.cleanroom");
-                                            case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
-                                            case NEO_FORGE -> i18n("install.installer.neoforge");
-                                            case FABRIC -> i18n("install.installer.fabric");
-                                            case LITE_LOADER -> i18n("install.installer.liteloader");
-                                            case QUILT -> i18n("install.installer.quilt");
-                                            default -> null;
-                                        };
-                                    } else if (loader.hasRight()) {
-                                        loaderName = StringUtils.removeDashAndCapitalizeWords(loader.right());
-                                    } else continue;
-                                    if (loaderName != null) tags.add(loaderName);
+                                    String tag = loader.map(
+                                            loaderType -> switch (loaderType) {
+                                                case FORGE -> i18n("install.installer.forge");
+                                                case CLEANROOM -> i18n("install.installer.cleanroom");
+                                                case NEO_FORGE -> i18n("install.installer.neoforge");
+                                                case FABRIC -> i18n("install.installer.fabric");
+                                                case LITE_LOADER -> i18n("install.installer.liteloader");
+                                                case QUILT -> i18n("install.installer.quilt");
+                                                case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
+                                                default -> null;
+                                            },
+                                            StringUtils::removeDashAndCapitalizeWords
+                                    );
+                                    if (tag != null) tags.add(tag);
                                 }
                                 title.addTags(tags);
 
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
index 6a1bd88c356..58a81b2853a 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
@@ -20,8 +20,8 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;
+import java.util.function.Function;
 
-/// @author Calboot
 public sealed abstract class Either<L, R> {
 
     public static <L, R> Either<L, R> left(@NotNull L left) {
@@ -40,6 +40,8 @@ public static <L, R> Either<L, R> right(@NotNull R right) {
 
     public abstract R right();
 
+    public abstract <T> T map(Function<L, T> lFunc, Function<R, T> rFunc);
+
     private static final class Left<L, R> extends Either<L, R> {
 
         private final L value;
@@ -67,6 +69,11 @@ public L left() {
         public R right() {
             return null;
         }
+
+        @Override
+        public <T> T map(Function<L, T> lFunc, Function<R, T> rFunc) {
+            return lFunc.apply(value);
+        }
     }
 
     private static final class Right<L, R> extends Either<L, R> {
@@ -96,6 +103,11 @@ public L left() {
         public R right() {
             return value;
         }
+
+        @Override
+        public <T> T map(Function<L, T> lFunc, Function<R, T> rFunc) {
+            return rFunc.apply(value);
+        }
     }
 
 }

From a3693acb2cd941201c3171c8e58536e1fb902463 Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Fri, 3 Jul 2026 20:40:20 +0800
Subject: [PATCH 06/18] add equals and hashCode

---
 .../java/org/jackhuang/hmcl/util/Either.java  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
index 58a81b2853a..a61791df900 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
@@ -74,6 +74,19 @@ public R right() {
         public <T> T map(Function<L, T> lFunc, Function<R, T> rFunc) {
             return lFunc.apply(value);
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof Either.Left<?,?> el) {
+                return this.value.equals(el.value);
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return value.hashCode();
+        }
     }
 
     private static final class Right<L, R> extends Either<L, R> {
@@ -108,6 +121,19 @@ public R right() {
         public <T> T map(Function<L, T> lFunc, Function<R, T> rFunc) {
             return rFunc.apply(value);
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof Either.Right<?,?> el) {
+                return this.value.equals(el.value);
+            }
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return value.hashCode() + 31;
+        }
     }
 
 }

From 47dd87788f252670e8aa2615de3ca8eb5ecd2498 Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Fri, 3 Jul 2026 21:40:17 +0800
Subject: [PATCH 07/18] update

---
 .../repository/CurseForgeRemoteAddonRepository.java      | 6 +++++-
 .../main/java/org/jackhuang/hmcl/util/StringUtils.java   | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
index af529118c9d..21a6d38430d 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
@@ -479,7 +479,11 @@ public RemoteAddon.Version toVersion() {
                             return RemoteAddon.Dependency.ofGeneral(RELATION_TYPE.get(dependency.relationType()), MODS, Integer.toString(dependency.modId()));
                         }).distinct().filter(Objects::nonNull).collect(Collectors.toList()),
                         gameVersions.stream().filter(GameVersionNumber::isKnown).toList(),
-                        gameVersions.stream().map(ModLoaderType::toEither).toList()
+                        gameVersions.stream().filter(s ->
+                                !"client".equalsIgnoreCase(s)
+                                && !"server".equalsIgnoreCase(s)
+                                && !StringUtils.containsDigit(s)
+                        ).map(ModLoaderType::toEither).toList()
                 );
             }
         }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
index 15bcd0168b6..5dd06908ba8 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
@@ -126,6 +126,15 @@ public static String removeDashAndCapitalizeWords(String str) {
         return String.join(" ", words);
     }
 
+    public static boolean containsDigit(String str) {
+        int l = str.length();
+        for (int i = 0; i < l; i++) {
+            char c = str.charAt(i);
+            if ('0' <= c && c <= '9') return true;
+        }
+        return false;
+    }
+
     public static String substringBeforeLast(String str, char delimiter) {
         return substringBeforeLast(str, delimiter, str);
     }

From c139a755234f4ab37367fce3baf46d623e2c92a0 Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Fri, 3 Jul 2026 22:14:49 +0800
Subject: [PATCH 08/18] update

---
 .../jackhuang/hmcl/addon/mod/ModLoaderType.java    | 14 ++++++++++++++
 .../CurseForgeRemoteAddonRepository.java           |  6 +-----
 .../java/org/jackhuang/hmcl/util/StringUtils.java  | 14 +++++++++++++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
index 96608cb6177..434ff1a896c 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.addon.mod;
 
 import org.jackhuang.hmcl.util.Either;
+import org.jackhuang.hmcl.util.StringUtils;
 
 import java.util.Locale;
 
@@ -31,6 +32,19 @@ public enum ModLoaderType {
     LITE_LOADER,
     LEGACY_FABRIC;
 
+    public static boolean mightBeModLoader(String str) {
+        if (StringUtils.isBlank(str)
+                || !StringUtils.isASCII(str)
+                || "client".equalsIgnoreCase(str) || "server".equalsIgnoreCase(str))
+            return false;
+        int l = str.length();
+        for (int i = 0; i < l; i++) {
+            char c = str.charAt(i);
+            if (c != '-' && c != ' ' && !StringUtils.isAlphabetic(c)) return false;
+        }
+        return true;
+    }
+
     public static Either<ModLoaderType, String> toEither(String loader) {
         return switch (loader.toLowerCase(Locale.ROOT)) {
             case "fabric" -> Either.left(ModLoaderType.FABRIC);
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
index 21a6d38430d..55cbf226520 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
@@ -479,11 +479,7 @@ public RemoteAddon.Version toVersion() {
                             return RemoteAddon.Dependency.ofGeneral(RELATION_TYPE.get(dependency.relationType()), MODS, Integer.toString(dependency.modId()));
                         }).distinct().filter(Objects::nonNull).collect(Collectors.toList()),
                         gameVersions.stream().filter(GameVersionNumber::isKnown).toList(),
-                        gameVersions.stream().filter(s ->
-                                !"client".equalsIgnoreCase(s)
-                                && !"server".equalsIgnoreCase(s)
-                                && !StringUtils.containsDigit(s)
-                        ).map(ModLoaderType::toEither).toList()
+                        gameVersions.stream().filter(ModLoaderType::mightBeModLoader).map(ModLoaderType::toEither).toList()
                 );
             }
         }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
index 5dd06908ba8..552fc189247 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
@@ -617,11 +617,23 @@ public static boolean isASCII(String cs) {
         return true;
     }
 
+    public static boolean isAlphabetic(char ch) {
+        return ch >= 'a' && ch <= 'z' || ch >= 'A' && ch <= 'Z';
+    }
+
+    public static boolean isAlphabetic(String str) {
+        int length = str.length();
+        for (int i = 0; i < length; i++) {
+            if (!isAlphabetic(str.charAt(i))) return false;
+        }
+        return true;
+    }
+
     public static boolean isAlphabeticOrNumber(String str) {
         int length = str.length();
         for (int i = 0; i < length; i++) {
             char ch = str.charAt(i);
-            if (!(ch >= '0' && ch <= '9') && !(ch >= 'a' && ch <= 'z') && !(ch >= 'A' && ch <= 'Z'))
+            if (!(ch >= '0' && ch <= '9') && !isAlphabetic(ch))
                 return false;
         }
         return true;

From b4a37977d141bbefe19908be46547c79d677bd9e Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Fri, 3 Jul 2026 22:36:32 +0800
Subject: [PATCH 09/18] update

---
 .../org/jackhuang/hmcl/ui/construct/TwoLineListItem.java | 9 +++++++++
 .../org/jackhuang/hmcl/ui/versions/ModListPageSkin.java  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
index 0c9f5387fb2..d1262fa5933 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
@@ -31,6 +31,8 @@
 import org.jackhuang.hmcl.ui.FXUtils;
 
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.stream.Collectors;
 
 public class TwoLineListItem extends VBox {
     private static final String DEFAULT_STYLE_CLASS = "two-line-list-item";
@@ -205,6 +207,13 @@ public void addTags(Collection<String> tags) {
         getTags().addAll(tags.stream().map(tag -> createTag(tag, null)).toList());
     }
 
+    public void addTagsIfNotExist(Collection<String> tags) {
+        var current = getTags().stream().map(Label::getText).collect(Collectors.toSet());
+        var target = new HashSet<>(tags);
+        target.removeAll(current);
+        addTags(target);
+    }
+
     private static final PseudoClass WARNING_PSEUDO_CLASS = PseudoClass.getPseudoClass("warning");
 
     public void addTagWarning(String tag) {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
index 5f245c6c72d..455aaf536be 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
@@ -491,7 +491,7 @@ final class ModInfoDialog extends JFXDialogLayout {
                                     );
                                     if (tag != null) tags.add(tag);
                                 }
-                                title.addTags(tags);
+                                title.addTagsIfNotExist(tags);
 
                                 button.setOnAction(e -> {
                                     fireEvent(new DialogCloseEvent());

From 9115b7fb0bf9e2d47aad3f14347ce5088e60793d Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Fri, 3 Jul 2026 22:38:33 +0800
Subject: [PATCH 10/18] update

---
 .../java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
index d1262fa5933..cb21a879557 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
@@ -31,7 +31,7 @@
 import org.jackhuang.hmcl.ui.FXUtils;
 
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.stream.Collectors;
 
 public class TwoLineListItem extends VBox {
@@ -209,7 +209,7 @@ public void addTags(Collection<String> tags) {
 
     public void addTagsIfNotExist(Collection<String> tags) {
         var current = getTags().stream().map(Label::getText).collect(Collectors.toSet());
-        var target = new HashSet<>(tags);
+        var target = new LinkedHashSet<>(tags);
         target.removeAll(current);
         addTags(target);
     }

From b2366a4de0f166939b9048e7cb491f9ebc0b5ea2 Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Fri, 3 Jul 2026 23:07:13 +0800
Subject: [PATCH 11/18] update

---
 .../main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
index 434ff1a896c..d00db9f5e2f 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
@@ -35,7 +35,7 @@ public enum ModLoaderType {
     public static boolean mightBeModLoader(String str) {
         if (StringUtils.isBlank(str)
                 || !StringUtils.isASCII(str)
-                || "client".equalsIgnoreCase(str) || "server".equalsIgnoreCase(str))
+                || "client".equalsIgnoreCase(str) || "server".equalsIgnoreCase(str) || "minecraft".equalsIgnoreCase(str))
             return false;
         int l = str.length();
         for (int i = 0; i < l; i++) {

From 6477450f2740e89f2f9d0c01b3b9354307eea209 Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Fri, 3 Jul 2026 23:09:03 +0800
Subject: [PATCH 12/18] discard

---
 .../main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
index d00db9f5e2f..434ff1a896c 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
@@ -35,7 +35,7 @@ public enum ModLoaderType {
     public static boolean mightBeModLoader(String str) {
         if (StringUtils.isBlank(str)
                 || !StringUtils.isASCII(str)
-                || "client".equalsIgnoreCase(str) || "server".equalsIgnoreCase(str) || "minecraft".equalsIgnoreCase(str))
+                || "client".equalsIgnoreCase(str) || "server".equalsIgnoreCase(str))
             return false;
         int l = str.length();
         for (int i = 0; i < l; i++) {

From 0582f0f7065626ca701539b98297ff1913f31b0b Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Sun, 5 Jul 2026 12:10:33 +0800
Subject: [PATCH 13/18] update

---
 .../hmcl/ui/versions/DownloadPage.java        | 22 +++-----
 .../hmcl/ui/versions/ModListPageSkin.java     | 16 +-----
 .../org/jackhuang/hmcl/util/i18n/I18n.java    | 25 +++++++++
 .../org/jackhuang/hmcl/addon/LoaderType.java  | 54 +++++++++++++++++++
 .../org/jackhuang/hmcl/addon/RemoteAddon.java |  2 +-
 .../hmcl/addon/mod/ModLoaderType.java         | 33 ++----------
 .../CurseForgeRemoteAddonRepository.java      |  4 +-
 .../ModrinthRemoteAddonRepository.java        |  4 +-
 .../java/org/jackhuang/hmcl/util/Either.java  |  3 ++
 9 files changed, 98 insertions(+), 65 deletions(-)
 create mode 100644 HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
index 5303e2da1cc..2fbf49c2bee 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
@@ -29,6 +29,7 @@
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
 import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.addon.LoaderType;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.LibraryAnalyzer;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
@@ -282,8 +283,9 @@ protected DownloadPageSkin(DownloadPage control) {
                                 resolve:
                                 for (RemoteAddon.Version modVersion : modVersions) {
                                     if (getSkinnable().type == RemoteAddonRepository.Type.MOD) {
-                                        for (Either<ModLoaderType, String> loader : modVersion.loaders()) {
-                                            if (loader.hasLeft() && targetLoaders.contains(loader.left())) {
+                                        for (Either<LoaderType, String> loader : modVersion.loaders()) {
+                                            //noinspection SuspiciousMethodCalls
+                                            if (loader.left() instanceof ModLoaderType && targetLoaders.contains(loader.left())) {
                                                 list.getContent().addAll(
                                                         ComponentList.createComponentListTitle(i18n("mods.download.recommend", gameVersion)),
                                                         new AddonItem(control.addon, modVersion, control)
@@ -453,20 +455,8 @@ private static final class AddonItem extends StackPane {
                     }
 
                     Set<String> tags = new LinkedHashSet<>();
-                    for (Either<ModLoaderType, String> loader : dataItem.loaders()) {
-                        String tag = loader.map(
-                                loaderType -> switch (loaderType) {
-                                    case FORGE -> i18n("install.installer.forge");
-                                    case CLEANROOM -> i18n("install.installer.cleanroom");
-                                    case NEO_FORGE -> i18n("install.installer.neoforge");
-                                    case FABRIC -> i18n("install.installer.fabric");
-                                    case LITE_LOADER -> i18n("install.installer.liteloader");
-                                    case QUILT -> i18n("install.installer.quilt");
-                                    case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
-                                    default -> null;
-                                },
-                                s -> "bungeecord".equalsIgnoreCase(s) ? "BungeeCord" : StringUtils.removeDashAndCapitalizeWords(s)
-                        );
+                    for (Either<LoaderType, String> loader : dataItem.loaders()) {
+                        String tag = I18n.translateLoaderType(loader);
                         if (tag != null) tags.add(tag);
                     }
                     content.addTags(tags);
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
index 455aaf536be..3d3df22774e 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
@@ -475,20 +475,8 @@ final class ModInfoDialog extends JFXDialogLayout {
                             RemoteAddon remoteAddon = repository.getModById(DownloadProviders.getDownloadProvider(), versionOptional.get().modid());
                             FXUtils.runInFX(() -> {
                                 Set<String> tags = new LinkedHashSet<>();
-                                for (Either<ModLoaderType, String> loader : versionOptional.get().loaders()) {
-                                    String tag = loader.map(
-                                            loaderType -> switch (loaderType) {
-                                                case FORGE -> i18n("install.installer.forge");
-                                                case CLEANROOM -> i18n("install.installer.cleanroom");
-                                                case NEO_FORGE -> i18n("install.installer.neoforge");
-                                                case FABRIC -> i18n("install.installer.fabric");
-                                                case LITE_LOADER -> i18n("install.installer.liteloader");
-                                                case QUILT -> i18n("install.installer.quilt");
-                                                case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
-                                                default -> null;
-                                            },
-                                            StringUtils::removeDashAndCapitalizeWords
-                                    );
+                                for (Either<LoaderType, String> loader : versionOptional.get().loaders()) {
+                                    String tag = I18n.translateLoaderType(loader);
                                     if (tag != null) tags.add(tag);
                                 }
                                 title.addTagsIfNotExist(tags);
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java
index 286910be07e..df057a31fc5 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java
@@ -17,8 +17,12 @@
  */
 package org.jackhuang.hmcl.util.i18n;
 
+import org.jackhuang.hmcl.addon.LoaderType;
+import org.jackhuang.hmcl.addon.mod.ModLoaderType;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.download.game.GameRemoteVersion;
+import org.jackhuang.hmcl.util.Either;
+import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.i18n.translator.Translator;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 import org.jetbrains.annotations.Nullable;
@@ -124,6 +128,27 @@ public static String getWikiLink(GameRemoteVersion remoteVersion) {
         return MinecraftWiki.getWikiLink(locale, remoteVersion);
     }
 
+    public static @Nullable String translateLoaderType(Either<LoaderType, String> loader) {
+        return loader.map(
+                loaderType -> {
+                    if (loaderType instanceof ModLoaderType modLoaderType) {
+                        return switch (modLoaderType) {
+                            case FORGE -> i18n("install.installer.forge");
+                            case CLEANROOM -> i18n("install.installer.cleanroom");
+                            case NEO_FORGE -> i18n("install.installer.neoforge");
+                            case FABRIC -> i18n("install.installer.fabric");
+                            case LITE_LOADER -> i18n("install.installer.liteloader");
+                            case QUILT -> i18n("install.installer.quilt");
+                            case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
+                            default -> null;
+                        };
+                    }
+                    return null;
+                },
+                s -> "bungeecord".equalsIgnoreCase(s) ? "BungeeCord" : StringUtils.removeDashAndCapitalizeWords(s)
+        );
+    }
+
     public static boolean hasKey(String key) {
         return getResourceBundle().containsKey(key);
     }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
new file mode 100644
index 00000000000..d6583c730d8
--- /dev/null
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
@@ -0,0 +1,54 @@
+/*
+ * 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.addon;
+
+import org.jackhuang.hmcl.addon.mod.ModLoaderType;
+import org.jackhuang.hmcl.util.Either;
+import org.jackhuang.hmcl.util.StringUtils;
+
+import java.util.Locale;
+
+/// For mods and shaders
+public interface LoaderType {
+
+    static boolean mightBeModLoader(String str) {
+        if (StringUtils.isBlank(str)
+                || !StringUtils.isASCII(str)
+                || "client".equalsIgnoreCase(str) || "server".equalsIgnoreCase(str))
+            return false;
+        int l = str.length();
+        for (int i = 0; i < l; i++) {
+            char c = str.charAt(i);
+            if (c != '-' && c != ' ' && !StringUtils.isAlphabetic(c)) return false;
+        }
+        return true;
+    }
+
+    static Either<LoaderType, String> toEither(String loader) {
+        return switch (loader.toLowerCase(Locale.ROOT)) {
+            case "fabric" -> Either.left(ModLoaderType.FABRIC);
+            case "forge" -> Either.left(ModLoaderType.FORGE);
+            case "neoforge" -> Either.left(ModLoaderType.NEO_FORGE);
+            case "quilt" -> Either.left(ModLoaderType.QUILT);
+            case "liteloader" -> Either.left(ModLoaderType.LITE_LOADER);
+            case "legacy-fabric" -> Either.left(ModLoaderType.LEGACY_FABRIC);
+            default -> Either.right(loader);
+        };
+    }
+
+}
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java
index 714c8bad6cf..17da2f16db9 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java
@@ -205,7 +205,7 @@ public interface IVersion {
 
     public record Version(IVersion self, String modid, String name, String version, String changelog,
                           Instant datePublished, VersionType versionType, File file, List<Dependency> dependencies,
-                          List<String> gameVersions, List<Either<ModLoaderType, String>> loaders) {
+                          List<String> gameVersions, List<Either<LoaderType, String>> loaders) {
     }
 
     public record File(Map<String, String> hashes, String url, String filename) {
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
index 434ff1a896c..39dd2fdea14 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
@@ -17,12 +17,9 @@
  */
 package org.jackhuang.hmcl.addon.mod;
 
-import org.jackhuang.hmcl.util.Either;
-import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.addon.LoaderType;
 
-import java.util.Locale;
-
-public enum ModLoaderType {
+public enum ModLoaderType implements LoaderType {
     UNKNOWN,
     FORGE,
     CLEANROOM,
@@ -30,30 +27,6 @@ public enum ModLoaderType {
     FABRIC,
     QUILT,
     LITE_LOADER,
-    LEGACY_FABRIC;
-
-    public static boolean mightBeModLoader(String str) {
-        if (StringUtils.isBlank(str)
-                || !StringUtils.isASCII(str)
-                || "client".equalsIgnoreCase(str) || "server".equalsIgnoreCase(str))
-            return false;
-        int l = str.length();
-        for (int i = 0; i < l; i++) {
-            char c = str.charAt(i);
-            if (c != '-' && c != ' ' && !StringUtils.isAlphabetic(c)) return false;
-        }
-        return true;
-    }
+    LEGACY_FABRIC
 
-    public static Either<ModLoaderType, String> toEither(String loader) {
-        return switch (loader.toLowerCase(Locale.ROOT)) {
-            case "fabric" -> Either.left(ModLoaderType.FABRIC);
-            case "forge" -> Either.left(ModLoaderType.FORGE);
-            case "neoforge" -> Either.left(ModLoaderType.NEO_FORGE);
-            case "quilt" -> Either.left(ModLoaderType.QUILT);
-            case "liteloader" -> Either.left(ModLoaderType.LITE_LOADER);
-            case "legacy-fabric" -> Either.left(ModLoaderType.LEGACY_FABRIC);
-            default -> Either.right(loader);
-        };
-    }
 }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
index 55cbf226520..8a86fe06dad 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
@@ -18,9 +18,9 @@
 package org.jackhuang.hmcl.addon.repository;
 
 import com.google.gson.reflect.TypeToken;
+import org.jackhuang.hmcl.addon.LoaderType;
 import org.jackhuang.hmcl.addon.RemoteAddon;
 import org.jackhuang.hmcl.addon.RemoteAddonRepository;
-import org.jackhuang.hmcl.addon.mod.ModLoaderType;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.io.HttpRequest;
@@ -479,7 +479,7 @@ public RemoteAddon.Version toVersion() {
                             return RemoteAddon.Dependency.ofGeneral(RELATION_TYPE.get(dependency.relationType()), MODS, Integer.toString(dependency.modId()));
                         }).distinct().filter(Objects::nonNull).collect(Collectors.toList()),
                         gameVersions.stream().filter(GameVersionNumber::isKnown).toList(),
-                        gameVersions.stream().filter(ModLoaderType::mightBeModLoader).map(ModLoaderType::toEither).toList()
+                        gameVersions.stream().filter(LoaderType::mightBeModLoader).map(LoaderType::toEither).toList()
                 );
             }
         }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java
index d49fb3bc9a4..77e594db7ed 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/ModrinthRemoteAddonRepository.java
@@ -19,9 +19,9 @@
 
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
+import org.jackhuang.hmcl.addon.LoaderType;
 import org.jackhuang.hmcl.addon.RemoteAddon;
 import org.jackhuang.hmcl.addon.RemoteAddonRepository;
-import org.jackhuang.hmcl.addon.mod.ModLoaderType;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
@@ -417,7 +417,7 @@ public Optional<RemoteAddon.Version> toVersion() {
                         return RemoteAddon.Dependency.ofGeneral(DEPENDENCY_TYPE.get(dependency.dependencyType), MODS, dependency.projectId);
                     }).filter(Objects::nonNull).collect(Collectors.toList()),
                     gameVersions,
-                    loaders.stream().map(ModLoaderType::toEither).toList()
+                    loaders.stream().map(LoaderType::toEither).toList()
             ));
         }
     }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
index a61791df900..8c3b4c9a0f1 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/Either.java
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.util;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.function.Function;
@@ -36,8 +37,10 @@ public static <L, R> Either<L, R> right(@NotNull R right) {
 
     public abstract boolean hasRight();
 
+    @Nullable
     public abstract L left();
 
+    @Nullable
     public abstract R right();
 
     public abstract <T> T map(Function<L, T> lFunc, Function<R, T> rFunc);

From d6fd6aae0612eddaf645d77555d2cd9b3f998f00 Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Sun, 5 Jul 2026 12:11:24 +0800
Subject: [PATCH 14/18] update

---
 HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java | 2 +-
 .../hmcl/addon/repository/CurseForgeRemoteAddonRepository.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
index d6583c730d8..98f03d161a5 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
@@ -26,7 +26,7 @@
 /// For mods and shaders
 public interface LoaderType {
 
-    static boolean mightBeModLoader(String str) {
+    static boolean mightBeLoader(String str) {
         if (StringUtils.isBlank(str)
                 || !StringUtils.isASCII(str)
                 || "client".equalsIgnoreCase(str) || "server".equalsIgnoreCase(str))
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
index 8a86fe06dad..23b94fa140e 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/repository/CurseForgeRemoteAddonRepository.java
@@ -479,7 +479,7 @@ public RemoteAddon.Version toVersion() {
                             return RemoteAddon.Dependency.ofGeneral(RELATION_TYPE.get(dependency.relationType()), MODS, Integer.toString(dependency.modId()));
                         }).distinct().filter(Objects::nonNull).collect(Collectors.toList()),
                         gameVersions.stream().filter(GameVersionNumber::isKnown).toList(),
-                        gameVersions.stream().filter(LoaderType::mightBeModLoader).map(LoaderType::toEither).toList()
+                        gameVersions.stream().filter(LoaderType::mightBeLoader).map(LoaderType::toEither).toList()
                 );
             }
         }

From 0d3297573f94606c9d95be0da187aebcbc935fd6 Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Sun, 5 Jul 2026 12:11:46 +0800
Subject: [PATCH 15/18] update

---
 .../main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
index 39dd2fdea14..375726975e5 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
@@ -28,5 +28,4 @@ public enum ModLoaderType implements LoaderType {
     QUILT,
     LITE_LOADER,
     LEGACY_FABRIC
-
 }

From 9ab287e6452087997c52633e9bf453421a6f786b Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Sun, 5 Jul 2026 12:22:41 +0800
Subject: [PATCH 16/18] update

---
 HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java
index 17da2f16db9..17cff9bf9e3 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/RemoteAddon.java
@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.addon;
 
-import org.jackhuang.hmcl.addon.mod.ModLoaderType;
 import org.jackhuang.hmcl.addon.repository.CurseForgeRemoteAddonRepository;
 import org.jackhuang.hmcl.addon.repository.ModrinthRemoteAddonRepository;
 import org.jackhuang.hmcl.download.DownloadProvider;

From 3242079f10c1a0028d2c42233098717b303c3c88 Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Sun, 5 Jul 2026 17:52:42 +0800
Subject: [PATCH 17/18] update

---
 .../org/jackhuang/hmcl/util/i18n/I18n.java    |  2 +-
 .../org/jackhuang/hmcl/addon/LoaderType.java  | 19 ++++++-------
 .../hmcl/addon/mod/ModLoaderType.java         | 28 ++++++++++++++-----
 .../org/jackhuang/hmcl/util/StringUtils.java  |  4 +--
 4 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java
index df057a31fc5..1b100938986 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java
@@ -145,7 +145,7 @@ public static String getWikiLink(GameRemoteVersion remoteVersion) {
                     }
                     return null;
                 },
-                s -> "bungeecord".equalsIgnoreCase(s) ? "BungeeCord" : StringUtils.removeDashAndCapitalizeWords(s)
+                s -> "bungeecord".equalsIgnoreCase(s) ? "BungeeCord" : StringUtils.capitalizeWords(s)
         );
     }
 
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
index 98f03d161a5..b5b10a9441f 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
@@ -21,11 +21,14 @@
 import org.jackhuang.hmcl.util.Either;
 import org.jackhuang.hmcl.util.StringUtils;
 
+import java.util.List;
 import java.util.Locale;
 
 /// For mods and shaders
 public interface LoaderType {
 
+    List<String> names();
+
     static boolean mightBeLoader(String str) {
         if (StringUtils.isBlank(str)
                 || !StringUtils.isASCII(str)
@@ -34,21 +37,17 @@ static boolean mightBeLoader(String str) {
         int l = str.length();
         for (int i = 0; i < l; i++) {
             char c = str.charAt(i);
-            if (c != '-' && c != ' ' && !StringUtils.isAlphabetic(c)) return false;
+            if (c != '-' && c != ' ' && c != '_' && !StringUtils.isAlphabetic(c)) return false;
         }
         return true;
     }
 
     static Either<LoaderType, String> toEither(String loader) {
-        return switch (loader.toLowerCase(Locale.ROOT)) {
-            case "fabric" -> Either.left(ModLoaderType.FABRIC);
-            case "forge" -> Either.left(ModLoaderType.FORGE);
-            case "neoforge" -> Either.left(ModLoaderType.NEO_FORGE);
-            case "quilt" -> Either.left(ModLoaderType.QUILT);
-            case "liteloader" -> Either.left(ModLoaderType.LITE_LOADER);
-            case "legacy-fabric" -> Either.left(ModLoaderType.LEGACY_FABRIC);
-            default -> Either.right(loader);
-        };
+        String l = loader.toLowerCase(Locale.ROOT);
+        for (var m : ModLoaderType.values()) {
+            if (m.names().contains(l)) return Either.left(m);
+        }
+        return Either.right(loader);
     }
 
 }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
index 375726975e5..29ba5f62495 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
@@ -19,13 +19,27 @@
 
 import org.jackhuang.hmcl.addon.LoaderType;
 
+import java.util.List;
+
 public enum ModLoaderType implements LoaderType {
     UNKNOWN,
-    FORGE,
-    CLEANROOM,
-    NEO_FORGE,
-    FABRIC,
-    QUILT,
-    LITE_LOADER,
-    LEGACY_FABRIC
+    FORGE("forge"),
+    CLEANROOM("cleanroom"),
+    NEO_FORGE("neoforge"),
+    FABRIC("fabric"),
+    QUILT("quilt"),
+    LITE_LOADER("liteloader"),
+    LEGACY_FABRIC("legacy-fabric");
+
+    private final List<String> names;
+
+    ModLoaderType(String... names) {
+        this.names = List.of(names);
+    }
+
+    @Override
+    public List<String> names() {
+        return names;
+    }
+
 }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
index 552fc189247..799300efc25 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java
@@ -116,10 +116,10 @@ public static String capitalizeFirst(String str) {
         return Character.toUpperCase(str.charAt(0)) + str.substring(1);
     }
 
-    public static String removeDashAndCapitalizeWords(String str) {
+    public static String capitalizeWords(String str) {
         if (str == null || str.isEmpty())
             return str;
-        String[] words = str.replace('-', ' ').split(" ");
+        String[] words = str.replace('-', ' ').replace('_', ' ').split(" ");
         for (int i = 0; i < words.length; i++) {
             words[i] = capitalizeFirst(words[i]);
         }

From d6b3b8782490dc47ffee2b2bc335bdd216b36954 Mon Sep 17 00:00:00 2001
From: ToobLac <tooblac39@gmail.com>
Date: Sun, 5 Jul 2026 18:01:52 +0800
Subject: [PATCH 18/18] update

---
 .../main/java/org/jackhuang/hmcl/addon/LoaderType.java    | 4 ++--
 .../java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
index b5b10a9441f..94fbcf5344a 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/LoaderType.java
@@ -21,13 +21,13 @@
 import org.jackhuang.hmcl.util.Either;
 import org.jackhuang.hmcl.util.StringUtils;
 
-import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 /// For mods and shaders
 public interface LoaderType {
 
-    List<String> names();
+    Set<String> names();
 
     static boolean mightBeLoader(String str) {
         if (StringUtils.isBlank(str)
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
index 29ba5f62495..e750eff8ffc 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/addon/mod/ModLoaderType.java
@@ -19,7 +19,7 @@
 
 import org.jackhuang.hmcl.addon.LoaderType;
 
-import java.util.List;
+import java.util.Set;
 
 public enum ModLoaderType implements LoaderType {
     UNKNOWN,
@@ -31,14 +31,14 @@ public enum ModLoaderType implements LoaderType {
     LITE_LOADER("liteloader"),
     LEGACY_FABRIC("legacy-fabric");
 
-    private final List<String> names;
+    private final Set<String> names;
 
     ModLoaderType(String... names) {
-        this.names = List.of(names);
+        this.names = Set.of(names);
     }
 
     @Override
-    public List<String> names() {
+    public Set<String> names() {
         return names;
     }