修复 由于ControlableParticleData 构造了EnvType.CLIENT的 ParticleTextureSheet 导致无法在服务器使用粒子发射器的BUG

CooStack · CooStack · commit fe20ca407267 · 2025-06-15T17:51:01.000+08:00
但是所有使用了textureSheet = XXX这种方法的kotlin代码均失效
使用setTextureSheet(sheet)
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ loom_version=1.10-SNAPSHOT
 fabric_kotlin_version=1.13.2+kotlin.2.1.20
 
 # Mod Properties
-mod_version=1.10.0
+mod_version=1.10.1
 maven_group=cn.coostack
 archives_base_name=coo-particles-api
 
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/items/TestParticleItem.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/items/TestParticleItem.kt
@@ -79,7 +79,7 @@ class TestParticleItem(settings: Settings) : Item(settings) {
             .also {
                 it.maxTick = 240
                 it.templateData.apply {
-                    textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+                    setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)
                     color = Math3DUtil.colorOf(100, 100, 210)
                     effect = TestEndRodEffect(uuid)
                     size = 0.1f
@@ -95,7 +95,7 @@ class TestParticleItem(settings: Settings) : Item(settings) {
                 it.maxTick = 240
                 it.templateData.apply {
                     maxAge = 1
-                    textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+                    setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)
                     color = Math3DUtil.colorOf(100, 100, 210)
                     effect = TestEndRodEffect(uuid)
                 }
@@ -110,7 +110,7 @@ class TestParticleItem(settings: Settings) : Item(settings) {
                 it.maxTick = 120
                 it.templateData.apply {
                     maxAge = 20
-                    textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+                    setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)
                     color = Math3DUtil.colorOf(100, 100, 210)
                     effect = TestEndRodEffect(uuid)
                 }
@@ -125,7 +125,7 @@ class TestParticleItem(settings: Settings) : Item(settings) {
                 it.maxTick = 10
                 it.templateData.apply {
                     maxAge = 60
-                    textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+                    setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)
                     color = Math3DUtil.colorOf(255, 255, 255)
                     effect = TestEndRodEffect(uuid)
                 }
@@ -141,7 +141,7 @@ class TestParticleItem(settings: Settings) : Item(settings) {
             it.maxTick = -1
             it.templateData.apply {
                 maxAge = 30
-                textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+                setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)
                 color = Math3DUtil.colorOf(255, 255, 255)
                 effect = TestEndRodEffect(uuid)
             }
@@ -159,7 +159,7 @@ class TestParticleItem(settings: Settings) : Item(settings) {
             it.moveDirection = user.rotationVector.normalize().multiply(0.5)
             it.templateData.apply {
                 maxAge = 20
-                textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+                setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)
                 color = Math3DUtil.colorOf(217, 137, 146)
                 effect = ControlableCloudEffect(uuid)
             }
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/ClassParticleEmitters.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/ClassParticleEmitters.kt
@@ -249,7 +249,7 @@ abstract class ClassParticleEmitters(
             this.color = data.color
             this.currentAge = data.age
             this.maxAge = data.maxAge
-            this.textureSheet = data.textureSheet
+            this.textureSheet = data.getTextureSheet()
             this.particleAlpha = data.alpha
         }
         control.addPreTickAction {
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/ControlableParticleData.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/ControlableParticleData.kt
@@ -1,5 +1,6 @@
 package cn.coostack.cooparticlesapi.network.particle.emitters
 
+import cn.coostack.cooparticlesapi.CooParticleAPI
 import cn.coostack.cooparticlesapi.particles.ControlableParticleEffect
 import cn.coostack.cooparticlesapi.particles.ControlableParticleEffectManager
 import cn.coostack.cooparticlesapi.particles.impl.TestEndRodEffect
@@ -31,9 +32,6 @@ open class ControlableParticleData {
             buf.writeString(data.effect::class.java.name)
             buf.writeUuid(data.uuid)
             buf.writeDouble(data.speed)
-//            val effectPacketCodec =
-//                data.effect.getPacketCodec() as PacketCodec<RegistryByteBuf, ControlableParticleEffect>
-//            effectPacketCodec.encode(buf, data.effect)
         }
 
         private fun decode(
@@ -65,7 +63,7 @@ open class ControlableParticleData {
                 this.visibleRange = visibleRange
                 this.age = age
                 this.maxAge = maxAge
-                this.textureSheet = this.textureSheetFromString(textureSheet)
+                this.textureSheet = textureSheet
                 this.effect = effect
                 this.speed = speed
             }
@@ -81,7 +79,9 @@ open class ControlableParticleData {
     var maxAge = 120
     var visibleRange = 128f
     var effect: ControlableParticleEffect = TestEndRodEffect(uuid)
-    var textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+
+    // 脑瘫东西设置了客户端专属
+    private var textureSheet: String = "PARTICLE_SHEET_TRANSLUCENT"
 
     /**
      * 粒子移动速度
@@ -99,6 +99,21 @@ open class ControlableParticleData {
         }
     }
 
+    fun getTextureSheet(): ParticleTextureSheet {
+        return textureSheetFromString(textureSheet) ?: let {
+            CooParticleAPI.logger.error("can not find textureSheet $textureSheet")
+            ParticleTextureSheet.PARTICLE_SHEET_OPAQUE
+        }
+    }
+
+    fun setTextureSheet(value: String) {
+        this.textureSheet = value
+    }
+
+    fun setTextureSheet(value: ParticleTextureSheet) {
+        this.textureSheet = value.toString()
+    }
+
     open fun getCodec(): PacketCodec<PacketByteBuf, out ControlableParticleData> {
         return PACKET_CODEC
     }
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/impl/DefendClassParticleEmitters.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/impl/DefendClassParticleEmitters.kt
@@ -76,7 +76,7 @@ class DefendClassParticleEmitters(var player: UUID, pos: Vec3d, world: World?) :
                 .associateBy {
                     templateData.clone().also {
                         it.alpha = 0.15f
-                        it.textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+                        it.setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)
                     }
                 }
         )
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/impl/PhysicsParticleEmitters.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/impl/PhysicsParticleEmitters.kt
@@ -318,7 +318,7 @@ class PhysicsParticleEmitters(
             this.color = data.color
             this.currentAge = data.age
             this.maxAge = data.maxAge
-            this.textureSheet = data.textureSheet
+            this.textureSheet = data.getTextureSheet()
             this.particleAlpha = data.alpha
         }
         control.addPreTickAction {
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/impl/PresetLaserEmitters.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/impl/PresetLaserEmitters.kt
@@ -182,7 +182,7 @@ class PresetLaserEmitters(pos: Vec3d, world: World?) : ClassParticleEmitters(pos
         spawnPos: Vec3d,
         spawnWorld: World
     ) {
-        data.textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+        data.setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)
         var tick = 0
         var speed = 0f
         data.maxAge = lineMaxTick
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/impl/SimpleParticleEmitters.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/network/particle/emitters/impl/SimpleParticleEmitters.kt
@@ -261,7 +261,7 @@ class SimpleParticleEmitters(
             this.color = data.color
             this.currentAge = data.age
             this.maxAge = data.maxAge
-            this.textureSheet = data.textureSheet
+            this.textureSheet = data.getTextureSheet()
             this.particleAlpha = data.alpha
         }
         control.addPreTickAction {
diff --git a/src/main/kotlin/cn/coostack/cooparticlesapi/test/entity/goal/TestPlayerAttackGoal.kt b/src/main/kotlin/cn/coostack/cooparticlesapi/test/entity/goal/TestPlayerAttackGoal.kt
@@ -69,7 +69,7 @@ class TestPlayerAttackGoal(entity: TestPlayerEntity, speed: Double, pauseWhenMob
                 it.maxTick = 5
                 it.templateData.apply {
                     maxAge = 60
-                    textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT
+                    setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)
                     color = Math3DUtil.colorOf(255, 255, 255)
                     effect = TestEndRodEffect(uuid)
                 }

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ abstract class ClassParticleEmitters(`
`249`	`249`	`this.color = data.color`
`250`	`250`	`this.currentAge = data.age`
`251`	`251`	`this.maxAge = data.maxAge`
`252`		`- this.textureSheet = data.textureSheet`
	`252`	`+ this.textureSheet = data.getTextureSheet()`
`253`	`253`	`this.particleAlpha = data.alpha`
`254`	`254`	`}`
`255`	`255`	`control.addPreTickAction {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class DefendClassParticleEmitters(var player: UUID, pos: Vec3d, world: World?) :`
`76`	`76`	`.associateBy {`
`77`	`77`	`templateData.clone().also {`
`78`	`78`	`it.alpha = 0.15f`
`79`		`- it.textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT`
	`79`	`+ it.setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`)`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ class PhysicsParticleEmitters(`
`318`	`318`	`this.color = data.color`
`319`	`319`	`this.currentAge = data.age`
`320`	`320`	`this.maxAge = data.maxAge`
`321`		`- this.textureSheet = data.textureSheet`
	`321`	`+ this.textureSheet = data.getTextureSheet()`
`322`	`322`	`this.particleAlpha = data.alpha`
`323`	`323`	`}`
`324`	`324`	`control.addPreTickAction {`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ class SimpleParticleEmitters(`
`261`	`261`	`this.color = data.color`
`262`	`262`	`this.currentAge = data.age`
`263`	`263`	`this.maxAge = data.maxAge`
`264`		`- this.textureSheet = data.textureSheet`
	`264`	`+ this.textureSheet = data.getTextureSheet()`
`265`	`265`	`this.particleAlpha = data.alpha`
`266`	`266`	`}`
`267`	`267`	`control.addPreTickAction {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class TestPlayerAttackGoal(entity: TestPlayerEntity, speed: Double, pauseWhenMob`
`69`	`69`	`it.maxTick = 5`
`70`	`70`	`it.templateData.apply {`
`71`	`71`	`maxAge = 60`
`72`		`- textureSheet = ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT`
	`72`	`+ setTextureSheet(ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT)`
`73`	`73`	`color = Math3DUtil.colorOf(255, 255, 255)`
`74`	`74`	`effect = TestEndRodEffect(uuid)`
`75`	`75`	`}`