Update to 1.20.5-rc2

gradle.properties

@@ -4,26 +4,26 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=23w51b
-yarn_build=4
-loader_version=0.15.7
+minecraft_version=1.20.5-rc2
+yarn_build=1
+loader_version=0.15.10
 
 # Mod Properties
-mod_version=1.1.2
+mod_version=1.2.0
 maven_group=net.mcbrawls
 mod_id=blueprint
 
 # Dependencies
-fabric_version=0.94.0+1.20.5
+fabric_version=0.97.4+1.20.5
 
 kotlin_version=1.9.23
 fabric_kotlin_version=1.10.19+kotlin.1.9.23
 
-devlogin_version=3.4.1
+devlogin_version=3.5
 
-bubble_version=1.0.7
+bubble_version=1.0.8
 audience_version=2.5.0
-codex_version=1.4.0
+codex_version=1.5.0
 brawls_sgui_version=1.0.0
 
-sgui_version=1.4.2+1.20.4
+sgui_version=1.5.0+1.20.5

src/main/kotlin/net/mcbrawls/blueprint/BlueprintMod.kt

@@ -2,6 +2,7 @@ package net.mcbrawls.blueprint
 
 import net.fabricmc.api.ModInitializer
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper
 import net.mcbrawls.blueprint.command.BlueprintCommand
@@ -30,7 +31,10 @@ object BlueprintMod : ModInitializer {
         BlueprintEditors
 
         // register config packet receiver
-        ServerPlayNetworking.registerGlobalReceiver(BlueprintConfigC2SPacket.TYPE) { packet, player, _ ->
+        PayloadTypeRegistry.playC2S().register(BlueprintConfigC2SPacket.PACKET_ID, BlueprintConfigC2SPacket.PACKET_CODEC)
+
+        ServerPlayNetworking.registerGlobalReceiver(BlueprintConfigC2SPacket.PACKET_ID) { packet, context ->
+            val player = context.player()
             player.blueprintData = packet.createBlueprintPlayerData()
 
             val playerName = player.gameProfile.name

src/main/kotlin/net/mcbrawls/blueprint/network/BlueprintConfigC2SPacket.kt

@@ -1,10 +1,15 @@
 package net.mcbrawls.blueprint.network
 
-import net.fabricmc.fabric.api.networking.v1.FabricPacket
-import net.fabricmc.fabric.api.networking.v1.PacketType
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import io.netty.buffer.ByteBuf
 import net.mcbrawls.blueprint.BlueprintMod
 import net.mcbrawls.blueprint.player.BlueprintPlayerData
 import net.minecraft.network.PacketByteBuf
+import net.minecraft.network.codec.PacketCodec
+import net.minecraft.network.codec.PacketCodecs
+import net.minecraft.network.packet.CustomPayload
+import net.minecraft.network.packet.CustomPayload.Id
 import net.minecraft.util.Identifier
 
 /**
@@ -15,17 +20,13 @@ data class BlueprintConfigC2SPacket(
      * Whether the server should render blueprint particles.
      */
     val renderParticles: Boolean,
-) : FabricPacket {
+) : CustomPayload {
     constructor(buf: PacketByteBuf) : this(
         buf.readBoolean()
     )
 
-    override fun write(buf: PacketByteBuf) {
-        buf.writeBoolean(renderParticles)
-    }
-
-    override fun getType(): PacketType<*> {
-        return TYPE
+    override fun getId(): Id<out CustomPayload> {
+        return PACKET_ID
     }
 
     /**
@@ -36,12 +37,14 @@ data class BlueprintConfigC2SPacket(
     }
 
     companion object {
-        /**
-         * The type of the config packet.
-         */
-        val TYPE: PacketType<BlueprintConfigC2SPacket> = PacketType.create(
-            Identifier(BlueprintMod.MOD_ID, "config"),
-            ::BlueprintConfigC2SPacket
-        )
+        val PACKET_ID: Id<BlueprintConfigC2SPacket> = Id(Identifier(BlueprintMod.MOD_ID, "config"))
+
+        val CODEC: Codec<BlueprintConfigC2SPacket> = RecordCodecBuilder.create { instance ->
+            instance.group(
+                Codec.BOOL.fieldOf("render_particles").forGetter(BlueprintConfigC2SPacket::renderParticles)
+            ).apply(instance, ::BlueprintConfigC2SPacket)
+        }
+
+        val PACKET_CODEC: PacketCodec<ByteBuf, BlueprintConfigC2SPacket> = PacketCodecs.codec(CODEC)
     }
 }

src/main/kotlin/net/mcbrawls/blueprint/region/CuboidRegion.kt

@@ -1,6 +1,6 @@
 package net.mcbrawls.blueprint.region
 
-import com.mojang.serialization.Codec
+import com.mojang.serialization.MapCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.mcbrawls.blueprint.region.Region.Companion.iterateBoxBlockPositions
 import net.mcbrawls.blueprint.region.serialization.SerializableRegion
@@ -58,7 +58,7 @@ data class CuboidRegion(
         /**
          * The codec of a cuboid region.
          */
-        val CODEC: Codec<CuboidRegion> = RecordCodecBuilder.create { instance ->
+        val CODEC: MapCodec<CuboidRegion> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
                 Vec3d.CODEC.fieldOf("root_position").forGetter(CuboidRegion::rootPosition),
                 Vec3d.CODEC.fieldOf("size").forGetter(CuboidRegion::size)

src/main/kotlin/net/mcbrawls/blueprint/region/PointRegion.kt

@@ -1,6 +1,6 @@
 package net.mcbrawls.blueprint.region
 
-import com.mojang.serialization.Codec
+import com.mojang.serialization.MapCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.mcbrawls.blueprint.region.serialization.SerializableRegion
 import net.mcbrawls.blueprint.region.serialization.SerializableRegionTypes
@@ -33,7 +33,7 @@ data class PointRegion(
         /**
          * The codec of a cuboid region.
          */
-        val CODEC: Codec<PointRegion> = RecordCodecBuilder.create { instance ->
+        val CODEC: MapCodec<PointRegion> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
                 Vec3d.CODEC.fieldOf("position").forGetter(PointRegion::pointPosition),
             ).apply(instance, ::PointRegion)

src/main/kotlin/net/mcbrawls/blueprint/region/SphericalRegion.kt

@@ -1,6 +1,7 @@
 package net.mcbrawls.blueprint.region
 
 import com.mojang.serialization.Codec
+import com.mojang.serialization.MapCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.mcbrawls.blueprint.region.Region.Companion.iterateBoxBlockPositions
 import net.mcbrawls.blueprint.region.serialization.SerializableRegion
@@ -53,7 +54,7 @@ data class SphericalRegion(
         /**
          * The codec of a spherical region.
          */
-        val CODEC: Codec<SphericalRegion> = RecordCodecBuilder.create { instance ->
+        val CODEC: MapCodec<SphericalRegion> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
                 Vec3d.CODEC.fieldOf("root_position").forGetter(SphericalRegion::rootPosition),
                 Codec.DOUBLE.fieldOf("radius").forGetter(SphericalRegion::radius)

src/main/kotlin/net/mcbrawls/blueprint/region/serialization/SerializableRegion.kt

@@ -1,6 +1,7 @@
 package net.mcbrawls.blueprint.region.serialization
 
 import com.mojang.serialization.Codec
+import com.mojang.serialization.MapCodec
 import net.mcbrawls.blueprint.region.CompoundRegion
 import net.mcbrawls.blueprint.region.Region
 import net.minecraft.util.math.Vec3d
@@ -29,14 +30,14 @@ abstract class SerializableRegion(
         /**
          * The codec of this serializable region type.
          */
-        val codec: Codec<out SerializableRegion>
+        val codec: MapCodec<out SerializableRegion>
     )
 
     companion object {
         /**
          * The codec for a serializable region, defined by its type.
          */
-        val CODEC: Codec<SerializableRegion> = SerializableRegionTypes.REGISTRY.getCodec()
+        val CODEC: Codec<SerializableRegion> = SerializableRegionTypes.REGISTRY.codec
             .dispatch(SerializableRegion::type, Type::codec)
     }
 }