Patch collection setting loading

Author: Avanatiker

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

@@ -8,14 +8,15 @@ import com.lambda.config.settings.collections.ListSetting
 import com.lambda.config.settings.collections.MapSetting
 import com.lambda.config.settings.collections.SetSetting
 import com.lambda.config.settings.comparable.BooleanSetting
+import com.lambda.config.settings.comparable.EnumSetting
 import com.lambda.config.settings.numeric.*
 import com.lambda.util.Nameable
 
 /**
  * Holds a set of [AbstractSetting]s that are associated with the [name] of the [Configurable].
  */
 abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
-    private val settings = mutableSetOf<AbstractSetting<*>>()
+    val settings = mutableSetOf<AbstractSetting<*>>()
 
     init {
         configuration.configurables.add(this) // ToDo: Find non-leaking solution
@@ -30,7 +31,9 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
 
     override fun loadFromJson(serialized: JsonElement) {
         serialized.asJsonObject.entrySet().forEach { (name, value) ->
-            settings.find { it.name == name }?.loadFromJson(value) ?: LOG.info("No saved setting found for $name")
+            settings.find {
+                it.name == name
+            }?.loadFromJson(value) ?: LOG.warn("No saved setting found for $name with $value in ${this::class.simpleName}")
         }
     }
 
@@ -43,6 +46,15 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         settings.add(it)
     }
 
+    inline fun <reified T : Enum<T>> setting(
+        name: String,
+        defaultValue: T,
+        noinline visibility: () -> Boolean = { true },
+        description: String = ""
+    ) = EnumSetting(name, defaultValue, visibility, description).also {
+        settings.add(it)
+    }
+
     fun setting(
         name: String,
         defaultValue: String,
@@ -52,7 +64,7 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         settings.add(it)
     }
 
-    private inline fun <reified T : Any> setting(
+    inline fun <reified T : Any> setting(
         name: String,
         defaultValue: List<T>,
         noinline visibility: () -> Boolean = { true },
@@ -61,7 +73,7 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         settings.add(it)
     }
 
-    private inline fun <reified K : Any, V : Any> setting(
+    inline fun <reified K : Any, V : Any> setting(
         name: String,
         defaultValue: Map<K, V>,
         noinline visibility: () -> Boolean = { true },
@@ -70,7 +82,7 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
         settings.add(it)
     }
 
-    private inline fun <reified T : Any> setting(
+    inline fun <reified T : Any> setting(
         name: String,
         defaultValue: Set<T>,
         noinline visibility: () -> Boolean = { true },

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

@@ -3,6 +3,7 @@ package com.lambda.config
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
+import com.lambda.Lambda
 import com.lambda.Lambda.LOG
 import com.lambda.Lambda.gson
 import com.lambda.event.EventFlow.lambdaScope
@@ -37,7 +38,7 @@ abstract class Configuration : Jsonable {
         serialized.asJsonObject.entrySet().forEach { (name, value) ->
             configurables.find {
                 it.name == name
-            }?.loadFromJson(value) ?: println("No saved setting found for $name")
+            }?.loadFromJson(value) ?: LOG.warn("No matching setting found for saved setting $name with $value in $configName config")
         }
     }
 

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

@@ -1,5 +1,8 @@
 package com.lambda.config.settings.collections
 
+import com.google.gson.JsonElement
+import com.google.gson.reflect.TypeToken
+import com.lambda.Lambda
 import com.lambda.config.AbstractSetting
 
 class ListSetting<T>(
@@ -11,4 +14,9 @@ class ListSetting<T>(
     defaultValue,
     visibility,
     description
-)
+) {
+    override fun loadFromJson(serialized: JsonElement) {
+        val listType = object : TypeToken<List<T>>() {}.type
+        value = Lambda.gson.fromJson(serialized, listType)
+    }
+}

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

@@ -1,5 +1,8 @@
 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
 
 class MapSetting<K, V>(
@@ -11,4 +14,9 @@ class MapSetting<K, V>(
     defaultValue,
     visibility,
     description
-)
+) {
+    override fun loadFromJson(serialized: JsonElement) {
+        val mapType = object : TypeToken<Map<K, V>>() {}.type
+        value = gson.fromJson(serialized, mapType)
+    }
+}

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

@@ -1,5 +1,8 @@
 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
 
 class SetSetting<T : Any>(
@@ -11,4 +14,9 @@ class SetSetting<T : Any>(
     defaultValue,
     visibility,
     description
-)
+) {
+    override fun loadFromJson(serialized: JsonElement) {
+        val setType = object : TypeToken<Set<T>>() {}.type
+        value = gson.fromJson(serialized, setType)
+    }
+}

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

@@ -11,10 +11,19 @@ object BoringModule : Module(
     tags = setOf(ModuleTag.MISC, ModuleTag.COMBAT),
 ) {
     private val superBoring by setting("Super Boring", false)
+    private val boringValue by setting("Boring Value", 0.0, 0.1..5.0, 0.1)
+    private val boringFriends by setting("Boring Friends List", listOf("Peter", "Paul", "Mary", "John", "Ringo"))
+    private val boringEnemies by setting("Boring Enemies Set", setOf("Sauron", "Voldemort", "Darth Vader", "The Joker"))
+    private val boringMap by setting("Boring Map", mapOf("One" to 1, "Two" to 2, "Three" to 3, "Four" to 4, "Five" to 5))
+    private val boringEnum by setting("Boring Enum", BoringEnum.ONE)
+
+    enum class BoringEnum {
+        ONE, TWO, THREE, FOUR, FIVE
+    }
 
     init {
         listener<TickEvent.Pre> {
-            if (isEnabled) println("I'm ${if (superBoring) "super boring" else "boring"}!")
+            if (isEnabled) println("I'm ${if (superBoring) "super boring ($boringValue)" else "boring"}!")
         }
     }
 }