Sort Names Ignoring Case

Nomi-CEu · Dec 30, 2024 · 29b2cdd · 29b2cdd
1 parent aaf189a
commit 29b2cdd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/com/nomiceu/nomilabs/integration/betterp2p/SortModes.java b/src/main/java/com/nomiceu/nomilabs/integration/betterp2p/SortModes.java
@@ -14,7 +14,7 @@ public enum SortModes {
     DISTANCE("nomilabs.gui.advanced_memory_card.sort.distance", wrapComp(SortModes::compareDistThenName)),
     NAME("nomilabs.gui.advanced_memory_card.sort.name", wrapComp((a, b) -> {
         if (a.getName().equals(b.getName())) return compareTypeThenDist(a, b, false);
-        return StringUtils.compare(a.getName(), b.getName());
+        return StringUtils.compareIgnoreCase(a.getName(), b.getName());
     }));
 
     private final String translationKey;
@@ -78,14 +78,14 @@ private static Comparator<InfoWrapper> compDefault(InfoWrapper selected) {
                 // Errors next, also sorted by frequency (display)
                 if (a.getError()) {
                     if (b.getError()) {
-                        return StringUtils.compare(a.getFreqDisplay(), b.getFreqDisplay());
+                        return StringUtils.compareIgnoreCase(a.getFreqDisplay(), b.getFreqDisplay());
                     }
                     return -1;
                 }
                 if (b.getError()) return 1;
 
                 // Else, sort by frequency (display)
-                return StringUtils.compare(a.getFreqDisplay(), b.getFreqDisplay());
+                return StringUtils.compareIgnoreCase(a.getFreqDisplay(), b.getFreqDisplay());
             }
 
             return compareTypeThenDist(a, b, true);
@@ -104,7 +104,7 @@ private static int compareDistThenName(InfoWrapper a, InfoWrapper b) {
         double distA = getDistance(a);
         double distB = getDistance(b);
 
-        if (distA == distB) return StringUtils.compare(a.getName(), b.getName());
+        if (distA == distB) return StringUtils.compareIgnoreCase(a.getName(), b.getName());
         return Double.compare(distA, distB);
     }