ServerControler 可以查看是否消散

修复CodecHelper不能实例化 Empty Stack的问题

Author: CooStack

common/src/main/kotlin/cn/coostack/cooparticlesapi/annotations/codec/CodecHelper.kt

@@ -75,7 +75,7 @@ object CodecHelper {
         }, {
             HitBox(it.readDouble(), it.readDouble(), it.readDouble(), it.readDouble(), it.readDouble(), it.readDouble())
         }))
-        register(ItemStack::class.java, ItemStack.STREAM_CODEC)
+        register(ItemStack::class.java, ItemStack.OPTIONAL_STREAM_CODEC)
         register(SimpleRandomParticleData::class.java, SimpleRandomParticleData.PACKET_CODEC)
         register(RelativeLocation::class.java, StreamCodec.of({ buf, r ->
             buf.apply {

common/src/main/kotlin/cn/coostack/cooparticlesapi/api/controler/server/ServerControler.kt

@@ -23,4 +23,7 @@ interface ServerControler<T> {
     fun spawn(world: Level, pos: Vec3)
 
     fun getValue(): T
+
+    fun isValid(): Boolean
+
 }

common/src/main/kotlin/cn/coostack/cooparticlesapi/display/DisplayEntity.kt

@@ -83,8 +83,7 @@ abstract class DisplayEntity(
     var prevScale = 1f
     var scale = 1f
 
-    var valid = true
-        private set
+    private var valid = true
 
     /**
      * 由 DisplayEntityManager计算模型旋转
@@ -298,6 +297,10 @@ abstract class DisplayEntity(
         )
     }
 
+    override fun isValid(): Boolean {
+        return valid
+    }
+
     override fun getValue(): DisplayEntity {
         return this
     }

common/src/main/kotlin/cn/coostack/cooparticlesapi/display/DisplayEntityManager.kt

@@ -130,7 +130,7 @@ object DisplayEntityManager {
         while (iterator.hasNext()) {
             val entry = iterator.next()
             entry.value.tick()
-            if (!entry.value.valid) {
+            if (!entry.value.isValid()) {
                 iterator.remove()
             }
         }
@@ -141,7 +141,7 @@ object DisplayEntityManager {
         while (iterator.hasNext()) {
             val entry = iterator.next()
             entry.value.tick()
-            if (!entry.value.valid) {
+            if (!entry.value.isValid()) {
                 iterator.remove()
             }
             sendCreateOrUpdate(entry.value)

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/ServerParticleGroup.kt

@@ -31,8 +31,7 @@ abstract class ServerParticleGroup(
         internal set
     var world: Level? = null
         internal set
-    var valid = true
-        internal set
+    internal var valid = true
     var canceled = false
         internal set
 
@@ -322,5 +321,8 @@ abstract class ServerParticleGroup(
         this.clientMaxTick = maxTick
     }
 
+    override fun isValid(): Boolean {
+        return valid
+    }
 
 }

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/composition/ParticleComposition.kt

@@ -388,6 +388,10 @@ abstract class ParticleComposition(var position: Vec3, var world: Level? = null)
         return this
     }
 
+    override fun isValid(): Boolean {
+        return !canceled
+    }
+
     protected open fun displayEntry(data: CompositionData, pos: RelativeLocation) {
         val uuid = data.uuid
         val displayer = data.displayerBuilder(uuid)

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

@@ -372,6 +372,7 @@ abstract class ClassEmitters(
         }
     }
 
+
     /**
      * 数据同步需要实现此方法。
      *

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

@@ -485,6 +485,8 @@ abstract class ClassParticleEmitters(
         data.velocity = v.add(a)
     }
 
+
+
     /**
      * # 处理单个粒子的位移位置
      * - 方便更真实的物理模拟

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

@@ -85,6 +85,10 @@ interface ParticleEmitters : ServerControler<ParticleEmitters> {
         ParticleEmittersManager.spawnEmitters(this)
     }
 
+    override fun isValid(): Boolean {
+        return !cancelled
+    }
+
     override fun rotateAsAxis(radian: Double) {
     }
 

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/style/ParticleGroupStyle.kt

@@ -59,12 +59,14 @@ abstract class ParticleGroupStyle(var visibleRange: Double = 32.0, val uuid: UUI
 
     var displayed = false
         internal set
-    var valid = true
-        internal set
+    internal var valid = true
     internal val invokeQueue = ArrayList<ParticleGroupStyle.() -> Unit>()
     val particles = ConcurrentHashMap<UUID, Controlable<*>>()
     val particleLocations = ConcurrentHashMap<Controlable<*>, RelativeLocation>()
 
+    override fun isValid(): Boolean {
+        return valid
+    }
 
     /** 当粒子组合初始化时, 存储1倍缩放粒子组与原点的距离 */
     val particleDefaultLength = ConcurrentHashMap<UUID, Double>()