Merge to latest

Author: emyfops

common/build.gradle.kts

@@ -47,6 +47,10 @@ dependencies {
     implementation("com.github.Edouard127:KDiscordIPC:$discordIPCVersion")
     implementation("com.pngencoder:pngencoder:0.15.0")
 
+    // Fuel HTTP library
+    implementation("com.github.kittinunf.fuel:fuel:$fuelVersion")
+    implementation("com.github.kittinunf.fuel:fuel-gson:$fuelVersion")
+
     // Add Kotlin
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
 

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

@@ -33,6 +33,7 @@ import com.mojang.blaze3d.systems.RenderSystem.recordRenderCall
 import net.minecraft.block.Block
 import net.minecraft.client.MinecraftClient
 import net.minecraft.item.ItemStack
+import net.minecraft.registry.DynamicRegistryManager
 import net.minecraft.text.Text
 import net.minecraft.util.math.BlockPos
 import org.apache.logging.log4j.LogManager
@@ -64,7 +65,7 @@ object Lambda {
         .registerTypeAdapter(GameProfile::class.java, GameProfileSerializer)
         .registerTypeAdapter(Optional::class.java, OptionalSerializer)
         .registerTypeAdapter(ItemStack::class.java, ItemStackSerializer)
-        .registerTypeAdapter(Text::class.java, Text.Serializer())
+        .registerTypeAdapter(Text::class.java, Text.Serializer(DynamicRegistryManager.EMPTY))
         .create()
 
     fun initialize(block: (Long) -> Unit) {

common/src/main/kotlin/com/lambda/brigadier/argument/GeometricArguments.kt

@@ -53,7 +53,7 @@ fun DefaultArgumentReader<RotationArgumentType>.value(): PosArgument =
  */
 @BrigadierDsl
 fun ArgumentReader<ServerCommandSource, DefaultArgumentDescriptor<RotationArgumentType>>.absolute(): Vec2f =
-    RotationArgumentType.getRotation(context, name).toAbsoluteRotation(context.source)
+    RotationArgumentType.getRotation(context, name).getRotation(context.source)
 
 /**
  * Reads the set of [Direction.Axis] from the

common/src/main/kotlin/com/lambda/brigadier/argument/IdentifierArguments.kt

@@ -19,6 +19,10 @@ package com.lambda.brigadier.argument
 import com.lambda.brigadier.*
 import net.minecraft.advancement.AdvancementEntry
 import net.minecraft.command.argument.IdentifierArgumentType
+import net.minecraft.command.argument.ItemPredicateArgumentType
+import net.minecraft.command.argument.ItemStackArgumentType
+import net.minecraft.command.argument.RegistryEntryArgumentType
+import net.minecraft.command.argument.RegistryKeyArgumentType
 import net.minecraft.loot.condition.LootCondition
 import net.minecraft.loot.function.LootFunction
 import net.minecraft.recipe.RecipeEntry
@@ -42,7 +46,7 @@ fun DefaultArgumentReader<IdentifierArgumentType>.value(): Identifier {
  * argument in the receiver [ArgumentReader]
  * as an [AdvancementEntry].
  *
- * @see IdentifierArgumentType.getAdvancementArgument
+ * @see RegistryKeyArgumentType.getAdvancementEntry
  */
 @BrigadierDsl
 fun ArgumentReader<
@@ -51,7 +55,7 @@ fun ArgumentReader<
                 IdentifierArgumentType
                 >
         >.asAdvancement(): AdvancementEntry {
-    return IdentifierArgumentType.getAdvancementArgument(context, name)
+    return RegistryKeyArgumentType.getAdvancementEntry(context, name)
 }
 
 /**
@@ -61,15 +65,15 @@ fun ArgumentReader<
  *
  * @see IdentifierArgumentType.getPredicateArgument
  */
-@BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        DefaultArgumentDescriptor<
-                IdentifierArgumentType
-                >
-        >.asPredicate(): LootCondition {
-    return IdentifierArgumentType.getPredicateArgument(context, name)
-}
+//@BrigadierDsl
+//fun ArgumentReader<
+//        ServerCommandSource,
+//        DefaultArgumentDescriptor<
+//                IdentifierArgumentType
+//                >
+//        >.asPredicate(): LootCondition {
+//    return IdentifierArgumentType.getPredicateArgument(context, name)
+//}
 
 /**
  * Reads the [Identifier] value from the
@@ -78,15 +82,15 @@ fun ArgumentReader<
  *
  * @see IdentifierArgumentType.getItemModifierArgument
  */
-@BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        DefaultArgumentDescriptor<
-                IdentifierArgumentType
-                >
-        >.asItemModifier(): LootFunction {
-    return IdentifierArgumentType.getItemModifierArgument(context, name)
-}
+//@BrigadierDsl
+//fun ArgumentReader<
+//        ServerCommandSource,
+//        DefaultArgumentDescriptor<
+//                IdentifierArgumentType
+//                >
+//        >.asItemModifier(): LootFunction {
+//    return IdentifierArgumentType.getItemModifierArgument(context, name)
+//}
 
 /**
  * Reads the [Identifier] value from the
@@ -102,7 +106,7 @@ fun ArgumentReader<
                 IdentifierArgumentType
                 >
         >.asRecipe(): RecipeEntry<*> {
-    return IdentifierArgumentType.getRecipeArgument(context, name)
+    return RegistryKeyArgumentType.getRecipeEntry(context, name)
 }
 
 /**
@@ -113,4 +117,4 @@ fun <S> identifier(
     name: String,
 ): DefaultArgumentConstructor<S, IdentifierArgumentType> {
     return argument(name, IdentifierArgumentType.identifier())
-}
+}

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

@@ -18,29 +18,26 @@
 package com.lambda.config.serializer
 
 import com.google.gson.*
+import com.mojang.serialization.JsonOps
 import net.minecraft.util.math.BlockPos
 import java.lang.reflect.Type
+import kotlin.jvm.optionals.getOrElse
 
 object BlockPosSerializer : JsonSerializer<BlockPos>, JsonDeserializer<BlockPos> {
     override fun serialize(
-        src: BlockPos?,
-        typeOfSrc: Type?,
-        context: JsonSerializationContext?,
+        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
+        BlockPos.CODEC.encodeStart(JsonOps.INSTANCE, src)
+            .orThrow
 
     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
+        BlockPos.CODEC.parse(JsonOps.INSTANCE, json)
+            .result()
+            .getOrElse { BlockPos.ORIGIN }
 }

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

@@ -18,25 +18,29 @@
 package com.lambda.config.serializer
 
 import com.google.gson.*
+import com.mojang.serialization.JsonOps
+import com.mojang.serialization.RecordBuilder
 import net.minecraft.block.Block
+import net.minecraft.block.Blocks
 import net.minecraft.registry.Registries
 import net.minecraft.util.Identifier
 import java.lang.reflect.Type
+import kotlin.jvm.optionals.getOrElse
 
 object BlockSerializer : JsonSerializer<Block>, JsonDeserializer<Block> {
     override fun serialize(
-        src: Block?,
-        typeOfSrc: Type?,
-        context: JsonSerializationContext?,
+        src: Block,
+        typeOfSrc: Type,
+        context: JsonSerializationContext,
     ): JsonElement =
-        src?.let {
-            JsonPrimitive(Registries.BLOCK.getId(it).toString())
-        } ?: JsonNull.INSTANCE
+        Registries.BLOCK.codec.encodeStart(JsonOps.INSTANCE, src)
+            .orThrow
 
     override fun deserialize(
         json: JsonElement?,
         typeOfT: Type?,
         context: JsonDeserializationContext?,
     ): Block =
-        Registries.BLOCK.get(Identifier.of(json?.asString))
+        Registries.BLOCK.codec.parse(JsonOps.INSTANCE, json)
+            .orThrow
 }

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

@@ -21,38 +21,34 @@ import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.JsonObject
+import com.google.gson.JsonParser
 import com.google.gson.JsonSerializationContext
 import com.google.gson.JsonSerializer
+import com.lambda.Lambda.mc
+import com.mojang.serialization.JsonOps
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.StringNbtReader
 import net.minecraft.nbt.visitor.StringNbtWriter
 import net.minecraft.registry.Registries
 import net.minecraft.util.Identifier
 import java.lang.reflect.Type
+import kotlin.jvm.optionals.getOrElse
 
 object ItemStackSerializer : JsonSerializer<ItemStack>, JsonDeserializer<ItemStack> {
     override fun serialize(
         stack: ItemStack,
         typeOfSrc: Type,
         context: JsonSerializationContext
     ): JsonElement =
-        JsonObject().apply {
-            addProperty("id", stack.item.registryEntry.key.get().value.toString())
-            addProperty("count", stack.count)
-            stack.nbt?.let { addProperty("tag", StringNbtWriter().apply(it)) }
-        }
+        ItemStack.CODEC.encodeStart(JsonOps.INSTANCE, stack)
+            .orThrow
 
     override fun deserialize(
         json: JsonElement,
         typeOfT: Type,
         context: JsonDeserializationContext
-    ): ItemStack {
-        val id = json.asJsonObject.get("id").asString
-        val count = json.asJsonObject.get("count").asInt
-        val nbt = json.asJsonObject?.get("tag")?.asString
-
-        val item = Registries.ITEM.get(Identifier(id))
-
-        return ItemStack(item, count).apply { nbt?.let { setNbt(StringNbtReader.parse(it)) } }
-    }
+    ): ItemStack =
+        ItemStack.CODEC.parse(JsonOps.INSTANCE, json)
+            .result()
+            .getOrElse { ItemStack.EMPTY }
 }

common/src/main/kotlin/com/lambda/graphics/animation/Animation.kt

@@ -28,7 +28,7 @@ class Animation(initialValue: Double, val update: (Double) -> Double) {
     private var currValue = initialValue
 
     operator fun getValue(thisRef: Any?, property: KProperty<*>) =
-        lerp(mc.partialTicks, prevValue, currValue)
+        lerp(mc.partialTicks.toDouble(), prevValue, currValue)
 
     operator fun setValue(thisRef: Any?, property: KProperty<*>, valueIn: Double) = setValue(valueIn)
 

common/src/main/kotlin/com/lambda/graphics/renderer/esp/impl/ESPRenderer.kt

@@ -47,7 +47,7 @@ abstract class ESPRenderer(tickedMode: Boolean) {
 
     fun render() {
         shader.use()
-        shader["u_TickDelta"] = mc.partialTicks
+        shader["u_TickDelta"] = mc.partialTicks.toDouble()
         shader["u_CameraPosition"] = mc.gameRenderer.camera.pos
 
         withFaceCulling(faces::render)

common/src/main/kotlin/com/lambda/interaction/construction/StructureRegistry.kt

@@ -45,7 +45,6 @@ import kotlin.io.path.*
  * It extends [ConcurrentHashMap] to allow concurrent access to structure templates by their names.
  * This registry supports multiple structure formats and automatically monitors changes in the structure directory.
  */
-@OptIn(ExperimentalPathApi::class)
 @Suppress("JavaIoSerializableObjectMustHaveReadResolve")
 object StructureRegistry : ConcurrentHashMap<String, StructureTemplate>(), Loadable {
     private val pathWatcher by lazy {
@@ -148,7 +147,7 @@ object StructureRegistry : ConcurrentHashMap<String, StructureTemplate>(), Loada
     private fun createStructure(nbt: NbtCompound, suffix: String): StructureTemplate =
         StructureTemplate().apply {
             serializers[suffix]
-                ?.invoke(this, Registries.BLOCK.readOnlyWrapper, nbt)
+                ?.invoke(this, Registries.BLOCK, nbt)
                 ?.let { throw it } // ToDo: Maybe use propagation instead of errors as values
         }