修改按键 binding

修复通过 CooKeyBinding注册的按键再重启后恢复按键到默认值的问题

Author: CooStack

common/src/main/kotlin/cn/coostack/cooparticlesapi/CooParticlesAPI.kt

@@ -2,7 +2,6 @@ package cn.coostack.cooparticlesapi
 
 import cn.coostack.cooparticlesapi.animation.AnimateManager
 import cn.coostack.cooparticlesapi.barrages.BarrageManager
-import cn.coostack.cooparticlesapi.client.KeyBindingManager
 import cn.coostack.cooparticlesapi.display.DisplayEntityManager
 import cn.coostack.cooparticlesapi.event.CooEventBus
 import cn.coostack.cooparticlesapi.reflect.CooAPIScanner

common/src/main/kotlin/cn/coostack/cooparticlesapi/display/DisplayEntityManager.kt

@@ -4,7 +4,7 @@ import cn.coostack.cooparticlesapi.CooParticlesAPI
 import cn.coostack.cooparticlesapi.CooParticlesConstants
 import cn.coostack.cooparticlesapi.annotations.CooAutoRegister
 import cn.coostack.cooparticlesapi.extend.plus
-import cn.coostack.cooparticlesapi.network.packet.PacketDisplayEntityS2C
+import cn.coostack.cooparticlesapi.network.packet.server.PacketDisplayEntityS2C
 import cn.coostack.cooparticlesapi.platform.CooParticlesServices
 import cn.coostack.cooparticlesapi.reflect.CooAPIScanner
 import cn.coostack.cooparticlesapi.utils.MinecraftRendererUtil

…particlesapi/client/KeyBindingManager.kt …particlesapi/key/CooKeyBindingManager.ktcommon/src/main/kotlin/cn/coostack/cooparticlesapi/client/KeyBindingManager.kt renamed to common/src/main/kotlin/cn/coostack/cooparticlesapi/key/CooKeyBindingManager.kt common/src/main/kotlin/cn/coostack/cooparticlesapi/client/KeyBindingManager.kt renamed to common/src/main/kotlin/cn/coostack/cooparticlesapi/key/CooKeyBindingManager.kt

@@ -1,14 +1,16 @@
-package cn.coostack.cooparticlesapi.client
+package cn.coostack.cooparticlesapi.key
 
 import cn.coostack.cooparticlesapi.event.CooEventBus
 import cn.coostack.cooparticlesapi.event.events.key.KeyActionEvent
 import cn.coostack.cooparticlesapi.event.events.key.KeyActionType
-import cn.coostack.cooparticlesapi.network.packet.PacketKeyActionC2S
+import cn.coostack.cooparticlesapi.network.packet.client.PacketKeyActionC2S
+import cn.coostack.cooparticlesapi.network.packet.server.PacketKeyBindingCountdownS2C
 import cn.coostack.cooparticlesapi.platform.CooParticlesServices
 import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.client.KeyMapping
 import net.minecraft.client.Minecraft
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
 
 /**
  * keyName 默认使用 keyId
@@ -24,7 +26,7 @@ import net.minecraft.resources.ResourceLocation
  * )
  * ```
  */
-object KeyBindingManager {
+object CooKeyBindingManager {
     private data class KeyState(
         val id: ResourceLocation,
         val mapping: KeyMapping,
@@ -38,6 +40,8 @@ object KeyBindingManager {
     private var registrar: ((KeyMapping) -> Unit)? = null
     private var tickCounter = 0L
 
+    // 服务器调用或者客户端调用， 设置countdown (在这期间不处理这个按键功能）
+    private val keyCountDowns = mutableMapOf<ResourceLocation, Int>()
     var doubleClickWindowTicks = 6
 
     fun setRegistrar(registerer: (KeyMapping) -> Unit) {
@@ -52,7 +56,7 @@ object KeyBindingManager {
         category: String
     ): KeyMapping {
         require(keyId !in keyStates) { "key id already registered: $keyId" }
-        val mapping = KeyMapping(keyId.toString(), keyType, defaultKey, category)
+        val mapping = KeyMapping("key.${keyId.namespace}.${keyId.path}", keyType, defaultKey, category)
         val state = KeyState(keyId, mapping)
         keyStates[keyId] = state
         registerIfPossible(state)
@@ -63,12 +67,34 @@ object KeyBindingManager {
         return keyStates[keyId]?.mapping
     }
 
+    fun setCountdown(key: ResourceLocation, cd: Int) {
+        keyCountDowns[key] = cd
+    }
+
+
+    fun sendCountdown(to: ServerPlayer, key: ResourceLocation, cd: Int) {
+        val packet = PacketKeyBindingCountdownS2C(key, cd)
+        CooParticlesServices.SERVER_NETWORK.send(packet, to)
+    }
+
     fun tick() {
         if (keyStates.isEmpty()) return
         tickCounter++
         val doubleInterval = doubleClickWindowTicks.coerceAtLeast(0).toLong()
         val states = keyStates.values.toList()
         states.forEach { state ->
+            if (keyCountDowns.containsKey(state.id)) {
+                val current = keyCountDowns[state.id]!!
+                if (current > 0) {
+                    keyCountDowns[state.id] = current - 1
+                    state.wasDown = false
+                    state.pressTick = 0
+                    state.lastClickTick = tickCounter
+                    return@forEach
+                } else {
+                    keyCountDowns.remove(state.id)
+                }
+            }
             val down = state.mapping.isDown
             if (down) {
                 if (!state.wasDown) {
@@ -112,4 +138,4 @@ object KeyBindingManager {
         )
         CooParticlesServices.CLIENT_NETWORK.send(PacketKeyActionC2S(keyId, action, pressTick, isRelease))
     }
-}
+}

…api/network/packet/PacketKeyActionC2S.kt …work/packet/client/PacketKeyActionC2S.ktcommon/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/PacketKeyActionC2S.kt renamed to common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/client/PacketKeyActionC2S.kt common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/PacketKeyActionC2S.kt renamed to common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/client/PacketKeyActionC2S.kt

@@ -1,4 +1,4 @@
-package cn.coostack.cooparticlesapi.network.packet
+package cn.coostack.cooparticlesapi.network.packet.client
 
 import cn.coostack.cooparticlesapi.CooParticlesConstants
 import cn.coostack.cooparticlesapi.event.events.key.KeyActionType
@@ -31,7 +31,7 @@ class PacketKeyActionC2S(
                 buf.writeBoolean(packet.isRelease)
             }, { buf ->
                 val keyId = buf.readResourceLocation()
-                val action = KeyActionType.fromId(buf.readInt())
+                val action = KeyActionType.Companion.fromId(buf.readInt())
                 val pressTick = buf.readInt()
                 val isRelease = buf.readBoolean()
                 PacketKeyActionC2S(keyId, action, pressTick, isRelease)
@@ -41,4 +41,4 @@ class PacketKeyActionC2S(
     override fun type(): CustomPacketPayload.Type<out CustomPacketPayload> {
         return payloadID
     }
-}
+}

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/client/listener/ClientCameraShakeHandler.kt

@@ -1,6 +1,6 @@
 package cn.coostack.cooparticlesapi.network.packet.client.listener
 
-import cn.coostack.cooparticlesapi.network.packet.PacketCameraShakeS2C
+import cn.coostack.cooparticlesapi.network.packet.server.PacketCameraShakeS2C
 import cn.coostack.cooparticlesapi.platform.network.ClientContext
 import cn.coostack.cooparticlesapi.utils.ClientCameraUtil
 object ClientCameraShakeHandler  {

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/client/listener/ClientDisplayEntityPacketHandler.kt

@@ -2,12 +2,10 @@ package cn.coostack.cooparticlesapi.network.packet.client.listener
 
 import cn.coostack.cooparticlesapi.display.DisplayEntity
 import cn.coostack.cooparticlesapi.display.DisplayEntityManager
-import cn.coostack.cooparticlesapi.network.packet.PacketDisplayEntityS2C
-import cn.coostack.cooparticlesapi.network.packet.PacketParticleEmittersS2C
+import cn.coostack.cooparticlesapi.network.packet.server.PacketDisplayEntityS2C
 import cn.coostack.cooparticlesapi.platform.network.ClientContext
 import io.netty.buffer.Unpooled
 import net.minecraft.client.Minecraft
-import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
 
 object ClientDisplayEntityPacketHandler {

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/client/listener/ClientKeyBindingCountdownHandler.kt

@@ -0,0 +1,15 @@
+package cn.coostack.cooparticlesapi.network.packet.client.listener
+
+import cn.coostack.cooparticlesapi.key.CooKeyBindingManager
+import cn.coostack.cooparticlesapi.network.packet.server.PacketKeyBindingCountdownS2C
+import cn.coostack.cooparticlesapi.platform.network.ClientContext
+
+object ClientKeyBindingCountdownHandler {
+    fun receive(
+        payload: PacketKeyBindingCountdownS2C,
+        context: ClientContext
+    ) {
+        CooKeyBindingManager.setCountdown(payload.key, payload.cd)
+    }
+
+}

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/client/listener/ClientParticleCompositionHandler.kt

@@ -1,6 +1,6 @@
 package cn.coostack.cooparticlesapi.network.packet.client.listener
 
-import cn.coostack.cooparticlesapi.network.packet.PacketParticleCompositionS2C
+import cn.coostack.cooparticlesapi.network.packet.server.PacketParticleCompositionS2C
 import cn.coostack.cooparticlesapi.network.particle.composition.ParticleComposition
 import cn.coostack.cooparticlesapi.network.particle.composition.manager.ParticleCompositionManager
 import cn.coostack.cooparticlesapi.platform.network.ClientContext

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/client/listener/ClientParticleEmittersPacketHandler.kt

@@ -1,7 +1,6 @@
 package cn.coostack.cooparticlesapi.network.packet.client.listener
 
-import cn.coostack.cooparticlesapi.network.packet.PacketParticleEmittersS2C
-import cn.coostack.cooparticlesapi.network.particle.emitters.ParticleEmitters
+import cn.coostack.cooparticlesapi.network.packet.server.PacketParticleEmittersS2C
 import cn.coostack.cooparticlesapi.network.particle.emitters.ParticleEmittersManager
 import cn.coostack.cooparticlesapi.platform.network.ClientContext
 import io.netty.buffer.Unpooled

common/src/main/kotlin/cn/coostack/cooparticlesapi/network/packet/client/listener/ClientParticleGroupPacketHandler.kt

@@ -1,7 +1,7 @@
 package cn.coostack.cooparticlesapi.network.packet.client.listener
 
 import cn.coostack.cooparticlesapi.network.buffer.ParticleControlerDataBuffer
-import cn.coostack.cooparticlesapi.network.packet.PacketParticleGroupS2C
+import cn.coostack.cooparticlesapi.network.packet.server.PacketParticleGroupS2C
 import cn.coostack.cooparticlesapi.particles.control.ControlType
 import cn.coostack.cooparticlesapi.particles.control.group.ClientParticleGroupManager
 import cn.coostack.cooparticlesapi.particles.control.group.ControlableParticleGroup