diff --git a/bootstrap/bukkit/build.gradle.kts b/bootstrap/bukkit/build.gradle.kts index d75fa2dc..f7338524 100644 --- a/bootstrap/bukkit/build.gradle.kts +++ b/bootstrap/bukkit/build.gradle.kts @@ -53,11 +53,11 @@ dependencies { exclude("com.google.code.gson") } compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") - compileOnly("com.github.SkriptLang:Skript:2.9.5") + compileOnly("com.github.SkriptLang:Skript:2.10.0") compileOnly("net.skinsrestorer:skinsrestorer-api:15.5.1") compileOnly("com.alessiodp.parties:parties-bukkit:3.2.16") compileOnly("com.nexomc:nexo:0.9.0") - compileOnly("io.th0rgal:oraxen:1.187.0") + compileOnly("io.th0rgal:oraxen:1.188.0") } bukkitPluginYaml { diff --git a/build.gradle.kts b/build.gradle.kts index 6f0d1b46..45dfb3d0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -77,7 +77,7 @@ tasks { hangar("ViaVersion", "5.2.1") hangar("ViaBackwards", "5.2.1") hangar("PlaceholderAPI", "2.11.6") - hangar("Skript", "2.9.5") + hangar("Skript", "2.10.0") } } build { diff --git a/changelog/1.12.md b/changelog/1.12.md new file mode 100644 index 00000000..ae5eaf25 --- /dev/null +++ b/changelog/1.12.md @@ -0,0 +1 @@ +# BetterHud 1.12 \ No newline at end of file diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/CommandManager.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/CommandManager.kt index c6089af6..b6293209 100644 --- a/dist/src/main/kotlin/kr/toxicity/hud/manager/CommandManager.kt +++ b/dist/src/main/kotlin/kr/toxicity/hud/manager/CommandManager.kt @@ -23,13 +23,8 @@ import kr.toxicity.hud.util.* import net.kyori.adventure.text.Component import net.kyori.adventure.text.minimessage.MiniMessage import java.io.File -import java.text.DecimalFormat object CommandManager : BetterHudManager { - - private val numberDecimal = DecimalFormat("#,###") - private fun Number.withDecimal() = Component.text(numberDecimal.format(this)) - val library = BetterCommand(DATA_FOLDER.subFolder("lang").apply { PLUGIN.loadAssets("lang") { name, stream -> val file = File(this, name) diff --git a/dist/src/main/kotlin/kr/toxicity/hud/manager/TextManagerImpl.kt b/dist/src/main/kotlin/kr/toxicity/hud/manager/TextManagerImpl.kt index 789ec9f5..f80b43e0 100644 --- a/dist/src/main/kotlin/kr/toxicity/hud/manager/TextManagerImpl.kt +++ b/dist/src/main/kotlin/kr/toxicity/hud/manager/TextManagerImpl.kt @@ -681,7 +681,7 @@ object TextManagerImpl : BetterHudManager, TextManager { } } } - debug(ConfigManager.DebugLevel.ASSETS, "Finalizing font text $saveName...") + debug(ConfigManager.DebugLevel.ASSETS, "Finalizing font text $saveName... (${charWidthMap.size.withDecimal()} of codepoints)") val result = TextElement(internalName, scale, textList, charWidthMap, imageTextScaleMap, yamlObject) synchronized(textCacheMap) { textCacheMap[TextCache(internalName, images.keys, supportedLanguage)] = result diff --git a/dist/src/main/kotlin/kr/toxicity/hud/util/Plugins.kt b/dist/src/main/kotlin/kr/toxicity/hud/util/Plugins.kt index fc260637..13e608c8 100644 --- a/dist/src/main/kotlin/kr/toxicity/hud/util/Plugins.kt +++ b/dist/src/main/kotlin/kr/toxicity/hud/util/Plugins.kt @@ -6,6 +6,11 @@ import kr.toxicity.hud.api.adapter.LocationWrapper import kr.toxicity.hud.api.manager.ConfigManager import kr.toxicity.hud.api.manager.ConfigManager.DebugLevel import kr.toxicity.hud.manager.ConfigManagerImpl +import net.kyori.adventure.text.Component +import java.text.DecimalFormat + +private val COMMA_FORMAT = DecimalFormat("#,###") +fun Number.withDecimal() = Component.text(COMMA_FORMAT.format(this)) val PLUGIN get() = BetterHudAPI.inst() diff --git a/gradle.properties b/gradle.properties index 15d94ee5..9bfcb5ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx16384M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true -version=1.11.4 +version=1.12 supported_version=1.21.2 @@ -11,10 +11,10 @@ minecraft_version=1.21.4 velocity_version=3.4.0 yarn_mappings=1.21.4+build.8 loader_version=0.16.10 -fabric_version=0.114.2+1.21.4 +fabric_version=0.114.3+1.21.4 kyori_mod_implementation=6.2.0 -parchment=parchment-1.21.4:2025.01.05 +parchment=parchment-1.21.4:2025.01.19 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3e01247a..afcdec9e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ bstats = "3.1.0" betterCommand = "1.4.2" resourceFactory = "1.2.0" loom = "1.9-SNAPSHOT" -paperweight = "2.0.0-beta.13" +paperweight = "2.0.0-beta.14" minotaur = "2.8.7" asm = "9.7.1" 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 index 9891d993..a00ac0a5 100644 --- 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 @@ -183,8 +183,6 @@ class NMSImpl : NMS { override fun getEnderChest(): Inventory { return player.enderChest } - override fun getPotentialBedLocation(): Location? = player.potentialBedLocation - override fun isOp(): Boolean { return player.isOp }