re-fix collection settings displaying wrong toString (sorry)

Author: beanbag44

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

@@ -21,6 +21,7 @@ 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
 import net.minecraft.block.Block
 
@@ -33,7 +34,7 @@ class BlockCollectionSetting(
 	TypeToken.getParameterized(Collection::class.java, Block::class.java).type
 ) {
 	context(setting: Setting<*, MutableCollection<Block>>)
-	override fun ImGuiBuilder.buildLayout() = buildComboBox("block")
+	override fun ImGuiBuilder.buildLayout() = buildComboBox("block") { BlockCodec.stringify(it) }
 
 	context(setting: Setting<*, MutableCollection<Block>>)
 	override fun toJson(): JsonElement = gson.toJsonTree(value, type)

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

@@ -37,7 +37,7 @@ class ClassCollectionSetting<T : Any>(
 	TypeToken.getParameterized(Collection::class.java, Any::class.java).type
 ) {
 	context(setting: Setting<*, MutableCollection<T>>)
-	override fun ImGuiBuilder.buildLayout() = buildComboBox("item")
+	override fun ImGuiBuilder.buildLayout() = buildComboBox("item") { it.className }
 
 	// When serializing the list to json we do not want to serialize the elements' classes, but their stringified representation.
 	// If we do serialize the classes we'll run into missing type adapters errors by Gson.

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

@@ -34,11 +34,11 @@ import imgui.flag.ImGuiSelectableFlags.DontClosePopups
 import java.lang.reflect.Type
 
 /**
- * This generic collection settings handles all [Comparable] values (i.e not classes) and serialize
+ * This generic collection settings handles all [Comparable] values (i.e., not classes) and serialize
  * their values by calling [Any.toString] and loads them by comparing what's in the [immutableCollection].
- * This behaviour is by design. If you wish to store collections of non-comparable values you must use [ClassCollectionSetting].
+ * This behavior is by design. If you wish to store collections of non-comparable values you must use [ClassCollectionSetting].
  *
- * If you wish to use a different codec or simply display values differently you must create your own
+ * If you wish to use a different codec or simply display values differently, you must create your own
  * collection setting.
  *
  * @see [com.lambda.config.Configurable]
@@ -59,10 +59,10 @@ open class CollectionSetting<R : Any>(
     val deselectListeners = mutableListOf<SafeContext.(R) -> Unit>()
 
 	context(setting: Setting<*, MutableCollection<R>>)
-    override fun ImGuiBuilder.buildLayout() = buildComboBox("item")
+    override fun ImGuiBuilder.buildLayout() = buildComboBox("item") { it.toString() }
 
 	context(setting: Setting<*, MutableCollection<R>>)
-	fun ImGuiBuilder.buildComboBox(itemName: String) {
+	fun ImGuiBuilder.buildComboBox(itemName: String, toString: (R) -> String) {
 		val text = if (value.size == 1) itemName else "${itemName}s"
 
 		combo("##${setting.name}", "${setting.name}: ${value.size} $text") {
@@ -85,7 +85,7 @@ open class CollectionSetting<R : Any>(
 						val selected = value.contains(v)
 
 						selectable(
-							label = v.toString(),
+							label = toString(v),
 							selected = selected,
 							flags = DontClosePopups
 						) {

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

@@ -21,6 +21,7 @@ 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
 import net.minecraft.item.Item
 
@@ -33,7 +34,7 @@ class ItemCollectionSetting(
 	TypeToken.getParameterized(Collection::class.java, Item::class.java).type
 ) {
 	context(setting: Setting<*, MutableCollection<Item>>)
-	override fun ImGuiBuilder.buildLayout() = buildComboBox("item")
+	override fun ImGuiBuilder.buildLayout() = buildComboBox("item") { ItemCodec.stringify(it) }
 
 	context(setting: Setting<*, MutableCollection<Item>>)
 	override fun toJson(): JsonElement = gson.toJsonTree(value, type)