Skip to content

Commit 51ac976

Browse files
committed
修复 SequencedParticleStyle.kt 使用 autoToggle = true时
会出现错误的粒子动画的BUG [生成了多余的不受控制的粒子] 为了修复上面的BUG 对SequencedParticleStyle的部分参数进行了一些修改 1. addSingle / removeSingle / addMultiple/ removeMultiple 只在服务器调用 如果在客户端环境调用 请确保此Style不会出现服务器同步问题 (会被服务器覆盖) 2. 除非是 纯客户端环境 然后使用1所述方法 否则 客户端环境的particleLinkageDisplayCurrentIndex始终为0 3. 取消了 particleLinkageDisplayCurrentIndex 的同步 (这个不会影响服务器发包
1 parent ad33e34 commit 51ac976

File tree

4 files changed

+5
-26
lines changed

4 files changed

+5
-26
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22
import groovy.json.JsonSlurper
33
import groovy.json.JsonOutput
44

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ loom_version=1.10-SNAPSHOT
1111
fabric_kotlin_version=1.13.2+kotlin.2.1.20
1212

1313
# Mod Properties
14-
mod_version=1.11.0
14+
mod_version=1.11.1
1515
maven_group=cn.coostack
1616
archives_base_name=coo-particles-api
1717

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientWorldEvents
4343
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents
4444
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking
4545
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry
46+
import net.fabricmc.fabric.api.client.rendering.v1.CoreShaderRegistrationCallback
4647
import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry
4748
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry
49+
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents
4850
import net.minecraft.client.MinecraftClient
51+
import net.minecraft.client.gl.ShaderProgram
4952
import net.minecraft.client.world.ClientWorld
5053

5154
object CooParticleAPIClient : ClientModInitializer {
@@ -130,21 +133,8 @@ object CooParticleAPIClient : ClientModInitializer {
130133
ParticleStyleManager.clearAllVisible()
131134
ClientParticleGroupManager.clearAllVisible()
132135
}
133-
//
134-
// ClientTickEvents.START_WORLD_TICK.register {
135-
// val tickManager = it.tickManager
136-
// if (!tickManager.shouldTick()) {
137-
// return@register
138-
// }
139-
// scheduler.doTick()
140-
// ClientParticleGroupManager.doClientTick()
141-
// ParticleStyleManager.doTickClient()
142-
// ParticleEmittersManager.doTickClient()
143-
// AnimateManager.tickClient()
144-
// }
145136
ClientTickEvents.START_WORLD_TICK.register {
146137
tickClient(it)
147-
148138
}
149139
ClientWorldEvents.AFTER_CLIENT_WORLD_CHANGE.register { _, _ ->
150140
ParticleEmittersManager.clientEmitters.clear()

src/main/kotlin/cn/coostack/cooparticlesapi/utils/helper/SequencedAnimationHelper.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,4 @@ class SequencedAnimationHelper<T : SequencedParticleStyle> {
3939
}
4040
return this
4141
}
42-
43-
fun getArgs(): Map<String, ParticleControlerDataBuffer<*>> = mapOf(
44-
"animation_index" to ParticleControlerDataBuffers.int(animationIndex)
45-
)
46-
47-
fun setFromArgs(args: Map<String, ParticleControlerDataBuffer<*>>) {
48-
args["animation_index"]?.let {
49-
animationIndex = it.loadedValue as Int
50-
}
51-
}
52-
5342
}

0 commit comments

Comments
 (0)