Fix listener skipping and improved module command

Author: Avanatiker

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

@@ -1,14 +1,11 @@
 package com.lambda.command.commands
 
+import com.lambda.brigadier.*
 import com.lambda.brigadier.CommandResult.Companion.failure
 import com.lambda.brigadier.CommandResult.Companion.success
 import com.lambda.brigadier.argument.boolean
 import com.lambda.brigadier.argument.string
 import com.lambda.brigadier.argument.value
-import com.lambda.brigadier.executeWithResult
-import com.lambda.brigadier.get
-import com.lambda.brigadier.optional
-import com.lambda.brigadier.required
 import com.lambda.command.CommandManager.prefix
 import com.lambda.command.CommandManager.register
 import com.lambda.command.LambdaCommand
@@ -25,6 +22,34 @@ object ModuleCommand : LambdaCommand() {
 
     init {
         register(name, "mod") {
+            executeWithResult {
+                val enabled = ModuleRegistry.modules.filter {
+                    it.isEnabled
+                }
+
+                if (enabled.isEmpty()) {
+                    info("No modules are enabled")
+                    return@executeWithResult success()
+                }
+
+                this@ModuleCommand.info(buildText {
+                    styled(Color.GREY) {
+                        literal("Enabled Modules: ")
+                    }
+                    enabled.forEachIndexed { index, module ->
+                        if (index != 0) {
+                            literal(", ")
+                        }
+                        clickEvent(suggestCommand("$prefix${input} ${module.name}")) {
+                            styled(if (module.isEnabled) Color.GREEN else Color.RED) {
+                                literal(module.name)
+                            }
+                        }
+                    }
+                })
+                return@executeWithResult success()
+            }
+
             required(string("module name")) { moduleName ->
                 suggests { _, builder ->
                     ModuleRegistry.modules.map {

common/src/main/kotlin/com/lambda/event/EventFlow.kt

@@ -1,8 +1,10 @@
 package com.lambda.event
 
+import com.lambda.Lambda.LOG
 import com.lambda.event.cancellable.ICancellable
 import com.lambda.event.listener.Listener
 import com.lambda.threading.runConcurrent
+import com.lambda.util.Communication.info
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -84,25 +86,23 @@ object EventFlow {
 
     private fun Event.executeListenerSynchronous() {
         syncListeners[this::class]?.forEach { listener ->
-            if (listener.owner is Muteable
-                && (listener.owner as Muteable).isMuted
-                && !listener.alwaysListen
-            ) return
-            if (this is ICancellable && this.isCanceled()) return
-            listener.execute(this@executeListenerSynchronous)
+            if (shouldNotNotify(listener, this)) return@forEach
+            listener.execute(this)
         }
     }
 
     private fun Event.executeListenerConcurrently() {
         concurrentListeners[this::class]?.forEach { listener ->
-            if (listener.owner is Muteable
-                && (listener.owner as Muteable).isMuted
-                && !listener.alwaysListen
-            ) return
-            if (this is ICancellable && this.isCanceled()) return
+            if (shouldNotNotify(listener, this)) return@forEach
             runConcurrent {
-                listener.execute(this@executeListenerConcurrently)
+                listener.execute(this)
             }
         }
     }
+
+    private fun shouldNotNotify(listener: Listener, event: Event) =
+        listener.owner is Muteable
+            && (listener.owner as Muteable).isMuted
+            && !listener.alwaysListen
+            || event is ICancellable && event.isCanceled()
 }

common/src/main/kotlin/com/lambda/event/listener/SafeListener.kt

@@ -173,4 +173,6 @@ class SafeListener(
             return listener
         }
     }
+
+    override fun toString() = "SafeListener(priority=$priority, owner=${owner::class.simpleName}, alwaysListen=$alwaysListen)"
 }

common/src/main/kotlin/com/lambda/module/modules/BoringModule.kt

@@ -39,7 +39,6 @@ object BoringModule : Module(
     init {
         onEnable {
             LOG.info("I'm was enabled!")
-            toast("I'm enabled!")
         }
 
         onDisable {
@@ -51,7 +50,7 @@ object BoringModule : Module(
         }
 
         listener<TickEvent.Pre> {
-            this@BoringModule.info("I'm ${if (superBoring) "super boring ($boringValue)" else "boring"}!")
+            LOG.info("I'm ${if (superBoring) "super boring ($boringValue)" else "boring"}!")
         }
     }
 }