Persistent GUI configuration

Avanatiker · Avanatiker · commit 0b7246123dcd · 2024-04-10T14:48:17.000+02:00
diff --git a/common/src/main/kotlin/com/lambda/Lambda.kt b/common/src/main/kotlin/com/lambda/Lambda.kt
@@ -3,7 +3,9 @@ package com.lambda
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.lambda.config.serializer.*
+import com.lambda.config.serializer.gui.TagWindowSerializer
 import com.lambda.core.Loader
+import com.lambda.gui.impl.clickgui.windows.TagWindow
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.KeyCode
 import net.minecraft.block.Block
@@ -24,6 +26,7 @@ object Lambda {
     val gson: Gson = GsonBuilder()
         .setPrettyPrinting()
         .registerTypeAdapter(ModuleTag::class.java, ModuleTagSerializer)
+        .registerTypeAdapter(TagWindow::class.java, TagWindowSerializer)
         .registerTypeAdapter(KeyCode::class.java, KeyCodeSerializer)
         .registerTypeAdapter(Color::class.java, ColorSerializer)
         .registerTypeAdapter(BlockPos::class.java, BlockPosSerializer)
diff --git a/common/src/main/kotlin/com/lambda/config/Configurable.kt b/common/src/main/kotlin/com/lambda/config/Configurable.kt
@@ -149,7 +149,7 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
      * The type parameter [T] must either be a primitive type or a type with a registered type adapter in [Lambda.gson].
      *
      * @param name The unique identifier for the setting.
-     * @param defaultValue The default [List] value of type [T] for the setting.
+     * @param defaultValue The default [MutableList] value of type [T] for the setting.
      * @param description A brief explanation of the setting's purpose and behavior.
      * @param visibility A lambda expression that determines the visibility status of the setting.
      *
@@ -162,7 +162,7 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
      */
     inline fun <reified T : Any> setting(
         name: String,
-        defaultValue: List<T>,
+        defaultValue: MutableList<T>,
         description: String = "",
         noinline visibility: () -> Boolean = { true },
     ) = ListSetting(name, defaultValue, description, visibility).also {
diff --git a/common/src/main/kotlin/com/lambda/config/configurations/GuiConfig.kt b/common/src/main/kotlin/com/lambda/config/configurations/GuiConfig.kt
@@ -0,0 +1,9 @@
+package com.lambda.config.configurations
+
+import com.lambda.config.Configuration
+import com.lambda.util.FolderRegister
+
+object GuiConfig : Configuration() {
+    override val configName = "gui"
+    override val primary = FolderRegister.config.resolve("$configName.json")
+}
diff --git a/common/src/main/kotlin/com/lambda/config/serializer/gui/TagWindowSerializer.kt b/common/src/main/kotlin/com/lambda/config/serializer/gui/TagWindowSerializer.kt
@@ -0,0 +1,42 @@
+package com.lambda.config.serializer.gui
+
+import com.google.gson.*
+import com.lambda.gui.impl.clickgui.windows.TagWindow
+import com.lambda.util.math.Vec2d
+import java.lang.reflect.Type
+
+object TagWindowSerializer : JsonSerializer<TagWindow>, JsonDeserializer<TagWindow> {
+
+    override fun serialize(
+        src: TagWindow?,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?,
+    ): JsonElement = src?.let {
+        JsonObject().apply {
+            addProperty("title", it.title)
+            addProperty("width", it.width)
+            addProperty("height", it.height)
+            addProperty("isOpen", it.isOpen)
+            add("position", JsonArray().apply {
+                add(it.position.x)
+                add(it.position.y)
+            })
+        }
+    } ?: JsonNull.INSTANCE
+
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?,
+    ) = json?.asJsonObject?.let {
+        TagWindow().apply {
+            width = it["width"].asDouble
+            height = it["height"].asDouble
+            isOpen = it["isOpen"].asBoolean
+            position = Vec2d(
+                it["position"].asJsonArray[0].asDouble,
+                it["position"].asJsonArray[1].asDouble
+            )
+        }
+    } ?: TagWindow()
+}
diff --git a/common/src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt b/common/src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt
@@ -7,16 +7,16 @@ import com.lambda.config.AbstractSetting
 
 class ListSetting<T>(
     override val name: String,
-    defaultValue: List<T>,
+    defaultValue: MutableList<T>,
     description: String,
     visibility: () -> Boolean,
-) : AbstractSetting<List<T>>(
+) : AbstractSetting<MutableList<T>>(
     defaultValue,
     description,
     visibility
 ) {
     override fun loadFromJson(serialized: JsonElement) {
-        val listType = object : TypeToken<List<T>>() {}.type
+        val listType = object : TypeToken<MutableList<T>>() {}.type
         value = gson.fromJson(serialized, listType)
     }
 }
diff --git a/common/src/main/kotlin/com/lambda/core/Loader.kt b/common/src/main/kotlin/com/lambda/core/Loader.kt
@@ -3,7 +3,9 @@ package com.lambda.core
 import com.lambda.Lambda
 import com.lambda.Lambda.LOG
 import com.lambda.command.CommandManager
+import com.lambda.config.configurations.GuiConfig
 import com.lambda.graphics.renderer.gui.font.LambdaFont
+import com.lambda.gui.impl.clickgui.LambdaClickGui
 import com.lambda.interaction.PlayerPacketManager
 import com.lambda.interaction.RotationManager
 import com.lambda.module.ModuleRegistry
@@ -35,5 +37,7 @@ object Loader {
         }
 
         LOG.info("${Lambda.MOD_NAME} ${Lambda.VERSION} was successfully initialized (${initTime}ms)")
+
+        LambdaClickGui
     }
 }
diff --git a/common/src/main/kotlin/com/lambda/gui/api/LambdaGui.kt b/common/src/main/kotlin/com/lambda/gui/api/LambdaGui.kt
@@ -1,7 +1,7 @@
 package com.lambda.gui.api
 
 import com.lambda.Lambda.mc
-import com.lambda.event.EventFlow
+import com.lambda.event.EventFlow.syncListeners
 import com.lambda.event.events.RenderEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.UnsafeListener
@@ -17,7 +17,10 @@ import net.minecraft.client.gui.screen.Screen
 import net.minecraft.text.Text
 
 @Suppress("LeakingThis")
-abstract class LambdaGui(override val name: String, private val owner: Module? = null) : Screen(Text.of(name)), IComponent, Nameable {
+abstract class LambdaGui(
+    override val name: String,
+    private val owner: Module? = null
+) : Screen(Text.of(name)), IComponent, Nameable {
     private var screenSize = Vec2d.ZERO
 
     private val renderListener = UnsafeListener(0, this, false) { event ->
@@ -38,15 +41,15 @@ abstract class LambdaGui(override val name: String, private val owner: Module? =
     fun show() {
         mc.currentScreen?.close()
 
-        recordRenderCall { // wait for previous screen to be closed
+        recordRenderCall { // wait for the previous screen to be closed
             mc.setScreen(this)
         }
     }
 
     final override fun onDisplayed() {
         onShow()
 
-        with(EventFlow.syncListeners) {
+        with(syncListeners) {
             subscribe<RenderEvent.GUI.Scaled>(renderListener)
             subscribe<TickEvent.Pre>(tickListener)
         }
@@ -60,7 +63,7 @@ abstract class LambdaGui(override val name: String, private val owner: Module? =
         owner?.disable()
         mc.currentScreen = this
 
-        with(EventFlow.syncListeners) {
+        with(syncListeners) {
             unsubscribe(renderListener)
             unsubscribe(tickListener)
         }
diff --git a/common/src/main/kotlin/com/lambda/gui/api/component/InteractiveComponent.kt b/common/src/main/kotlin/com/lambda/gui/api/component/InteractiveComponent.kt
@@ -29,8 +29,12 @@ abstract class InteractiveComponent : IComponent, IRectComponent {
         hovered = rect.contains(mouse)
     }
 
-    override fun onMouseClick(button: Mouse.Button, action: Mouse.Action, mouse: Vec2d) {
-        activeMouseButton = button.takeUnless { it.isMainButton && action == Mouse.Action.Click }
+    override fun onMouseClick(
+        button: Mouse.Button, action: Mouse.Action, mouse: Vec2d
+    ) {
+        activeMouseButton = button.takeUnless {
+            it.isMainButton && action == Mouse.Action.Click
+        }
         pressed = hovered && button.isMainButton && action == Mouse.Action.Click
     }
 }
diff --git a/common/src/main/kotlin/com/lambda/gui/api/component/WindowComponent.kt b/common/src/main/kotlin/com/lambda/gui/api/component/WindowComponent.kt
@@ -24,7 +24,7 @@ abstract class WindowComponent <T : ChildComponent> : InteractiveComponent(), IL
 
     var position = Vec2d.ZERO
 
-    private var isOpen = true
+    var isOpen = true
     private var dragOffset: Vec2d? = null
     private val padding get() = ClickGui.windowPadding
 
diff --git a/common/src/main/kotlin/com/lambda/gui/impl/clickgui/LambdaClickGui.kt b/common/src/main/kotlin/com/lambda/gui/impl/clickgui/LambdaClickGui.kt
@@ -1,19 +1,23 @@
 package com.lambda.gui.impl.clickgui
 
+import com.lambda.command.CommandManager.setting
+import com.lambda.config.Configurable
+import com.lambda.config.configurations.GuiConfig
 import com.lambda.gui.api.LambdaGui
 import com.lambda.gui.api.component.WindowComponent
 import com.lambda.gui.api.component.core.list.IListComponent
-import com.lambda.gui.api.component.sub.ButtonComponent
 import com.lambda.gui.impl.clickgui.windows.TagWindow
-import com.lambda.module.ModuleRegistry
 import com.lambda.module.modules.client.ClickGui
-import com.lambda.util.Mouse
-import com.lambda.util.math.Vec2d
 
-class LambdaClickGui : LambdaGui("Lambda ClickGui", ClickGui), IListComponent<WindowComponent<*>> {
-    override val children = mutableListOf<WindowComponent<*>>()
+object LambdaClickGui : LambdaGui("ClickGui", ClickGui), IListComponent<WindowComponent<*>> {
+    private val windows = setting("windows", mutableListOf<WindowComponent<*>>(TagWindow()))
+    override val children: MutableList<WindowComponent<*>> get() = windows.value
 
     init {
-        children.add(TagWindow())
+        object : Configurable(GuiConfig) {
+            init { settings.add(windows) }
+
+            override val name = this@LambdaClickGui.name
+        }
     }
 }
diff --git a/common/src/main/kotlin/com/lambda/gui/impl/clickgui/windows/TagWindow.kt b/common/src/main/kotlin/com/lambda/gui/impl/clickgui/windows/TagWindow.kt
@@ -4,14 +4,18 @@ import com.lambda.gui.api.component.WindowComponent
 import com.lambda.gui.impl.clickgui.buttons.ModuleButton
 import com.lambda.module.ModuleRegistry
 import com.lambda.module.modules.client.ClickGui
+import com.lambda.module.tag.ModuleTag
 
-class TagWindow : WindowComponent<ModuleButton>() {
-    override val title = "Test Window"
-    override var width = 110.0
-    override var height = 300.0
-
+class TagWindow(
+    private val tags: Set<ModuleTag> = emptySet(),
+    override val title: String = "Test Window",
+    override var width: Double = 110.0,
+    override var height: Double = 300.0
+) : WindowComponent<ModuleButton>() {
     init {
-        ModuleRegistry.modules.forEach {
+        ModuleRegistry.modules.filter {
+            it.customTags.value.any { tag -> tags.contains(tag) } || tags.isEmpty()
+        }.forEach {
             children.add(ModuleButton(it, this))
         }
     }
@@ -24,6 +28,8 @@ class TagWindow : WindowComponent<ModuleButton>() {
     private fun updateModules() {
         children.sortBy { it.module.name }
 
+        // ToDo: Update tag filter
+
         children.forEachIndexed { i, button ->
             button.heightOffset = i * (ClickGui.buttonHeight + ClickGui.buttonStep)
         }
diff --git a/common/src/main/kotlin/com/lambda/module/Module.kt b/common/src/main/kotlin/com/lambda/module/Module.kt
@@ -98,7 +98,7 @@ abstract class Module(
     private val isEnabledSetting = setting("Enabled", enabledByDefault, visibility = { false })
     private val keybindSetting = setting("Keybind", defaultKeybind)
     private val isVisible = setting("Visible", true)
-    private val customTags = setting("Tags", defaultTags, visibility = { false })
+    val customTags = setting("Tags", defaultTags, visibility = { false })
 
     var isEnabled by isEnabledSetting
     override val isMuted: Boolean
diff --git a/common/src/main/kotlin/com/lambda/module/modules/Packetlogger.kt b/common/src/main/kotlin/com/lambda/module/modules/Packetlogger.kt
@@ -37,8 +37,8 @@ object Packetlogger : Module(
     private val networkSide by setting("Network Side", NetworkSide.ANY, "Side of the network to log packets from")
     private val logTicks by setting("Log Ticks", true, "Show game ticks in the log")
     private val scope by setting("Scope", Scope.ANY, "Scope of packets to log")
-    private val whitelist by setting("Whitelist Packets", emptyList<String>(), "Packets to whitelist") { scope == Scope.WHITELIST }
-    private val blacklist by setting("Blacklist Packets", emptyList<String>(), "Packets to blacklist") { scope == Scope.BLACKLIST }
+    private val whitelist by setting("Whitelist Packets", mutableListOf<String>(), "Packets to whitelist") { scope == Scope.WHITELIST }
+    private val blacklist by setting("Blacklist Packets", mutableListOf<String>(), "Packets to blacklist") { scope == Scope.BLACKLIST }
     private val maxRecursionDepth by setting("Max Recursion Depth", 6, 1..10, 1, "Maximum recursion depth for packet serialization")
     private val logConcurrent by setting("Build Data Concurrent", false, "Whether to serialize packets concurrently. Will not save packets in chronological order but wont lag the game.")
 
diff --git a/common/src/main/kotlin/com/lambda/module/modules/client/ClickGui.kt b/common/src/main/kotlin/com/lambda/module/modules/client/ClickGui.kt
@@ -19,20 +19,16 @@ object ClickGui : Module(
     val buttonHeight by setting("Button Height", 11.0, 8.0..20.0, 0.1)
     val buttonStep by setting("Button Step", 1.0, 0.0..5.0, 0.1)
 
-    private val gui by mainThread {
-        LambdaClickGui()
-    }
-
     init {
         onEnable {
-            if (mc.currentScreen != gui) {
-                gui.show()
+            if (mc.currentScreen != LambdaClickGui) {
+                LambdaClickGui.show()
             }
         }
 
         onDisable {
-            if (mc.currentScreen == gui) {
-                gui.close()
+            if (mc.currentScreen == LambdaClickGui) {
+                LambdaClickGui.close()
             }
         }
 
diff --git a/common/src/main/kotlin/com/lambda/util/Communication.kt b/common/src/main/kotlin/com/lambda/util/Communication.kt
@@ -2,7 +2,9 @@ package com.lambda.util
 
 import com.lambda.Lambda
 import com.lambda.Lambda.mc
+import com.lambda.threading.runOnGameThread
 import com.lambda.threading.runSafe
+import com.lambda.threading.runSafeOnGameThread
 import com.lambda.util.StringUtils.capitalize
 import com.lambda.util.text.*
 import net.minecraft.client.toast.SystemToast
@@ -34,10 +36,10 @@ object Communication {
     }
 
     fun Any.toast(message: Text, logLevel: LogLevel = LogLevel.INFO) {
-        runSafe {
-            buildText {
-                text(this@toast.source(logLevel, color = Color.YELLOW))
-            }.let { title ->
+        buildText {
+            text(this@toast.source(logLevel, color = Color.YELLOW))
+        }.let { title ->
+            runSafeOnGameThread {
                 mc.toastManager.add(logLevel.toast(title, message))
             }
         }
@@ -53,11 +55,11 @@ object Communication {
     }
 
     fun Any.log(message: Text, logLevel: LogLevel = LogLevel.INFO, source: String = "", textSource: Text = Text.empty()) {
-        runSafe {
-            buildText {
-                text(this@log.source(logLevel, source, textSource))
-                text(message)
-            }.let { log ->
+        buildText {
+            text(this@log.source(logLevel, source, textSource))
+            text(message)
+        }.let { log ->
+            runSafeOnGameThread {
                 player.sendMessage(log)
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,9 @@ package com.lambda.core`
`3`	`3`	`import com.lambda.Lambda`
`4`	`4`	`import com.lambda.Lambda.LOG`
`5`	`5`	`import com.lambda.command.CommandManager`
	`6`	`+import com.lambda.config.configurations.GuiConfig`
`6`	`7`	`import com.lambda.graphics.renderer.gui.font.LambdaFont`
	`8`	`+import com.lambda.gui.impl.clickgui.LambdaClickGui`
`7`	`9`	`import com.lambda.interaction.PlayerPacketManager`
`8`	`10`	`import com.lambda.interaction.RotationManager`
`9`	`11`	`import com.lambda.module.ModuleRegistry`
`@@ -35,5 +37,7 @@ object Loader {`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`LOG.info("${Lambda.MOD_NAME} ${Lambda.VERSION} was successfully initialized (${initTime}ms)")`
	`40`	`+`
	`41`	`+ LambdaClickGui`
`38`	`42`	`}`
`39`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,12 @@ abstract class InteractiveComponent : IComponent, IRectComponent {`
`29`	`29`	`hovered = rect.contains(mouse)`
`30`	`30`	`}`
`31`	`31`
`32`		`- override fun onMouseClick(button: Mouse.Button, action: Mouse.Action, mouse: Vec2d) {`
`33`		`- activeMouseButton = button.takeUnless { it.isMainButton && action == Mouse.Action.Click }`
	`32`	`+ override fun onMouseClick(`
	`33`	`+ button: Mouse.Button, action: Mouse.Action, mouse: Vec2d`
	`34`	`+ ) {`
	`35`	`+ activeMouseButton = button.takeUnless {`
	`36`	`+ it.isMainButton && action == Mouse.Action.Click`
	`37`	`+ }`
`34`	`38`	`pressed = hovered && button.isMainButton && action == Mouse.Action.Click`
`35`	`39`	`}`
`36`	`40`	`}`