修复RenderEntity无法在Flashback正常显示的问题

Author: CooStack

build.gradle

@@ -9,7 +9,7 @@ plugins {
 tasks.register("publish-all") {
     group("build")
     description = "上传Fabric和Neoforge的内容到仓库中"
-    dependsOn(":neoforge:publish", ":fabric:publish", ":kapt:publish")
+    dependsOn(":neoforge:publish", ":fabric:publish")
 }
 
 subprojects {

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/PacketRenderEntityS2C.kt

@@ -8,7 +8,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload
 import net.minecraft.resources.ResourceLocation
 import java.util.UUID
 
-class PacketRenderEntityS2C(var uuid: UUID, var entityData: ByteBuf, var id: ResourceLocation, var method: Method) :
+class PacketRenderEntityS2C(var uuid: UUID, var entityData: ByteArray, var id: ResourceLocation, var method: Method) :
     CustomPacketPayload {
     enum class Method(val id: Int) {
         CREATE(0),
@@ -35,26 +35,26 @@ class PacketRenderEntityS2C(var uuid: UUID, var entityData: ByteBuf, var id: Res
         @JvmStatic
         val CODEC: StreamCodec<FriendlyByteBuf, PacketRenderEntityS2C> =
             CustomPacketPayload.codec({ packet, buf ->
-                val entity = packet.entityData.copy().array()
+                val entity = packet.entityData
                 buf.writeInt(packet.method.id)
                 buf.writeUUID(packet.uuid)
                 buf.writeResourceLocation(packet.id)
+                buf.writeInt(entity.size)
                 buf.writeBytes(entity)
             }, { buf ->
                 val method = buf.readInt()
                 val uuid = buf.readUUID()
                 val id = buf.readResourceLocation()
-                val entity = buf.readBytes(buf.readableBytes())
-                val packet = PacketRenderEntityS2C(uuid, entity, id, Method.idOf(method))
+                val size = buf.readInt()
+                val entity = buf.readBytes(size)
+                val bytes = ByteArray(size)
+                entity.readBytes(bytes)
+                val packet = PacketRenderEntityS2C(uuid, bytes, id, Method.idOf(method))
                 return@codec packet
             }
             )
     }
 
-    fun copyWithBuffer(): PacketRenderEntityS2C {
-        return PacketRenderEntityS2C(uuid, entityData.copy(), id, method)
-    }
-
     override fun type(): CustomPacketPayload.Type<out CustomPacketPayload?> {
         return payloadID
     }

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/client/listener/ClientRenderEntityPacketHandler.kt

@@ -3,18 +3,18 @@ package cn.coostack.cooparticlesapi.network.packet.client.listener
 import cn.coostack.cooparticlesapi.network.packet.PacketRenderEntityS2C
 import cn.coostack.cooparticlesapi.platform.network.ClientContext
 import cn.coostack.cooparticlesapi.renderer.client.ClientRenderEntityManager
+import io.netty.buffer.Unpooled
 import net.minecraft.network.FriendlyByteBuf
 
 object ClientRenderEntityPacketHandler {
     fun receive(
-        payload: PacketRenderEntityS2C,
+        packet: PacketRenderEntityS2C,
         context: ClientContext
     ) {
-        val packet = payload.copyWithBuffer()
         val method = packet.method
         val data = packet.entityData
         val id = packet.id
-        val buf = FriendlyByteBuf(data)
+        val buf = FriendlyByteBuf(Unpooled.wrappedBuffer(data))
         val codec = ClientRenderEntityManager.getCodecFromID(id) ?: return
         val entity = codec.decode(buf)
         entity.world = context.client().level
@@ -24,11 +24,11 @@ object ClientRenderEntityPacketHandler {
             }
 
             PacketRenderEntityS2C.Method.TOGGLE -> {
-                ClientRenderEntityManager.getFrom(payload.uuid)?.loadProfileFromEntity(entity)
+                ClientRenderEntityManager.getFrom(packet.uuid)?.loadProfileFromEntity(entity)
             }
 
             PacketRenderEntityS2C.Method.REMOVE -> {
-                ClientRenderEntityManager.getFrom(payload.uuid)?.canceled = true
+                ClientRenderEntityManager.getFrom(packet.uuid)?.canceled = true
             }
         }
     }

common/src/main/kotlin/cn/coostack/cooparticlesapi/renderer/RenderEntity.kt

@@ -72,8 +72,10 @@ abstract class RenderEntity(var world: Level?, var pos: Vec3 = Vec3.ZERO) : Serv
         }
         val buf = FriendlyByteBuf(Unpooled.buffer())
         getCodec().encode(buf, this)
+        val bytes = ByteArray(buf.readableBytes())
+        buf.readBytes(bytes)
         // 发包
-        val packet = PacketRenderEntityS2C(uuid, buf, getRenderID(), method)
+        val packet = PacketRenderEntityS2C(uuid, bytes, getRenderID(), method)
         return packet
     }
 

common/src/main/kotlin/cn/coostack/cooparticlesapi/test/TestA.kt

@@ -1,7 +1,7 @@
 # Important Notes:
 # Every field you add must be added to the root build.gradle expandProps map.
 # Project
-version=2.2.4
+version=2.2.4.2
 group=cn.coostack
 artifact=cooparticlesapi
 java_version=21