diff --git a/build.gradle.kts b/build.gradle.kts index 6554d8ee..ae189605 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -96,7 +96,7 @@ allprojects { apply(plugin = "org.jetbrains.dokka") group = "kr.toxicity.hud" - version = "1.7" + (System.getenv("BUILD_NUMBER")?.let { ".DEV-$it" } ?: "") + version = "1.8" + (System.getenv("BUILD_NUMBER")?.let { ".DEV-$it" } ?: "") repositories { mavenCentral() @@ -209,10 +209,16 @@ fun Project.legacy() = also { fun Project.modrinthPublish(depend: Jar, additionalJar: List, loadersList: List, versionList: List, requiredDependency: List) { apply(plugin = "com.modrinth.minotaur") modrinth { + val log = System.getenv("COMMIT_MESSAGE") + if (log != null) { + versionType = "alpha" + changelog = log + } else { + versionType = "release" + changelog = rootProject.file("changelog/${project.version}.md").readText() + } token = System.getenv("MODRINTH_API_TOKEN") projectId = "betterhud2" - versionType = "alpha" - changelog = System.getenv("COMMIT_MESSAGE") versionName = "BetterHud ${project.version} for ${depend.archiveClassifier.get()}" versionNumber = project.version as String uploadFile.set(depend.archiveFile) @@ -452,10 +458,16 @@ tasks.create("modrinthPublish") { hangarPublish { publications.register("plugin") { version = project.version as String - channel = "Snapshot" id = "BetterHud" apiKey = System.getenv("HANGAR_API_TOKEN") - changelog = System.getenv("COMMIT_MESSAGE") + val log = System.getenv("COMMIT_MESSAGE") + if (log != null) { + changelog = log + channel = "Snapshot" + } else { + changelog = rootProject.file("changelog/${project.version}.md").readText() + channel = "Release" + } platforms { register(Platforms.PAPER) { jar = file("build/libs/${project.name}-${project.version}-bukkit.jar") diff --git a/changelog/1.7.md b/changelog/1.7.md new file mode 100644 index 00000000..6219aa5f --- /dev/null +++ b/changelog/1.7.md @@ -0,0 +1,11 @@ +# Features +- 1.21.3 supports. +- Bug fixes. +- Compass location data will saved. +- A layout option 'opacity' is added.(0 to 1) +- Now compass can use custom icon. +- "fancy" head render type added. +- Some experimental effect is added.(property) +- A layout option 'render-scale' is added.(Compare to primary scale, primary scale is json scale of texture, render-scale is shader scale. you can use both of that.) +- LuckPerms and TextPlaceholderAPI supports(fabric) +- Fabric build is now done. \ No newline at end of file diff --git a/changelog/1.8.md b/changelog/1.8.md new file mode 100644 index 00000000..a8d5a694 --- /dev/null +++ b/changelog/1.8.md @@ -0,0 +1,21 @@ +# BetterHud 1.8 + +## Fix +- Merge with other resource pack #47 +- Attribute API in Bukkit to supports 1.21.3. +- Stable version for Fabric 1.21.3 is released. +- Optimizes resource pack zip. + +## Add +- 'parties_is_leader' placeholder is added. +- Command now uses [BetterCommand](https://github.com/toxicity188/BetterCommand) library. +- Add lang folder (like en_US.json) + +## Change +- CI is changed to split each platform. + +## Make your own lang +- step 1. Join your server. +- step 2. Command /hud gen to create your language file. +- step 3. Edit BetterHud/lang/your_language.json file. +- step 4. if you want, you can contribute BetterHud to upload this lang file in my Discord or PR in GitHub. \ 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 237ed5c4..3c302ad1 100644 --- a/dist/src/main/kotlin/kr/toxicity/hud/manager/CommandManager.kt +++ b/dist/src/main/kotlin/kr/toxicity/hud/manager/CommandManager.kt @@ -124,7 +124,7 @@ object CommandManager : BetterHudManager { //Reload private val reload_tryReload = library.registerKey(CommandMessage("betterhud.reload.message.try_reload", Component.text("Trying to reload. please wait..."))) private val reload_onReload = library.registerKey(CommandMessage("betterhud.reload.message.on_reload", Component.text("The plugin is still reloading!"))) - private val reload_success = library.registerKey(CommandMessage("betterhud.reload.message.success", Component.text("Reload successful! [time] ms)"))) + private val reload_success = library.registerKey(CommandMessage("betterhud.reload.message.success", Component.text("Reload successful! ([time] ms)"))) private val reload_failure1 = library.registerKey(CommandMessage("betterhud.reload.message.failure.1", Component.text("Reload failed."))) private val reload_failure2 = library.registerKey(CommandMessage("betterhud.reload.message.failure.2", Component.text("Cause: [cause]"))) @Command diff --git a/dist/src/main/resources/lang/en_US.json b/dist/src/main/resources/lang/en_US.json index 84835682..237183bd 100644 --- a/dist/src/main/resources/lang/en_US.json +++ b/dist/src/main/resources/lang/en_US.json @@ -19,6 +19,7 @@ "betterhud.hud.remove.message.success": "Successfully removed.", "betterhud.null.compass": "Unable to find this compass: [value]", "betterhud.null.hud": "Unable to find this hud: [value]", + "betterhud.null.icon": "Unable to find this icon: [icon]", "betterhud.null.player": "Unable to find this player: [value]", "betterhud.null.popup": "Unable to find this popup: [value]", "betterhud.null.vector": "Invalid vector: [value]", @@ -52,7 +53,7 @@ "betterhud.reload.message.failure.1": "Reload failed.", "betterhud.reload.message.failure.2": "Cause: [cause]", "betterhud.reload.message.on_reload": "The plugin is still reloading!", - "betterhud.reload.message.success": "Reload successful! [time] ms)", + "betterhud.reload.message.success": "Reload successful! ([time] ms)", "betterhud.reload.message.try_reload": "Trying to reload. please wait...", "betterhud.turn.description": "Turns on or off HUD.", "betterhud.turn.off.description": "Turns off your HUD.", @@ -82,6 +83,8 @@ "internal.type.float.required": "(float)", "internal.type.hud.optional": "[hud]", "internal.type.hud.required": "(hud)", + "internal.type.icon.optional": "[icon]", + "internal.type.icon.required": "(icon)", "internal.type.integer.optional": "[integer]", "internal.type.integer.required": "(integer)", "internal.type.long.optional": "[long]", diff --git a/dist/src/main/resources/lang/ko_KR.json b/dist/src/main/resources/lang/ko_KR.json index 56cf9a61..d2f3dcb3 100644 --- a/dist/src/main/resources/lang/ko_KR.json +++ b/dist/src/main/resources/lang/ko_KR.json @@ -19,6 +19,7 @@ "betterhud.hud.remove.message.success": "성공적으로 제거되었습니다.", "betterhud.null.compass": "해당 나침반을 찾을 수 없습니다: [value]", "betterhud.null.hud": "해당 HUD를 찾을 수 없습니다: [value]", + "betterhud.null.icon": "해당 아이콘을 찾을 수 없습니다: [value]", "betterhud.null.player": "해당 플레이어를 찾을 수 없습니다: [value]", "betterhud.null.popup": "해당 팝업을 찾을 수 없습니다: [value]", "betterhud.null.vector": "잘못된 벡터: [value]", @@ -82,6 +83,8 @@ "internal.type.float.required": "(부동소숫점)", "internal.type.hud.optional": "[HUD]", "internal.type.hud.required": "(HUD)", + "internal.type.icon.optional": "[아이콘]", + "internal.type.icon.required": "(아이콘)", "internal.type.integer.optional": "[정수]", "internal.type.integer.required": "(정수)", "internal.type.long.optional": "[정수]",