Add 'color-overrides' in image, text, head, layout

Author: toxicity188

README.md

@@ -15,11 +15,11 @@ Welcome to BetterHud!
 
 </div>
 
-### Multi-platform server-side HUD implementation of Minecraft.
+### Multiplatform server-side HUD implementation of Minecraft
 This project implements a server-side HUD.
 
 - Supports auto-generating resource pack.
-- Supports display image(include png sequence), display, head.
+- Supports display image(include png sequence), text, head.
 - Supports animation.
 
 ### Platform

api/build.gradle.kts

@@ -1,9 +1,18 @@
+import com.vanniktech.maven.publish.JavaLibrary
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.SonatypeHost
+
 plugins {
-    `maven-publish`
+    id("com.vanniktech.maven.publish") version "0.30.0"
+    signing
 }
 
 subprojects {
-    apply(plugin = "maven-publish")
+
+    val publishName = "${rootProject.name}-${project.name}"
+
+    apply(plugin = "com.vanniktech.maven.publish")
+    apply(plugin = "signing")
 
     dependencies {
         compileOnly("org.projectlombok:lombok:1.18.34")
@@ -13,25 +22,46 @@ subprojects {
         testAnnotationProcessor("org.projectlombok:lombok:1.18.34")
     }
 
-    val sourcesJar by tasks.creating(Jar::class.java) {
-        from(sourceSets.main.get().allJava)
-        archiveClassifier = "sources"
+    java {
+        withSourcesJar()
+        withJavadocJar()
     }
-    val javadocJar by tasks.creating(Jar::class.java) {
-        dependsOn(tasks.javadoc)
-        archiveClassifier = "javadoc"
-        from(tasks.javadoc.get().destinationDir)
+
+    signing {
+        useGpgCmd()
     }
 
-    publishing {
-        publications {
-            create<MavenPublication>("maven") {
-                from(components["java"])
-                afterEvaluate {
-                    artifact(javadocJar)
-                    artifact(sourcesJar)
+    mavenPublishing {
+        publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+        signAllPublications()
+        coordinates("io.github.toxicity188", publishName, project.version as String)
+        configure(JavaLibrary(
+            javadocJar = JavadocJar.None(),
+            sourcesJar = true,
+        ))
+        pom {
+            name = publishName
+            description = "A multi-platform server-side implementation of HUD in Minecraft, supporting Bukkit(with Folia), Velocity, and Fabric."
+            inceptionYear = "2024"
+            url = "https://github.com/toxicity188/BetterHud/"
+            licenses {
+                license {
+                    name = "MIT License"
+                    url = "https://mit-license.org/"
                 }
             }
+            developers {
+                developer {
+                    id = "toxicity188"
+                    name = "toxicity188"
+                    url = "https://github.com/toxicity188/"
+                }
+            }
+            scm {
+                url = "https://github.com/toxicity188/BetterHud/"
+                connection = "scm:git:git://github.com/toxicity188/BetterHud.git"
+                developerConnection = "scm:git:ssh://[email protected]/toxicity188/BetterHud.git"
+            }
         }
     }
 }

api/bukkit-api/src/main/java/kr/toxicity/hud/api/bukkit/nms/NMS.java

@@ -1,7 +1,7 @@
 package kr.toxicity.hud.api.bukkit.nms;
 
 import kr.toxicity.command.BetterCommandSource;
-import kr.toxicity.command.CommandModule;
+import kr.toxicity.command.impl.CommandModule;
 import kr.toxicity.hud.api.volatilecode.VolatileCodeHandler;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

build.gradle.kts

@@ -31,7 +31,7 @@ val platform = "4.3.4"
 val targetJavaVersion = 21
 val velocity = "3.4.0"
 val bStats = "3.1.0"
-val betterCommand = "1.3"
+val betterCommand = "1.4"
 
 val supportedMinecraftVersions = listOf(
     //1.17
@@ -86,6 +86,7 @@ allprojects {
 
     dependencies {
         testImplementation("org.jetbrains.kotlin:kotlin-test")
+        implementation("io.github.toxicity188:BetterCommand:$betterCommand")
     }
 
     tasks {
@@ -130,9 +131,6 @@ subprojects {
             displayName = project.name
         }
     }
-    dependencies {
-        compileOnly("com.github.toxicity188:BetterCommand:$betterCommand")
-    }
 }
 
 val legacyNmsVersion = listOf(
@@ -300,12 +298,11 @@ dependencies {
         implementation(it)
     }
     implementation(dist)
-    implementation("com.github.toxicity188:BetterCommand:$betterCommand")
     implementation("org.bstats:bstats-bukkit:$bStats")
     implementation("org.bstats:bstats-velocity:$bStats")
 }
 
-val sourceJar by tasks.creating(Jar::class.java) {
+val sourcesJar by tasks.creating(Jar::class.java) {
     dependsOn(tasks.classes)
     fun getProjectSource(project: Project): Array<File> {
         return if (project.subprojects.isEmpty()) project.sourceSets.main.get().allSource.srcDirs.toTypedArray() else ArrayList<File>().apply {
@@ -314,13 +311,13 @@ val sourceJar by tasks.creating(Jar::class.java) {
             }
         }.toTypedArray()
     }
-    archiveClassifier = "source"
+    archiveClassifier = "sources"
     from(*getProjectSource(project))
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
-val dokkaJar by tasks.creating(Jar::class.java) {
+val javadocJar by tasks.creating(Jar::class.java) {
     dependsOn(tasks.dokkaGenerate)
-    archiveClassifier = "dokka"
+    archiveClassifier = "javadoc"
     from(layout.buildDirectory.dir("dokka/html").orNull?.asFile)
 }
 val fabricJar by tasks.creating(Jar::class.java) {
@@ -391,7 +388,8 @@ fun Jar.relocateAll() {
             "kotlin",
             "net.objecthunter.exp4j",
             "org.bstats",
-            "me.lucko.jarrelocator"
+            "me.lucko.jarrelocator",
+            "kr.toxicity.command.impl"
         ).map {
             Relocation(it, "${project.group}.shaded.$it")
         }
@@ -420,10 +418,7 @@ tasks {
         pluginJars(fileTree("plugins"))
     }
     build {
-        finalizedBy(sourceJar, dokkaJar, pluginJar, velocityJar, fabricJar)
-    }
-    logLinkDokkaGeneratePublicationHtml {
-        enabled = false
+        finalizedBy(sourcesJar, javadocJar, pluginJar, velocityJar, fabricJar)
     }
     shadowJar {
         archiveClassifier = ""
@@ -435,7 +430,7 @@ tasks {
 
 bukkitBootstrap.modrinthPublish(
     pluginJar,
-    listOf(sourceJar, dokkaJar),
+    listOf(sourcesJar, javadocJar),
     listOf("bukkit", "spigot", "paper", "purpur", "folia"),
     supportedMinecraftVersions,
     listOf(),
@@ -444,15 +439,15 @@ bukkitBootstrap.modrinthPublish(
 
 velocityBootstrap.modrinthPublish(
     velocityJar,
-    listOf(sourceJar, dokkaJar),
+    listOf(sourcesJar, javadocJar),
     listOf("velocity"),
     supportedMinecraftVersions,
     listOf(),
     listOf()
 )
 fabricBootstrap.modrinthPublish(
     fabricJar,
-    listOf(sourceJar, dokkaJar),
+    listOf(sourcesJar, javadocJar),
     listOf("fabric", "quilt"),
     listOf(minecraft),
     listOf("fabric-api"),

changelog/1.10.md

@@ -39,4 +39,43 @@ children_full:
   setting:
     children: * #wild card(*) defines all available image.
     follow: "skript_variable:your_value" #If you want to show image depend on some placeholder, set 'follow' section.
-```
+```
+- Now we're using maven central to publish API
+```kotlin
+dependencies {
+    compileOnly("io.github.toxicity188:BetterHud-standard-api:VERSION") //Standard API
+    compileOnly("io.github.toxicity188:BetterHud-bukkit-api:VERSION") //Platform API
+}
+```
+- Add 'color-overrides' in image, text, head, layout
+```yaml
+test_layout:
+  heads:
+    1:
+      name: test_head
+      align: center
+  texts:
+    1:
+      name: test_text
+      pattern: |
+        Text1
+        Text2
+      line: 3
+      align: center
+      line-align: center
+      scale: 0.5
+      y: 48
+      properties:
+        - wave
+  color-overrides:
+    1:
+      color: "#FF8080"
+      conditions:
+        1:
+          first: health_percentage
+          second: 0.33
+          operation: "<"
+```
+## Fix
+- Fix placeholder comma.
+- Fix Folia adaption

dist/src/main/kotlin/kr/toxicity/hud/BetterHudImpl.kt

@@ -71,13 +71,13 @@ class BetterHudImpl(val bootstrap: BetterHudBootstrap) : BetterHud {
     private val reloadEndTask = ArrayList<(ReloadState) -> Unit>()
 
     override fun addReloadStartTask(runnable: Runnable) {
-        reloadStartTask.add {
+        reloadStartTask += {
             runnable.run()
         }
     }
 
     override fun addReloadEndTask(runnable: Consumer<ReloadState>) {
-        reloadEndTask.add {
+        reloadEndTask += {
             runnable.accept(it)
         }
     }

dist/src/main/kotlin/kr/toxicity/hud/compass/type/CircleCompass.kt

@@ -8,7 +8,6 @@ import kr.toxicity.hud.api.update.UpdateEvent
 import kr.toxicity.hud.api.yaml.YamlObject
 import kr.toxicity.hud.compass.CompassImpl
 import kr.toxicity.hud.equation.TEquation
-import kr.toxicity.hud.hud.HudImpl
 import kr.toxicity.hud.location.PixelLocation
 import kr.toxicity.hud.manager.ConfigManagerImpl
 import kr.toxicity.hud.pack.PackGenerator
@@ -96,14 +95,14 @@ class CircleCompass(
         val newHeight = (image.height.toDouble() * scale * scaleMultiplier).roundToInt()
         val div = newHeight.toDouble() / image.height.toDouble()
         array?.let { array ->
-            HudImpl.createBit(shader, pixel.y + y + (maxHeight - newHeight) / 2) { bit ->
-                array.add(jsonObjectOf(
+            createAscent(shader, pixel.y + y + (maxHeight - newHeight) / 2) { bit ->
+                array += jsonObjectOf(
                     "type" to "bitmap",
                     "file" to "$NAME_SPACE_ENCODED:$nameEncoded.png",
                     "ascent" to bit,
                     "height" to newHeight,
                     "chars" to jsonArrayOf(char)
-                ))
+                )
             }
         }
         resourceRef?.let {
@@ -254,14 +253,14 @@ class CircleCompass(
             if (!BOOTSTRAP.useLegacyFont()) {
                 val max = images.max + 2 * space + length
                 val center = CURRENT_CENTER_SPACE_CODEPOINT
-                it.add(buildJsonObject {
+                it += buildJsonObject {
                     addProperty("type", "space")
                     add("advances", buildJsonObject {
                         for (i in -max..max) {
                             addProperty((center + i).parseChar(), i)
                         }
                     })
-                })
+                }
             }
             PackGenerator.addTask(resource.font + "$encode.json") {
                 jsonObjectOf("providers" to it).toByteArray()

dist/src/main/kotlin/kr/toxicity/hud/dependency/DependencyInjector.kt

@@ -4,7 +4,6 @@ import kr.toxicity.hud.api.BetterHudDependency
 import kr.toxicity.hud.api.BetterHudLogger
 import kr.toxicity.hud.util.subFile
 import kr.toxicity.hud.util.subFolder
-import kr.toxicity.hud.util.toYaml
 import me.lucko.jarrelocator.JarRelocator
 import me.lucko.jarrelocator.Relocation
 import java.io.File
@@ -95,8 +94,8 @@ class DependencyInjector(version: String, dataFolder: File, private val logger:
         }
 
         fun addURL(url: URL) {
-            unopenedURLs.add(url)
-            pathURLs.add(url)
+            unopenedURLs += url
+            pathURLs += url
         }
     }
 

dist/src/main/kotlin/kr/toxicity/hud/element/HeadElement.kt

@@ -0,0 +1,13 @@
+package kr.toxicity.hud.element
+
+import kr.toxicity.hud.api.yaml.YamlObject
+import kr.toxicity.hud.configuration.HudConfiguration
+import kr.toxicity.hud.placeholder.ConditionSource
+
+class HeadElement(
+    override val path: String,
+    val name: String,
+    yaml: YamlObject
+) : HudConfiguration, HudElement, ConditionSource by ConditionSource.Impl(yaml) {
+    val pixel = yaml.getAsInt("pixel", 1).coerceAtLeast(1)
+}

dist/src/main/kotlin/kr/toxicity/hud/element/HudElement.kt

@@ -0,0 +1,5 @@
+package kr.toxicity.hud.element
+
+import kr.toxicity.hud.placeholder.ConditionSource
+
+interface HudElement : ConditionSource

dist/src/main/kotlin/kr/toxicity/hud/image/HudImage.kt dist/src/main/kotlin/kr/toxicity/hud/element/ImageElement.kt

@@ -1,25 +1,25 @@
-package kr.toxicity.hud.image
+package kr.toxicity.hud.element
 
 import kr.toxicity.hud.api.yaml.YamlArray
 import kr.toxicity.hud.api.yaml.YamlElement
 import kr.toxicity.hud.api.yaml.YamlObject
 import kr.toxicity.hud.configuration.HudConfiguration
+import kr.toxicity.hud.image.NamedLoadedImage
 import kr.toxicity.hud.image.enums.ImageType
 import kr.toxicity.hud.manager.ImageManager
 import kr.toxicity.hud.manager.ListenerManagerImpl
 import kr.toxicity.hud.manager.PlaceholderManagerImpl
 import kr.toxicity.hud.placeholder.Conditions
+import kr.toxicity.hud.placeholder.ConditionSource
 import kr.toxicity.hud.util.ifNull
-import kr.toxicity.hud.util.toConditions
 
-class HudImage(
+class ImageElement(
     override val path: String,
     val name: String,
     val image: List<NamedLoadedImage>,
     val type: ImageType,
     setting: YamlObject
-) : HudConfiguration {
-    val conditions = setting.toConditions()
+) : HudConfiguration, HudElement, ConditionSource by ConditionSource.Impl(setting) {
     val listener = setting["listener"]?.asObject()?.let {
         ListenerManagerImpl.getListener(it)
     }