From 58d378055354581135d8837a1b6b2bd3b6ad3f3a Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@gmail.com>
Date: Mon, 13 Oct 2025 15:13:46 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20#4663:=20=E6=8E=92=E5=BA=8F=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E6=97=B6=E5=BA=94=E5=BF=BD=E7=95=A5=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99=20(#4665)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/jackhuang/hmcl/ui/versions/ModListPage.java    |  4 ++--
 .../jackhuang/hmcl/ui/versions/ModListPageSkin.java    | 10 +---------
 .../main/java/org/jackhuang/hmcl/mod/LocalModFile.java |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java
index 3a74e3840..0dce35cd2 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java
@@ -104,7 +104,7 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
             lock.lock();
             try {
                 modManager.refreshMods();
-                return modManager.getMods();
+                return modManager.getMods().stream().map(ModListPageSkin.ModInfoObject::new).toList();
             } catch (IOException e) {
                 throw new UncheckedIOException(e);
             } finally {
@@ -114,7 +114,7 @@ public final class ModListPage extends ListPageBase<ModListPageSkin.ModInfoObjec
             updateSupportedLoaders(modManager);
 
             if (exception == null) {
-                getItems().setAll(list.stream().map(ModListPageSkin.ModInfoObject::new).toList());
+                getItems().setAll(list);
             } else {
                 LOG.warning("Failed to load mods", exception);
                 getItems().clear();
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 c64ce176b..8d1a3d34f 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
@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.ui.versions;
 
 import com.jfoenix.controls.*;
-import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
 import javafx.animation.PauseTransition;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
@@ -61,7 +60,6 @@ import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jackhuang.hmcl.util.io.CompressingUtils;
 import org.jackhuang.hmcl.util.io.FileUtils;
 import org.jackhuang.hmcl.util.io.NetworkUtils;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.ref.SoftReference;
@@ -289,7 +287,7 @@ final class ModListPageSkin extends SkinBase<ModListPage> {
         }
     }
 
-    static final class ModInfoObject extends RecursiveTreeObject<ModInfoObject> implements Comparable<ModInfoObject> {
+    static final class ModInfoObject {
         private final BooleanProperty active;
         private final LocalModFile localModFile;
         private final @Nullable ModTranslations.Mod modTranslations;
@@ -403,12 +401,6 @@ final class ModListPageSkin extends SkinBase<ModListPage> {
                 imageView.setImage(image);
             }, Schedulers.javafx());
         }
-
-        @Override
-        public int compareTo(@NotNull ModListPageSkin.ModInfoObject o) {
-            return localModFile.getFileName().toLowerCase(Locale.ROOT)
-                    .compareTo(o.localModFile.getFileName().toLowerCase(Locale.ROOT));
-        }
     }
 
     final class ModInfoDialog extends JFXDialogLayout {
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/LocalModFile.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/LocalModFile.java
index 0f05a684b..5cb1a4403 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/LocalModFile.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/LocalModFile.java
@@ -189,7 +189,7 @@ public final class LocalModFile implements Comparable<LocalModFile> {
 
     @Override
     public int compareTo(LocalModFile o) {
-        return getFileName().compareTo(o.getFileName());
+        return getFileName().compareToIgnoreCase(o.getFileName());
     }
 
     @Override