star/KSpigot
1
0
Fork 0
Code Pull Requests Packages Activity

Merge pull request #35 from l4zs/master

Browse Source 
fix nested styling
This commit is contained in:
Jakob K
2022-01-19 17:05:18 +01:00
committed by GitHub
parent 31925b60a0 bfe48d6cd4
commit 6fc08cbbee
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/kotlin/net/axay/kspigot/chat/LiteralTextBuilder.kt
View File

@@ -8,7 +8,6 @@ import net.kyori.adventure.text.Component.newline
import net.kyori.adventure.text.event.ClickEvent import net.kyori.adventure.text.event.ClickEvent
import net.kyori.adventure.text.event.HoverEvent import net.kyori.adventure.text.event.HoverEvent
import net.kyori.adventure.text.format.TextColor import net.kyori.adventure.text.format.TextColor
import net.kyori.adventure.text.format.TextColor.color
import net.kyori.adventure.text.format.TextDecoration import net.kyori.adventure.text.format.TextDecoration
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
import org.bukkit.entity.Entity import org.bukkit.entity.Entity
@@ -176,7 +175,15 @@ class LiteralTextBuilder(val internalText: Component) {
} }
fun build(): Component { fun build(): Component {
var style = internalText.style() return if (siblingText.children().isNotEmpty()) {
internalText.stylize().append(siblingText.stylize())
} else {
internalText.stylize()
}
}
private fun Component.stylize(): Component {
var style = style()
val decorations = style.decorations().toMutableMap() val decorations = style.decorations().toMutableMap()
decorations[TextDecoration.BOLD] = TextDecoration.State.byBoolean(this@LiteralTextBuilder.bold) decorations[TextDecoration.BOLD] = TextDecoration.State.byBoolean(this@LiteralTextBuilder.bold)
decorations[TextDecoration.ITALIC] = TextDecoration.State.byBoolean(this@LiteralTextBuilder.italic) decorations[TextDecoration.ITALIC] = TextDecoration.State.byBoolean(this@LiteralTextBuilder.italic)
@@ -184,15 +191,11 @@ class LiteralTextBuilder(val internalText: Component) {
decorations[TextDecoration.STRIKETHROUGH] = TextDecoration.State.byBoolean(this@LiteralTextBuilder.strikethrough) decorations[TextDecoration.STRIKETHROUGH] = TextDecoration.State.byBoolean(this@LiteralTextBuilder.strikethrough)
decorations[TextDecoration.OBFUSCATED] = TextDecoration.State.byBoolean(this@LiteralTextBuilder.obfuscate) decorations[TextDecoration.OBFUSCATED] = TextDecoration.State.byBoolean(this@LiteralTextBuilder.obfuscate)
style = style.decorations(decorations) style = style.decorations(decorations)
this@LiteralTextBuilder.color?.let { style = style.color(color(it)) } this@LiteralTextBuilder.color?.let { style = style.color(it) }
this@LiteralTextBuilder.clickEvent?.let { style = style.clickEvent(it) } this@LiteralTextBuilder.clickEvent?.let { style = style.clickEvent(it) }
this@LiteralTextBuilder.hoverEvent?.let { style = style.hoverEvent(it) } this@LiteralTextBuilder.hoverEvent?.let { style = style.hoverEvent(it) }
return if (siblingText.children().isNotEmpty()) { return this.style(style)
internalText.append(siblingText).style(style)
} else {
internalText.style(style)
}
} }
} }