From b924fe6f8909e4e4e4d239abe16a00ede9308909 Mon Sep 17 00:00:00 2001
From: Shiewk <shiewkmail@shiewk.de>
Date: Fri, 5 Dec 2025 17:38:51 +0100
Subject: [PATCH] (2.1.0) Sort widgets on the overview screen alphabetically

---
 gradle.properties                                   |  2 +-
 .../client/screen/EditWidgetPositionsScreen.java    |  3 ++-
 .../client/screen/components/WidgetListWidget.java  | 13 ++++++++-----
 .../de/shiewk/widgets/widgets/ArmorHudWidget.java   |  3 ++-
 .../de/shiewk/widgets/widgets/InventoryWidget.java  |  3 ++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b487b7f..9903569 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.21.9
 yarn_mappings=1.21.9+build.1
 loader_version=0.17.2
 # Mod Properties
-mod_version=2.0.0
+mod_version=2.1.0
 maven_group=de.shiewk
 archives_base_name=Widgets
 # Dependencies
diff --git a/src/main/java/de/shiewk/widgets/client/screen/EditWidgetPositionsScreen.java b/src/main/java/de/shiewk/widgets/client/screen/EditWidgetPositionsScreen.java
index abc8323..cc1d024 100644
--- a/src/main/java/de/shiewk/widgets/client/screen/EditWidgetPositionsScreen.java
+++ b/src/main/java/de/shiewk/widgets/client/screen/EditWidgetPositionsScreen.java
@@ -20,6 +20,7 @@ import org.joml.Vector2i;
 
 import java.awt.*;
 import java.util.List;
+import java.util.Locale;
 import java.util.function.Consumer;
 
 public class EditWidgetPositionsScreen extends AnimatedScreen {
@@ -279,7 +280,7 @@ public class EditWidgetPositionsScreen extends AnimatedScreen {
                                             List<ContextMenuScreen.Option> options = new ObjectArrayList<>(Anchor.values().length);
                                             for (Anchor anchor : Anchor.values()) {
                                                 options.add(new ContextMenuScreen.Option(
-                                                        Text.translatable("widgets.ui.anchor." + anchor.name().toLowerCase()),
+                                                        Text.translatable("widgets.ui.anchor." + anchor.name().toLowerCase(Locale.ROOT)),
                                                         hovered.getSettings().anchor == anchor,
                                                         () -> {
                                                             hovered.setPos(
diff --git a/src/main/java/de/shiewk/widgets/client/screen/components/WidgetListWidget.java b/src/main/java/de/shiewk/widgets/client/screen/components/WidgetListWidget.java
index 3463299..f57a697 100644
--- a/src/main/java/de/shiewk/widgets/client/screen/components/WidgetListWidget.java
+++ b/src/main/java/de/shiewk/widgets/client/screen/components/WidgetListWidget.java
@@ -18,7 +18,9 @@ import net.minecraft.text.Text;
 import org.joml.Matrix3x2fStack;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 import java.util.function.Consumer;
 
 public class WidgetListWidget extends ScrollableWidget {
@@ -31,6 +33,7 @@ public class WidgetListWidget extends ScrollableWidget {
     private final Consumer<ModWidget> onEdit;
 
     public static boolean searchQueryMatches(String search, ModWidget widget) {
+        if (search == null) return true;
         return widget.getName().getString().contains(search) || widget.getDescription().getString().contains(search) || widget.getId().toString().contains(search);
     }
 
@@ -44,11 +47,11 @@ public class WidgetListWidget extends ScrollableWidget {
     }
 
     private List<ModWidget> loadWidgets(String search) {
-        if (search == null) {
-            return WidgetManager.getAllWidgets();
-        } else {
-            return WidgetManager.getAllWidgets().stream().filter(w -> searchQueryMatches(search, w)).toList();
-        }
+        return WidgetManager.getAllWidgets()
+                .stream()
+                .filter(w -> searchQueryMatches(search, w))
+                .sorted(Comparator.comparing(w -> w.getName().getString().toLowerCase(Locale.ROOT)))
+                .toList();
     }
 
     private void init(){
diff --git a/src/main/java/de/shiewk/widgets/widgets/ArmorHudWidget.java b/src/main/java/de/shiewk/widgets/widgets/ArmorHudWidget.java
index 41842a1..3901b6a 100644
--- a/src/main/java/de/shiewk/widgets/widgets/ArmorHudWidget.java
+++ b/src/main/java/de/shiewk/widgets/widgets/ArmorHudWidget.java
@@ -16,6 +16,7 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
 import java.util.List;
+import java.util.Locale;
 
 import static net.minecraft.text.Text.translatable;
 
@@ -41,7 +42,7 @@ public class ArmorHudWidget extends ResizableWidget {
         PERCENT;
 
         public Text getDisplayName() {
-            return translatable("widgets.widgets.armorHud.durabilityStyle." + name().toLowerCase());
+            return translatable("widgets.widgets.armorHud.durabilityStyle." + name().toLowerCase(Locale.ROOT));
         }
     }
 
diff --git a/src/main/java/de/shiewk/widgets/widgets/InventoryWidget.java b/src/main/java/de/shiewk/widgets/widgets/InventoryWidget.java
index 6e3f216..7a3568f 100644
--- a/src/main/java/de/shiewk/widgets/widgets/InventoryWidget.java
+++ b/src/main/java/de/shiewk/widgets/widgets/InventoryWidget.java
@@ -16,6 +16,7 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
 import java.util.List;
+import java.util.Locale;
 
 import static net.minecraft.text.Text.translatable;
 
@@ -42,7 +43,7 @@ public class InventoryWidget extends ResizableWidget {
         }
 
         public Text display() {
-            return translatable("widgets.widgets.inventory.mode." + name().toLowerCase());
+            return translatable("widgets.widgets.inventory.mode." + name().toLowerCase(Locale.ROOT));
         }
     }