fixed serializables collection settings from being parsed as a string

Author: emyfops

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

@@ -158,12 +158,13 @@ abstract class Configurable(
         immutableList: Collection<T> = defaultValue,
         description: String = "",
         displayClassName: Boolean = false,
+        serialize: Boolean = false,
         noinline visibility: () -> Boolean = { true },
     ) = Setting(
 	    name,
 	    description,
         if (displayClassName) ClassCollectionSetting(immutableList, defaultValue.toMutableList())
-                else CollectionSetting(defaultValue.toMutableList(), immutableList, TypeToken.getParameterized(Collection::class.java, T::class.java).type),
+                else CollectionSetting(defaultValue.toMutableList(), immutableList, TypeToken.getParameterized(Collection::class.java, T::class.java).type, serialize),
 		this,
 	    visibility
 	).register()

src/main/kotlin/com/lambda/config/settings/collections/BlockCollectionSetting.kt

@@ -17,9 +17,7 @@
 
 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.Setting
 import com.lambda.config.serializer.BlockCodec
 import com.lambda.gui.dsl.ImGuiBuilder
@@ -31,17 +29,9 @@ class BlockCollectionSetting(
 ) : CollectionSetting<Block>(
 	defaultValue,
 	immutableCollection,
-	TypeToken.getParameterized(Collection::class.java, Block::class.java).type
+	TypeToken.getParameterized(Collection::class.java, Block::class.java).type,
+	serialize = true,
 ) {
 	context(setting: Setting<*, MutableCollection<Block>>)
 	override fun ImGuiBuilder.buildLayout() = buildComboBox("block") { BlockCodec.stringify(it) }
-
-	context(setting: Setting<*, MutableCollection<Block>>)
-	override fun toJson(): JsonElement = gson.toJsonTree(value, type)
-
-	context(setting: Setting<*, MutableCollection<Block>>)
-	override fun loadFromJson(serialized: JsonElement) {
-		value = gson.fromJson<Collection<Block>>(serialized, type)
-			.toMutableList()
-	}
 }

src/main/kotlin/com/lambda/config/settings/collections/ClassCollectionSetting.kt

@@ -34,7 +34,8 @@ class ClassCollectionSetting<T : Any>(
 ) : CollectionSetting<T>(
 	defaultValue,
 	immutableCollection,
-	TypeToken.getParameterized(Collection::class.java, Any::class.java).type
+	TypeToken.getParameterized(Collection::class.java, Any::class.java).type,
+	serialize = false,
 ) {
 	context(setting: Setting<*, MutableCollection<T>>)
 	override fun ImGuiBuilder.buildLayout() = buildComboBox("item") { it.className }

src/main/kotlin/com/lambda/config/settings/collections/CollectionSetting.kt

@@ -17,7 +17,6 @@
 
 package com.lambda.config.settings.collections
 
-import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.reflect.TypeToken
 import com.lambda.Lambda.gson
@@ -47,7 +46,8 @@ import java.lang.reflect.Type
 open class CollectionSetting<R : Any>(
 	defaultValue: MutableCollection<R>,
 	private var immutableCollection: Collection<R>,
-	type: Type
+	type: Type,
+	private val serialize: Boolean,
 ) : SettingCore<MutableCollection<R>>(
 	defaultValue,
 	type
@@ -107,16 +107,18 @@ open class CollectionSetting<R : Any>(
 
 	context(setting: Setting<*, MutableCollection<R>>)
     override fun toJson(): JsonElement =
-		gson.toJsonTree(value)
+		gson.toJsonTree(value, type)
 
 	context(setting: Setting<*, MutableCollection<R>>)
     override fun loadFromJson(serialized: JsonElement) {
-        val strList = gson.fromJson<Collection<String>>(serialized, strListType)
-            .mapNotNull { str -> immutableCollection.find { it.toString() == str } }
-            .toMutableList()
+		val strList =
+			if (serialize) gson.fromJson(serialized, type)
+			else gson.fromJson<Collection<String>>(serialized, strListType)
+				.mapNotNull { str -> immutableCollection.find { it.toString() == str } }
+				.toMutableList()
 
-        value = strList
-    }
+		value = strList
+	}
 
 	companion object {
 		fun <T : CollectionSetting<R>, R : Any> Setting<T, MutableCollection<R>>.onSelect(block: SafeContext.(R) -> Unit) = apply {

src/main/kotlin/com/lambda/config/settings/collections/ItemCollectionSetting.kt

@@ -17,9 +17,7 @@
 
 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.Setting
 import com.lambda.config.serializer.ItemCodec
 import com.lambda.gui.dsl.ImGuiBuilder
@@ -31,17 +29,9 @@ class ItemCollectionSetting(
 ) : CollectionSetting<Item>(
 	defaultValue,
 	immutableCollection,
-	TypeToken.getParameterized(Collection::class.java, Item::class.java).type
+	TypeToken.getParameterized(Collection::class.java, Item::class.java).type,
+	serialize = true,
 ) {
 	context(setting: Setting<*, MutableCollection<Item>>)
 	override fun ImGuiBuilder.buildLayout() = buildComboBox("item") { ItemCodec.stringify(it) }
-
-	context(setting: Setting<*, MutableCollection<Item>>)
-	override fun toJson(): JsonElement = gson.toJsonTree(value, type)
-
-	context(setting: Setting<*, MutableCollection<Item>>)
-	override fun loadFromJson(serialized: JsonElement) {
-		value = gson.fromJson<Collection<Item>>(serialized, type)
-			.toMutableList()
-	}
 }