More compact json and qol

Author: Avanatiker

…va/com/lambda/mixin/MixinKeyBinding.java …va/com/lambda/mixin/KeyBindingMixin.javacommon/src/main/java/com/lambda/mixin/MixinKeyBinding.java renamed to common/src/main/java/com/lambda/mixin/KeyBindingMixin.java common/src/main/java/com/lambda/mixin/MixinKeyBinding.java renamed to common/src/main/java/com/lambda/mixin/KeyBindingMixin.java

@@ -10,7 +10,7 @@
 import java.util.Objects;
 
 @Mixin(KeyBinding.class)
-public class MixinKeyBinding {
+public class KeyBindingMixin {
     @Inject(method = "isPressed", at = @At("HEAD"), cancellable = true)
     void autoSprint(CallbackInfoReturnable<Boolean> cir) {
         KeyBinding instance = (KeyBinding) (Object) this;

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

@@ -2,9 +2,9 @@ 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.config.serializer.ColorSerializer
+import com.lambda.config.serializer.*
+import com.lambda.module.tag.ModuleTag
+import com.lambda.util.KeyCode
 import dev.architectury.platform.Platform
 import net.minecraft.block.Block
 import net.minecraft.client.MinecraftClient
@@ -22,10 +22,12 @@ object Lambda {
     val VERSION: String = LoaderInfo.getVersion()
     val LOG = (LogManager.getLogger(SYMBOL) as Logger)
         .apply { level = if (Platform.isDevelopmentEnvironment()) Level.DEBUG else Level.INFO }
-    val mc: MinecraftClient by lazy { MinecraftClient.getInstance() }
+    @JvmStatic val mc: MinecraftClient by lazy { MinecraftClient.getInstance() }
 
     val gson: Gson = GsonBuilder()
         .setPrettyPrinting()
+        .registerTypeAdapter(ModuleTag::class.java, ModuleTagSerializer)
+        .registerTypeAdapter(KeyCode::class.java, KeyCodeSerializer)
         .registerTypeAdapter(Color::class.java, ColorSerializer)
         .registerTypeAdapter(BlockPos::class.java, BlockPosSerializer)
         .registerTypeAdapter(Block::class.java, BlockSerializer)

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

@@ -48,13 +48,13 @@ import kotlin.reflect.KProperty
  * ```
  *
  * @property defaultValue The default value of the setting.
- * @property visibility A function that determines whether the setting is visible.
  * @property description A description of the setting.
+ * @property visibility A function that determines whether the setting is visible.
  */
 abstract class AbstractSetting<T : Any>(
     private val defaultValue: T,
-    val visibility: () -> Boolean,
     val description: String,
+    val visibility: () -> Boolean,
 ) : Jsonable, Nameable {
     private val listeners = mutableListOf<(from: T, to: T) -> Unit>()
 

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

@@ -0,0 +1,23 @@
+package com.lambda.config.serializer
+
+import com.google.gson.*
+import com.lambda.util.KeyCode
+import java.lang.reflect.Type
+
+object KeyCodeSerializer : JsonSerializer<KeyCode>, JsonDeserializer<KeyCode> {
+    override fun serialize(
+        src: KeyCode?,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement =
+        src?.let {
+            JsonPrimitive(it.key)
+        } ?: JsonNull.INSTANCE
+
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): KeyCode =
+        json?.asInt?.let { KeyCode(it) } ?: throw JsonParseException("Invalid key code format")
+}

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

@@ -0,0 +1,23 @@
+package com.lambda.config.serializer
+
+import com.google.gson.*
+import com.lambda.module.tag.ModuleTag
+import java.lang.reflect.Type
+
+object ModuleTagSerializer : JsonSerializer<ModuleTag>, JsonDeserializer<ModuleTag> {
+    override fun serialize(
+        src: ModuleTag?,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?
+    ): JsonElement =
+        src?.let {
+            JsonPrimitive(it.name)
+        } ?: JsonNull.INSTANCE
+
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?
+    ): ModuleTag =
+        json?.asString?.let { ModuleTag(it) } ?: throw JsonParseException("Invalid module tag format")
+}

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

@@ -13,10 +13,10 @@ import com.lambda.config.AbstractSetting
 class CharSetting(
     override val name: String,
     defaultValue: Char,
-    visibility: () -> Boolean,
     description: String,
+    visibility: () -> Boolean,
 ) : AbstractSetting<Char>(
     defaultValue,
-    visibility,
-    description
+    description,
+    visibility
 )

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

@@ -1,6 +1,7 @@
 package com.lambda.config.settings
 
 import com.lambda.config.AbstractSetting
+import com.lambda.util.math.MathUtils.roundToStep
 import kotlin.math.round
 import kotlin.reflect.KProperty
 
@@ -14,18 +15,22 @@ import kotlin.reflect.KProperty
  * @property step The [step] to which the setting's [value] is rounded.
  * @property visibility A function that determines whether the setting [isVisible].
  * @property description A [description] of the setting.
+ * @property unit The unit of the setting's [value].
  */
 abstract class NumericSetting<T>(
     value: T,
     open val range: ClosedRange<T>,
     open val step: T,
-    visibility: () -> Boolean,
     description: String,
+    visibility: () -> Boolean,
+    val unit: String,
 ) : AbstractSetting<T>(
     value,
-    visibility,
-    description
+    description,
+    visibility
 ) where T : Number, T : Comparable<T> {
+    override fun toString() = "$value$unit"
+
     override operator fun setValue(thisRef: Any?, property: KProperty<*>, valueIn: T) {
         value = valueIn.coerceIn(range).roundToStep(step)
     }

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

@@ -7,16 +7,16 @@ import com.lambda.config.AbstractSetting
  *
  * @property name The [name] of the setting.
  * @property defaultValue The default [String] [value] of the setting.
- * @property visibility A function that determines whether the setting [isVisible].
  * @property description A [description] of the setting.
+ * @property visibility A function that determines whether the setting [isVisible].
  */
 class StringSetting(
     override val name: String,
     defaultValue: String,
-    visibility: () -> Boolean,
     description: String,
+    visibility: () -> Boolean,
 ) : AbstractSetting<String>(
     defaultValue,
-    visibility,
-    description
+    description,
+    visibility
 )

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

@@ -8,12 +8,12 @@ import com.lambda.config.AbstractSetting
 class ListSetting<T>(
     override val name: String,
     defaultValue: List<T>,
-    visibility: () -> Boolean,
     description: String,
+    visibility: () -> Boolean,
 ) : AbstractSetting<List<T>>(
     defaultValue,
-    visibility,
-    description
+    description,
+    visibility
 ) {
     override fun loadFromJson(serialized: JsonElement) {
         val listType = object : TypeToken<List<T>>() {}.type