现在ControlableParticleGroup支持在生成粒子时输入一个子ParticleGroup

子ParticleGroup无需注册Provider

优化了粒子传送时的移动, 现在进行复杂运动(例如旋转+位移)
更加流畅

Author: CooStack

gradle.properties

@@ -10,7 +10,7 @@ loader_version=0.16.10
 fabric_kotlin_version=1.13.1+kotlin.2.1.10
 
 # Mod Properties
-mod_version=1.1
+mod_version=1.2
 maven_group=cn.coostack
 archives_base_name=coo-particles-api
 

src/main/kotlin/cn/coostack/particles/Controlable.kt

@@ -0,0 +1,18 @@
+package cn.coostack.particles
+
+import cn.coostack.test.util.RelativeLocation
+import net.minecraft.util.math.Vec3d
+
+/**
+ * T 控制器对象
+ */
+interface Controlable<T> {
+    fun rotateParticlesToPoint(to: RelativeLocation)
+    fun rotateToWithAngle(to: RelativeLocation, angle: Double)
+    fun rotateParticlesAsAxis(angle: Double)
+
+    fun teleportTo(pos: Vec3d)
+    fun teleportTo(x: Double, y: Double, z: Double)
+
+    fun getControlObject(): T
+}

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

@@ -2,6 +2,7 @@ package cn.coostack.particles
 
 import cn.coostack.particles.control.ControlParticleManager
 import cn.coostack.particles.control.ParticleControler
+import cn.coostack.test.util.RelativeLocation
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
 import net.minecraft.client.particle.Particle
@@ -25,12 +26,10 @@ abstract class ControlableParticle(
 ) : SpriteBillboardParticle(world, pos.x, pos.y, pos.z, velocity.x, velocity.y, velocity.z) {
     val controler: ParticleControler = ControlParticleManager.getControl(controlUUID)!!
 
-
     /**
      * 是否调用 net.minecraft.client.particle.Particle中的tick方法
      */
     var minecraftTick: Boolean = false
-
     /**
      * @see x
      * @see y
@@ -202,14 +201,17 @@ abstract class ControlableParticle(
             ascending = value
         }
 
+
+    private var lastPreview = cloneVec(pos)
+    private var update = false
     fun teleportTo(pos: Vec3d) {
-        prevPos = this.pos
-        this.pos = pos
+        lastPreview = cloneVec(pos)
+        update = true
     }
 
     fun teleportTo(x: Double, y: Double, z: Double) {
-        prevPos = this.pos
-        this.pos = Vec3d(x, y, z)
+        lastPreview = Vec3d(x, y, z)
+        update = true
     }
 
     init {
@@ -225,8 +227,16 @@ abstract class ControlableParticle(
         if (minecraftTick) {
             super.tick()
         }
-
         controler.doTick()
+        if (update) {
+            prevPos = this.pos
+            this.pos = lastPreview
+            update = false
+        }
+    }
+
+    private fun cloneVec(vec: Vec3d): Vec3d {
+        return Vec3d(vec.x, vec.y, vec.z)
     }
 
 }

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

@@ -0,0 +1,7 @@
+package cn.coostack.particles
+
+import net.minecraft.particle.ParticleEffect
+import java.util.UUID
+
+abstract class ControlableParticleEffect(val controlUUID: UUID) : ParticleEffect {
+}

src/main/kotlin/cn/coostack/particles/ParticleDisplayer.kt

@@ -0,0 +1,42 @@
+package cn.coostack.particles
+
+import cn.coostack.particles.control.ControlParticleManager
+import cn.coostack.particles.control.group.ControlableParticleGroup
+import net.minecraft.client.world.ClientWorld
+import net.minecraft.particle.ParticleEffect
+import net.minecraft.util.math.Vec3d
+
+/**
+ * 为了更好的让ControlableParticleGroup 进行操作
+ */
+interface ParticleDisplayer {
+    companion object {
+        @JvmStatic
+        fun withSingle(effect: ControlableParticleEffect): ParticleDisplayer {
+            return SingleParticleDisplayer(effect)
+        }
+
+        @JvmStatic
+        fun withGroup(group: ControlableParticleGroup): ParticleDisplayer {
+            return ParticleGroupDisplayer(group)
+        }
+    }
+
+    fun display(loc: Vec3d, world: ClientWorld): Controlable<*>?
+    class SingleParticleDisplayer(val effect: ControlableParticleEffect) : ParticleDisplayer {
+        /**
+         * 始终返回null 因为此时粒子一定还未设置成功
+         */
+        override fun display(loc: Vec3d, world: ClientWorld): Controlable<ControlableParticle>? {
+            world.addParticle(effect, loc.x, loc.y, loc.z, 0.0, 0.0, 0.0)
+            return ControlParticleManager.getControl(effect.controlUUID)
+        }
+    }
+
+    class ParticleGroupDisplayer(val group: ControlableParticleGroup) : ParticleDisplayer {
+        override fun display(loc: Vec3d, world: ClientWorld): Controlable<ControlableParticleGroup> {
+            group.display(loc, world)
+            return group
+        }
+    }
+}

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

@@ -2,8 +2,11 @@ package cn.coostack.particles.control
 
 import cn.coostack.particles.ControlableParticle
 import cn.coostack.network.buffer.ParticleControlerDataBuffer
+import cn.coostack.particles.Controlable
+import cn.coostack.test.util.RelativeLocation
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
+import net.minecraft.util.math.Vec3d
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 
@@ -12,7 +15,7 @@ import java.util.concurrent.ConcurrentHashMap
  * 此Controler 由 ControlerGroup代理创建 (Builder) 并使用
  */
 @Environment(EnvType.CLIENT)
-class ParticleControler(private val uuid: UUID) {
+class ParticleControler(private val uuid: UUID) : Controlable<ControlableParticle> {
     lateinit var particle: ControlableParticle
         private set
 
@@ -65,5 +68,26 @@ class ParticleControler(private val uuid: UUID) {
         }
     }
 
+    override fun rotateParticlesToPoint(to: RelativeLocation) {
+    }
+
+    override fun rotateToWithAngle(to: RelativeLocation, angle: Double) {
+    }
+
+    override fun rotateParticlesAsAxis(angle: Double) {
+    }
+
+    override fun teleportTo(pos: Vec3d) {
+        particle.teleportTo(pos)
+    }
+
+    override fun teleportTo(x: Double, y: Double, z: Double) {
+        particle.teleportTo(x, y, z)
+    }
+
+    override fun getControlObject(): ControlableParticle {
+        return particle
+    }
+
 
 }