mutable module priority setting and event flow modification to update listener sorting

Author: beanbag44

src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -95,7 +95,7 @@ void onNetwork(ClientPlayerInteractionManager instance, Operation<Void> original
 
     @Definition(id = "overlay", field = "Lnet/minecraft/client/MinecraftClient;overlay:Lnet/minecraft/client/gui/screen/Overlay;")
     @Expression("this.overlay == null")
-    @ModifyExpressionValue(method = "tick", at = @At("MIXINEXTRAS:EXPRESSION"))
+    @ModifyExpressionValue(method = "tick", at = @At(value = "MIXINEXTRAS:EXPRESSION", ordinal = 1))
     private boolean modifyCurrentScreenNullCheck(boolean original) {
         if (!original || this.currentScreen != null) {
             EventFlow.post(TickEvent.Input.Pre.INSTANCE);

src/main/kotlin/com/lambda/Lambda.kt

@@ -19,8 +19,8 @@ package com.lambda
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
-import com.lambda.config.serializer.BlockPosCodec
 import com.lambda.config.serializer.BlockCodec
+import com.lambda.config.serializer.BlockPosCodec
 import com.lambda.config.serializer.ColorSerializer
 import com.lambda.config.serializer.GameProfileCodec
 import com.lambda.config.serializer.ItemCodec
@@ -45,7 +45,6 @@ import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
 import net.minecraft.item.PotionItem
 import net.minecraft.item.RangedWeaponItem
-import net.minecraft.registry.DynamicRegistryManager
 import net.minecraft.text.Text
 import net.minecraft.util.math.BlockPos
 import org.apache.logging.log4j.LogManager
@@ -92,7 +91,7 @@ object Lambda : ClientModInitializer {
 
     init {
         // We want the opengl context to be created
-        listenOnceUnsafe<ClientEvent.Startup>(priority = Int.MAX_VALUE) {
+        listenOnceUnsafe<ClientEvent.Startup>({ Int.MAX_VALUE }) {
             LOG.info("$MOD_NAME $VERSION initialized in ${Loader.initialize()} ms\n")
             if (ClickGuiLayout.setLambdaWindowIcon) setLambdaWindowIcon()
             true

src/main/kotlin/com/lambda/config/Configuration.kt

@@ -65,7 +65,7 @@ abstract class Configuration : Jsonable, Loadable {
         get() = File("${primary.parent}/${primary.nameWithoutExtension}-backup.${primary.extension}")
 
     override fun load(): String {
-        listenUnsafe<ClientEvent.Shutdown>(Int.MIN_VALUE) { trySave() }
+        listenUnsafe<ClientEvent.Shutdown>({ Int.MIN_VALUE }) { trySave() }
         register()
         return super.load()
     }

src/main/kotlin/com/lambda/config/Setting.kt

@@ -90,9 +90,7 @@ import kotlin.reflect.KProperty
  * ```
  *
  * @property defaultValue The default value of the setting.
- * @property description A description of the setting.
  * @property type The type reflection of the setting.
- * @property visibility A function that determines whether the setting is visible.
  */
 abstract class SettingCore<T>(
 	var defaultValue: T,

src/main/kotlin/com/lambda/config/UserAutomationConfig.kt

@@ -24,7 +24,7 @@ import com.lambda.module.Module
 import com.lambda.module.ModuleRegistry.moduleNameMap
 
 class UserAutomationConfig(override val name: String) : AutomationConfig(name, UserAutomationConfigs) {
-    val linkedModules = setting<String>("Linked Modules", emptySet(), moduleNameMap.filter { it.value.defaultAutomationConfig != Companion.DEFAULT }.keys)
+    val linkedModules = setting<String>("Linked Modules", emptySet(), moduleNameMap.filter { it.value.defaultAutomationConfig != Companion.DEFAULT }.keys) { false }
         .onSelect { name ->
 	        moduleNameMap[name]?.let {
 		        it.removeLink()

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

@@ -97,6 +97,17 @@ object EventFlow {
         concurrentListeners.unsubscribe(this)
     }
 
+    fun Any.updateListenerSorting() {
+        syncListeners.values.forEach { listeners ->
+            val matching = listeners.filter { it.owner === this }
+            matching.forEach { !listeners.remove(it); it.priority.update(); listeners.add(it) }
+        }
+        concurrentListeners.values.forEach { listeners ->
+            val matching = listeners.filter { it.owner === this }
+            matching.forEach { listeners.remove(it); it.priority.update(); listeners.add(it) }
+        }
+    }
+
     init {
         // parallel event execution on dedicated threads
         runConcurrent {

src/main/kotlin/com/lambda/event/listener/Listener.kt

@@ -21,6 +21,7 @@ import com.lambda.event.Event
 import com.lambda.event.EventFlow
 import com.lambda.event.Muteable
 import com.lambda.module.Module
+import com.lambda.util.collections.UpdatableLazy
 
 /**
  * An abstract class representing a [Listener] in the [Event] system ([EventFlow]).
@@ -45,7 +46,7 @@ import com.lambda.module.Module
  * @property alwaysListen If true, the [Listener] will always be triggered, even if the [owner] is [Muteable.isMuted].
  */
 abstract class Listener<T : Event> : Comparable<Listener<T>> {
-    abstract val priority: Int
+    abstract val priority: UpdatableLazy<Int>
     abstract val owner: Any
     abstract val alwaysListen: Boolean
 
@@ -61,10 +62,13 @@ abstract class Listener<T : Event> : Comparable<Listener<T>> {
 
     companion object {
         val comparator = compareBy<Listener<out Event>> {
-            it.priority
+            it.priority.value
         }.thenBy {
             // Hashcode is needed because ConcurrentSkipListSet handles insertion based on compareTo
             it.hashCode()
         }
+
+        val Any.modulePriorityOr0Getter
+            get() = (this as? Module)?.let { { prioritySetting.value } } ?: { 0 }
     }
 }

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

@@ -25,6 +25,7 @@ import com.lambda.threading.runConcurrent
 import com.lambda.threading.runGameScheduled
 import com.lambda.threading.runSafe
 import com.lambda.util.Pointer
+import com.lambda.util.collections.updatableLazy
 import com.lambda.util.selfReference
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
@@ -62,11 +63,13 @@ import kotlin.reflect.KProperty
  * @property function The function to be executed when the event occurs. This function operates within a [SafeContext].
  */
 class SafeListener<T : Event>(
-    override val priority: Int = 0,
+    priorityProvider: () -> Int,
     override val owner: Any,
     override val alwaysListen: Boolean = false,
     val function: SafeContext.(T) -> Unit
 ) : Listener<T>(), ReadOnlyProperty<Any?, T?> {
+    override val priority = updatableLazy(priorityProvider)
+
     /**
      * The last processed event signal.
      */
@@ -118,7 +121,7 @@ class SafeListener<T : Event>(
          * @return The newly created and registered [SafeListener].
          */
         inline fun <reified T : Event> Any.listen(
-            priority: Int = 0,
+            noinline priority: () -> Int = modulePriorityOr0Getter,
             alwaysListen: Boolean = false,
             noinline function: SafeContext.(T) -> Unit = {}
         ): SafeListener<T> {
@@ -163,7 +166,7 @@ class SafeListener<T : Event>(
          */
         fun <T : Event> Any.listen(
             kClass: KClass<out T>,
-            priority: Int = 0,
+            priority: () -> Int = modulePriorityOr0Getter,
             alwaysListen: Boolean = false,
             function: SafeContext.(T) -> Unit = {},
         ): SafeListener<T> {
@@ -205,7 +208,7 @@ class SafeListener<T : Event>(
          * @return The newly created and registered [SafeListener].
          */
         inline fun <reified T : Event> Any.listenOnce(
-            priority: Int = 0,
+            noinline priority: () -> Int = modulePriorityOr0Getter,
             alwaysListen: Boolean = false,
             noinline predicate: SafeContext.(T) -> Boolean = { true },
         ): ReadWriteProperty<Any?, T?> {
@@ -253,7 +256,7 @@ class SafeListener<T : Event>(
          * @return The newly created and registered [SafeListener].
          */
         inline fun <reified T : Event> Any.listenConcurrently(
-            priority: Int = 0,
+            noinline priority: () -> Int = modulePriorityOr0Getter,
             alwaysListen: Boolean = false,
             scheduler: CoroutineDispatcher = Dispatchers.Default,
             noinline function: suspend SafeContext.(T) -> Unit = {},

src/main/kotlin/com/lambda/event/listener/UnsafeListener.kt

@@ -25,6 +25,7 @@ import com.lambda.event.listener.SafeListener.Companion.listenConcurrently
 import com.lambda.event.listener.SafeListener.Companion.listenOnce
 import com.lambda.threading.runConcurrent
 import com.lambda.util.Pointer
+import com.lambda.util.collections.updatableLazy
 import com.lambda.util.selfReference
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
@@ -60,11 +61,13 @@ import kotlin.reflect.KProperty
  * @property function The function to be executed when the event occurs. This function operates without a [SafeContext].
  */
 class UnsafeListener<T : Event>(
-    override val priority: Int,
+    priorityProvider: () -> Int,
     override val owner: Any,
     override val alwaysListen: Boolean = false,
     val function: (T) -> Unit,
 ) : Listener<T>(), ReadOnlyProperty<Any?, T?> {
+    override val priority = updatableLazy(priorityProvider)
+
     /**
      * The last processed event signal.
      */
@@ -107,7 +110,7 @@ class UnsafeListener<T : Event>(
          * @return The newly created and registered [UnsafeListener].
          */
         inline fun <reified T : Event> Any.listenUnsafe(
-            priority: Int = 0,
+            noinline priority: () -> Int = modulePriorityOr0Getter,
             alwaysListen: Boolean = false,
             noinline function: (T) -> Unit = {},
         ): UnsafeListener<T> {
@@ -144,7 +147,7 @@ class UnsafeListener<T : Event>(
          * @return The newly created and registered [UnsafeListener].
          */
         inline fun <reified T : Event> Any.listenOnceUnsafe(
-            priority: Int = 0,
+            noinline priority: () -> Int = modulePriorityOr0Getter,
             alwaysListen: Boolean = false,
             noinline function: (T) -> Boolean = { true },
         ): ReadWriteProperty<Any?, T?> {
@@ -193,7 +196,7 @@ class UnsafeListener<T : Event>(
          * @return The newly created and registered [UnsafeListener].
          */
         inline fun <reified T : Event> Any.listenConcurrentlyUnsafe(
-            priority: Int = 0,
+            noinline priority: () -> Int = modulePriorityOr0Getter,
             alwaysListen: Boolean = false,
             scheduler: CoroutineDispatcher = Dispatchers.Default,
             noinline function: suspend (T) -> Unit = {},

src/main/kotlin/com/lambda/gui/components/SettingsWidget.kt

@@ -37,12 +37,19 @@ object SettingsWidget {
     fun ImGuiBuilder.buildConfigSettingsContext(config: Configurable) {
         group {
             if (config is Module) {
-                with(config.keybindSetting) { buildLayout() }
-                with(config.disableOnReleaseSetting) { buildLayout() }
-	            with(config.drawSetting) { buildLayout() }
-            }
-            smallButton("Reset") {
-                config.settings.forEach { it.reset(silent = true) }
+				button("Module Settings") {
+					ImGui.openPopup("##module-settings-popup-${config.name}")
+				}
+	            ImGui.setNextWindowSizeConstraints(0f, 0f, Float.MAX_VALUE, io.displaySize.y * 0.5f)
+	            popupContextItem("##module-settings-popup-${config.name}", ImGuiPopupFlags.None) {
+		            with(config.keybindSetting) { buildLayout() }
+		            with(config.prioritySetting) { buildLayout() }
+		            with(config.disableOnReleaseSetting) { buildLayout() }
+		            with(config.drawSetting) { buildLayout() }
+		            smallButton("Reset") {
+			            config.settings.forEach { it.reset(silent = true) }
+		            }
+	            }
             }
             lambdaTooltip("Resets all settings for this module to their default values")
             if (config is MutableAutomationConfig && config.automationConfig !== AutomationConfig.Companion.DEFAULT) {
@@ -74,13 +81,8 @@ object SettingsWidget {
                 }
             }
         }
-        val toIgnoreSettings =
-            when (config) {
-                is Module -> setOf(config.keybindSetting, config.disableOnReleaseSetting, config.drawSetting)
-                is UserAutomationConfig -> setOf(config.linkedModules)
-                else -> emptySet()
-            }
-        val visibleSettings = config.settings.filter { it.visibility() } - toIgnoreSettings
+
+        val visibleSettings = config.settings.filter { it.visibility() }
 	    if (visibleSettings.isEmpty()) return
 	    else separator()
         val (grouped, ungrouped) = visibleSettings.partition { it.groups.isNotEmpty() }