From 7c5e4e40dba303bf19ae89fb2248b8bbefb3ff81 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 11 May 2023 15:22:26 +0100 Subject: [PATCH] Fixed action bar on 1.19+ --- .../willfp/ecoskills/proxy/v1_19_R1/ActionBarCompatibility.kt | 4 +++- .../willfp/ecoskills/proxy/v1_19_R2/ActionBarCompatibility.kt | 4 +++- .../willfp/ecoskills/proxy/v1_19_R3/ActionBarCompatibility.kt | 4 +++- .../kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt | 2 +- .../src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R1/ActionBarCompatibility.kt b/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R1/ActionBarCompatibility.kt index f4f5b5c..a99dbd9 100644 --- a/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R1/ActionBarCompatibility.kt +++ b/eco-core/core-nms/v1_19_R1/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R1/ActionBarCompatibility.kt @@ -4,13 +4,15 @@ import com.willfp.eco.core.packet.PacketEvent import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy import com.willfp.ecoskills.actionbar.pausePersistentActionBar import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket +import net.minecraft.network.protocol.game.ClientboundSystemChatPacket class ActionBarCompatibility : ActionBarCompatibilityProxy { override fun onSend(event: PacketEvent) { val player = event.player - when (event.packet.handle) { + when (val packet = event.packet.handle) { is ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() + is ClientboundSystemChatPacket -> if (packet.c()) player.pausePersistentActionBar() } } } diff --git a/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R2/ActionBarCompatibility.kt b/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R2/ActionBarCompatibility.kt index ce9451d..126b5f9 100644 --- a/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R2/ActionBarCompatibility.kt +++ b/eco-core/core-nms/v1_19_R2/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R2/ActionBarCompatibility.kt @@ -4,13 +4,15 @@ import com.willfp.eco.core.packet.PacketEvent import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket import com.willfp.ecoskills.actionbar.pausePersistentActionBar +import net.minecraft.network.protocol.game.ClientboundSystemChatPacket class ActionBarCompatibility : ActionBarCompatibilityProxy { override fun onSend(event: PacketEvent) { val player = event.player - when (event.packet.handle) { + when (val packet = event.packet.handle) { is ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() + is ClientboundSystemChatPacket -> if (packet.c()) player.pausePersistentActionBar() } } } diff --git a/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R3/ActionBarCompatibility.kt b/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R3/ActionBarCompatibility.kt index e59d9c7..b3aa194 100644 --- a/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R3/ActionBarCompatibility.kt +++ b/eco-core/core-nms/v1_19_R3/src/main/kotlin/com/willfp/ecoskills/proxy/v1_19_R3/ActionBarCompatibility.kt @@ -4,13 +4,15 @@ import com.willfp.eco.core.packet.PacketEvent import com.willfp.ecoskills.actionbar.ActionBarCompatibilityProxy import net.minecraft.network.protocol.game.ClientboundSetActionBarTextPacket import com.willfp.ecoskills.actionbar.pausePersistentActionBar +import net.minecraft.network.protocol.game.ClientboundSystemChatPacket class ActionBarCompatibility : ActionBarCompatibilityProxy { override fun onSend(event: PacketEvent) { val player = event.player - when (event.packet.handle) { + when (val packet = event.packet.handle) { is ClientboundSetActionBarTextPacket -> player.pausePersistentActionBar() + is ClientboundSystemChatPacket -> if (packet.c()) player.pausePersistentActionBar() } } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt index 7a14898..c7ccdcb 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/actionbar/ActionBarHandler.kt @@ -11,7 +11,7 @@ import org.bukkit.event.Listener import org.bukkit.event.player.PlayerGameModeChangeEvent import java.util.UUID -private const val ACTION_BAR_DURATION = 3000L +private const val ACTION_BAR_DURATION = 2700L private const val TICK_DURATION = 50L private val blacklist = mutableMapOf() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt index 0ae253f..4be26a2 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/skills/Skill.kt @@ -49,7 +49,7 @@ class Skill( ) private val xpGainMethods = config.getSubsections("xp-gain-methods").mapNotNull { - Counters.compile(it, ViolationContext(plugin, "Skill $id")) + Counters.compile(it, ViolationContext(plugin, "Skill $id xp-gain-methods")) } private val xpFormula = config.getStringOrNull("xp-formula")