Setting Refactor

Author: bladekt

common/src/main/kotlin/com/lambda/config/Configurable.kt

@@ -2,6 +2,7 @@ package com.lambda.config
 
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import com.google.gson.reflect.TypeToken
 import com.lambda.Lambda
 import com.lambda.Lambda.LOG
 import com.lambda.config.settings.CharSetting
@@ -164,10 +165,9 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
     inline fun <reified T : Any> setting(
         name: String,
         defaultValue: List<T>,
-        type: Type,
         description: String = "",
         noinline visibility: () -> Boolean = { true },
-    ) = ListSetting(name, defaultValue, type, description, visibility).also {
+    ) = ListSetting(name, defaultValue, object : TypeToken<List<T>>() {}.type, description, visibility).also {
         settings.add(it)
     }
 
@@ -191,10 +191,9 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
     inline fun <reified K : Any, V : Any> setting(
         name: String,
         defaultValue: Map<K, V>,
-        type: Type,
         description: String = "",
         noinline visibility: () -> Boolean = { true },
-    ) = MapSetting(name, defaultValue, type, description, visibility).also {
+    ) = MapSetting(name, defaultValue, object : TypeToken<Map<K, V>>() {}.type, description, visibility).also {
         settings.add(it)
     }
 
@@ -218,10 +217,9 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
     inline fun <reified T : Any> setting(
         name: String,
         defaultValue: Set<T>,
-        type: Type,
         description: String = "",
         noinline visibility: () -> Boolean = { true },
-    ) = SetSetting(name, defaultValue, type, description, visibility).also {
+    ) = SetSetting(name, defaultValue, object : TypeToken<Set<T>>() {}.type, description, visibility).also {
         settings.add(it)
     }
 

common/src/main/kotlin/com/lambda/config/serializer/gui/TagWindowSerializer.kt

@@ -15,15 +15,7 @@ object TagWindowSerializer : JsonSerializer<TagWindow>, JsonDeserializer<TagWind
     ): JsonElement = src?.let {
         JsonObject().apply {
             addProperty("title", it.title)
-            add("tags", JsonArray().apply {
-                it.tags.forEach { tag ->
-                    add(tag.name)
-//                    add(JsonObject().apply {
-//                        addProperty("name", tag.name)
-//                        addProperty("color", tag.color.rgb)
-//                    })
-                }
-            })
+            addProperty("tag", it.tag.name)
             addProperty("width", it.width)
             addProperty("height", it.height)
             addProperty("isOpen", it.isOpen)
@@ -40,9 +32,7 @@ object TagWindowSerializer : JsonSerializer<TagWindow>, JsonDeserializer<TagWind
         context: JsonDeserializationContext?,
     ) = json?.asJsonObject?.let {
         TagWindow(
-            tags = it["tags"].asJsonArray.map { tag ->
-                ModuleTag(tag.asString)
-            }.toSet(),
+            tag = ModuleTag(it["tag"].asString),
             title = it["title"].asString,
             width = it["width"].asDouble,
             height = it["height"].asDouble
@@ -53,5 +43,5 @@ object TagWindowSerializer : JsonSerializer<TagWindow>, JsonDeserializer<TagWind
                 it["position"].asJsonArray[1].asDouble
             )
         }
-    } ?: TagWindow()
+    } ?: throw JsonParseException("Invalid window data")
 }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/GuiConfigurable.kt

@@ -1,11 +1,11 @@
 package com.lambda.gui.impl.clickgui
 
-import com.google.gson.reflect.TypeToken
 import com.lambda.config.Configurable
 import com.lambda.config.configurations.GuiConfig
 import com.lambda.gui.impl.clickgui.windows.TagWindow
+import com.lambda.module.tag.ModuleTag
 
 object GuiConfigurable : Configurable(GuiConfig) {
     override val name = "gui"
-    val windows = setting("windows", listOf(TagWindow()), object : TypeToken<List<TagWindow>>() {}.type)
+    val windows = setting("windows", listOf(TagWindow(ModuleTag("Test Window"))))
 }

common/src/main/kotlin/com/lambda/gui/impl/clickgui/windows/TagWindow.kt

@@ -7,15 +7,15 @@ import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.tag.ModuleTag
 
 class TagWindow(
-    val tags: Set<ModuleTag> = emptySet(),
-    override var title: String = "Test Window",
+    val tag: ModuleTag,
+    override var title: String = tag.name,
     override var width: Double = 110.0,
     override var height: Double = 300.0
 ) : WindowComponent<ModuleButton>() {
     init {
-        ModuleRegistry.modules.filter {
-            it.customTags.value.any { tag -> tags.contains(tag) } || tags.isEmpty()
-        }.forEach {
+        ModuleRegistry.modules/*.filter { module ->
+            module.customTags.value.any { it.name.equals(tag.name, true) }
+        }*/.forEach {
             children.add(ModuleButton(it, this))
         }
     }

common/src/main/kotlin/com/lambda/module/Module.kt

@@ -99,7 +99,7 @@ abstract class Module(
     private val isEnabledSetting = setting("Enabled", enabledByDefault, visibility = { false })
     private val keybindSetting = setting("Keybind", defaultKeybind)
     private val isVisible = setting("Visible", true)
-    val customTags = setting("Tags", defaultTags, object : TypeToken<Set<ModuleTag>>() {}.type, visibility = { false })
+    val customTags = setting("Tags", defaultTags, visibility = { false })
 
     var isEnabled by isEnabledSetting
     override val isMuted: Boolean

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

@@ -38,8 +38,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", listOf<String>(), object : TypeToken<List<String>>() {}.type, "Packets to whitelist") { scope == Scope.WHITELIST }
-    private val blacklist by setting("Blacklist Packets", listOf<String>(), object : TypeToken<List<String>>() {}.type, "Packets to blacklist") { scope == Scope.BLACKLIST }
+    private val whitelist by setting("Whitelist Packets", listOf<String>(), "Packets to whitelist") { scope == Scope.WHITELIST }
+    private val blacklist by setting("Blacklist Packets", listOf<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.")