From 11ac8f209ee601e3deffa4ffa969e9a277f611d0 Mon Sep 17 00:00:00 2001
From: Yang Seong Mo <angryko@naver.com>
Date: Wed, 4 Dec 2024 17:35:18 +0900
Subject: [PATCH 1/3] Bump Fabric 1.21.4

---
 .../toxicity/hud/bootstrap/fabric/FabricBootstrapImpl.kt  | 4 ++--
 .../hud/bootstrap/velocity/VelocityBootstrapImpl.kt       | 4 ++--
 build.gradle.kts                                          | 4 ++--
 gradle.properties                                         | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bootstrap/fabric/src/main/kotlin/kr/toxicity/hud/bootstrap/fabric/FabricBootstrapImpl.kt b/bootstrap/fabric/src/main/kotlin/kr/toxicity/hud/bootstrap/fabric/FabricBootstrapImpl.kt
index 10e964b5..a83d24f5 100644
--- a/bootstrap/fabric/src/main/kotlin/kr/toxicity/hud/bootstrap/fabric/FabricBootstrapImpl.kt
+++ b/bootstrap/fabric/src/main/kotlin/kr/toxicity/hud/bootstrap/fabric/FabricBootstrapImpl.kt
@@ -242,9 +242,9 @@ class FabricBootstrapImpl : FabricBootstrap, DedicatedServerModInitializer {
     }
 
 
-    override fun minecraftVersion(): String = "1.21.3"
+    override fun minecraftVersion(): String = "1.21.4"
 
-    override fun mcmetaVersion(): Int = 42
+    override fun mcmetaVersion(): Int = 46
 
     private val uuidMap = ConcurrentHashMap<String, UUID>()
 
diff --git a/bootstrap/velocity/src/main/kotlin/kr/toxicity/hud/bootstrap/velocity/VelocityBootstrapImpl.kt b/bootstrap/velocity/src/main/kotlin/kr/toxicity/hud/bootstrap/velocity/VelocityBootstrapImpl.kt
index 582452f3..8eae5b3d 100644
--- a/bootstrap/velocity/src/main/kotlin/kr/toxicity/hud/bootstrap/velocity/VelocityBootstrapImpl.kt
+++ b/bootstrap/velocity/src/main/kotlin/kr/toxicity/hud/bootstrap/velocity/VelocityBootstrapImpl.kt
@@ -233,8 +233,8 @@ class VelocityBootstrapImpl @Inject constructor(
         }
     }
 
-    override fun minecraftVersion(): String = "1.21.3"
-    override fun mcmetaVersion(): Int = 42
+    override fun minecraftVersion(): String = "1.21.4"
+    override fun mcmetaVersion(): Int = 46
     override fun useLegacyFont(): Boolean = false
 
     override fun world(name: String): WorldWrapper? = null
diff --git a/build.gradle.kts b/build.gradle.kts
index 00889874..e06e3194 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -175,7 +175,7 @@ fun Project.dependency(any: Any) = also {
         }
     }
 }
-fun Project.bukkit() = dependency("org.spigotmc:spigot-api:$minecraft-R0.1-SNAPSHOT")
+fun Project.bukkit() = dependency("org.spigotmc:spigot-api:1.21.3-R0.1-SNAPSHOT")
     .dependency("org.bstats:bstats-bukkit:$bStats")
     .dependency(rootProject.fileTree("shaded"))
 fun Project.velocity() = also {
@@ -185,7 +185,7 @@ fun Project.velocity() = also {
     it.dependencies.compileOnly("com.velocitypowered:velocity-proxy:$velocity-SNAPSHOT")
     it.dependencies.annotationProcessor("com.velocitypowered:velocity-api:$velocity-SNAPSHOT")
 }
-fun Project.folia() = dependency("io.papermc.paper:paper-api:$minecraft-R0.1-SNAPSHOT")
+fun Project.folia() = dependency("io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT")
 fun Project.adventure() = dependency("net.kyori:adventure-api:$adventure")
     .dependency("net.kyori:adventure-text-minimessage:$adventure")
     .dependency("net.kyori:adventure-text-serializer-legacy:$adventure")
diff --git a/gradle.properties b/gradle.properties
index 82b64b0c..607247ea 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,13 +3,13 @@ org.gradle.jvmargs=-Xmx16384M -Dfile.encoding=UTF-8
 org.gradle.caching=true
 org.gradle.parallel=true
 
-paperVersion=1.18.2-1.21.3
+paperVersion=1.18.2-1.21.4
 velocityVersion=3.4
 
-minecraft_version=1.21.3
-yarn_mappings=1.21.3+build.2
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.1
 loader_version=0.16.9
-fabric_version=0.106.1+1.21.3
+fabric_version=0.110.5+1.21.4
 
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
\ No newline at end of file

From 33a67d5df551ee8dadd29260afc7d0c33ffbc06e Mon Sep 17 00:00:00 2001
From: Yang Seong Mo <angryko@naver.com>
Date: Thu, 5 Dec 2024 17:30:02 +0900
Subject: [PATCH 2/3] Bump Bukkit 1.21.4

---
 .idea/gradle.xml                              |   1 +
 BANNER.md                                     |   4 +-
 README.md                                     |  25 +-
 bootstrap/bukkit/build.gradle.kts             |  10 +-
 .../bootstrap/bukkit/BukkitBootstrapImpl.kt   |   1 +
 build.gradle.kts                              |  12 +-
 changelog/1.10.md                             |   1 +
 nms/v1_21_R3/build.gradle.kts                 |   3 +
 .../kr/toxicity/hud/nms/v1_21_R3/NMSImpl.kt   | 520 ++++++++++++++++++
 settings.gradle.kts                           |   1 +
 10 files changed, 564 insertions(+), 14 deletions(-)
 create mode 100644 nms/v1_21_R3/build.gradle.kts
 create mode 100644 nms/v1_21_R3/src/main/kotlin/kr/toxicity/hud/nms/v1_21_R3/NMSImpl.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ddc82a66..78e31774 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -32,6 +32,7 @@
             <option value="$PROJECT_DIR$/nms/v1_20_R4" />
             <option value="$PROJECT_DIR$/nms/v1_21_R1" />
             <option value="$PROJECT_DIR$/nms/v1_21_R2" />
+            <option value="$PROJECT_DIR$/nms/v1_21_R3" />
             <option value="$PROJECT_DIR$/scheduler" />
             <option value="$PROJECT_DIR$/scheduler/folia" />
             <option value="$PROJECT_DIR$/scheduler/standard" />
diff --git a/BANNER.md b/BANNER.md
index 334b3dd2..0c304829 100644
--- a/BANNER.md
+++ b/BANNER.md
@@ -61,5 +61,5 @@ This plugin utilizes a boss bar, but you can still use the first boss bar.
 No
 
 ### Version
-Plugin: 1.18.2-1.21.3  
-Fabric mod: server 1.21.3
\ No newline at end of file
+Plugin: 1.18.2-1.21.4  
+Fabric mod: server 1.21.4
\ No newline at end of file
diff --git a/README.md b/README.md
index ef10ad1c..462fbe4b 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,9 @@ This project implements a server-side HUD.
 - Supports animation.
 
 ### Platform
-- Bukkit(including Folia) 1.18.2-1.21.3
+- Bukkit(including Folia) 1.18.2-1.21.4
 - Velocity 3.3-3.4
-- Fabric server 1.21.3
+- Fabric server 1.21.4
 
 ### Library
 - [kotlin stdlib](https://github.com/JetBrains/kotlin): Implements better functional programming.
@@ -54,6 +54,21 @@ Requires Java 17, 21 Eclipse Adoptium.
 - Build dokka-based docs jar: ./gradlew dokkaJar
 
 ### API
+Get from maven central
+``` kotlin
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compileOnly("net.kyori:adventure-api:VERSION") //Adventure api
+    compileOnly("io.github.toxicity188:BetterHud-standard-api:VERSION") //Standard api
+    compileOnly("io.github.toxicity188:BetterHud-bukkit-api:VERSION") //Platform api
+    compileOnly("io.github.toxicity188:BetterCommand:VERSION") //BetterCommand library
+}
+```
+
+Get from Jitpack  
 [![](https://jitpack.io/v/toxicity188/BetterHud.svg)](https://jitpack.io/#toxicity188/BetterHud)
 ``` kotlin
 repositories {
@@ -62,9 +77,9 @@ repositories {
 }
 
 dependencies {
-    compileOnly("net.kyori:adventure-api:VERSION") //Adventure api.
-    compileOnly("com.github.toxicity188:BetterHud:VERSION") //BetterHud.
-    compileOnly("com.github.toxicity188:BetterCommand:VERSION") //BetterCommand library.
+    compileOnly("net.kyori:adventure-api:VERSION") //Adventure api
+    compileOnly("com.github.toxicity188:BetterHud:VERSION") //BetterHud
+    compileOnly("com.github.toxicity188:BetterCommand:VERSION") //BetterCommand library
 }
 ```
 
diff --git a/bootstrap/bukkit/build.gradle.kts b/bootstrap/bukkit/build.gradle.kts
index 526cc5d1..70137628 100644
--- a/bootstrap/bukkit/build.gradle.kts
+++ b/bootstrap/bukkit/build.gradle.kts
@@ -15,8 +15,14 @@ dependencies {
     compileOnly("net.Indyuce:MMOCore-API:1.13.1-SNAPSHOT")
     compileOnly("net.Indyuce:MMOItems-API:6.10-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.11.6")
-    compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.4.0-SNAPSHOT")
-    compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
+    compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.4.0-SNAPSHOT") {
+        exclude("com.google.guava")
+        exclude("com.google.code.gson")
+    }
+    compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT") {
+        exclude("com.google.guava")
+        exclude("com.google.code.gson")
+    }
     compileOnly("com.github.MilkBowl:VaultAPI:1.7.1")
     compileOnly("com.github.SkriptLang:Skript:2.9.5")
     compileOnly("net.skinsrestorer:skinsrestorer-api:15.4.4")
diff --git a/bootstrap/bukkit/src/main/kotlin/kr/toxicity/hud/bootstrap/bukkit/BukkitBootstrapImpl.kt b/bootstrap/bukkit/src/main/kotlin/kr/toxicity/hud/bootstrap/bukkit/BukkitBootstrapImpl.kt
index f9b85465..fbb18f16 100644
--- a/bootstrap/bukkit/src/main/kotlin/kr/toxicity/hud/bootstrap/bukkit/BukkitBootstrapImpl.kt
+++ b/bootstrap/bukkit/src/main/kotlin/kr/toxicity/hud/bootstrap/bukkit/BukkitBootstrapImpl.kt
@@ -170,6 +170,7 @@ class BukkitBootstrapImpl : BukkitBootstrap, JavaPlugin() {
     override fun onLoad() {
         val pluginManager = Bukkit.getPluginManager()
         nms = when (MinecraftVersion.current) {
+            MinecraftVersion.version1_21_4 -> kr.toxicity.hud.nms.v1_21_R3.NMSImpl()
             MinecraftVersion.version1_21_2, MinecraftVersion.version1_21_3 -> kr.toxicity.hud.nms.v1_21_R2.NMSImpl()
             MinecraftVersion.version1_21, MinecraftVersion.version1_21_1 -> kr.toxicity.hud.nms.v1_21_R1.NMSImpl()
             MinecraftVersion.version1_20_5, MinecraftVersion.version1_20_6 -> kr.toxicity.hud.nms.v1_20_R4.NMSImpl()
diff --git a/build.gradle.kts b/build.gradle.kts
index e06e3194..a74afb9b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
     `java-library`
     kotlin("jvm") version "2.1.0"
     id("io.github.goooler.shadow") version "8.1.8"
-    id("io.papermc.paperweight.userdev") version "1.7.4" apply false
+    id("io.papermc.paperweight.userdev") version "1.7.6" apply false
     id("xyz.jpenilla.run-paper") version "2.3.1"
     id("org.jetbrains.dokka") version "2.0.0-Beta"
     id("io.papermc.hangar-publish-plugin") version "0.1.2"
@@ -59,7 +59,8 @@ val supportedMinecraftVersions = listOf(
     "1.21",
     "1.21.1",
     "1.21.2",
-    "1.21.3"
+    "1.21.3",
+    "1.21.4"
 )
 val supportedVelocityVersions = listOf(
     "3.3",
@@ -72,7 +73,7 @@ allprojects {
     apply(plugin = "org.jetbrains.dokka")
 
     group = "kr.toxicity.hud"
-    version = "1.9.2" + (System.getenv("BUILD_NUMBER")?.let { ".DEV-$it" } ?: "")
+    version = "1.10" + (System.getenv("BUILD_NUMBER")?.let { ".DEV-$it" } ?: "")
 
     repositories {
         mavenCentral()
@@ -153,6 +154,7 @@ val currentNmsVersion = listOf(
     "v1_20_R4",
     "v1_21_R1",
     "v1_21_R2",
+    "v1_21_R3",
 ).map {
     project("nms:$it")
 }
@@ -175,7 +177,7 @@ fun Project.dependency(any: Any) = also {
         }
     }
 }
-fun Project.bukkit() = dependency("org.spigotmc:spigot-api:1.21.3-R0.1-SNAPSHOT")
+fun Project.bukkit() = dependency("org.spigotmc:spigot-api:$minecraft-R0.1-SNAPSHOT")
     .dependency("org.bstats:bstats-bukkit:$bStats")
     .dependency(rootProject.fileTree("shaded"))
 fun Project.velocity() = also {
@@ -185,7 +187,7 @@ fun Project.velocity() = also {
     it.dependencies.compileOnly("com.velocitypowered:velocity-proxy:$velocity-SNAPSHOT")
     it.dependencies.annotationProcessor("com.velocitypowered:velocity-api:$velocity-SNAPSHOT")
 }
-fun Project.folia() = dependency("io.papermc.paper:paper-api:1.21.3-R0.1-SNAPSHOT")
+fun Project.folia() = dependency("io.papermc.paper:paper-api:$minecraft-R0.1-SNAPSHOT")
 fun Project.adventure() = dependency("net.kyori:adventure-api:$adventure")
     .dependency("net.kyori:adventure-text-minimessage:$adventure")
     .dependency("net.kyori:adventure-text-serializer-legacy:$adventure")
diff --git a/changelog/1.10.md b/changelog/1.10.md
index 3b351d4c..374d9e51 100644
--- a/changelog/1.10.md
+++ b/changelog/1.10.md
@@ -5,6 +5,7 @@
 - Now support about Nexo is available.
 
 ## Add
+- 1.21.4 support
 - Add 'children' in image.
 ```yaml
 children_full:
diff --git a/nms/v1_21_R3/build.gradle.kts b/nms/v1_21_R3/build.gradle.kts
new file mode 100644
index 00000000..8fa8ce73
--- /dev/null
+++ b/nms/v1_21_R3/build.gradle.kts
@@ -0,0 +1,3 @@
+dependencies {
+    paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
+}
\ No newline at end of file
diff --git a/nms/v1_21_R3/src/main/kotlin/kr/toxicity/hud/nms/v1_21_R3/NMSImpl.kt b/nms/v1_21_R3/src/main/kotlin/kr/toxicity/hud/nms/v1_21_R3/NMSImpl.kt
new file mode 100644
index 00000000..d5dda52d
--- /dev/null
+++ b/nms/v1_21_R3/src/main/kotlin/kr/toxicity/hud/nms/v1_21_R3/NMSImpl.kt
@@ -0,0 +1,520 @@
+package kr.toxicity.hud.nms.v1_21_R3
+
+import io.netty.buffer.ByteBuf
+import io.netty.buffer.Unpooled
+import io.netty.channel.ChannelDuplexHandler
+import io.netty.channel.ChannelHandlerContext
+import io.netty.channel.ChannelPromise
+import kr.toxicity.command.BetterCommandSource
+import kr.toxicity.command.impl.CommandModule
+import kr.toxicity.hud.api.BetterHud
+import kr.toxicity.hud.api.BetterHudAPI
+import kr.toxicity.hud.api.bukkit.nms.NMS
+import kr.toxicity.hud.api.bukkit.nms.NMSVersion
+import kr.toxicity.hud.api.component.WidthComponent
+import kr.toxicity.hud.api.player.HudPlayer
+import net.kyori.adventure.bossbar.BossBar
+import net.kyori.adventure.pointer.Pointers
+import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.TextComponent
+import net.kyori.adventure.text.TranslatableComponent
+import net.kyori.adventure.text.format.TextDecoration
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer
+import net.minecraft.commands.CommandSourceStack
+import net.minecraft.core.RegistryAccess
+import net.minecraft.nbt.NbtAccounter
+import net.minecraft.nbt.NbtOps
+import net.minecraft.network.Connection
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.network.chat.ComponentSerialization
+import net.minecraft.network.protocol.game.ClientboundBossEventPacket
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.server.network.ServerCommonPacketListenerImpl
+import net.minecraft.server.network.ServerGamePacketListenerImpl
+import net.minecraft.world.BossEvent
+import org.bukkit.Bukkit
+import org.bukkit.GameMode
+import org.bukkit.WorldBorder
+import org.bukkit.command.ConsoleCommandSender
+import org.bukkit.craftbukkit.CraftServer
+import org.bukkit.craftbukkit.entity.CraftPlayer
+import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer
+import org.bukkit.craftbukkit.util.CraftChatMessage
+import org.bukkit.entity.Player
+import org.bukkit.event.entity.EntityDamageEvent
+import org.bukkit.inventory.EntityEquipment
+import org.bukkit.inventory.Inventory
+import org.bukkit.inventory.PlayerInventory
+import org.bukkit.permissions.Permission
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.ConcurrentLinkedQueue
+
+class NMSImpl : NMS {
+    companion object {
+        private const val INJECT_NAME = BetterHud.DEFAULT_NAMESPACE
+        private val bossBarMap = ConcurrentHashMap<UUID, PlayerBossBar>()
+
+        @Suppress("UNCHECKED_CAST")
+        private val operation = ClientboundBossEventPacket::class.java.declaredClasses.first {
+            it.isEnum
+        } as Class<out Enum<*>>
+
+        private val operationEnum = operation.enumConstants
+        private val getConnection: (ServerCommonPacketListenerImpl) -> Connection = if (BetterHudAPI.inst().bootstrap().isPaper) {
+            {
+                it.connection
+            }
+        } else {
+            ServerCommonPacketListenerImpl::class.java.declaredFields.first { f ->
+                f.type == Connection::class.java
+            }.apply {
+                isAccessible = true
+            }.let { get ->
+                {
+                    get[it] as Connection
+                }
+            }
+        }
+
+        fun createBossBar(byteBuf: RegistryFriendlyByteBuf): ClientboundBossEventPacket = ClientboundBossEventPacket.STREAM_CODEC.decode(byteBuf)
+
+        private fun toAdventure(component: net.minecraft.network.chat.Component) = GsonComponentSerializer.gson().deserialize(CraftChatMessage.toJSON(component))
+        private fun fromAdventure(component: Component) = CraftChatMessage.fromJSON(GsonComponentSerializer.gson().serialize(component))
+        private fun getColor(color: BossBar.Color) =  when (color) {
+            BossBar.Color.PINK -> BossEvent.BossBarColor.PINK
+            BossBar.Color.BLUE -> BossEvent.BossBarColor.BLUE
+            BossBar.Color.RED -> BossEvent.BossBarColor.RED
+            BossBar.Color.GREEN -> BossEvent.BossBarColor.GREEN
+            BossBar.Color.YELLOW -> BossEvent.BossBarColor.YELLOW
+            BossBar.Color.PURPLE -> BossEvent.BossBarColor.PURPLE
+            BossBar.Color.WHITE -> BossEvent.BossBarColor.WHITE
+        }
+    }
+
+    override fun inject(player: HudPlayer, color: BossBar.Color) {
+        val h = player.handle() as CraftPlayer
+        bossBarMap.computeIfAbsent(h.uniqueId) {
+            PlayerBossBar(h, h.handle.connection, color, Component.empty())
+        }
+    }
+    override fun showBossBar(player: HudPlayer, color: BossBar.Color, component: Component) {
+        bossBarMap[player.uuid()]?.update(color, component)
+    }
+
+    override fun removeBossBar(player: HudPlayer) {
+        bossBarMap.remove(player.uuid())?.remove()
+    }
+
+    override fun reloadBossBar(player: HudPlayer, color: BossBar.Color) {
+        bossBarMap[player.uuid()]?.resetDummy(color)
+    }
+
+    override fun getVersion(): NMSVersion {
+        return NMSVersion.V1_21_R3
+    }
+
+    override fun getTextureValue(player: HudPlayer): String {
+        return (player.handle() as CraftPlayer).handle.gameProfile.properties.get("textures").first().value
+    }
+
+
+    override fun registerCommand(module: CommandModule<BetterCommandSource>) {
+        val dispatcher = (Bukkit.getServer() as CraftServer).server.commands.dispatcher
+        module.build { s: CommandSourceStack ->
+            when (val sender = s.bukkitSender) {
+                is ConsoleCommandSender -> BetterHudAPI.inst().bootstrap().consoleSource()
+                is Player -> BetterHudAPI.inst().playerManager.getHudPlayer(sender.uniqueId)
+                else -> null
+            }
+        }.forEach {
+            dispatcher.register(it)
+        }
+    }
+
+    override fun getFoliaAdaptedPlayer(player: Player): Player {
+        val handle = (player as CraftPlayer).handle
+        return object : CraftPlayer(Bukkit.getServer() as CraftServer, handle) {
+            override fun getPersistentDataContainer(): CraftPersistentDataContainer {
+                return player.persistentDataContainer
+            }
+            override fun getHandle(): ServerPlayer {
+                return handle
+            }
+            override fun getHealth(): Double {
+                return player.health
+            }
+            override fun getScaledHealth(): Float {
+                return player.scaledHealth
+            }
+            override fun getHealthScale(): Double {
+                return player.healthScale
+            }
+            override fun getFirstPlayed(): Long {
+                return player.firstPlayed
+            }
+            override fun getInventory(): PlayerInventory {
+                return player.inventory
+            }
+            override fun getEnderChest(): Inventory {
+                return player.enderChest
+            }
+            override fun isOp(): Boolean {
+                return player.isOp
+            }
+            override fun getGameMode(): GameMode {
+                return player.gameMode
+            }
+            override fun getEquipment(): EntityEquipment {
+                return player.equipment
+            }
+            override fun hasPermission(name: String): Boolean {
+                return player.hasPermission(name)
+            }
+            override fun hasPermission(perm: Permission): Boolean {
+                return player.hasPermission(perm)
+            }
+            override fun isPermissionSet(name: String): Boolean {
+                return player.isPermissionSet(name)
+            }
+            override fun isPermissionSet(perm: Permission): Boolean {
+                return player.isPermissionSet(perm)
+            }
+            override fun hasPlayedBefore(): Boolean {
+                return player.hasPlayedBefore()
+            }
+            override fun getWorldBorder(): WorldBorder? {
+                return player.getWorldBorder()
+            }
+            override fun showBossBar(bar: BossBar) {
+                player.showBossBar(bar)
+            }
+            override fun hideBossBar(bar: BossBar) {
+                player.hideBossBar(bar)
+            }
+            override fun sendMessage(message: String) {
+                player.sendMessage(message)
+            }
+            override fun getLastDamageCause(): EntityDamageEvent? {
+                return player.lastDamageCause
+            }
+            override fun pointers(): Pointers {
+                return player.pointers()
+            }
+            override fun spigot(): Player.Spigot {
+                return player.spigot()
+            }
+        }
+    }
+
+
+    private class CachedHudBossbar(val hud: HudBossBar, val cacheUUID: UUID, val buf: HudByteBuf)
+    private class PlayerBossBar(val player: Player, val listener: ServerGamePacketListenerImpl, color: BossBar.Color, component: Component): ChannelDuplexHandler() {
+        private inner class PlayerDummyBossBar(color: BossBar.Color) {
+            val line = BetterHudAPI.inst().configManager.bossbarLine - 1
+            val dummyBars = (0..<line).map {
+                HudBossBar(UUID.randomUUID(), Component.empty(), color).apply {
+                    listener.send(ClientboundBossEventPacket.createAddPacket(this))
+                }
+            }
+            val dummyBarsUUID = dummyBars.map {
+                it.uuid
+            }
+        }
+        private var dummy = PlayerDummyBossBar(color)
+        private val dummyBarHandleMap = Collections.synchronizedMap(LinkedHashMap<UUID, CachedHudBossbar>())
+        private val otherBarCache = ConcurrentLinkedQueue<Pair<UUID, HudByteBuf>>()
+        private val uuid = UUID.randomUUID().apply {
+            listener.send(ClientboundBossEventPacket.createAddPacket(HudBossBar(this, component, color)))
+        }
+
+        private var last: HudBossBar = HudBossBar(uuid, Component.empty(), color)
+        private var onUse = uuid to HudByteBuf(Unpooled.buffer())
+
+        init {
+            val pipeLine = getConnection(listener).channel.pipeline()
+            pipeLine.toMap().forEach {
+                if (it.value is Connection) pipeLine.addBefore(it.key, INJECT_NAME, this)
+            }
+        }
+
+        fun update(color: BossBar.Color, component: Component) {
+            val bossBar = HudBossBar(uuid, component, color)
+            last = bossBar
+            listener.send(ClientboundBossEventPacket.createUpdateNamePacket(bossBar))
+        }
+        
+        fun resetDummy(color: BossBar.Color) {
+            listener.send(ClientboundBossEventPacket.createRemovePacket(uuid))
+            dummy.dummyBarsUUID.forEach {
+                listener.send(ClientboundBossEventPacket.createRemovePacket(it))
+            }
+            dummy = PlayerDummyBossBar(color)
+            dummy.dummyBars.forEach { 
+                listener.send(ClientboundBossEventPacket.createAddPacket(it))
+            }
+            listener.send(ClientboundBossEventPacket.createAddPacket(last))
+        }
+
+        fun remove() {
+            val channel = getConnection(listener).channel
+            channel.eventLoop().submit {
+                channel.pipeline().remove(INJECT_NAME)
+            }
+            listener.send(ClientboundBossEventPacket.createRemovePacket(uuid))
+            dummy.dummyBarsUUID.forEach {
+                listener.send(ClientboundBossEventPacket.createRemovePacket(it))
+            }
+        }
+
+        private fun writeBossBar(buf: HudByteBuf, ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
+            val originalUUID = buf.readUUID()
+            if (originalUUID == uuid || dummy.dummyBarsUUID.contains(originalUUID)) {
+                super.write(ctx, msg, promise)
+                return
+            }
+            if (BetterHudAPI.inst().isOnReload) return
+            val enum = buf.readEnum(operation)
+
+            fun getBuf(targetUUID: UUID = uuid) = HudByteBuf(Unpooled.buffer(1 shl 4))
+                .writeUUID(targetUUID)
+
+            fun sendProgress(getBuf: HudByteBuf = getBuf(), targetBuf: HudByteBuf = buf) = listener.send(createBossBar(getBuf
+                .writeEnum(operationEnum[2])
+                .writeFloat(targetBuf.readFloat())
+            ))
+            fun sendName(getBuf: HudByteBuf = getBuf(), targetBuf: HudByteBuf = buf) = listener.send(createBossBar(getBuf
+                .writeEnum(operationEnum[3])
+                .writeComponent(targetBuf.readComponentTrusted())
+            ))
+            fun sendStyle(getBuf: HudByteBuf = getBuf(), targetBuf: HudByteBuf = buf) = listener.send(createBossBar(getBuf
+                .writeEnum(operationEnum[4])
+                .writeEnum(targetBuf.readEnum(BossEvent.BossBarColor::class.java))
+                .writeEnum(targetBuf.readEnum(BossEvent.BossBarOverlay::class.java)))
+            )
+            fun sendProperties(getBuf: HudByteBuf = getBuf(), targetBuf: HudByteBuf = buf) = listener.send(createBossBar(getBuf
+                .writeEnum(operationEnum[5])
+                .writeByte(targetBuf.readUnsignedByte().toInt())
+            ))
+            fun changeName(targetBuf: HudByteBuf = buf) {
+                runCatching {
+                    val hud = BetterHudAPI.inst().playerManager.getHudPlayer(player.uniqueId) ?: return
+                    val comp = toAdventure(targetBuf.readComponentTrusted())
+                    val key = BetterHudAPI.inst().defaultKey
+                    fun applyFont(component: Component): Component {
+                        return component.font(key).children(component.children().map {
+                            applyFont(it)
+                        })
+                    }
+                    fun hasDecoration(parent: Boolean, state: TextDecoration.State) = when (state) {
+                        TextDecoration.State.TRUE -> true
+                        TextDecoration.State.NOT_SET -> parent
+                        TextDecoration.State.FALSE -> false
+                    }
+                    @Suppress("DEPRECATION")
+                    fun getWidth(component: Component, bold: Boolean, italic: Boolean): Int {
+                        var i = 0
+                        if (bold) i++
+                        if (italic) i++
+                        return component.children().sumOf {
+                            getWidth(
+                                it,
+                                hasDecoration(bold, it.decoration(TextDecoration.BOLD)),
+                                hasDecoration(italic, it.decoration(TextDecoration.ITALIC))
+                            )
+                        } + (when (component) {
+                            is TextComponent -> component.content()
+                            is TranslatableComponent -> BetterHudAPI.inst().translate(player.locale, component.key())
+                            else -> null
+                        }?.codePoints()?.map {
+                            (if (it == ' '.code) 4 else BetterHudAPI.inst().getWidth(it) + 1) + i
+                        }?.sum() ?: 0)
+                    }
+                    hud.additionalComponent = WidthComponent(Component.text().append(applyFont(comp)), getWidth(
+                        comp,
+                        hasDecoration(false, comp.decoration(TextDecoration.BOLD)),
+                        hasDecoration(false, comp.decoration(TextDecoration.ITALIC))
+                    ))
+                }
+            }
+            fun removeBossbar(changeCache: Boolean = false): Boolean {
+                if (onUse.first == uuid) return false
+                var result = false
+                if (changeCache) {
+                    val cacheSize = dummyBarHandleMap.size
+                    if (cacheSize < dummy.line) {
+                        val cache = CachedHudBossbar(dummy.dummyBars[cacheSize], onUse.first, HudByteBuf(onUse.second.unwrap()))
+                        dummyBarHandleMap[onUse.first] = cache
+                        sendName(getBuf = getBuf(cache.hud.uuid), targetBuf = onUse.second)
+                        sendProgress(getBuf = getBuf(cache.hud.uuid), targetBuf = onUse.second)
+                        sendStyle(getBuf = getBuf(cache.hud.uuid), targetBuf = onUse.second)
+                        sendProperties(getBuf = getBuf(cache.hud.uuid), targetBuf = onUse.second)
+                        result = true
+                    }
+                }
+                otherBarCache.poll()?.let { target ->
+                    val targetBuf = HudByteBuf(Unpooled.copiedBuffer(target.second.unwrap()))
+                    listener.send(ClientboundBossEventPacket.createRemovePacket(target.first))
+                    changeName(targetBuf = targetBuf)
+                    sendProgress(targetBuf = targetBuf)
+                    sendStyle(targetBuf = targetBuf)
+                    sendProperties(targetBuf = targetBuf)
+                    onUse = target
+                } ?: run {
+                    onUse = uuid to HudByteBuf(buf.unwrap())
+                    BetterHudAPI.inst().playerManager.getHudPlayer(player.uniqueId)?.additionalComponent = null
+                    listener.send(ClientboundBossEventPacket.createUpdateNamePacket(last))
+                    listener.send(ClientboundBossEventPacket.createUpdateProgressPacket(last))
+                    listener.send(ClientboundBossEventPacket.createUpdateStylePacket(last))
+                    listener.send(ClientboundBossEventPacket.createUpdatePropertiesPacket(last))
+                }
+                return result
+            }
+
+            runCatching {
+                val cacheSize = dummyBarHandleMap.size
+                if (cacheSize < dummy.line && enum.ordinal == 0) {
+                    val hud = dummyBarHandleMap.computeIfAbsent(originalUUID) {
+                        CachedHudBossbar(dummy.dummyBars[cacheSize], originalUUID, HudByteBuf(buf.unwrap()))
+                    }
+                    sendName(getBuf = getBuf(hud.hud.uuid))
+                    sendProgress(getBuf = getBuf(hud.hud.uuid))
+                    sendStyle(getBuf = getBuf(hud.hud.uuid))
+                    sendProperties(getBuf = getBuf(hud.hud.uuid))
+                    return
+                } else {
+                    dummyBarHandleMap[originalUUID]?.let {
+                        when (enum.ordinal) {
+                            0 -> {
+                                sendName(getBuf = getBuf(it.hud.uuid))
+                                sendProgress(getBuf = getBuf(it.hud.uuid))
+                                sendStyle(getBuf = getBuf(it.hud.uuid))
+                                sendProperties(getBuf = getBuf(it.hud.uuid))
+                            }
+                            1 -> {
+                                dummyBarHandleMap.remove(originalUUID)
+                                val swap = removeBossbar(changeCache = true)
+                                val list = dummyBarHandleMap.entries.toList()
+                                val last = if (list.isNotEmpty()) list.last().value else it
+                                list.forEachIndexed { index, target ->
+                                    val after = target.value
+                                    val targetBuf = after.buf
+                                    val newCache = CachedHudBossbar(dummy.dummyBars[index], after.cacheUUID, HudByteBuf(targetBuf.unwrap()))
+                                    target.setValue(newCache)
+                                    sendName(getBuf = getBuf(newCache.hud.uuid), targetBuf = targetBuf)
+                                    sendProgress(getBuf = getBuf(newCache.hud.uuid), targetBuf = targetBuf)
+                                    sendStyle(getBuf = getBuf(newCache.hud.uuid), targetBuf = targetBuf)
+                                    sendProperties(getBuf = getBuf(newCache.hud.uuid), targetBuf = targetBuf)
+                                }
+                                if (!swap) {
+                                    listener.send(ClientboundBossEventPacket.createUpdateNamePacket(last.hud))
+                                    listener.send(ClientboundBossEventPacket.createUpdateProgressPacket(last.hud))
+                                    listener.send(ClientboundBossEventPacket.createUpdateStylePacket(last.hud))
+                                    listener.send(ClientboundBossEventPacket.createUpdatePropertiesPacket(last.hud))
+                                }
+                            }
+                            2 -> sendProgress(getBuf = getBuf(it.hud.uuid))
+                            3 -> sendName(getBuf = getBuf(it.hud.uuid))
+                            4 -> sendStyle(getBuf = getBuf(it.hud.uuid))
+                            5 -> sendProperties(getBuf = getBuf(it.hud.uuid))
+                            else -> {}
+                        }
+                        return
+                    }
+                }
+                if (otherBarCache.isEmpty() && enum.ordinal == 0 && onUse.first == uuid) {
+                    onUse = originalUUID to HudByteBuf(buf.unwrap())
+                    changeName()
+                    sendProgress()
+                    sendStyle()
+                    sendProperties()
+                    return
+                }
+                if (originalUUID == onUse.first) {
+                    when (enum.ordinal) {
+                        0 -> {
+                            changeName()
+                            sendProgress()
+                            sendStyle()
+                            sendProperties()
+                        }
+                        1 -> removeBossbar()
+                        2 -> sendProgress()
+                        3 -> changeName()
+                        4 -> sendStyle()
+                        5 -> sendProperties()
+                        else -> {}
+                    }
+                } else {
+                    when (enum.ordinal) {
+                        0 -> {
+                            otherBarCache.removeIf {
+                                it.first == originalUUID
+                            }
+                            otherBarCache.add(originalUUID to HudByteBuf(buf.unwrap()))
+                        }
+                        1 -> otherBarCache.removeIf {
+                            it.first == originalUUID
+                        }
+                    }
+                    super.write(ctx, msg, promise)
+                }
+            }.onFailure {
+                it.printStackTrace()
+            }
+        }
+
+        override fun write(ctx: ChannelHandlerContext?, msg: Any?, promise: ChannelPromise?) {
+            if (msg is ClientboundBossEventPacket) {
+
+                if (BetterHudAPI.inst().isMergeBossBar) {
+                    val buf = HudByteBuf(Unpooled.buffer(1 shl 4)).apply {
+                        ClientboundBossEventPacket.STREAM_CODEC.encode(this, msg)
+                    }
+                    writeBossBar(buf, ctx, msg, promise)
+                } else super.write(ctx, msg, promise)
+            } else {
+                super.write(ctx, msg, promise)
+            }
+        }
+    }
+    private class HudByteBuf(private val source: ByteBuf) : RegistryFriendlyByteBuf(source, RegistryAccess.EMPTY) {
+        override fun unwrap(): ByteBuf {
+            return Unpooled.copiedBuffer(source)
+        }
+        override fun writeEnum(instance: Enum<*>): HudByteBuf {
+            super.writeEnum(instance)
+            return this
+        }
+        override fun writeUUID(uuid: UUID): HudByteBuf {
+            super.writeUUID(uuid)
+            return this
+        }
+        override fun writeFloat(f: Float): HudByteBuf {
+            super.writeFloat(f)
+            return this
+        }
+        override fun writeByte(i: Int): HudByteBuf {
+            super.writeByte(i)
+            return this
+        }
+        fun readComponentTrusted(): net.minecraft.network.chat.Component {
+            return ComponentSerialization.CODEC.parse(NbtOps.INSTANCE, readNbt(NbtAccounter.unlimitedHeap())).orThrow
+        }
+        fun writeComponent(component: net.minecraft.network.chat.Component): HudByteBuf {
+            writeNbt(ComponentSerialization.CODEC.encodeStart(NbtOps.INSTANCE, component).orThrow)
+            return this
+        }
+    }
+
+    private class HudBossBar(val uuid: UUID, component: net.minecraft.network.chat.Component, color: BossBarColor): BossEvent(uuid, component, color, BossBarOverlay.PROGRESS) {
+        constructor(uuid: UUID, component: Component, color: BossBar.Color): this(
+            uuid,
+            fromAdventure(component),
+            getColor(color)
+        )
+        override fun getProgress(): Float {
+            return 0F
+        }
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d12beea3..1de1acbb 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -33,6 +33,7 @@ include(
     "nms:v1_20_R4",
     "nms:v1_21_R1",
     "nms:v1_21_R2",
+    "nms:v1_21_R3",
 
     "scheduler:standard",
     "scheduler:folia",

From 3f57c60e39e8c747d36c384040e3b7c3cd525262 Mon Sep 17 00:00:00 2001
From: Yang Seong Mo <angryko@naver.com>
Date: Fri, 6 Dec 2024 18:55:18 +0900
Subject: [PATCH 3/3] Clean build jar

---
 bootstrap/fabric/build.gradle.kts | 2 +-
 changelog/1.10.md                 | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bootstrap/fabric/build.gradle.kts b/bootstrap/fabric/build.gradle.kts
index 6d7de097..a5e144fa 100644
--- a/bootstrap/fabric/build.gradle.kts
+++ b/bootstrap/fabric/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     //Kyori
     modCompileOnly("net.fabricmc:fabric-loader:${project.properties["loader_version"]}")
     modCompileOnly("net.fabricmc.fabric-api:fabric-api:${project.properties["fabric_version"]}")
-    modImplementation(include("net.kyori:adventure-platform-mod-shared-fabric-repack:6.1.0")!!)
+    modCompileOnly("net.kyori:adventure-platform-mod-shared-fabric-repack:6.1.0")
     modImplementation(include("net.kyori:adventure-platform-fabric:6.1.0")!!)
 }
 
diff --git a/changelog/1.10.md b/changelog/1.10.md
index 374d9e51..85f316d9 100644
--- a/changelog/1.10.md
+++ b/changelog/1.10.md
@@ -118,6 +118,8 @@ test_text:
 ```yaml
 disable-legacy-offset: false #If this is true, a correct pixel offset is provided.
 ```
+- Add 'hud turn on|off <player' command
+- Remove space constraint in text layout
 ## Change
 - Now BetterHud uses BetterCommand 1.4
 - Now BetterHud uses Kotlin 2.1.0
@@ -126,4 +128,5 @@ disable-legacy-offset: false #If this is true, a correct pixel offset is provide
 - Fix placeholder comma.
 - Fix Folia adaption
 - Fix layout identifier.
-- Fix render scale calculation.
\ No newline at end of file
+- Fix render scale calculation.
+- Optimize text renderer.
\ No newline at end of file