Feature: Mutable collection settings

Author: emyfops

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

@@ -164,10 +164,10 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
      */
     inline fun <reified T : Any> setting(
         name: String,
-        defaultValue: ArrayList<T>,
+        defaultValue: List<T>,
         description: String = "",
         noinline visibility: () -> Boolean = { true },
-    ) = ListSetting(name, defaultValue, TypeToken.getParameterized(ArrayList::class.java, T::class.java).type, description, visibility).also {
+    ) = ListSetting(name, defaultValue.toMutableList(), TypeToken.getParameterized(MutableList::class.java, T::class.java).type, description, visibility).also {
         settings.add(it)
     }
 
@@ -193,7 +193,7 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         defaultValue: Map<K, V>,
         description: String = "",
         noinline visibility: () -> Boolean = { true },
-    ) = MapSetting(name, defaultValue, TypeToken.getParameterized(Map::class.java, K::class.java, V::class.java).type, description, visibility).also {
+    ) = MapSetting(name, defaultValue.toMutableMap(), TypeToken.getParameterized(Map::class.java, K::class.java, V::class.java).type, description, visibility).also {
         settings.add(it)
     }
 
@@ -219,7 +219,7 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         defaultValue: Set<T>,
         description: String = "",
         noinline visibility: () -> Boolean = { true },
-    ) = SetSetting(name, defaultValue, TypeToken.getParameterized(Set::class.java, T::class.java).type, description, visibility).also {
+    ) = SetSetting(name, defaultValue.toMutableSet(), TypeToken.getParameterized(Set::class.java, T::class.java).type, description, visibility).also {
         settings.add(it)
     }
 

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

@@ -1,24 +1,27 @@
 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
-import java.util.ArrayList
 
 class ListSetting<T : Any>(
     override val name: String,
-    defaultValue: ArrayList<T>,
+    private val defaultValue: MutableList<T>,
     private val type: Type,
     description: String,
     visibility: () -> Boolean,
-) : AbstractSetting<ArrayList<T>>(
+) : AbstractSetting<MutableList<T>>(
     defaultValue,
     description,
     visibility
 ) {
     override fun loadFromJson(serialized: JsonElement) {
         value = gson.fromJson(serialized, type)
     }
+
+    override fun toJson(): JsonElement {
+        value = defaultValue.toMutableList() // Hack the Delegates.observable
+        return gson.toJsonTree(value)
+    }
 }

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

@@ -7,16 +7,21 @@ import java.lang.reflect.Type
 
 class MapSetting<K, V>(
     override val name: String,
-    defaultValue: Map<K, V>,
+    private val defaultValue: MutableMap<K, V>,
     private val type: Type,
     description: String,
     visibility: () -> Boolean,
-) : AbstractSetting<Map<K, V>>(
+) : AbstractSetting<MutableMap<K, V>>(
     defaultValue,
     description,
     visibility
 ) {
     override fun loadFromJson(serialized: JsonElement) {
         value = gson.fromJson(serialized, type)
     }
-}
+
+    override fun toJson(): JsonElement {
+        value = defaultValue.toMutableMap() // Hack the Delegates.observable
+        return gson.toJsonTree(value)
+    }
+}

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

@@ -7,16 +7,21 @@ import java.lang.reflect.Type
 
 class SetSetting<T : Any>(
     override val name: String,
-    defaultValue: Set<T>,
+    private val defaultValue: MutableSet<T>,
     private val type: Type,
     description: String,
     visibility: () -> Boolean,
-) : AbstractSetting<Set<T>>(
+) : AbstractSetting<MutableSet<T>>(
     defaultValue,
     description,
     visibility
 ) {
     override fun loadFromJson(serialized: JsonElement) {
         value = gson.fromJson(serialized, type)
     }
-}
+
+    override fun toJson(): JsonElement {
+        value = defaultValue.toMutableSet() // Hack the Delegates.observable
+        return gson.toJsonTree(value)
+    }
+}

common/src/main/kotlin/com/lambda/core/Loader.kt

@@ -42,8 +42,6 @@ object Loader {
             }
         }
 
-        FriendManager.add(GameProfile(UUID.randomUUID(), "Lambda"))
-
         LOG.info("${Lambda.MOD_NAME} ${Lambda.VERSION} was successfully initialized (${initTime}ms)")
     }
 }

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

@@ -7,5 +7,5 @@ import com.lambda.gui.impl.clickgui.windows.TagWindow
 
 object GuiConfigurable : Configurable(GuiConfig), Loadable {
     override val name = "gui"
-    val windows = setting("windows", arrayListOf(TagWindow()))
+    val windows = setting("windows", listOf(TagWindow()))
 }