Make the search widget show module aliases in the search results

Author: Wide-Cat

src/main/java/meteordevelopment/meteorclient/gui/GuiTheme.java

@@ -155,7 +155,10 @@ public WSection section(String title) {
 
     public abstract WAccount account(WidgetScreen screen, Account<?> account);
 
-    public abstract WWidget module(Module module);
+    public WWidget module(Module module) {
+        return module(module, module.title);
+    }
+    public abstract WWidget module(Module module, String title);
 
     public abstract WQuad quad(Color color);
 

src/main/java/meteordevelopment/meteorclient/gui/screens/ModulesScreen.java

@@ -20,6 +20,7 @@
 import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.utils.misc.NbtUtils;
 import net.minecraft.item.Items;
+import net.minecraft.util.Pair;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -80,30 +81,30 @@ protected WWindow createCategory(WContainer c, Category category, List<Module> m
     protected void createSearchW(WContainer w, String text) {
         if (!text.isEmpty()) {
             // Titles
-            Set<Module> modules = Modules.get().searchTitles(text);
+            List<Pair<Module, String>> modules = Modules.get().searchTitles(text);
 
             if (!modules.isEmpty()) {
                 WSection section = w.add(theme.section("Modules")).expandX().widget();
                 section.spacing = 0;
 
                 int count = 0;
-                for (Module module : modules) {
+                for (Pair<Module, String> p : modules) {
                     if (count >= Config.get().moduleSearchCount.get() || count >= modules.size()) break;
-                    section.add(theme.module(module)).expandX();
+                    section.add(theme.module(p.getLeft(), p.getRight())).expandX();
                     count++;
                 }
             }
 
             // Settings
-            modules = Modules.get().searchSettingTitles(text);
+            Set<Module> settings = Modules.get().searchSettingTitles(text);
 
-            if (!modules.isEmpty()) {
+            if (!settings.isEmpty()) {
                 WSection section = w.add(theme.section("Settings")).expandX().widget();
                 section.spacing = 0;
 
                 int count = 0;
-                for (Module module : modules) {
-                    if (count >= Config.get().moduleSearchCount.get() || count >= modules.size()) break;
+                for (Module module : settings) {
+                    if (count >= Config.get().moduleSearchCount.get() || count >= settings.size()) break;
                     section.add(theme.module(module)).expandX();
                     count++;
                 }

src/main/java/meteordevelopment/meteorclient/gui/themes/meteor/MeteorGuiTheme.java

@@ -276,8 +276,8 @@ public WAccount account(WidgetScreen screen, Account<?> account) {
     }
 
     @Override
-    public WWidget module(Module module) {
-        return w(new WMeteorModule(module));
+    public WWidget module(Module module, String title) {
+        return w(new WMeteorModule(module, title));
     }
 
     @Override

src/main/java/meteordevelopment/meteorclient/gui/themes/meteor/widgets/WMeteorModule.java

@@ -19,15 +19,17 @@
 
 public class WMeteorModule extends WPressable implements MeteorWidget {
     private final Module module;
+    private final String title;
 
     private double titleWidth;
 
     private double animationProgress1;
 
     private double animationProgress2;
 
-    public WMeteorModule(Module module) {
+    public WMeteorModule(Module module, String title) {
         this.module = module;
+        this.title = title;
         this.tooltip = module.description;
 
         if (module.isActive()) {
@@ -48,7 +50,7 @@ public double pad() {
     protected void onCalculateSize() {
         double pad = pad();
 
-        if (titleWidth == 0) titleWidth = theme.textWidth(module.title);
+        if (titleWidth == 0) titleWidth = theme.textWidth(title);
 
         width = pad + titleWidth + pad;
         height = pad + theme.textHeight() + pad;
@@ -88,6 +90,6 @@ else if (theme.moduleAlignment.get() == AlignmentX.Right) {
             x += w - titleWidth;
         }
 
-        renderer.text(module.title, x, y + pad, theme.textColor.get(), false);
+        renderer.text(title, x, y + pad, theme.textColor.get(), false);
     }
 }

src/main/java/meteordevelopment/meteorclient/systems/modules/Modules.java

@@ -42,6 +42,7 @@
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtList;
+import net.minecraft.util.Pair;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
@@ -148,21 +149,30 @@ public List<Module> getActive() {
         return active;
     }
 
-    public Set<Module> searchTitles(String text) {
-        Map<Module, Integer> modules = new ValueComparableMap<>(Comparator.naturalOrder());
+    public List<Pair<Module, String>> searchTitles(String text) {
+        Map<Pair<Module, String>, Integer> modules = new HashMap<>();
 
         for (Module module : this.moduleInstances.values()) {
-            int score = Utils.searchLevenshteinDefault(module.title, text, false);
+            String title = module.title;
+            int score = Utils.searchLevenshteinDefault(title, text, false);
+
             if (Config.get().moduleAliases.get()) {
                 for (String alias : module.aliases) {
                     int aliasScore = Utils.searchLevenshteinDefault(alias, text, false);
-                    if (aliasScore < score) score = aliasScore;
+                    if (aliasScore < score) {
+                        title = module.title + " (" + alias + ")";
+                        score = aliasScore;
+                    }
                 }
             }
-            modules.put(module, modules.getOrDefault(module, 0) + score);
+
+            modules.put(new Pair<>(module, title), score);
         }
 
-        return modules.keySet();
+        List<Pair<Module, String>> l = new ArrayList<>(modules.keySet());
+        l.sort(Comparator.comparingInt(modules::get));
+
+        return l;
     }
 
     public Set<Module> searchSettingTitles(String text) {