修复 Emitter发包之前会执行tick方法 导致客户端刚刚开始收到的tick不为0 (看不见)的BUG

由于修复上述BUG
将Emitter相关的所有CODEC由RegistryByteBuf 改为 PacketByteBuf

修改ControlableParticle的getBrightness方法
现在可以自定义粒子亮度 (修改light属性) 设置为-1则为环境亮度 (自动获取)

Author: CooStack

src/main/java/cn/coostack/cooparticlesapi/mixin/CooParticleCameraMixin.java

@@ -13,26 +13,30 @@
 
 @Mixin(Camera.class)
 public abstract class CooParticleCameraMixin {
-    @Shadow private float yaw;
+    @Shadow
+    private float yaw;
 
-    @Shadow private float pitch;
+    @Shadow
+    private float pitch;
 
 
-    @Shadow protected abstract void setRotation(float yaw, float pitch);
+    @Shadow
+    protected abstract void setRotation(float yaw, float pitch);
 
-    @Shadow protected abstract void setPos(double x, double y, double z);
+    @Shadow
+    protected abstract void setPos(double x, double y, double z);
 
-    @Shadow private Vec3d pos;
+    @Shadow
+    private Vec3d pos;
 
-    @Inject(method = "update", at=@At("TAIL"))
+    @Inject(method = "update", at = @At("TAIL"))
     private void onUpdate(CallbackInfo ci) {
 //        float newYaw = yaw + CameraUtil.INSTANCE.getCurrentYawOffset();
 //        float newPitch = pitch + CameraUtil.INSTANCE.getCurrentPitchOffset();
 //        setRotation(newYaw, newPitch);
         double x = pos.getX() + CameraUtil.INSTANCE.getCurrentXOffset();
         double y = pos.getY() + CameraUtil.INSTANCE.getCurrentYOffset();
         double z = pos.getZ() + CameraUtil.INSTANCE.getCurrentZOffset();
-        setPos(x,y,z);
+        setPos(x, y, z);
     }
-
 }

src/main/java/cn/coostack/cooparticlesapi/mixin/ParticleManagerRenderMixin.java

@@ -21,9 +21,8 @@
 
 /**
  * TODO
- * 异步生成BuiltBuffer时
- * 在主线程draw会导致 buffer no longer valid的异常
- * 原理未知
+ * 100%崩端 提示非法访问内存
+ * 原因未知
  */
 @Mixin(ParticleManager.class)
 public class ParticleManagerRenderMixin {

src/main/kotlin/cn/coostack/cooparticlesapi/CooParticleAPIClient.kt

@@ -115,19 +115,16 @@ object CooParticleAPIClient : ClientModInitializer {
             ParticleEmittersManager.clientEmitters.clear()
             ParticleStyleManager.clearAllVisible()
             ClientParticleGroupManager.clearAllVisible()
-            ParticleAsyncRenderHelper.close()
         }
         ClientTickEvents.START_WORLD_TICK.register {
             ClientParticleGroupManager.doClientTick()
             ParticleStyleManager.doTickClient()
             ParticleEmittersManager.doTickClient()
-            ParticleAsyncRenderHelper.reloadIfClosed()
         }
         ClientWorldEvents.AFTER_CLIENT_WORLD_CHANGE.register { _, _ ->
             ParticleEmittersManager.clientEmitters.clear()
             ParticleStyleManager.clearAllVisible()
             ClientParticleGroupManager.clearAllVisible()
-            ParticleAsyncRenderHelper.reloadIfClosed()
         }
     }
 

src/main/kotlin/cn/coostack/cooparticlesapi/network/animation/ParticleAnimation.kt

@@ -0,0 +1,12 @@
+package cn.coostack.cooparticlesapi.network.animation
+
+/**
+ * 粒子动画
+ * 兼容 粒子发射器(ParticleEmitter) 粒子样式 (ParticleGroupStyle)
+ * 在服务器端发包控制动画
+ * TODO 没想好框架
+ */
+interface ParticleAnimation {
+
+
+}

src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/PacketParticleEmittersS2C.kt

@@ -4,19 +4,19 @@ import cn.coostack.cooparticlesapi.CooParticleAPI
 import cn.coostack.cooparticlesapi.network.particle.emitters.ParticleEmitters
 import cn.coostack.cooparticlesapi.network.particle.emitters.ParticleEmittersManager
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry
+import net.minecraft.network.PacketByteBuf
 import net.minecraft.network.RegistryByteBuf
 import net.minecraft.network.codec.PacketCodec
 import net.minecraft.network.packet.CustomPayload
 import net.minecraft.util.Identifier
 import java.util.UUID
 
 class PacketParticleEmittersS2C(
-    val emitter: ParticleEmitters,
+    val emitterBuf: PacketByteBuf,
     val emitterID: String,
     val type: PacketType
 ) :
     CustomPayload {
-
     enum class PacketType(val id: Int) {
         CHANGE_OR_CREATE(0),
         REMOVE(1);
@@ -36,17 +36,16 @@ class PacketParticleEmittersS2C(
     companion object {
         private val identifierID = Identifier.of(CooParticleAPI.MOD_ID, "particle_emitters")
         val payloadID = CustomPayload.Id<PacketParticleEmittersS2C>(identifierID)
-        private val CODEC: PacketCodec<RegistryByteBuf, PacketParticleEmittersS2C> =
+        private val CODEC: PacketCodec<PacketByteBuf, PacketParticleEmittersS2C> =
             CustomPayload.codecOf({ packet, buf ->
                 buf.writeInt(packet.type.id)
                 buf.writeString(packet.emitterID)
-                packet.emitter.getCodec().encode(buf, packet.emitter)
+                buf.writeBytes(packet.emitterBuf)
             }, { buf ->
                 val packetTypeID = buf.readInt()
                 val emitterID = buf.readString()
-                val codec = ParticleEmittersManager.getCodecFromID(emitterID)!!
-                val emitter = codec.decode(buf)
-                PacketParticleEmittersS2C(emitter, emitterID, PacketType.fromID(packetTypeID))
+                val emitterBuf = buf.readBytes(buf.readableBytes())
+                PacketParticleEmittersS2C(PacketByteBuf(emitterBuf), emitterID, PacketType.fromID(packetTypeID))
             })
 
         fun init() {

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

@@ -4,6 +4,7 @@ import cn.coostack.cooparticlesapi.network.packet.PacketParticleEmittersS2C
 import cn.coostack.cooparticlesapi.network.particle.emitters.ParticleEmitters
 import cn.coostack.cooparticlesapi.network.particle.emitters.ParticleEmittersManager
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking
+import net.minecraft.network.PacketByteBuf
 
 object ClientParticleEmittersPacketHandler : ClientPlayNetworking.PlayPayloadHandler<PacketParticleEmittersS2C> {
     override fun receive(
@@ -12,16 +13,20 @@ object ClientParticleEmittersPacketHandler : ClientPlayNetworking.PlayPayloadHan
     ) {
         when (payload.type) {
             PacketParticleEmittersS2C.PacketType.CHANGE_OR_CREATE -> handleChangeOrCreate(payload, context)
-            PacketParticleEmittersS2C.PacketType.REMOVE -> handleRemove(payload.emitter)
+            PacketParticleEmittersS2C.PacketType.REMOVE -> handleRemove(payload)
         }
 
     }
 
     fun handleChangeOrCreate(payload: PacketParticleEmittersS2C, context: ClientPlayNetworking.Context) {
-        ParticleEmittersManager.createOrChangeClient(payload.emitter, context.player().world)
+        val codec = ParticleEmittersManager.getCodecFromID(payload.emitterID) ?: return
+        val emitter = codec.decode(payload.emitterBuf)
+        ParticleEmittersManager.createOrChangeClient(emitter, context.player().world)
     }
 
-    fun handleRemove(emitter: ParticleEmitters) {
+    fun handleRemove(payload: PacketParticleEmittersS2C) {
+        val codec = ParticleEmittersManager.getCodecFromID(payload.emitterID) ?: return
+        val emitter = codec.decode(payload.emitterBuf)
         ParticleEmittersManager.clientEmitters[emitter.uuid]?.cancelled = true
     }
 }

src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/ClassParticleEmitters.kt

@@ -5,14 +5,14 @@ import cn.coostack.cooparticlesapi.network.particle.emitters.environment.wind.Wi
 import cn.coostack.cooparticlesapi.network.particle.emitters.environment.wind.WindDirections
 import cn.coostack.cooparticlesapi.network.particle.emitters.impl.PhysicsParticleEmitters.Companion.CROSS_SECTIONAL_AREA
 import cn.coostack.cooparticlesapi.network.particle.emitters.impl.PhysicsParticleEmitters.Companion.DRAG_COEFFICIENT
-import cn.coostack.cooparticlesapi.particles.ControlableParticle
 import cn.coostack.cooparticlesapi.particles.ParticleDisplayer
 import cn.coostack.cooparticlesapi.particles.control.ControlParticleManager
 import cn.coostack.cooparticlesapi.particles.control.ParticleControler
 import cn.coostack.cooparticlesapi.utils.RelativeLocation
+import io.netty.buffer.Unpooled
 import net.minecraft.client.world.ClientWorld
+import net.minecraft.network.PacketByteBuf
 import net.minecraft.network.RegistryByteBuf
-import net.minecraft.network.codec.PacketCodec
 import net.minecraft.util.math.Vec3d
 import net.minecraft.world.World
 import java.util.UUID
@@ -37,7 +37,7 @@ abstract class ClassParticleEmitters(
     var gravity: Double = 0.0
 
     companion object {
-        fun encodeBase(data: ClassParticleEmitters, buf: RegistryByteBuf) {
+        fun encodeBase(data: ClassParticleEmitters, buf: PacketByteBuf) {
             buf.writeVec3d(data.pos)
             buf.writeInt(data.tick)
             buf.writeInt(data.maxTick)
@@ -58,7 +58,7 @@ abstract class ClassParticleEmitters(
          * 然后将buf和container 传入此方法
          * 然后继续decode自己的参数
          */
-        fun decodeBase(container: ClassParticleEmitters, buf: RegistryByteBuf) {
+        fun decodeBase(container: ClassParticleEmitters, buf: PacketByteBuf) {
             val pos = buf.readVec3d()
             val tick = buf.readInt()
             val maxTick = buf.readInt()
@@ -122,21 +122,25 @@ abstract class ClassParticleEmitters(
         if (cancelled || !playing) {
             return
         }
-        if (tick++ >= maxTick && maxTick != -1) {
-            stop()
-        }
 
         world ?: return
         doTick()
         if (!world!!.isClient) {
+            increaseTick()
             return
         }
-
         if (tick % max(1, delay) == 0) {
             // 执行粒子变更操作
             // 生成新粒子
             spawnParticle()
         }
+        increaseTick()
+    }
+
+    private fun increaseTick() {
+        if (++tick >= maxTick && maxTick != -1) {
+            stop()
+        }
     }
 
     override fun spawnParticle() {
@@ -213,6 +217,12 @@ abstract class ClassParticleEmitters(
         } else {
             Vec3d.ZERO
         }
+
+        if (!wind.hasLoadedEmitters()) {
+            wind.loadEmitters(this)
+        }
+
+
         val windForce = WindDirections.handleWindForce(
             wind, pos,
             airDensity, DRAG_COEFFICIENT, CROSS_SECTIONAL_AREA, v

src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/ControlableParticleData.kt

@@ -4,6 +4,7 @@ import cn.coostack.cooparticlesapi.particles.ControlableParticleEffect
 import cn.coostack.cooparticlesapi.particles.ControlableParticleEffectManager
 import cn.coostack.cooparticlesapi.particles.impl.TestEndRodEffect
 import net.minecraft.client.particle.ParticleTextureSheet
+import net.minecraft.network.PacketByteBuf
 import net.minecraft.network.RegistryByteBuf
 import net.minecraft.network.codec.PacketCodec
 import net.minecraft.util.math.Vec3d
@@ -13,11 +14,11 @@ import java.util.UUID
 open class ControlableParticleData {
     companion object {
         @JvmStatic
-        val PACKET_CODEC = PacketCodec.ofStatic<RegistryByteBuf, ControlableParticleData>(
+        val PACKET_CODEC = PacketCodec.ofStatic<PacketByteBuf, ControlableParticleData>(
             ::encode, ::decode
         )
 
-        private fun encode(buf: RegistryByteBuf, data: ControlableParticleData) {
+        private fun encode(buf: PacketByteBuf, data: ControlableParticleData) {
             buf.writeUuid(data.uuid)
             buf.writeVec3d(data.velocity)
             buf.writeFloat(data.size)
@@ -36,7 +37,7 @@ open class ControlableParticleData {
         }
 
         private fun decode(
-            buf: RegistryByteBuf,
+            buf: PacketByteBuf,
         ): ControlableParticleData {
             val uuid = buf.readUuid()
             val velocity = buf.readVec3d()
@@ -98,7 +99,7 @@ open class ControlableParticleData {
         }
     }
 
-    open fun getCodec(): PacketCodec<RegistryByteBuf, out ControlableParticleData> {
+    open fun getCodec(): PacketCodec<PacketByteBuf, out ControlableParticleData> {
         return PACKET_CODEC
     }
 

src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/ParticleEmitters.kt

@@ -1,5 +1,6 @@
 package cn.coostack.cooparticlesapi.network.particle.emitters
 
+import net.minecraft.network.PacketByteBuf
 import net.minecraft.network.RegistryByteBuf
 import net.minecraft.network.codec.PacketCodec
 import net.minecraft.util.math.Vec3d
@@ -22,7 +23,6 @@ interface ParticleEmitters {
     var pos: Vec3d
     var world: World?
     var tick: Int
-
     /**
      * 当maxTick == -1时
      * 代表此粒子不会由生命周期控制
@@ -57,5 +57,5 @@ interface ParticleEmitters {
      * 编解码器
      * 编码粒子信息, 当前位置
      */
-    fun getCodec(): PacketCodec<RegistryByteBuf, ParticleEmitters>
+    fun getCodec(): PacketCodec<PacketByteBuf, ParticleEmitters>
 }