Complex setting types

Author: Avanatiker

common/src/main/kotlin/com/lambda/Lambda.kt

@@ -2,13 +2,17 @@ package com.lambda
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
+import com.lambda.config.serializer.BlockPosSerializer
+import com.lambda.config.serializer.BlockSerializer
 import com.lambda.event.events.KeyPressEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.module.modules.BoringModule
 import com.lambda.module.modules.BoringModule2
 import com.lambda.task.tasks.HelloWorldTask
 import com.lambda.threading.taskContext
+import net.minecraft.block.Block
 import net.minecraft.client.MinecraftClient
+import net.minecraft.util.math.BlockPos
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
 import org.lwjgl.glfw.GLFW
@@ -21,7 +25,11 @@ object Lambda {
 
     val LOG: Logger = LogManager.getLogger(SYMBOL)
     val mc: MinecraftClient = MinecraftClient.getInstance()
-    val gson: Gson = GsonBuilder().setPrettyPrinting().create()
+    val gson: Gson = GsonBuilder()
+        .setPrettyPrinting()
+        .registerTypeAdapter(BlockPos::class.java, BlockPosSerializer)
+        .registerTypeAdapter(Block::class.java, BlockSerializer)
+        .create()
 
     init {
         BoringModule

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

@@ -9,8 +9,12 @@ 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.complex.BlockPosSetting
+import com.lambda.config.settings.complex.BlockSetting
 import com.lambda.config.settings.numeric.*
 import com.lambda.util.Nameable
+import net.minecraft.block.Block
+import net.minecraft.util.math.BlockPos
 
 /**
  * Holds a set of [AbstractSetting]s that are associated with the [name] of the [Configurable].
@@ -156,4 +160,22 @@ abstract class Configurable(configuration: Configuration) : Jsonable, Nameable {
     ) = ShortSetting(name, defaultValue, range, step, visibility, description).also {
         settings.add(it)
     }
+
+    fun setting(
+        name: String,
+        defaultValue: BlockPos,
+        visibility: () -> Boolean = { true },
+        description: String = ""
+    ) = BlockPosSetting(name, defaultValue, visibility, description).also {
+        settings.add(it)
+    }
+
+    fun setting(
+        name: String,
+        defaultValue: Block,
+        visibility: () -> Boolean = { true },
+        description: String = ""
+    ) = BlockSetting(name, defaultValue, visibility, description).also {
+        settings.add(it)
+    }
 }

common/src/main/kotlin/com/lambda/config/serializer/BlockPosSerializer.kt

@@ -0,0 +1,29 @@
+package com.lambda.config.serializer
+
+import com.google.gson.*
+import net.minecraft.util.math.BlockPos
+import java.lang.reflect.Type
+
+object BlockPosSerializer : JsonSerializer<BlockPos>, JsonDeserializer<BlockPos> {
+    override fun serialize(
+        src: BlockPos?,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement =
+        src?.let {
+            JsonObject().apply {
+                addProperty("x", it.x)
+                addProperty("y", it.y)
+                addProperty("z", it.z)
+            }
+        } ?: JsonNull.INSTANCE
+
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): BlockPos =
+        json?.asJsonObject?.let {
+            BlockPos(it["x"].asInt, it["y"].asInt, it["z"].asInt)
+        } ?: BlockPos.ORIGIN
+}

common/src/main/kotlin/com/lambda/config/serializer/BlockSerializer.kt

@@ -0,0 +1,25 @@
+package com.lambda.config.serializer
+
+import com.google.gson.*
+import net.minecraft.block.Block
+import net.minecraft.registry.Registries
+import net.minecraft.util.Identifier
+import java.lang.reflect.Type
+
+object BlockSerializer : JsonSerializer<Block>, JsonDeserializer<Block> {
+    override fun serialize(
+        src: Block?,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?,
+    ): JsonElement =
+        src?.let {
+            JsonPrimitive(Registries.BLOCK.getId(it).toString())
+        } ?: JsonNull.INSTANCE
+
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?,
+    ): Block =
+        Registries.BLOCK.getOrEmpty(Identifier(json?.asString)).orElseThrow()
+}

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

@@ -3,7 +3,10 @@ package com.lambda.config.settings.collections
 import com.google.gson.JsonElement
 import com.google.gson.reflect.TypeToken
 import com.lambda.Lambda
+import com.lambda.Lambda.LOG
+import com.lambda.Lambda.gson
 import com.lambda.config.AbstractSetting
+import java.lang.reflect.Type
 
 class ListSetting<T>(
     override val name: String,
@@ -17,6 +20,6 @@ class ListSetting<T>(
 ) {
     override fun loadFromJson(serialized: JsonElement) {
         val listType = object : TypeToken<List<T>>() {}.type
-        value = Lambda.gson.fromJson(serialized, listType)
+        value = gson.fromJson(serialized, listType)
     }
 }

common/src/main/kotlin/com/lambda/config/settings/complex/BlockPosSetting.kt

@@ -0,0 +1,15 @@
+package com.lambda.config.settings.complex
+
+import com.lambda.config.AbstractSetting
+import net.minecraft.util.math.BlockPos
+
+class BlockPosSetting(
+    override val name: String,
+    defaultValue: BlockPos,
+    visibility: () -> Boolean,
+    description: String
+) : AbstractSetting<BlockPos>(
+    defaultValue,
+    visibility,
+    description
+)

common/src/main/kotlin/com/lambda/config/settings/complex/BlockSetting.kt

@@ -0,0 +1,15 @@
+package com.lambda.config.settings.complex
+
+import com.lambda.config.AbstractSetting
+import net.minecraft.block.Block
+
+class BlockSetting(
+    override val name: String,
+    defaultValue: Block,
+    visibility: () -> Boolean,
+    description: String
+) : AbstractSetting<Block>(
+    defaultValue,
+    visibility,
+    description
+)

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

@@ -4,6 +4,8 @@ import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listener
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import net.minecraft.block.Blocks
+import net.minecraft.util.math.BlockPos
 
 object BoringModule : Module(
     name = "BoringModule",
@@ -16,6 +18,9 @@ object BoringModule : Module(
     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)
+    private val blockSetting by setting("Boring Block", Blocks.STONE)
+    private val blockPosSetting by setting("Boring BlockPos", BlockPos(420, 69, 1337))
+//    private val blockListSetting by setting("Boring Block List", listOf(Blocks.STONE, Blocks.DIRT, Blocks.GRASS_BLOCK))
 
     enum class BoringEnum {
         ONE, TWO, THREE, FOUR, FIVE