Merge remote-tracking branch 'origin/feature/renderer' into feature/renderer

Author: bladekt

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

@@ -5,6 +5,7 @@ import com.lambda.Lambda.gson
 import com.lambda.context.SafeContext
 import com.lambda.threading.runSafe
 import com.lambda.util.Nameable
+import java.lang.reflect.Type
 import kotlin.properties.Delegates
 import kotlin.reflect.KProperty
 
@@ -49,10 +50,12 @@ import kotlin.reflect.KProperty
  *
  * @property defaultValue The default value of the setting.
  * @property description A description of the setting.
+ * @property type The type reflection of the setting.
  * @property visibility A function that determines whether the setting is visible.
  */
 abstract class AbstractSetting<T : Any>(
     private val defaultValue: T,
+    private val type: Type,
     val description: String,
     val visibility: () -> Boolean,
 ) : Jsonable, Nameable {
@@ -74,10 +77,10 @@ abstract class AbstractSetting<T : Any>(
     }
 
     override fun toJson(): JsonElement =
-        gson.toJsonTree(value)
+        gson.toJsonTree(value, type)
 
     override fun loadFromJson(serialized: JsonElement) {
-        value = gson.fromJson(serialized, value::class.java)
+        value = gson.fromJson(serialized, type)
     }
 
     fun onValueChange(block: SafeContext.(from: T, to: T) -> Unit) {
@@ -101,4 +104,4 @@ abstract class AbstractSetting<T : Any>(
     }
 
     class ValueListener <T> (val requiresValueChange: Boolean, val execute: (from: T, to: T) -> Unit)
-}
+}

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

@@ -22,7 +22,6 @@ 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].

common/src/main/kotlin/com/lambda/config/settings/CharSetting.kt

@@ -1,5 +1,6 @@
 package com.lambda.config.settings
 
+import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
 
 /**
@@ -17,6 +18,7 @@ class CharSetting(
     visibility: () -> Boolean,
 ) : AbstractSetting<Char>(
     defaultValue,
+    TypeToken.get(Char::class.java).type,
     description,
     visibility
-)
+)

common/src/main/kotlin/com/lambda/config/settings/NumericSetting.kt

@@ -1,5 +1,6 @@
 package com.lambda.config.settings
 
+import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
 import com.lambda.util.math.MathUtils.roundToStep
 import kotlin.reflect.KProperty
@@ -25,6 +26,7 @@ abstract class NumericSetting<T>(
     val unit: String,
 ) : AbstractSetting<T>(
     value,
+    TypeToken.get(value::class.java).type,
     description,
     visibility
 ) where T : Number, T : Comparable<T> {
@@ -33,4 +35,4 @@ abstract class NumericSetting<T>(
     override operator fun setValue(thisRef: Any?, property: KProperty<*>, valueIn: T) {
         value = valueIn.coerceIn(range)
     }
-}
+}

common/src/main/kotlin/com/lambda/config/settings/StringSetting.kt

@@ -1,5 +1,6 @@
 package com.lambda.config.settings
 
+import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
 
 /**
@@ -17,6 +18,7 @@ class StringSetting(
     visibility: () -> Boolean,
 ) : AbstractSetting<String>(
     defaultValue,
+    TypeToken.get(String::class.java).type,
     description,
     visibility
-)
+)

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

@@ -1,6 +1,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.AbstractSetting
 import java.lang.reflect.Type
@@ -13,6 +14,7 @@ class ListSetting<T : Any>(
     visibility: () -> Boolean,
 ) : AbstractSetting<MutableList<T>>(
     defaultValue,
+    type,
     description,
     visibility
 ) {

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

@@ -1,27 +1,17 @@
 package com.lambda.config.settings.collections
 
-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,
-    private val defaultValue: MutableMap<K, V>,
-    private val type: Type,
+    defaultValue: MutableMap<K, V>,
+    type: Type,
     description: String,
     visibility: () -> Boolean,
 ) : AbstractSetting<MutableMap<K, V>>(
     defaultValue,
+    type,
     description,
     visibility
-) {
-    override fun loadFromJson(serialized: JsonElement) {
-        value = gson.fromJson(serialized, type)
-    }
-
-    override fun toJson(): JsonElement {
-        value = defaultValue // Hack the Delegates.observable
-        return gson.toJsonTree(value)
-    }
-}
+)

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

@@ -1,27 +1,17 @@
 package com.lambda.config.settings.collections
 
-import com.google.gson.JsonElement
-import com.lambda.Lambda.gson
 import com.lambda.config.AbstractSetting
 import java.lang.reflect.Type
 
 class SetSetting<T : Any>(
     override val name: String,
-    private val defaultValue: MutableSet<T>,
-    private val type: Type,
+    defaultValue: MutableSet<T>,
+    type: Type,
     description: String,
     visibility: () -> Boolean,
 ) : AbstractSetting<MutableSet<T>>(
     defaultValue,
+    type,
     description,
     visibility
-) {
-    override fun loadFromJson(serialized: JsonElement) {
-        value = gson.fromJson(serialized, type)
-    }
-
-    override fun toJson(): JsonElement {
-        value = defaultValue // Hack the Delegates.observable
-        return gson.toJsonTree(value)
-    }
-}
+)

common/src/main/kotlin/com/lambda/config/settings/comparable/BooleanSetting.kt

@@ -1,5 +1,6 @@
 package com.lambda.config.settings.comparable
 
+import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
 
 class BooleanSetting(
@@ -9,6 +10,7 @@ class BooleanSetting(
     visibility: () -> Boolean,
 ) : AbstractSetting<Boolean>(
     defaultValue,
+    TypeToken.get(Boolean::class.java).type,
     description,
     visibility
-)
+)

common/src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt

@@ -1,5 +1,6 @@
 package com.lambda.config.settings.comparable
 
+import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
 
 class EnumSetting<T : Enum<T>>(
@@ -9,6 +10,7 @@ class EnumSetting<T : Enum<T>>(
     visibility: () -> Boolean,
 ) : AbstractSetting<T>(
     defaultValue,
+    TypeToken.get(defaultValue.declaringJavaClass).type,
     description,
     visibility,
 ) {
@@ -17,4 +19,4 @@ class EnumSetting<T : Enum<T>>(
     fun next() {
         value = enumValues[((value.ordinal + 1) % enumValues.size)]
     }
-}
+}