Merge branch '1.21.4'

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
+Plugin: 1.18.2-1.21.4  
+Fabric mod: server 1.21.4

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
 }
 ```
 

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")

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()

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>()
 

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

build.gradle.kts

@@ -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",
@@ -153,6 +154,7 @@ val currentNmsVersion = listOf(
     "v1_20_R4",
     "v1_21_R1",
     "v1_21_R2",
+    "v1_21_R3",
 ).map {
     project("nms:$it")
 }

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:
@@ -117,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
@@ -125,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.
+- Fix render scale calculation.
+- Optimize text renderer.

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

nms/v1_21_R3/build.gradle.kts

@@ -0,0 +1,3 @@
+dependencies {
+    paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
+}