sort plugin id on plugin toggle screen

(cherry picked from commit 38adb5f)
badasintended · Jun 17, 2024 · 6b9fde4 · 6b9fde4
1 parent 51ffc4d
commit 6b9fde4
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/main/java/mcp/mobius/waila/gui/screen/PluginToggleScreen.java b/src/main/java/mcp/mobius/waila/gui/screen/PluginToggleScreen.java
@@ -2,6 +2,7 @@
 
 import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
 import mcp.mobius.waila.api.IWailaConfig;
+import mcp.mobius.waila.api.WailaConstants;
 import mcp.mobius.waila.buildconst.Tl;
 import mcp.mobius.waila.gui.widget.ConfigListWidget;
 import mcp.mobius.waila.gui.widget.value.BooleanValue;
@@ -50,7 +51,17 @@ public ConfigListWidget getOptions() {
 
         });
 
-        for (var plugin : PluginInfo.getAll()) {
+        var sorted = PluginInfo.getAll().stream().sorted((a, b) -> {
+            var aId = a.getPluginId();
+            var bId = b.getPluginId();
+
+            var aIsWaila = aId.getNamespace().equals(WailaConstants.NAMESPACE);
+            var bIsWaila = bId.getNamespace().equals(WailaConstants.NAMESPACE);
+            if (aIsWaila == bIsWaila) return aId.compareTo(bId);
+            return aIsWaila ? +1 : -1;
+        }).toList();
+
+        for (var plugin : sorted) {
             var impl = (PluginInfo) plugin;
             var id = plugin.getPluginId();
             var enabled = plugin.isEnabled();