Fix type erasure for all collection settings

Author: Avanatiker

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

@@ -21,6 +21,7 @@ import com.lambda.util.Nameable
 import net.minecraft.block.Block
 import net.minecraft.util.math.BlockPos
 import java.awt.Color
+import java.lang.reflect.Type
 
 /**
  * Represents a set of [AbstractSetting]s that are associated with the [name] of the [Configurable].
@@ -163,9 +164,10 @@ 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, description, visibility).also {
+    ) = ListSetting(name, defaultValue, type, description, visibility).also {
         settings.add(it)
     }
 
@@ -189,9 +191,10 @@ 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, description, visibility).also {
+    ) = MapSetting(name, defaultValue, type, description, visibility).also {
         settings.add(it)
     }
 
@@ -215,9 +218,10 @@ 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, description, visibility).also {
+    ) = SetSetting(name, defaultValue, type, description, visibility).also {
         settings.add(it)
     }
 

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

@@ -90,7 +90,7 @@ abstract class Configuration : Jsonable {
                 }
                 .onFailure {
                     val message = "Failed to load ${configName.capitalize()} config, loading backup"
-                    LOG.error(message)
+                    LOG.error(message, it)
                     this@Configuration.logError(message)
                     runCatching { load(backup) }
                         .onSuccess {

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

@@ -2,6 +2,7 @@ package com.lambda.config.serializer.gui
 
 import com.google.gson.*
 import com.lambda.gui.impl.clickgui.windows.TagWindow
+import com.lambda.module.tag.ModuleTag
 import com.lambda.util.math.Vec2d
 import java.lang.reflect.Type
 
@@ -14,6 +15,15 @@ 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("width", it.width)
             addProperty("height", it.height)
             addProperty("isOpen", it.isOpen)
@@ -29,9 +39,14 @@ object TagWindowSerializer : JsonSerializer<TagWindow>, JsonDeserializer<TagWind
         typeOfT: Type?,
         context: JsonDeserializationContext?,
     ) = json?.asJsonObject?.let {
-        TagWindow().apply {
-            width = it["width"].asDouble
+        TagWindow(
+            tags = it["tags"].asJsonArray.map { tag ->
+                ModuleTag(tag.asString)
+            }.toSet(),
+            title = it["title"].asString,
+            width = it["width"].asDouble,
             height = it["height"].asDouble
+        ).apply {
             isOpen = it["isOpen"].asBoolean
             position = Vec2d(
                 it["position"].asJsonArray[0].asDouble,

common/src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt

@@ -1,15 +1,14 @@
 package com.lambda.config.settings.collections
 
 import com.google.gson.JsonElement
-import com.google.gson.reflect.TypeToken
-import com.lambda.Lambda.LOG
 import com.lambda.Lambda.gson
 import com.lambda.config.AbstractSetting
-import com.lambda.util.DynamicReflectionSerializer.dynamicString
+import java.lang.reflect.Type
 
-class ListSetting<T>(
+class ListSetting<T : Any>(
     override val name: String,
     defaultValue: List<T>,
+    private val type: Type,
     description: String,
     visibility: () -> Boolean,
 ) : AbstractSetting<List<T>>(
@@ -18,10 +17,6 @@ class ListSetting<T>(
     visibility
 ) {
     override fun loadFromJson(serialized: JsonElement) {
-        val listType = object : TypeToken<List<T>>() {}.type
-        LOG.info("Loading $name with value $serialized current value ${value.dynamicString()} $value and type ${listType.typeName}")
-        val dese = gson.fromJson<List<T>>(serialized, listType)
-        value = dese
-        LOG.info("Loaded $name with value ${value.dynamicString()} $value and type ${listType.typeName}")
+        value = gson.fromJson(serialized, type)
     }
 }

common/src/main/kotlin/com/lambda/config/settings/collections/MapSetting.kt

@@ -1,13 +1,14 @@
 package com.lambda.config.settings.collections
 
-import com.google.common.reflect.TypeToken
 import com.google.gson.JsonElement
 import com.lambda.Lambda.gson
 import com.lambda.config.AbstractSetting
+import java.lang.reflect.Type
 
 class MapSetting<K, V>(
     override val name: String,
     defaultValue: Map<K, V>,
+    private val type: Type,
     description: String,
     visibility: () -> Boolean,
 ) : AbstractSetting<Map<K, V>>(
@@ -16,7 +17,6 @@ class MapSetting<K, V>(
     visibility
 ) {
     override fun loadFromJson(serialized: JsonElement) {
-        val mapType = object : TypeToken<Map<K, V>>() {}.type
-        value = gson.fromJson(serialized, mapType)
+        value = gson.fromJson(serialized, type)
     }
 }

common/src/main/kotlin/com/lambda/config/settings/collections/SetSetting.kt

@@ -1,13 +1,14 @@
 package com.lambda.config.settings.collections
 
 import com.google.gson.JsonElement
-import com.google.gson.reflect.TypeToken
 import com.lambda.Lambda.gson
 import com.lambda.config.AbstractSetting
+import java.lang.reflect.Type
 
 class SetSetting<T : Any>(
     override val name: String,
     defaultValue: Set<T>,
+    private val type: Type,
     description: String,
     visibility: () -> Boolean,
 ) : AbstractSetting<Set<T>>(
@@ -16,7 +17,6 @@ class SetSetting<T : Any>(
     visibility
 ) {
     override fun loadFromJson(serialized: JsonElement) {
-        val setType = object : TypeToken<Set<T>>() {}.type
-        value = gson.fromJson(serialized, setType)
+        value = gson.fromJson(serialized, type)
     }
 }

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

@@ -1,10 +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
 
 object GuiConfigurable : Configurable(GuiConfig) {
-    override val name = "ClickGui"
-    val windows = setting("windows", listOf(TagWindow()))
+    override val name = "gui"
+    val windows = setting("windows", listOf(TagWindow()), object : TypeToken<List<TagWindow>>() {}.type)
 }

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

@@ -7,8 +7,8 @@ import com.lambda.module.modules.client.ClickGui
 import com.lambda.module.tag.ModuleTag
 
 class TagWindow(
-    private val tags: Set<ModuleTag> = emptySet(),
-    override val title: String = "Test Window",
+    val tags: Set<ModuleTag> = emptySet(),
+    override var title: String = "Test Window",
     override var width: Double = 110.0,
     override var height: Double = 300.0
 ) : WindowComponent<ModuleButton>() {

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

@@ -1,5 +1,6 @@
 package com.lambda.module
 
+import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
 import com.lambda.config.Configurable
 import com.lambda.config.Configuration
@@ -98,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, visibility = { false })
+    val customTags = setting("Tags", defaultTags, object : TypeToken<Set<ModuleTag>>() {}.type, visibility = { false })
 
     var isEnabled by isEnabledSetting
     override val isMuted: Boolean

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

@@ -1,5 +1,6 @@
 package com.lambda.module.modules
 
+import com.google.gson.reflect.TypeToken
 import com.lambda.Lambda
 import com.lambda.Lambda.mc
 import com.lambda.event.EventFlow.lambdaScope
@@ -37,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>(), "Packets to whitelist") { scope == Scope.WHITELIST }
-    private val blacklist by setting("Blacklist Packets", listOf<String>(), "Packets to blacklist") { scope == Scope.BLACKLIST }
+    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 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.")