修复当玩家死亡时, 会导致粒子遗留的BUG

CooStack · CooStack · commit d0bbed677568 · 2025-07-26T22:49:05.000+08:00
diff --git a/src/main/java/cn/coostack/cooparticlesapi/mixin/ParticleManagerRenderMixin.java b/src/main/java/cn/coostack/cooparticlesapi/mixin/ParticleManagerRenderMixin.java
@@ -1,22 +1,17 @@
 package cn.coostack.cooparticlesapi.mixin;
 
-import cn.coostack.cooparticlesapi.CooParticleAPI;
 import cn.coostack.cooparticlesapi.utils.ParticleAsyncRenderHelper;
-import com.google.common.collect.EvictingQueue;
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.particle.ParticleManager;
 import net.minecraft.client.particle.ParticleTextureSheet;
 import net.minecraft.client.render.*;
 import net.minecraft.client.texture.TextureManager;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-import java.util.List;
+import java.util.Collection;
 import java.util.Queue;
 
 /**
diff --git a/src/main/java/cn/coostack/cooparticlesapi/mixin/plugin/CooParticleMixinLoaderPlugin.java b/src/main/java/cn/coostack/cooparticlesapi/mixin/plugin/CooParticleMixinLoaderPlugin.java
@@ -23,10 +23,13 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        if (!mixinClassName.equals("cn.coostack.cooparticlesapi.mixin.ParticleManagerMixin")) {
-            return true;
+        if ("cn.coostack.cooparticlesapi.mixin.ParticleManagerMixin".equals(mixinClassName)) {
+            return APIConfigManager.getConfig().getEnabledParticleCountInject();
         }
-        return APIConfigManager.getConfig().getEnabledParticleCountInject();
+        if ("cn.coostack.cooparticlesapi.mixin.ParticleManagerRenderMixin".equals(mixinClassName)) {
+            return APIConfigManager.getConfig().getEnabledParticleAsync();
+        }
+        return true;
     }
 
     @Override
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/CooParticleAPI.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/CooParticleAPI.kt
@@ -34,6 +34,7 @@ import cn.coostack.cooparticlesapi.test.entity.CooParticleEntities
 import cn.coostack.cooparticlesapi.test.entity.TestEntity
 import cn.coostack.cooparticlesapi.test.entity.TestPlayerEntity
 import com.ezylang.evalex.Expression
+import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents
 import net.fabricmc.fabric.api.`object`.builder.v1.entity.FabricDefaultAttributeRegistry
 
 object CooParticleAPI : ModInitializer {
@@ -105,6 +106,7 @@ object CooParticleAPI : ModInitializer {
         testEntity()
     }
 
+
     private fun testEntity() {
         CooParticleEntities.init()
         FabricDefaultAttributeRegistry.register(
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/CooParticleAPIClient.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/CooParticleAPIClient.kt
@@ -39,13 +39,17 @@ import cn.coostack.cooparticlesapi.test.particle.style.RotateTestStyle
 import cn.coostack.cooparticlesapi.test.particle.style.TestShapeUtilStyle
 import cn.coostack.cooparticlesapi.utils.ParticleAsyncRenderHelper
 import net.fabricmc.api.ClientModInitializer
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientEntityEvents
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientWorldEvents
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking
 import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry
 import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry
+import net.fabricmc.fabric.api.event.client.player.ClientPlayerBlockBreakEvents
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.network.ClientPlayerEntity
 
 object CooParticleAPIClient : ClientModInitializer {
     /**
@@ -141,6 +145,7 @@ object CooParticleAPIClient : ClientModInitializer {
             ParticleStyleManager.clearAllVisible()
             ClientParticleGroupManager.clearAllVisible()
         }
+        MinecraftClient.getInstance().player?.isDead
     }
 
     private fun testEntity() {
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/config/APIConfig.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/config/APIConfig.kt
@@ -8,17 +8,18 @@ class APIConfig {
      * (对其他插件进行兼容)
      */
     var enabledParticleCountInject = true
+    var enabledParticleAsync = true
 
     /**
      * 粒子数量上限
-     * 原版上限为65536
+     * 原版上限为16384
      */
-    var particleCountLimit = 65536
+    var particleCountLimit = 65536 * 2
         get() = max(field, 1)
 
     /**
      * Math3DUtil的 threadPool最大线程数
      */
-    var calculateThreadCount = 4
+    var calculateThreadCount = 16
         get() = max(field, 1)
 }
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/config/APIConfigManager.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/config/APIConfigManager.kt
@@ -9,15 +9,18 @@ import java.nio.file.Files
 object APIConfigManager {
     private val gson = GsonBuilder().setPrettyPrinting().create()
     private val path = FabricLoader.getInstance().configDir.resolve("${CooParticleAPI.MOD_ID}.json")
+
     @JvmStatic
     private var withConfig: APIConfig? = null
+
     @JvmStatic
     fun getConfig(): APIConfig {
         return withConfig ?: let {
             loadConfig()
             withConfig!!
         }
     }
+
     @JvmStatic
     fun loadConfig() {
         if (!Files.exists(path)) {
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/items/TestParticleItem.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/items/TestParticleItem.kt
@@ -81,8 +81,6 @@ class TestParticleItem(settings: Settings) : Item(settings) {
     private fun testRomaCircle(world: World, user: PlayerEntity) {
         val style = RomaMagicTestStyle()
         ParticleStyleManager.spawnStyle(world as ServerWorld, user.pos, style)
-        val motion = QuadraticStylePathMotion(style)
-        PathMotionManager.applyMotion(motion)
     }
 
     private fun testPresets(world: World, user: PlayerEntity) {
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/ServerParticleGroupManager.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/ServerParticleGroupManager.kt
@@ -5,6 +5,7 @@ import cn.coostack.cooparticlesapi.network.buffer.ParticleControlerDataBuffers
 import cn.coostack.cooparticlesapi.network.packet.PacketParticleGroupS2C
 import cn.coostack.cooparticlesapi.particles.control.ControlType
 import cn.coostack.cooparticlesapi.network.packet.PacketParticleGroupS2C.PacketArgsType
+import cn.coostack.cooparticlesapi.network.particle.style.ParticleStyleManager
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.server.world.ServerWorld
@@ -91,6 +92,13 @@ object ServerParticleGroupManager {
                     visibleSet!!.remove(value)
                     return@forEach
                 }
+                if (p.isDead) {
+                    if (value in visibleSet) {
+                        removeGroupPlayerView(p, value)
+                        visibleSet!!.remove(value)
+                    }
+                    return@forEach
+                }
                 if (value.pos.distanceTo(p.pos) <= value.visibleRange) {
                     // 防止重复添加(发包)
                     if (value in visibleSet) {
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/ParticleEmittersManager.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/ParticleEmittersManager.kt
@@ -138,6 +138,13 @@ object ParticleEmittersManager {
                 }
                 return@forEach
             }
+            if (p.isDead) {
+                if (emitters in visibleSet) {
+                    removeView(p, emitters)
+                    visibleSet!!.remove(emitters)
+                }
+                return@forEach
+            }
             if (emitters in visibleSet) {
                 return@forEach
             }
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/style/ParticleGroupStyle.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/style/ParticleGroupStyle.kt
@@ -355,6 +355,7 @@ abstract class ParticleGroupStyle(var visibleRange: Double = 32.0, val uuid: UUI
             if (len in -1e-3..1e-3) return@forEach
             value.multiply(len * scale / value.length())
         }
+        toggleRelative()
     }
 
     open fun preRotateTo(map: Map<StyleData, RelativeLocation>, to: RelativeLocation) {
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/style/ParticleStyleManager.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/style/ParticleStyleManager.kt
@@ -138,6 +138,13 @@ object ParticleStyleManager {
                 }
                 return@forEach
             }
+            if (p.isDead) {
+                if (style in visibleSet) {
+                    removeGroupPlayerView(p, style)
+                    visibleSet!!.remove(style)
+                }
+                return@forEach
+            }
             if (style.pos.distanceTo(p.pos) <= style.visibleRange) {
                 // 防止重复添加(发包)
                 if (style in visibleSet) {
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/style/SequencedParticleStyle.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/style/SequencedParticleStyle.kt
@@ -19,6 +19,11 @@ import java.util.UUID
 import kotlin.collections.toList
 import kotlin.math.PI
 
+
+/**
+ * 几个免除手动书写 SequencedParticleStyle的方法
+ *
+ */
 abstract class SequencedParticleStyle(visibleRange: Double = 32.0, uuid: UUID = UUID.randomUUID()) :
     ParticleGroupStyle(visibleRange, uuid) {
 
@@ -104,15 +109,21 @@ abstract class SequencedParticleStyle(visibleRange: Double = 32.0, uuid: UUID =
             return this
         }
 
-        fun build(order: Int): StyleData = SortedStyleData(displayerBuilder, order)
+        fun build(order: Int): SortedStyleData = SortedStyleData(displayerBuilder, order)
             .withParticleHandler {
                 particleHandlers.forEach { it() }
             }.withParticleControlerHandler {
                 particleControlerHandlers.forEach { it() }
-            }
+            } as SortedStyleData
     }
 
-    // 在服务器处为0
+    /**
+     * 在服务器处是0 size的大小
+     * client用于存储某个粒子/粒子组 的展示情况
+     *
+     * TODO 制作扩容的 MutableLongStatusList
+     * 用于彻底解除强制重写的烦恼
+     */
     val displayedStatus: LongArray by lazy {
         LongArray(getParticlesCount())
     }
@@ -349,6 +360,11 @@ abstract class SequencedParticleStyle(visibleRange: Double = 32.0, uuid: UUID =
         displayParticles()
     }
 
+    override fun clear(valid: Boolean) {
+        sequencedParticles.clear()
+        super.clear(valid)
+    }
+
     /**
      * 新的参数用于传输 粒子启用顺序
      */
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/test/particle/style/RomaMagicTestStyle.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/test/particle/style/RomaMagicTestStyle.kt
@@ -32,7 +32,7 @@ class RomaMagicTestStyle(uuid: UUID = UUID.randomUUID()) :
                         PointsBuilder()
                             .addWith {
                                 val r = ArrayList<RelativeLocation>()
-                                PointsBuilder().addCircle(3.5, 10)
+                                PointsBuilder().addCircle(3.5, 12)
                                     .create().forEachIndexed { index, rel ->
                                         r.addAll(
                                             PointsBuilder().withPreset { withRomaNumber(index + 1, 1.0) }
@@ -52,7 +52,7 @@ class RomaMagicTestStyle(uuid: UUID = UUID.randomUUID()) :
                         }
                     }.toggleOnDisplay {
                         this.addPreTickAction {
-                            rotateParticlesAsAxis(PI / 32)
+                            rotateParticlesAsAxis(PI / 256)
                             rotateParticlesToPoint(this@RomaMagicTestStyle.axis)
                         }
                     }
@@ -138,7 +138,7 @@ class RomaMagicTestStyle(uuid: UUID = UUID.randomUUID()) :
                         }
                     }.toggleOnDisplay {
                         this.addPreTickAction {
-                            rotateParticlesAsAxis(-PI / 32)
+                            rotateParticlesAsAxis(-PI / 256)
                             rotateParticlesToPoint(this@RomaMagicTestStyle.axis)
                         }
                     }
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/utils/Math3DUtil.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/utils/Math3DUtil.kt
@@ -243,26 +243,23 @@ object Math3DUtil {
      *                实际偏移量为 [0, discrete] 的随机值，负值会被自动归零
      */
     fun getSingleDiscreteOnCircleXZ(r: Double, discrete: Double, pointRadius: Double): RelativeLocation {
-        val effectiveDiscrete = discrete.coerceAtLeast(0.0)  // 确保非负分散度
-        // 生成标准圆环坐标 (y 固定为 0)
-        val x0 = r * cos(pointRadius)
-        val z0 = r * sin(pointRadius)
-        // 生成三维随机偏移向量（球坐标系）
-        val u = Random.nextDouble()
-        val v = Random.nextDouble()
-        val azimuth = 2 * PI * u      // 方位角 [0, 2π)
-        val polar = acos(2 * v - 1)   // 极角 [0, π] 保证均匀分布
-        val offsetMag = Random.nextDouble() * effectiveDiscrete  // 偏移量 [0, discrete]
-        // 转换为笛卡尔坐标系的偏移量
-        val horizontal = offsetMag * sin(polar)
-        val dx = horizontal * cos(azimuth)
-        val dz = horizontal * sin(azimuth)
-        val dy = offsetMag * cos(polar)  // 垂直方向偏移
+        val x = cos(pointRadius) * r
+        val z = sin(pointRadius) * r
+        if (discrete <= 0) return RelativeLocation(x, 0.0, z)
+
+        val randomR = random.nextDouble(discrete)
+        val rx = random.nextDouble(-PI, PI)
+        val ry = random.nextDouble(-PI, PI)
+        val add = RelativeLocation(
+            randomR * cos(rx) * cos(ry),
+            randomR * sin(rx),
+            randomR * sin(ry) * cos(rx)
+        )
         // 合成最终坐标
         return RelativeLocation(
-            x = x0 + dx,
-            y = dy,  // 原 y 坐标为 0，直接使用偏移量
-            z = z0 + dz
+            x = x + add.x,
+            y = add.y,  // 原 y 坐标为 0，直接使用偏移量
+            z = z + add.z
         )
     }
 
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/utils/MathPresets.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/utils/MathPresets.kt
@@ -161,13 +161,28 @@ object MathPresets {
         return builder.create()
     }
 
-    /**
-     *
-     */
+    fun romaXI(scale: Double): List<RelativeLocation> {
+        require(scale >= 0.01)
+        val res = ArrayList<RelativeLocation>()
+        val offset = getRomaOffsetX(scale) / 2
+        res.addAll(romaX(scale).onEach { it.x -= offset })
+        res.addAll(romaI(scale).onEach { it.x += offset })
+        return res
+    }
+
+    fun romaXII(scale: Double): List<RelativeLocation> {
+        require(scale >= 0.01)
+        val res = ArrayList<RelativeLocation>()
+        val offset = getRomaOffsetX(scale) / 2
+        res.addAll(romaXI(scale).onEach { it.x -= offset * 2 })
+        res.addAll(romaI(scale).onEach { it.x += offset })
+        return res
+    }
+
     fun getRomaOffsetX(scale: Double): Double = 0.125 * scale * 2
     fun getRomaOffsetY(scale: Double): Double = 0.25 * scale * 2
     fun withRomaNumber(i: Int, scale: Double): List<RelativeLocation> {
-        require(i in 1..10) { "只支持1-10的罗马数字" }
+        require(i in 1..12) { "只支持1-10的罗马数字" }
         return when (i) {
             1 -> romaI(scale)
             2 -> romaII(scale)
@@ -179,6 +194,8 @@ object MathPresets {
             8 -> romaVIII(scale)
             9 -> romaIX(scale)
             10 -> romaX(scale)
+            11 -> romaXI(scale)
+            12 -> romaXII(scale)
             else -> {
                 ArrayList<RelativeLocation>()
             }
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/utils/ParticleAsyncRenderHelper.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/utils/ParticleAsyncRenderHelper.kt
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/utils/RelativeLocation.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/utils/RelativeLocation.kt
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/utils/helper/HelperUtil.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/utils/helper/HelperUtil.kt
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/utils/helper/SequencedAnimationHelper.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/utils/helper/SequencedAnimationHelper.kt
diff --git a/src/main/resources/cooparticleapi.mixins.json b/src/main/resources/cooparticleapi.mixins.json

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,6 @@ class TestParticleItem(settings: Settings) : Item(settings) {`
`81`	`81`	`private fun testRomaCircle(world: World, user: PlayerEntity) {`
`82`	`82`	`val style = RomaMagicTestStyle()`
`83`	`83`	`ParticleStyleManager.spawnStyle(world as ServerWorld, user.pos, style)`
`84`		`- val motion = QuadraticStylePathMotion(style)`
`85`		`- PathMotionManager.applyMotion(motion)`
`86`	`84`	`}`
`87`	`85`
`88`	`86`	`private fun testPresets(world: World, user: PlayerEntity) {`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,13 @@ object ParticleEmittersManager {`
`138`	`138`	`}`
`139`	`139`	`return@forEach`
`140`	`140`	`}`
	`141`	`+ if (p.isDead) {`
	`142`	`+ if (emitters in visibleSet) {`
	`143`	`+ removeView(p, emitters)`
	`144`	`+ visibleSet!!.remove(emitters)`
	`145`	`+ }`
	`146`	`+ return@forEach`
	`147`	`+ }`
`141`	`148`	`if (emitters in visibleSet) {`
`142`	`149`	`return@forEach`
`143`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -355,6 +355,7 @@ abstract class ParticleGroupStyle(var visibleRange: Double = 32.0, val uuid: UUI`
`355`	`355`	`if (len in -1e-3..1e-3) return@forEach`
`356`	`356`	`value.multiply(len * scale / value.length())`
`357`	`357`	`}`
	`358`	`+ toggleRelative()`
`358`	`359`	`}`
`359`	`360`
`360`	`361`	`open fun preRotateTo(map: Map<StyleData, RelativeLocation>, to: RelativeLocation) {`