From b4467fa0e160053a5249c41db106c874392e778d Mon Sep 17 00:00:00 2001
From: Xiaro <62033805+Xiaro@users.noreply.github.com>
Date: Thu, 7 Jan 2021 00:38:19 -0500
Subject: [PATCH] [fix] Module ordering and searching in GUI

---
 .../java/me/zeroeightsix/kami/gui/clickgui/KamiClickGui.kt     | 3 ++-
 src/main/java/me/zeroeightsix/kami/module/ModuleManager.kt     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/zeroeightsix/kami/gui/clickgui/KamiClickGui.kt b/src/main/java/me/zeroeightsix/kami/gui/clickgui/KamiClickGui.kt
index 981f6b9c9..dfd501d64 100644
--- a/src/main/java/me/zeroeightsix/kami/gui/clickgui/KamiClickGui.kt
+++ b/src/main/java/me/zeroeightsix/kami/gui/clickgui/KamiClickGui.kt
@@ -84,7 +84,8 @@ object KamiClickGui : AbstractKamiGui<ModuleSettingWindow, Module>() {
 
                     val string = typedString.replace(" ", "")
                     setModuleVisibility { moduleButton ->
-                        moduleButton.module.alias.any { it.contains(string, true) }
+                        moduleButton.module.name.contains(string, true)
+                        || moduleButton.module.alias.any { it.contains(string, true) }
                     }
                 }
             }
diff --git a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.kt b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.kt
index caad1c562..c40b2f791 100644
--- a/src/main/java/me/zeroeightsix/kami/module/ModuleManager.kt
+++ b/src/main/java/me/zeroeightsix/kami/module/ModuleManager.kt
@@ -15,7 +15,7 @@ object ModuleManager : AsyncLoader<List<Class<out Module>>> {
 
     private val moduleSet = AliasSet<Module>()
     val modules by AsyncCachedValue(5L, TimeUnit.SECONDS) {
-        moduleSet.distinct()
+        moduleSet.distinct().sortedBy { it.name }
     }
 
     override fun preLoad0(): List<Class<out Module>> {