[2.3.17] Support Head

ItsFlicker · ItsFlicker · commit 3301c713f2c5 · 2026-01-01T14:12:06.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .gradle
 .idea
+.kotlin
 build
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,6 +36,7 @@ subprojects {
             )
             install(JavaScript)
             install(Bukkit, BungeeCord, Velocity)
+            modules.remove("minecraft-chat")
             disableOnSkippedVersion = false
 //            disableOnUnsupportedVersion = false
         }
@@ -62,7 +63,7 @@ subprojects {
         compileOnly(kotlin("stdlib"))
         compileOnly("com.google.code.gson:gson:2.8.5")
         compileOnly("com.google.guava:guava:21.0")
-        compileOnly("net.kyori:adventure-api:4.24.0")
+        compileOnly("net.kyori:adventure-api:4.26.1")
     }
 
     // 编译配置
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=me.arasple.mc.trchat
-version=2.3.16
+version=2.3.17
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -25,13 +25,11 @@ taboolib {
 //        }
     }
     relocate("com.eatthepath.uuid.", "${rootProject.group}.library.uuid.")
-//    relocate("net.md_5.bungee", "net.md_5.bungee121")
 //    relocate("com.electronwill.nightconfig", "com.electronwill.nightconfig_3_6_7")
 }
 
 dependencies {
     taboo("com.eatthepath:fast-uuid:0.2.0")
-//    taboo("net.md-5:bungeecord-chat:1.21-R0.3") { isTransitive = false }
 }
 
 tasks {
diff --git a/project/common/build.gradle.kts b/project/common/build.gradle.kts
@@ -1,5 +1,5 @@
 dependencies {
-//    compileOnly(project(":project:module-chat"))
+    compileOnly(project(":project:module-chat"))
     compileOnly("com.eatthepath:fast-uuid:0.2.0")
 }
 
diff --git a/project/module-adventure/build.gradle.kts b/project/module-adventure/build.gradle.kts
@@ -1,8 +1,8 @@
 dependencies {
     compileOnly(project(":project:common"))
-//    compileOnly(project(":project:module-chat"))
+    compileOnly(project(":project:module-chat"))
     compileOnly("net.kyori:adventure-platform-bukkit:4.4.1")
-    compileOnly("net.kyori:adventure-text-serializer-plain:4.24.0")
+    compileOnly("net.kyori:adventure-text-serializer-plain:4.26.1")
     // paper native
     compileOnly(fileTree(rootDir.resolve("libs")))
 }
diff --git a/project/module-chat/build.gradle.kts b/project/module-chat/build.gradle.kts
@@ -1,8 +1,8 @@
 dependencies {
     compileOnly("com.google.code.gson:gson:2.8.7")
-    compileOnly("net.md-5:bungeecord-api:1.21-R0.3")
+    compileOnly("net.md-5:bungeecord-api:1.21-R0.4")
     compileOnly("net.kyori:adventure-platform-bukkit:4.4.1")
-    compileOnly("net.kyori:adventure-text-serializer-plain:4.24.0")
+    compileOnly("net.kyori:adventure-text-serializer-plain:4.26.1")
 }
 
 taboolib { subproject = true }
diff --git a/project/module-chat/src/main/kotlin/taboolib/module/chat/ComponentText.kt b/project/module-chat/src/main/kotlin/taboolib/module/chat/ComponentText.kt
@@ -1,6 +1,7 @@
 package taboolib.module.chat
 
 import java.awt.Color
+import java.util.*
 
 /**
  * TabooLib
@@ -45,6 +46,9 @@ interface ComponentText : Source {
     /** 添加选择器文本块 */
     fun appendSelector(selector: String): ComponentText
 
+    /** 添加玩家头像文本块 */
+    fun appendHead(name: String? = null, id: UUID? = null, hat: Boolean = true, texture: String? = null): ComponentText
+
     /** 显示文本 */
     fun hoverText(text: String): ComponentText
 
diff --git a/project/module-chat/src/main/kotlin/taboolib/module/chat/impl/AdventureComponent.kt b/project/module-chat/src/main/kotlin/taboolib/module/chat/impl/AdventureComponent.kt
@@ -9,6 +9,7 @@ import net.kyori.adventure.text.event.ClickEvent
 import net.kyori.adventure.text.event.HoverEvent
 import net.kyori.adventure.text.format.TextColor
 import net.kyori.adventure.text.format.TextDecoration
+import net.kyori.adventure.text.`object`.ObjectContents
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer
@@ -114,6 +115,19 @@ class AdventureComponent() : ComponentText {
         return this
     }
 
+    override fun appendHead(name: String?, id: UUID?, hat: Boolean, texture: String?): ComponentText {
+        flush()
+        latest += Component.`object`(ObjectContents.playerHead().also {
+            it.name(name)
+            it.id(id)
+            it.hat(hat)
+            if (texture != null) {
+                it.texture(Key.key(texture))
+            }
+        }.build())
+        return this
+    }
+
     override fun hoverText(text: String): ComponentText {
         return hoverText(ComponentText.of(text))
     }
diff --git a/project/module-chat/src/main/kotlin/taboolib/module/chat/impl/DefaultComponent.kt b/project/module-chat/src/main/kotlin/taboolib/module/chat/impl/DefaultComponent.kt
@@ -6,13 +6,16 @@ import net.md_5.bungee.api.chat.*
 import net.md_5.bungee.api.chat.hover.content.Entity
 import net.md_5.bungee.api.chat.hover.content.Item
 import net.md_5.bungee.api.chat.hover.content.Text
+import net.md_5.bungee.api.chat.objects.PlayerObject
+import net.md_5.bungee.api.chat.player.Profile
 import net.md_5.bungee.chat.ComponentSerializer
 import taboolib.common.UnsupportedVersionException
 import taboolib.common.platform.ProxyCommandSender
 import taboolib.common.platform.ProxyPlayer
 import taboolib.common.platform.function.onlinePlayers
 import taboolib.module.chat.*
 import java.awt.Color
+import java.util.*
 
 /**
  * TabooLib
@@ -125,6 +128,12 @@ class DefaultComponent() : ComponentText {
         return this
     }
 
+    override fun appendHead(name: String?, id: UUID?, hat: Boolean, texture: String?): ComponentText {
+        flush()
+        latest += ObjectComponent(PlayerObject(Profile(name, id, null), hat))
+        return this
+    }
+
     override fun hoverText(text: String): ComponentText {
         return hoverText(ComponentText.of(text))
     }
diff --git a/project/module-compat/build.gradle.kts b/project/module-compat/build.gradle.kts
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     compileOnly(project(":project:common"))
-//    compileOnly(project(":project:module-chat"))
+    compileOnly(project(":project:module-chat"))
     compileOnly("ink.ptms.core:v12107:12107:universal")
 
     compileOnly("com.discordsrv:discordsrv:1.26.0") { isTransitive = false }
diff --git a/project/module-nms/build.gradle.kts b/project/module-nms/build.gradle.kts
@@ -1,6 +1,6 @@
 dependencies {
     compileOnly(project(":project:common"))
-//    compileOnly(project(":project:module-chat"))
+    compileOnly(project(":project:module-chat"))
 //    compileOnly("ink.ptms.core:v12107:12107:mapped")
 //    compileOnly("ink.ptms.core:v12005:12005:mapped")
     compileOnly("ink.ptms.core:v12004:12004:mapped")
diff --git a/project/runtime-bukkit/build.gradle.kts b/project/runtime-bukkit/build.gradle.kts
@@ -5,7 +5,7 @@ repositories {
 dependencies {
     compileOnly(project(":project:common"))
     compileOnly(project(":project:module-adventure"))
-//    compileOnly(project(":project:module-chat"))
+    compileOnly(project(":project:module-chat"))
     compileOnly(project(":project:module-compat"))
     compileOnly(project(":project:module-nms"))
     compileOnly("ink.ptms.core:v12105:12105:universal")
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/conf/Loader.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/conf/Loader.kt
@@ -12,6 +12,7 @@ import me.arasple.mc.trchat.module.display.format.Format
 import me.arasple.mc.trchat.module.display.format.Group
 import me.arasple.mc.trchat.module.display.format.JsonComponent
 import me.arasple.mc.trchat.module.display.format.MsgComponent
+import me.arasple.mc.trchat.module.display.format.obj.Head
 import me.arasple.mc.trchat.module.display.format.obj.Style
 import me.arasple.mc.trchat.module.display.format.obj.Text
 import me.arasple.mc.trchat.module.display.function.CustomFunction
@@ -248,8 +249,9 @@ object Loader {
             val defaultColor = content["default-color"]!!.serialize().map { CustomColor.get(it.first) to it.second.getCondition() }
             MsgComponent(defaultColor, style.filterNotNull())
         } else {
-            val text = Property.serialize(content["text"] ?: "null").map { Text(it.first, it.second.getCondition()) }
-            JsonComponent(text, style.filterNotNull())
+            val text = content["text"]?.serialize()?.map { Text(it.first, it.second.getCondition()) } ?: emptyList()
+            val head = content["head"]?.serialize()?.map { Head(it.first, it.second.getCondition()) } ?: emptyList()
+            JsonComponent(text, head, style.filterNotNull())
         }
     }
 
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/JsonComponent.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/JsonComponent.kt
@@ -1,5 +1,6 @@
 package me.arasple.mc.trchat.module.display.format
 
+import me.arasple.mc.trchat.module.display.format.obj.Head
 import me.arasple.mc.trchat.module.display.format.obj.Style
 import me.arasple.mc.trchat.module.display.format.obj.Style.Companion.applyTo
 import me.arasple.mc.trchat.module.display.format.obj.Text
@@ -13,12 +14,15 @@ import taboolib.module.chat.Components
  * @date 2019/11/30 12:42
  */
 open class JsonComponent(
-    val text: List<Text>?,
+    val text: List<Text>? = null,
+    val head: List<Head>? = null,
     val style: List<Style>
 ) {
 
     open fun toTextComponent(sender: CommandSender, vararg vars: String): ComponentText {
-        val component = text?.firstOrNull { it.condition.pass(sender) }?.process(sender, *vars) ?: Components.empty()
+        val component = Components.empty()
+        head?.firstOrNull { it.condition.pass(sender) }?.process(sender, *vars)?.let { component += it }
+        text?.firstOrNull { it.condition.pass(sender) }?.process(sender, *vars)?.let { component += it }
         style.forEach {
             it.applyTo(component, sender, *vars)
         }
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/MsgComponent.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/MsgComponent.kt
@@ -23,7 +23,7 @@ import taboolib.module.chat.impl.AdventureComponent
  * @author ItsFlicker
  * @since 2021/12/12 13:46
  */
-class MsgComponent(val defaultColor: List<Pair<CustomColor, Condition?>>, style: List<Style>) : JsonComponent(null, style) {
+class MsgComponent(val defaultColor: List<Pair<CustomColor, Condition?>>, style: List<Style>) : JsonComponent(style = style) {
 
     private fun processComponent(sender: CommandSender, msg: TextComponent, disabledFunctions: List<String>, depth: Int = 1): TextComponent {
         val children = msg.children().map { processComponent(sender, it as TextComponent, disabledFunctions, depth + 1) }
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/obj/Head.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/obj/Head.kt
@@ -0,0 +1,34 @@
+package me.arasple.mc.trchat.module.display.format.obj
+
+import me.arasple.mc.trchat.module.internal.script.Condition
+import me.arasple.mc.trchat.module.internal.script.kether.KetherHandler
+import me.arasple.mc.trchat.util.setPlaceholders
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import taboolib.common.util.replaceWithOrder
+import taboolib.common5.cbool
+import taboolib.common5.util.parseUUID
+import taboolib.module.chat.ComponentText
+import taboolib.module.chat.Components
+
+class Head(content: String, condition: Condition?) : Text(content.split(':')[0], condition) {
+
+    val hat = (content.split(':').getOrNull(1) ?: "true").cbool
+
+    override fun process(sender: CommandSender, vararg vars: String): ComponentText {
+        var text = KetherHandler.parseInline(content, sender)
+        if (sender is Player && dynamic) {
+            text = text.setPlaceholders(sender)
+        }
+        text = text.replaceWithOrder(*vars)
+        val uuid = text.parseUUID()
+        return if (uuid != null) {
+            Components.empty().appendHead(id = uuid, hat = hat)
+        } else if (text.contains('/')) {
+            Components.empty().appendHead(texture = text, hat = hat)
+        } else {
+            Components.empty().appendHead(name = text, hat = hat)
+        }
+    }
+
+}
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/obj/Text.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/obj/Text.kt
@@ -17,18 +17,16 @@ import taboolib.module.chat.Components
  * @author ItsFlicker
  * @since 2022/1/21 23:21
  */
-class Text(val content: String, val condition: Condition?) {
+open class Text(val content: String, val condition: Condition?) {
 
     val dynamic = papiRegex.containsMatchIn(content)
 
-    fun process(sender: CommandSender, vararg vars: String): ComponentText {
+    open fun process(sender: CommandSender, vararg vars: String): ComponentText {
         var text = KetherHandler.parseInline(content, sender)
-        if (sender is Player) {
-            if (dynamic) {
-                text = text.setPlaceholders(sender)
-            }
-            text = hookItemsAdder.replaceFontImages(text, null)
+        if (sender is Player && dynamic) {
+            text = text.setPlaceholders(sender)
         }
+        text = hookItemsAdder.replaceFontImages(text, null)
         text = text.replaceWithOrder(*vars).colorify()
         return if (isDragonCoreHooked) {
             Components.text(text, color = false)
diff --git a/project/runtime-bungee/build.gradle.kts b/project/runtime-bungee/build.gradle.kts
@@ -1,6 +1,6 @@
 dependencies {
     compileOnly(project(":project:common"))
-//    compileOnly(project(":project:module-chat"))
+    compileOnly(project(":project:module-chat"))
     compileOnly("net.md-5:bungeecord-api:1.21-R0.3")
 }
 
diff --git a/project/runtime-velocity/build.gradle.kts b/project/runtime-velocity/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 dependencies {
     compileOnly(project(":project:common"))
-//    compileOnly(project(":project:module-chat"))
+    compileOnly(project(":project:module-chat"))
     compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,7 +3,7 @@ rootProject.name = "TrChat"
 include("plugin")
 include("project:common")
 include("project:module-adventure")
-//include("project:module-chat")
+include("project:module-chat")
 include("project:module-compat")
 include("project:module-nms")
 include("project:runtime-bukkit")

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 .gradle
 .idea
 +.kotlin
 build
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ subprojects {`
`36`	`36`	`)`
`37`	`37`	`install(JavaScript)`
`38`	`38`	`install(Bukkit, BungeeCord, Velocity)`
	`39`	`+ modules.remove("minecraft-chat")`
`39`	`40`	`disableOnSkippedVersion = false`
`40`	`41`	`// disableOnUnsupportedVersion = false`
`41`	`42`	`}`
`@@ -62,7 +63,7 @@ subprojects {`
`62`	`63`	`compileOnly(kotlin("stdlib"))`
`63`	`64`	`compileOnly("com.google.code.gson:gson:2.8.5")`
`64`	`65`	`compileOnly("com.google.guava:guava:21.0")`
`65`		`- compileOnly("net.kyori:adventure-api:4.24.0")`
	`66`	`+ compileOnly("net.kyori:adventure-api:4.26.1")`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`// 编译配置`
Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,11 @@ taboolib {`
`25`	`25`	`// }`
`26`	`26`	`}`
`27`	`27`	`relocate("com.eatthepath.uuid.", "${rootProject.group}.library.uuid.")`
`28`		`-// relocate("net.md_5.bungee", "net.md_5.bungee121")`
`29`	`28`	`// relocate("com.electronwill.nightconfig", "com.electronwill.nightconfig_3_6_7")`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`dependencies {`
`33`	`32`	`taboo("com.eatthepath:fast-uuid:0.2.0")`
`34`		`-// taboo("net.md-5:bungeecord-chat:1.21-R0.3") { isTransitive = false }`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`tasks {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dependencies {`
`2`		`-// compileOnly(project(":project:module-chat"))`
	`2`	`+ compileOnly(project(":project:module-chat"))`
`3`	`3`	`compileOnly("com.eatthepath:fast-uuid:0.2.0")`
`4`	`4`	`}`
`5`	`5`