Skip to content

UTextComponent: fix inconsistencies in toFormattedString #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

UTextComponent: fix inconsistencies in toFormattedString #103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a22f236
UTextComponent: fix inconsistencies in `toFormattedString`
My-Name-Is-Jeff Apr 26, 2025
42dbd91
fix mapping issues
My-Name-Is-Jeff Apr 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 21 additions & 44 deletions src/main/kotlin/gg/essential/universal/utils/textUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,69 +3,46 @@ package gg.essential.universal.utils
import net.minecraft.util.IChatComponent

//#if MC>=11600
//$$ import net.minecraft.util.ICharacterConsumer
//$$ import net.minecraft.util.text.Color
//$$ import net.minecraft.util.text.Style
//$$ import net.minecraft.util.text.TextFormatting
//$$ import java.util.Optional
//#endif

//#if MC>=11602
//$$ private class TextBuilder(private val isFormatted: Boolean) : ICharacterConsumer {
//$$ private val builder = StringBuilder()
//$$ private var cachedStyle: Style? = null
//$$ private val colorToFormatChar = TextFormatting.values().mapNotNull { format ->
//$$ Color.fromTextFormatting(format)?.let { it to format }
//$$ }.toMap()
//$$
//$$ override fun accept(index: Int, style: Style, codePoint: Int): Boolean {
//$$ if (isFormatted && style != cachedStyle) {
//$$ cachedStyle = style
//$$ builder.append(formatString(style))
//$$ }
//$$
//$$ builder.append(codePoint.toChar())
//$$ return true
//$$ }
//$$
//$$ fun getString() = builder.toString()
//$$
//$$ private fun formatString(style: Style): String {
//$$ val builder = StringBuilder("§r")
//$$
//$$ when {
//$$ style.bold -> builder.append("§l")
//$$ style.italic -> builder.append("§o")
//$$ style.underlined -> builder.append("§n")
//$$ style.strikethrough -> builder.append("§m")
//$$ style.obfuscated -> builder.append("§k")
//$$ }
//$$
//$$ style.color?.let(colorToFormatChar::get)?.let {
//$$ builder.append(it)
//$$ }
//$$ return builder.toString()
//$$ }
//$$
//$$ companion object {
//$$ private val colorToFormatChar = TextFormatting.values().mapNotNull { format ->
//$$ Color.fromTextFormatting(format)?.let { it to format }
//$$ }.toMap()
//$$ }
//$$ private fun formatString(style: Style): String = buildString {
//$$ style.color?.let(colorToFormatChar::get)?.let(::append)
//$$ if (style.bold) append("§l")
//$$ if (style.italic) append("§o")
//$$ if (style.underlined) append("§n")
//$$ if (style.obfuscated) append("§k")
//$$ if (style.strikethrough) append("§m")
//$$ }
//#endif

fun IChatComponent.toUnformattedString(): String {
//#if MC>=11600
//$$ val builder = TextBuilder(false)
//$$ func_241878_f().accept(builder)
//$$ return builder.getString()
//$$ return string
//#else
return unformattedText
//#endif
}

fun IChatComponent.toFormattedString(): String {
//#if MC>=11600
//$$ val builder = TextBuilder(true)
//$$ func_241878_f().accept(builder)
//$$ return builder.getString()
//$$ return buildString {
//$$ append(formatString(style))
//$$ [email protected]<String> {
//$$ append(it)
//$$ Optional.empty()
//$$ }
//$$ append("§r")
//$$ siblings.forEach { append(it.toFormattedString()) }
//$$ }
//#else
return formattedText
//#endif
Expand Down