# 修复

修复了ParticleGroupStyle 在传送,旋转上的同步参数输入错误的问题
# 新增
新增了几个其他的粒子样式
使用注解更快生成粒子同步参数
支持修改单个粒子朝向(x,y,z)
修改了粒子渲染方式 (在参数中输入 faceToPlayer = false)时
多个朝向修改生效
修复了只TP一次会发生来回闪烁的BUG

Author: CooStack

src/main/kotlin/cn/coostack/cooparticlesapi/network/buffer/ParticleControlerDataBuffer.kt

@@ -4,7 +4,20 @@ import net.minecraft.util.Identifier
 
 interface ParticleControlerDataBuffer<T> {
 
-    data class Id(val value: Identifier)
+    data class Id(val value: Identifier) {
+        companion object {
+            @JvmStatic
+            fun toID(string: String): Id {
+                val split = string.split(":")
+                if (split.size != 2) {
+                    throw IllegalArgumentException("Invalid ID format: $string")
+                }
+                val namespace = split[0]
+                val id = split[1]
+                return Id(Identifier.of(namespace, id))
+            }
+        }
+    }
 
     var loadedValue: T?
     fun encode(): ByteArray?

src/main/kotlin/cn/coostack/cooparticlesapi/network/buffer/ParticleControlerDataBuffers.kt

@@ -7,7 +7,16 @@ import net.minecraft.util.math.Vec3d
 import java.util.UUID
 
 object ParticleControlerDataBuffers {
-
+    private val wrapperToPrimitive = mapOf<Class<*>, Class<*>>(
+        java.lang.Integer::class.java to Int::class.java,
+        java.lang.Double::class.java to Double::class.java,
+        java.lang.Long::class.java to Long::class.java,
+        java.lang.Float::class.java to Float::class.java,
+        java.lang.Boolean::class.java to Boolean::class.java,
+        java.lang.Character::class.java to Char::class.java,
+        java.lang.Byte::class.java to Byte::class.java,
+        java.lang.Short::class.java to Short::class.java
+    )
     val registerBuilder = HashMap<ParticleControlerDataBuffer.Id, Class<out ParticleControlerDataBuffer<*>>>()
     val registerTypes = HashMap<Class<*>, ParticleControlerDataBuffer.Id>()
 
@@ -46,8 +55,11 @@ object ParticleControlerDataBuffers {
     }
 
     fun fromBufferType(value: Any, clazz: Class<*>): ParticleControlerDataBuffer<*>? {
-        val id = registerTypes[clazz]!!
-        return withId(id, value)
+        val targetClass = registerTypes[clazz]?.let { clazz }
+            ?: wrapperToPrimitive[clazz]?.takeIf { registerTypes.containsKey(it) }
+            ?: return null
+
+        return registerTypes[targetClass]?.let { withId(it, value) }
     }
 
     fun withDecode(buf: ByteArray, clazz: Class<out ParticleControlerDataBuffer<*>>): ParticleControlerDataBuffer<*> {
@@ -145,7 +157,7 @@ object ParticleControlerDataBuffers {
     init {
         register(Boolean::class.java, BooleanControlerBuffer.id, BooleanControlerBuffer::class.java)
         register(Long::class.java, LongControlerBuffer.id, LongControlerBuffer::class.java)
-        register(Int::class.java, IntControlerBuffer.id, IntControlerBuffer::class.java)
+        register(Integer::class.java, IntControlerBuffer.id, IntControlerBuffer::class.java)
         register(Double::class.java, DoubleControlerBuffer.id, DoubleControlerBuffer::class.java)
         register(Float::class.java, FloatControlerBuffer.id, FloatControlerBuffer::class.java)
         register(String::class.java, StringControlerBuffer.id, StringControlerBuffer::class.java)

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

@@ -24,7 +24,7 @@ open class ParticleShapeStyle(uuid: UUID) :
     val scaleHelper = StyleScaleHelper(1.0, 1.0, 1)
     private var onDisplayInvoke: ParticleShapeStyle.() -> Unit = {}
     private var beforeDisplayInvoke: ParticleShapeStyle.(Map<StyleData, RelativeLocation>) -> Unit = {}
-    private val pointBuilders = LinkedHashMap<PointsBuilder, () -> StyleData>()
+    private val pointBuilders = LinkedHashMap<PointsBuilder, (RelativeLocation) -> StyleData>()
 
     /**
      * 设置为true时 会利用scaleHelper 每tick增长一点
@@ -38,11 +38,18 @@ open class ParticleShapeStyle(uuid: UUID) :
     var scaleReversed = false
         private set
 
-    fun appendBuilder(pointsBuilder: PointsBuilder, dataBuilder: () -> StyleData): ParticleShapeStyle {
+    fun appendBuilder(pointsBuilder: PointsBuilder, dataBuilder: (RelativeLocation) -> StyleData): ParticleShapeStyle {
         pointBuilders[pointsBuilder] = dataBuilder
         return this
     }
 
+    fun appendPoint(point: RelativeLocation, dataBuilder: (RelativeLocation) -> StyleData): ParticleShapeStyle {
+        pointBuilders[
+            PointsBuilder().also { it.addPoint(point) }
+        ] = dataBuilder
+        return this
+    }
+
     /**
      * @param max 直接让scale从最大开始
      */
@@ -87,7 +94,7 @@ open class ParticleShapeStyle(uuid: UUID) :
     override fun getCurrentFrames(): Map<StyleData, RelativeLocation> {
         val res = HashMap<StyleData, RelativeLocation>()
         pointBuilders.forEach { entry ->
-            res.putAll(entry.key.createWithStyleData { entry.value() })
+            res.putAll(entry.key.createWithStyleData { entry.value(it) })
         }
         return res
     }

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

@@ -3,31 +3,39 @@ package cn.coostack.cooparticlesapi.particles
 import cn.coostack.cooparticlesapi.particles.control.ControlParticleManager
 import cn.coostack.cooparticlesapi.particles.control.ParticleControler
 import cn.coostack.cooparticlesapi.utils.Math3DUtil
-import com.mojang.blaze3d.platform.GlStateManager
-import com.mojang.blaze3d.systems.RenderSystem
+import cn.coostack.cooparticlesapi.utils.RelativeLocation
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
-import net.minecraft.client.particle.Particle
 import net.minecraft.client.particle.ParticleTextureSheet
 import net.minecraft.client.particle.SpriteBillboardParticle
 import net.minecraft.client.render.Camera
 import net.minecraft.client.render.LightmapTextureManager
 import net.minecraft.client.render.VertexConsumer
 import net.minecraft.client.world.ClientWorld
-import net.minecraft.particle.ParticleTypes
 import net.minecraft.util.math.Box
+import net.minecraft.util.math.MathHelper
 import net.minecraft.util.math.Vec3d
 import net.minecraft.util.math.random.Random
+import org.joml.Matrix4f
+import org.joml.Quaternionf
 import org.joml.Vector2f
 import org.joml.Vector3f
+import org.joml.Vector4f
+import org.lwjgl.opengl.GL11
 import java.util.*
+import kotlin.math.PI
+
 
 @Environment(EnvType.CLIENT)
 abstract class ControlableParticle(
     world: ClientWorld,
     pos: Vec3d,
     velocity: Vec3d,
-    val controlUUID: UUID
+    val controlUUID: UUID,
+    /**
+     * 是否始终转向玩家(默认实现)
+     */
+    val faceToCamera: Boolean = true
 ) : SpriteBillboardParticle(world, pos.x, pos.y, pos.z, velocity.x, velocity.y, velocity.z) {
     val controler: ParticleControler = ControlParticleManager.getControl(controlUUID)!!
 
@@ -180,10 +188,16 @@ abstract class ControlableParticle(
             alpha = value.coerceIn(0f, 1f)
         }
 
+    var previewAngleX: Float = 0f
+    var currentAngleX: Float = 0f
+
+    var previewAngleY: Float = 0f
+    var currentAngleY: Float = 0f
+
     /**
      * @see prevAngle
      */
-    var previewAngle: Float
+    var previewAngleZ: Float
         get() = prevAngle
         set(value) {
             prevAngle = value
@@ -192,7 +206,7 @@ abstract class ControlableParticle(
     /**
      * @see angle
      */
-    var currentAngle: Float
+    var currentAngleZ: Float
         get() = angle
         set(value) {
             angle = value
@@ -238,6 +252,22 @@ abstract class ControlableParticle(
         controler.particleInit()
     }
 
+    var lastRotate = Vector3f(previewAngleX, previewAngleY, previewAngleZ)
+    var updateRotate = false
+    fun rotateParticleTo(target: RelativeLocation) {
+        rotateParticleTo(Vector3f(target.x.toFloat(), target.y.toFloat(), target.z.toFloat()))
+    }
+
+    fun rotateParticleTo(target: Vec3d) {
+        rotateParticleTo(target.toVector3f())
+    }
+
+    fun rotateParticleTo(target: Vector3f) {
+        val (x, y, z) = Math3DUtil.calculateEulerAnglesToPoint(target)
+        updateRotate = true
+        lastRotate = Vector3f(x, y, z)
+    }
+
     /**
      * 防止频繁调用Math3DUtil (让键盘休息一会)
      * 也不用调用 color = Vector3f(xxx/255f,xxx/255f,xxx/255f)
@@ -264,13 +294,128 @@ abstract class ControlableParticle(
             super.tick()
         }
         controler.doTick()
+        prevPos = this.pos
         if (update) {
             prevPos = this.pos
             this.pos = lastPreview
             update = false
         }
+        previewAngleX = currentAngleX
+        previewAngleY = currentAngleY
+        previewAngleZ = currentAngleZ
+        if (updateRotate) {
+            currentAngleX = lastRotate.x
+            currentAngleY = lastRotate.y
+            currentAngleZ = lastRotate.z
+            updateRotate = false
+        }
     }
 
+    override fun buildGeometry(vertexConsumer: VertexConsumer, camera: Camera, tickDelta: Float) {
+        if (faceToCamera) {
+            super.buildGeometry(vertexConsumer, camera, tickDelta)
+            return
+        }
+        // 获取摄像机位置
+        val cameraPos = camera.pos
+        val x = (MathHelper.lerp(tickDelta.toDouble(), this.prevPosX, this.x) - cameraPos.getX()).toFloat()
+        val y = (MathHelper.lerp(tickDelta.toDouble(), this.prevPosY, this.y) - cameraPos.getY()).toFloat()
+        val z = (MathHelper.lerp(tickDelta.toDouble(), this.prevPosZ, this.z) - cameraPos.getZ()).toFloat()
+        val q = Quaternionf()
+        q.rotateXYZ(
+            MathHelper.lerp(tickDelta, this.previewAngleX, this.currentAngleX),
+            MathHelper.lerp(tickDelta, this.previewAngleY, this.currentAngleY),
+            MathHelper.lerp(tickDelta, this.previewAngleZ, this.currentAngleZ)
+        )
+        // 构建顶点几何
+        val light = this.getBrightness(tickDelta)
+
+
+        setParticleTexture(vertexConsumer, q, x, y, z, tickDelta, light)
+    }
+
+    private fun setParticleTexture(
+        vertexConsumer: VertexConsumer,
+        q: Quaternionf,
+        x: Float,
+        y: Float,
+        z: Float,
+        tickDelta: Float,
+        light: Int
+    ) {
+        val s = getSize(tickDelta)
+
+        addVertex(
+            vertexConsumer, q, x, y, z, 1f, -1f, maxU, maxV, s, light
+        )
+        addVertex(
+            vertexConsumer, q, x, y, z, 1f, 1f, maxU, minV, s, light
+        )
+        addVertex(
+            vertexConsumer, q, x, y, z, -1f, 1f, minU, minV, s, light
+        )
+        addVertex(
+            vertexConsumer, q, x, y, z, -1f, -1f, minU, maxV, s, light
+        )
+
+        // 背面
+        addVertex(
+            vertexConsumer, q, x, y, z,
+            vx = -1f, // 左下角 X
+            vy = -1f,
+            tu = minU, // UV 镜像
+            tv = maxV,
+            size = s,
+            light = light
+        )
+        addVertex(
+            vertexConsumer, q, x, y, z,
+            vx = -1f, // 左上角 X
+            vy = 1f,
+            tu = minU,
+            tv = minV,
+            size = s,
+            light = light
+        )
+        addVertex(
+            vertexConsumer, q, x, y, z,
+            vx = 1f,  // 右上角 X
+            vy = 1f,
+            tu = maxU, // UV 镜像
+            tv = minV,
+            size = s,
+            light = light
+        )
+        addVertex(
+            vertexConsumer, q, x, y, z,
+            vx = 1f,  // 右下角 X
+            vy = -1f,
+            tu = maxU,
+            tv = maxV,
+            size = s,
+            light = light
+        )
+    }
+
+    private fun addVertex(
+        consumer: VertexConsumer,
+        q: Quaternionf,
+        dx: Float,
+        dy: Float,
+        dz: Float,
+        vx: Float,
+        vy: Float,
+        tu: Float,
+        tv: Float,
+        size: Float,
+        light: Int
+    ) {
+        val pos = Vector3f(vx, vy, 0f).rotate(q).mul(size).add(dx, dy, dz)
+        consumer.vertex(pos.x, pos.y, pos.z)
+            .texture(tu, tv)
+            .color(red, green, blue, alpha)
+            .light(light)
+    }
 
     override fun getType(): ParticleTextureSheet? {
         return textureSheet

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

@@ -1,7 +1,13 @@
 package cn.coostack.cooparticlesapi.particles
 
+import cn.coostack.cooparticlesapi.particles.impl.ControlableCloudEffect
+import com.mojang.serialization.Codec
+import com.mojang.serialization.MapCodec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import io.netty.buffer.Unpooled
 import net.minecraft.particle.ParticleEffect
 import java.util.UUID
 
-abstract class ControlableParticleEffect(val controlUUID: UUID) : ParticleEffect {
+abstract class ControlableParticleEffect(val controlUUID: UUID, val faceToPlayer: Boolean = true) : ParticleEffect {
+
 }

src/main/kotlin/cn/coostack/cooparticlesapi/particles/control/ParticleControler.kt

@@ -2,10 +2,12 @@ package cn.coostack.cooparticlesapi.particles.control
 
 import cn.coostack.cooparticlesapi.particles.Controlable
 import cn.coostack.cooparticlesapi.particles.ControlableParticle
+import cn.coostack.cooparticlesapi.utils.Math3DUtil
 import cn.coostack.cooparticlesapi.utils.RelativeLocation
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
 import net.minecraft.util.math.Vec3d
+import org.joml.Vector3f
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 
@@ -67,6 +69,18 @@ class ParticleControler(private val uuid: UUID) : Controlable<ControlableParticl
         }
     }
 
+    fun rotateParticleTo(target: RelativeLocation) {
+        rotateParticleTo(Vector3f(target.x.toFloat(), target.y.toFloat(), target.z.toFloat()))
+    }
+
+    fun rotateParticleTo(target: Vec3d) {
+        rotateParticleTo(target.toVector3f())
+    }
+
+    fun rotateParticleTo(target: Vector3f) {
+        particle.rotateParticleTo(target)
+    }
+
     override fun controlUUID(): UUID {
         return uuid
     }