Skip to content

Commit ee0f7ce

Browse files
committed
Optimized module list
1 parent d7dff92 commit ee0f7ce

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ object ModuleCommand : LambdaCommand(
7575

7676
required(string("module name")) { moduleName ->
7777
suggests { _, builder ->
78-
ModuleRegistry.modules.map {
79-
it.name
80-
}.forEach {
78+
ModuleRegistry.moduleNames.forEach {
8179
builder.suggest(it)
8280
}
8381
builder.buildFuture()

src/main/kotlin/com/lambda/gui/MenuBar.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ object MenuBar {
262262
menu(tag.name) {
263263
ModuleRegistry.modules
264264
.filter { it.tag == tag }
265-
.sortedBy { it.name.lowercase() }
266265
.forEach { module ->
267266
menuItem(module.name, selected = module.isEnabled) {
268267
if (module.isEnabled) module.disable() else module.enable()

src/main/kotlin/com/lambda/module/ModuleRegistry.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ import com.lambda.util.reflections.getInstances
2525
*/
2626
object ModuleRegistry : Loadable {
2727
override val priority = 1
28-
val modules = getInstances<Module>().toMutableList()
2928

30-
val moduleNames: Set<String>
31-
get() = modules.map { it.name }.toSet()
29+
val modules = getInstances<Module>()
30+
.sortedBy { it.name }
3231

33-
override fun load(): String {
34-
return "Loaded ${modules.size} modules with ${modules.sumOf { it.settings.size }} settings"
35-
}
32+
val moduleNames = modules.map { it.name }.toSet()
33+
34+
override fun load() =
35+
"Loaded ${modules.size} modules with ${modules.sumOf { it.settings.size }} settings"
3636
}

0 commit comments

Comments
 (0)