Remove delegation hack, byte and short settings; added SettingTest

Author: Avanatiker

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

@@ -193,13 +193,11 @@ abstract class Configurable(
         defaultValue: List<T>,
         description: String = "",
         noinline visibility: () -> Boolean = { true },
-        hackDelegates: Boolean = false,
     ) = ListSetting(
         name,
         defaultValue.toMutableList(),
         TypeToken.getParameterized(MutableList::class.java, T::class.java).type,
         description,
-        hackDelegates,
         visibility,
     ).also {
         settings.add(it)
@@ -227,14 +225,12 @@ abstract class Configurable(
         name: String,
         defaultValue: Map<K, V>,
         description: String = "",
-        hackDelegates: Boolean,
         noinline visibility: () -> Boolean = { true },
     ) = MapSetting(
         name,
         defaultValue.toMutableMap(),
         TypeToken.getParameterized(MutableMap::class.java, K::class.java, V::class.java).type,
         description,
-        hackDelegates,
         visibility
     ).also {
         settings.add(it)
@@ -272,33 +268,6 @@ abstract class Configurable(
         settings.add(it)
     }
 
-    /**
-     * Creates a [ByteSetting] with the provided parameters and adds it to the [settings].
-     *
-     * The value of the setting is coerced into the specified [range] and rounded to the nearest [step].
-     *
-     * @param name The unique identifier for the setting.
-     * @param defaultValue The default [Byte] value of the setting.
-     * @param range The range within which the setting's value must fall.
-     * @param step The step to which the setting's value is rounded.
-     * @param description A brief explanation of the setting's purpose and behavior.
-     * @param visibility A lambda expression that determines the visibility status of the setting.
-     * @param unit The unit of the setting. E.g. "°C", "m/s", "ms", "ticks", etc.
-     *
-     * @return The created [ByteSetting].
-     */
-    fun setting(
-        name: String,
-        defaultValue: Byte,
-        range: ClosedRange<Byte>,
-        step: Byte = 1,
-        description: String = "",
-        unit: String = "",
-        visibility: () -> Boolean = { true },
-    ) = ByteSetting(name, defaultValue, range, step, description, visibility, unit).also {
-        settings.add(it)
-    }
-
     /**
      * Creates a [DoubleSetting] with the provided parameters and adds it to the [settings].
      *
@@ -407,33 +376,6 @@ abstract class Configurable(
         settings.add(it)
     }
 
-    /**
-     * Creates a [ShortSetting] with the provided parameters and adds it to the [settings].
-     *
-     * The value of the setting is coerced into the specified [range] and rounded to the nearest [step].
-     *
-     * @param name The unique identifier for the setting.
-     * @param defaultValue The default [Short] value of the setting.
-     * @param range The range within which the setting's value must fall.
-     * @param step The step to which the setting's value is rounded.
-     * @param description A brief explanation of the setting's purpose and behavior.
-     * @param visibility A lambda expression that determines the visibility status of the setting.
-     * @param unit The unit of the setting. E.g. "°C", "m/s", "ms", "ticks", etc.
-     *
-     * @return The created [ShortSetting].
-     */
-    fun setting(
-        name: String,
-        defaultValue: Short,
-        range: ClosedRange<Short>,
-        step: Short = 1,
-        description: String = "",
-        unit: String = "",
-        visibility: () -> Boolean = { true },
-    ) = ShortSetting(name, defaultValue, range, step, description, visibility, unit).also {
-        settings.add(it)
-    }
-
     /**
      * Creates a [KeyBindSetting] with the provided parameters and adds it to the [settings].
      *

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

@@ -17,8 +17,6 @@
 
 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
 
@@ -27,26 +25,13 @@ import java.lang.reflect.Type
  */
 class ListSetting<T : Any>(
     override val name: String,
-    private val defaultValue: MutableList<T>,
+    defaultValue: MutableList<T>,
     type: Type,
     description: String,
-    private val hackDelegates: Boolean,
     visibility: () -> Boolean,
 ) : AbstractSetting<MutableList<T>>(
     defaultValue,
     type,
     description,
     visibility
-) {
-    override fun toJson(): JsonElement {
-        return if (hackDelegates) gson.toJsonTree(defaultValue, type)
-        else super.toJson()
-    }
-
-    override fun loadFromJson(serialized: JsonElement) {
-        if (hackDelegates) {
-            defaultValue.addAll(gson.fromJson(serialized, type))
-            setValue(this, ::value, defaultValue.distinct().toMutableList())
-        } else super.loadFromJson(serialized)
-    }
-}
+)

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

@@ -17,8 +17,6 @@
 
 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
 
@@ -27,26 +25,13 @@ import java.lang.reflect.Type
  */
 class MapSetting<K, V>(
     override val name: String,
-    private val defaultValue: MutableMap<K, V>,
+    defaultValue: MutableMap<K, V>,
     type: Type,
     description: String,
-    private val hackDelegates: Boolean,
     visibility: () -> Boolean,
 ) : AbstractSetting<MutableMap<K, V>>(
     defaultValue,
     type,
     description,
     visibility
-) {
-    override fun toJson(): JsonElement {
-        return if (hackDelegates) gson.toJsonTree(defaultValue, type)
-        else super.toJson()
-    }
-
-    override fun loadFromJson(serialized: JsonElement) {
-        if (hackDelegates) {
-            defaultValue.putAll(gson.fromJson(serialized, type))
-            setValue(this, ::value, defaultValue)
-        } else super.loadFromJson(serialized)
-    }
-}
+)

common/src/main/kotlin/com/lambda/config/settings/numeric/ByteSetting.kt

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.module.modules.debug
+
+import com.lambda.module.Module
+import com.lambda.module.tag.ModuleTag
+import com.lambda.util.KeyCode
+import net.minecraft.block.Blocks
+import net.minecraft.util.math.BlockPos
+import java.awt.Color
+
+object SettingTest : Module(
+    name = "SettingTest",
+    defaultTags = setOf(ModuleTag.DEBUG)
+) {
+    // CharSetting
+    private val charSetting by setting("Character Setting", 'A')
+
+    // String
+    private val stringSetting by setting("String Setting", "Default String")
+
+    // Comparable
+    private val booleanSetting by setting("Boolean Setting", true)
+    private val enumSetting by setting("Enum Setting", ExampleEnum.VALUE_ONE)
+
+    // Numeric
+    private val doubleSetting by setting("Double Setting", 3.14159, 0.0..100.0, 0.1)
+    private val floatSetting by setting("Float Setting", 3.14f, 0.0f..100.0f, 0.1f)
+    private val integerSetting by setting("Integer Setting", 42, 0..1000)
+    private val longSetting by setting("Long Setting", 100000L, 0L..1000000L, 1000L)
+
+    // Collections
+    private val stringList by setting("String List", listOf("Hello", "World"))
+    private val stringSet by setting("String Set", setOf("Apple", "Banana"))
+    private val stringMap by setting("String Map", mapOf("Key1" to "Value1", "Key2" to "Value2"))
+
+    // Complex
+    private val blockPosSetting by setting("Block Position", BlockPos(0, 0, 0))
+    private val blockSetting by setting("Block Setting", Blocks.OBSIDIAN)
+    private val colorSetting by setting("Color Setting", Color.GREEN)
+    private val keyBindSetting by setting("Key Bind Setting", KeyCode.T)
+
+    // Complex collections
+    private val blockPosSet by setting("Block Position Set", setOf(BlockPos(0, 0, 0)))
+    private val blockList by setting("Block List", listOf(Blocks.OBSIDIAN))
+    private val colorMap by setting("Color Map", mapOf("Primary" to Color.GREEN))
+    private val keyBindSet by setting("Key Bind Set", setOf(KeyCode.T))
+
+    enum class ExampleEnum {
+        VALUE_ONE,
+        VALUE_TWO,
+        VALUE_THREE
+    }
+}

common/src/main/kotlin/com/lambda/config/settings/numeric/ShortSetting.kt

@@ -53,8 +53,8 @@ object PacketLogger : Module(
     private val networkSide by setting("Network Side", NetworkSide.ANY, "Side of the network to log packets from")
     private val logTicks by setting("Log Ticks", true, "Show game ticks in the log")
     private val scope by setting("Scope", Scope.ANY, "Scope of packets to log")
-    private val whitelist by setting("Whitelist Packets", emptyList<String>(), "Packets to whitelist", visibility = { scope == Scope.WHITELIST })
-    private val blacklist by setting("Blacklist Packets", emptyList<String>(), "Packets to blacklist", visibility = { scope == Scope.BLACKLIST })
+    private val whitelist by setting("Whitelist Packets", emptyList<String>(), "Packets to whitelist") { scope == Scope.WHITELIST }
+    private val blacklist by setting("Blacklist Packets", emptyList<String>(), "Packets to blacklist") { scope == Scope.BLACKLIST }
     private val maxRecursionDepth by setting("Max Recursion Depth", 6, 1..10, 1, "Maximum recursion depth for packet serialization")
     private val logConcurrent by setting("Build Data Concurrent", false, "Whether to serialize packets concurrently. Will not save packets in chronological order but wont lag the game.")