可能修复在使用 Barrage功能时退出重进会导致卡死锁的问题

Author: CooStack

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

@@ -35,7 +35,7 @@ public BufferBuilder renderParticles(ParticleTextureSheet instance,
                                          @Local(argsOnly = true) Camera camera,
                                          @Local(argsOnly = true) float tickDelta,
                                          @Local(ordinal = 0) ParticleTextureSheet sheet) {
-        Object[] array = queue.toArray();
+        Particle[] array = queue.toArray(new Particle[0]);
         // 异步调用...
         ParticleAsyncRenderHelper.INSTANCE
                 .renderParticlesAsync(array, instance, textureManager, camera, tickDelta);

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

@@ -90,6 +90,7 @@ object CooParticleAPI : ModInitializer {
         ServerLifecycleEvents.SERVER_STARTED.register { server ->
             this.server = server
         }
+
         PacketParticleGroupS2C.init()
         PacketParticleS2C.init()
         PacketParticleStyleS2C.init()
@@ -100,7 +101,6 @@ object CooParticleAPI : ModInitializer {
 
     private fun testEntity() {
         CooParticleEntities.init()
-
         FabricDefaultAttributeRegistry.register(
             CooParticleEntities.TEST_ENTITY,
             TestEntity.createDefaultMobAttributes()

src/main/kotlin/cn/coostack/cooparticlesapi/barrages/AbstractBarrage.kt

@@ -6,7 +6,9 @@ import com.google.common.base.Predicate
 import net.minecraft.entity.LivingEntity
 import net.minecraft.server.world.ServerWorld
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.ChunkPos
 import net.minecraft.util.math.Vec3d
+import net.minecraft.world.chunk.Chunk
 import kotlin.math.max
 
 abstract class AbstractBarrage(
@@ -67,18 +69,20 @@ abstract class AbstractBarrage(
         }
         var hit = false
         val blockPos = BlockPos.ofFloored(loc)
-        val block = world.getBlockState(blockPos)
         val result = BarrageHitResult()
-        if (!block.isAir) {
-            val shape = block.getCollisionShape(world, blockPos)
-            if (block.isLiquid) {
-                if (!options.acrossLiquid) {
+        if (world.shouldTick(blockPos) && world.isPosLoaded(blockPos.x, blockPos.z)) {
+            val block = world.getBlockState(blockPos)
+            if (!block.isAir) {
+                val shape = block.getCollisionShape(world, blockPos)
+                if (block.isLiquid) {
+                    if (!options.acrossLiquid) {
+                        result.hitBlockState = block
+                        hit = true
+                    }
+                } else if (!options.acrossBlock && (!shape.isEmpty || !options.acrossEmptyCollectionShape)) {
                     result.hitBlockState = block
                     hit = true
                 }
-            } else if (!options.acrossBlock && (!shape.isEmpty || !options.acrossEmptyCollectionShape)) {
-                result.hitBlockState = block
-                hit = true
             }
         }
 

src/main/kotlin/cn/coostack/cooparticlesapi/particles/ControlableParticle.kt

@@ -348,8 +348,6 @@ abstract class ControlableParticle(
         )
         // 构建顶点几何
         val light = this.getBrightness(tickDelta)
-
-
         setParticleTexture(vertexConsumer, q, x, y, z, tickDelta, light)
     }
 

src/main/kotlin/cn/coostack/cooparticlesapi/utils/ParticleAsyncRenderHelper.kt

@@ -1,6 +1,15 @@
 package cn.coostack.cooparticlesapi.utils
 
 import cn.coostack.cooparticlesapi.config.APIConfigManager
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.newFixedThreadPoolContext
+import kotlinx.coroutines.runBlocking
 import net.minecraft.client.particle.Particle
 import net.minecraft.client.particle.ParticleTextureSheet
 import net.minecraft.client.render.BufferBuilder
@@ -22,8 +31,7 @@ object ParticleAsyncRenderHelper {
     val threadCount: Int
         get() = APIConfigManager.getConfig().calculateThreadCount
     private var threadPool = Executors.newFixedThreadPool(threadCount)
-
-
+    private var scope = CoroutineScope(newFixedThreadPoolContext(threadCount, "particle-async"))
     fun close() {
         threadPool.shutdownNow()
     }
@@ -59,7 +67,8 @@ object ParticleAsyncRenderHelper {
         // 索引计算规则如下 从0开始 到 taskPreThreadCount + n 结束 左闭右开
         // 下一个thread就是 taskPreThreadCount + n 开始 n一般为1或者0
         var currentIndex = 0
-        val tasks = ArrayList<FutureTask<BufferBuilder?>>()
+//        val tasks = ArrayList<FutureTask<BufferBuilder?>>()
+        val tasks = ArrayList<Deferred<BufferBuilder>>()
         repeat(actualThreads) {
             val tessellator = Tessellator.getInstance()
             var next = currentIndex + taskPreThreadCount // 取到  taskHandledIndexStart ..< next
@@ -73,35 +82,58 @@ object ParticleAsyncRenderHelper {
             // 复用子数组 taskHandledIndexStart - next
             val array = particles.sliceArray(taskHandledIndexStart..<next)
             // 创建任务
-            val task = submitParticlesRender(
-                array, builder, camera, tickDelta
-            )
-            task ?: return@repeat
-            tasks.add(task)
+
+            val job = scope.async {
+                submitParticlesRender(array, builder, camera, tickDelta)
+            }
+            tasks.add(job)
+//            val task = submitParticlesRender(
+//                array, builder, camera, tickDelta
+//            )
+//            task ?: return@repeat
+//            tasks.add(task)
         }
-        tasks.forEach {
-            val builder = it.get() ?: return@forEach
-            val built = builder.endNullable() ?: return@forEach
-            BufferRenderer.drawWithGlobalProgram(built)
+        runBlocking {
+            tasks.awaitAll().forEach { builder ->
+                val built = builder.endNullable() ?: return@forEach
+                BufferRenderer.drawWithGlobalProgram(built)
+            }
         }
+//        tasks.forEach {
+//            val builder = it.get() ?: return@forEach
+//            val built = builder.endNullable() ?: return@forEach
+//            BufferRenderer.drawWithGlobalProgram(built)
+//        }
     }
 
     fun submitParticlesRender(
         particles: Array<out Any>,
         builder: BufferBuilder,
         camera: Camera,
         tickDelta: Float
-    ): FutureTask<BufferBuilder?>? {
-        val task = FutureTask {
-            particles.forEach { particle ->
-                render(particle, builder, camera, tickDelta)
-            }
-            return@FutureTask builder
+    ): BufferBuilder {
+        particles.forEach { particle ->
+            render(particle, builder, camera, tickDelta)
         }
-        threadPool.submit(task)
-        return task
+        return builder
     }
 
+//    fun submitParticlesRender(
+//        particles: Array<out Any>,
+//        builder: BufferBuilder,
+//        camera: Camera,
+//        tickDelta: Float
+//    ): FutureTask<BufferBuilder?>? {
+//        val task = FutureTask {
+//            particles.forEach { particle ->
+//                render(particle, builder, camera, tickDelta)
+//            }
+//            return@FutureTask builder
+//        }
+//        threadPool.submit(task)
+//        return task
+//    }
+
     // 渲染一个粒子
     fun render(p: Any, builder: BufferBuilder, camera: Camera, tickDelta: Float) {
         if (p !is Particle) return