Fix for Meteor build 4 (Make the search widget show module aliases in the search results)

Author: X-C-0

src/main/java/me/pindour/catpuccin/gui/screens/CatpuccinModulesScreen.java

@@ -19,6 +19,7 @@
 import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.meteorclient.utils.misc.NbtUtils;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.util.Pair;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -116,30 +117,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/me/pindour/catpuccin/gui/themes/catpuccin/CatpuccinGuiTheme.java

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

src/main/java/me/pindour/catpuccin/gui/themes/catpuccin/widgets/WCatpuccinModule.java

@@ -20,6 +20,7 @@
 
 public class WCatpuccinModule extends WPressable implements CatpuccinWidget {
     private final Module module;
+    private final String title;
 
     private double titleWidth;
     private boolean wasHovered = false;
@@ -34,8 +35,9 @@ public class WCatpuccinModule extends WPressable implements CatpuccinWidget {
     private Color semiTransparentColor;
     private Color transparentColor;
 
-    public WCatpuccinModule(Module module) {
+    public WCatpuccinModule(Module module, String title) {
         this.module = module;
+        this.title = title;
         this.tooltip = module.description;
     }
 
@@ -67,7 +69,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;
@@ -161,6 +163,6 @@ protected void onRender(GuiRenderer renderer, double mouseX, double mouseY, doub
 
         // Text
         Color textColor = ColorUtils.interpolateColor(theme.textColor(), theme.baseColor(), highlightProgress);
-        catpuccinRenderer().text(RichText.of(module.title), x, y + pad, textColor);
+        catpuccinRenderer().text(RichText.of(title), x, y + pad, textColor);
     }
 }