chore: Use components instead of legacy colors

osipxd · osipxd · commit 3b85a008d2e4 · 2025-04-23T10:08:26.000+02:00
diff --git a/mimic-bukkit/src/main/kotlin/command/ClassSystemSubcommand.kt b/mimic-bukkit/src/main/kotlin/command/ClassSystemSubcommand.kt
@@ -23,7 +23,12 @@ import dev.jorel.commandapi.executors.PlayerCommandExecutor
 import dev.jorel.commandapi.kotlindsl.greedyStringArgument
 import dev.jorel.commandapi.kotlindsl.playerArgument
 import dev.jorel.commandapi.kotlindsl.subcommand
+import net.kyori.adventure.text.TextComponent
+import net.kyori.adventure.text.format.NamedTextColor
 import ru.endlesscode.mimic.Mimic
+import ru.endlesscode.mimic.internal.append
+import ru.endlesscode.mimic.internal.appendLine
+import ru.endlesscode.mimic.internal.text
 
 /**
  * Commands to deal with class systems.
@@ -51,11 +56,15 @@ private fun infoCommandExecutor(mimic: Mimic) = PlayerCommandExecutor { player,
     val target = args.getOrDefaultUnchecked(TARGET, player)
     val provider = mimic.getClassSystemProvider()
     val system = provider.getSystem(target)
-    player.send(
-        "&3System: &7${provider.id}",
-        "&3Classes: &7${system.classes}",
-        "&3Primary: &7${system.primaryClass}",
-    )
+
+    val message = text {
+        appendStats(
+            "System" to provider.id,
+            "Classes" to system.classes.toString(),
+            "Primary" to system.primaryClass.toString(),
+        )
+    }
+    player.sendMessage(message)
 }
 
 private fun checkCommandExecutor(mimic: Mimic) = PlayerCommandExecutor { player, args ->
@@ -65,14 +74,26 @@ private fun checkCommandExecutor(mimic: Mimic) = PlayerCommandExecutor { player,
     val system = mimic.getClassSystem(target)
     val hasAllClasses = system.hasAllClasses(classes)
     val hasAnyOfClasses = system.hasAnyOfClasses(classes)
-    target.send(
-        "&6Player '${target.name}':",
-        "&6- has any of: ${hasAnyOfClasses.toChatMessage()}",
-        "&6- has all: ${hasAllClasses.toChatMessage()}",
-    )
+
+    val message = text {
+        color(NamedTextColor.GOLD)
+        appendLine("Player '${target.name}':")
+        append("- has any of: ")
+        appendStatus(hasAnyOfClasses)
+        appendLine()
+        append("- has all: ")
+        appendStatus(hasAllClasses)
+    }
+    target.sendMessage(message)
 }
 
-private fun Boolean.toChatMessage(): String = if (this) "&ayes" else "&cno"
+private fun TextComponent.Builder.appendStatus(status: Boolean) {
+    if (status) {
+        append("yes", NamedTextColor.GREEN)
+    } else {
+        append("no", NamedTextColor.RED)
+    }
+}
 
 private const val TARGET = "target"
 private const val CLASSES = "classes"
diff --git a/mimic-bukkit/src/main/kotlin/command/InventorySubcommand.kt b/mimic-bukkit/src/main/kotlin/command/InventorySubcommand.kt
@@ -6,6 +6,7 @@ import dev.jorel.commandapi.kotlindsl.playerExecutor
 import dev.jorel.commandapi.kotlindsl.subcommand
 import ru.endlesscode.mimic.ExperimentalMimicApi
 import ru.endlesscode.mimic.Mimic
+import ru.endlesscode.mimic.internal.text
 
 /**
  * Commands to deal with inventory provider.
@@ -24,12 +25,16 @@ internal fun CommandAPICommand.inventorySubcommand(mimic: Mimic) = subcommand("i
             val target = args.getOrDefaultUnchecked(TARGET, sender)
             val provider = mimic.getPlayerInventoryProvider()
             val inventory = provider.getSystem(target)
-            sender.send(
-                "&3Inventory provider: &7${provider.id}",
-                "&3Count of Equipped: &7%d".format(inventory.equippedItems.size),
-                "&3Count of Stored: &7%d".format(inventory.storedItems.size),
-                "&3Total Count: &7%d".format(inventory.items.size),
-            )
+
+            val message = text {
+                appendStats(
+                    "Inventory provider" to provider.id,
+                    "Count of Equipped" to inventory.equippedItems.size.toString(),
+                    "Count of Stored" to inventory.storedItems.size.toString(),
+                    "Total Count" to inventory.items.size.toString(),
+                )
+            }
+            sender.sendMessage(message)
         }
     }
 }
diff --git a/mimic-bukkit/src/main/kotlin/command/ItemsSubcommand.kt b/mimic-bukkit/src/main/kotlin/command/ItemsSubcommand.kt
@@ -23,9 +23,14 @@ import dev.jorel.commandapi.CommandAPICommand
 import dev.jorel.commandapi.arguments.ArgumentSuggestions
 import dev.jorel.commandapi.executors.CommandExecutor
 import dev.jorel.commandapi.kotlindsl.*
+import net.kyori.adventure.text.format.NamedTextColor
 import org.bukkit.entity.Player
 import ru.endlesscode.mimic.impl.mimic.MimicItemsRegistry
+import ru.endlesscode.mimic.internal.append
+import ru.endlesscode.mimic.internal.appendLine
+import ru.endlesscode.mimic.internal.text
 import ru.endlesscode.mimic.items.BukkitItemsRegistry
+import ru.endlesscode.mimic.items.unwrap
 
 /**
  * Commands to deal with items registries
@@ -59,15 +64,15 @@ internal fun CommandAPICommand.itemsSubcommand(itemsRegistry: BukkitItemsRegistr
         playerExecutor { sender, args ->
             val item: String by args
             val isSame = itemsRegistry.isSameItem(sender.inventory.itemInMainHand, item)
-            sender.send("&6Item in hand and '$item' %s same.".format(if (isSame) "are" else "aren't"))
+            sender.sendMessage(successText("Item in hand and '$item' %s same.".format(if (isSame) "are" else "aren't")))
         }
     }
 
     subcommand("id") {
         withShortDescription("Prints ID of item in hand")
         playerExecutor { sender, _ ->
             val id = itemsRegistry.getItemId(sender.inventory.itemInMainHand)
-            sender.send("&6Id of item in hand is '$id'")
+            sender.sendMessage(successText("Id of item in hand is '$id'"))
         }
     }
 
@@ -77,48 +82,51 @@ internal fun CommandAPICommand.itemsSubcommand(itemsRegistry: BukkitItemsRegistr
         anyExecutor { sender, args ->
             val item: String by args
             val itemExists = itemsRegistry.isItemExists(item)
-            sender.send("&6Item with id '$item'%s exists".format(if (itemExists) "" else " isn't"))
+            sender.sendMessage(successText("Item with id '$item'%s exists".format(if (itemExists) "" else " isn't")))
         }
     }
 }
 
 // We can use only greedy string if we need to allow colons because it requires quoting in non-greedy strings.
 // https://github.com/Mojang/brigadier/blob/cf754c4ef654160dca946889c11941634c5db3d5/src/main/java/com/mojang/brigadier/StringReader.java#L169
-private fun CommandAPICommand.itemArgument(itemsRegistry: BukkitItemsRegistry) = greedyStringArgument(ITEM) {
-    replaceSuggestions(ArgumentSuggestions.stringCollection { itemsRegistry.knownIds })
+private fun CommandAPICommand.itemArgument(itemRegistry: BukkitItemsRegistry) = greedyStringArgument(ITEM) {
+    replaceSuggestions(ArgumentSuggestions.stringCollection { itemRegistry.knownIds })
 }
 
-private fun infoExecutor(itemsRegistry: BukkitItemsRegistry) = CommandExecutor { sender, _ ->
-    val registries = (itemsRegistry as? MimicItemsRegistry)?.providers
-        .orEmpty()
-        .map { it.provider }
-        .map { "  &f${it.id}: &7${it.knownIds.size}" }
+private fun infoExecutor(itemRegistry: BukkitItemsRegistry) = CommandExecutor { sender, _ ->
+    val providers = (itemRegistry.unwrap() as? MimicItemsRegistry)?.providers.orEmpty().map { it.provider }
 
-    sender.send(
-        "&3Items Service: &7${itemsRegistry.id}",
-        "&3Known IDs amount: &7${itemsRegistry.knownIds.size}"
-    )
-    sender.send(registries)
+    val message = text {
+        appendStats(
+            "Item Registry" to itemRegistry.id,
+            "Known IDs amount" to itemRegistry.knownIds.size.toString(),
+        )
+
+        for (provider in providers) {
+            append("  ${provider.id}: ", NamedTextColor.WHITE)
+            appendLine(provider.knownIds.size.toString(), NamedTextColor.GRAY)
+        }
+    }
+    sender.sendMessage(message)
 }
 
-private fun giveExecutor(itemsRegistry: BukkitItemsRegistry) = CommandExecutor { sender, args ->
+private fun giveExecutor(itemRegistry: BukkitItemsRegistry) = CommandExecutor { sender, args ->
     val target: Player by args
     val amount = args.getOrDefaultUnchecked(AMOUNT, 1)
     // We can use only one greedy string at the end, so we read item and its payload from the same argument
     val itemParts = args.getRaw(ITEM).orEmpty().split(" ", limit = 2)
     val item = itemParts.first()
     val payload = itemParts.getOrNull(1)
 
-    val itemStack = itemsRegistry.getItem(item, payload, amount)
+    val itemStack = itemRegistry.getItem(item, payload, amount)
     if (itemStack != null) {
         target.inventory.addItem(itemStack)
-        sender.send("&6Gave ${itemStack.amount} [$item] to ${target.name}.")
+        sender.sendMessage(successText("Gave ${itemStack.amount} [$item] to ${target.name}."))
     } else {
-        sender.send("&cUnknown item '$item'.")
+        sender.sendMessage(errorText("Unknown item '$item'"))
     }
 }
 
 private const val TARGET = "target"
 private const val ITEM = "item"
 private const val AMOUNT = "amount"
-private const val PAYLOAD = "payload"
diff --git a/mimic-bukkit/src/main/kotlin/command/LevelSystemSubcommand.kt b/mimic-bukkit/src/main/kotlin/command/LevelSystemSubcommand.kt
@@ -24,9 +24,11 @@ import dev.jorel.commandapi.CommandAPICommand
 import dev.jorel.commandapi.arguments.ArgumentSuggestions
 import dev.jorel.commandapi.executors.PlayerCommandExecutor
 import dev.jorel.commandapi.kotlindsl.*
+import net.kyori.adventure.text.TextComponent
 import org.bukkit.command.CommandSender
 import ru.endlesscode.mimic.Mimic
 import ru.endlesscode.mimic.internal.Log
+import ru.endlesscode.mimic.internal.text
 import ru.endlesscode.mimic.level.BukkitLevelSystem
 import kotlin.math.roundToInt
 
@@ -97,12 +99,17 @@ private fun infoCommandExecutor(mimic: Mimic) = PlayerCommandExecutor { sender,
     val target = args.getOrDefaultUnchecked(TARGET, sender)
     val provider = mimic.getLevelSystemProvider()
     val system = provider.getSystem(target)
-    sender.send(
-        "&3System: &7${provider.id}",
-        "&3Level: &7%.2f".format(system.level + system.fractionalExp),
-        "&3Exp: &7%.1f &8| &3To next level: &7%.1f".format(system.exp, system.expToNextLevel),
-        "&3Total exp: &7%.1f".format(system.totalExp)
-    )
+
+    val message = text {
+        appendStats(
+            "System" to provider.id,
+            "Level" to "%.2f".format(system.level + system.fractionalExp),
+            "Exp" to "%.1f".format(system.exp),
+            "Exp to next level" to "%.1f".format(system.expToNextLevel),
+            "Total exp" to "%.1f".format(system.totalExp)
+        )
+    }
+    target.sendMessage(message)
 }
 
 private fun setCommandExecutor(mimic: Mimic) = PlayerCommandExecutor { sender, args ->
@@ -159,17 +166,17 @@ private inline fun catchUnsupported(block: () -> Unit) {
 }
 
 private fun BukkitLevelSystem.printNewStats(sender: CommandSender) {
-    sender.send("&6New ${player.name}'s stats: $level LVL, %.1f XP".format(exp))
+    sender.sendMessage(successText("New ${player.name}'s stats: $level LVL, %.1f XP".format(exp)))
 }
 
 private fun hasCommandExecutor(mimic: Mimic) = PlayerCommandExecutor { sender, args ->
     val amount: Double by args
     val type = args.getOrDefaultRaw(TYPE, TYPE_LVL)
     val target = args.getOrDefaultUnchecked(TARGET, sender)
 
-    fun buildMessage(has: Boolean, valueType: String): String {
+    fun buildMessage(has: Boolean, valueType: String): TextComponent {
         val hasOrNot = if (has) "has" else "has not"
-        return "&6${target.name} $hasOrNot $amount $valueType."
+        return successText("${target.name} $hasOrNot $amount $valueType.")
     }
 
     val system = mimic.getLevelSystem(target)
@@ -179,7 +186,7 @@ private fun hasCommandExecutor(mimic: Mimic) = PlayerCommandExecutor { sender, a
         TYPE_TOTAL -> buildMessage(system.hasExpTotal(amount), "total experience")
         else -> error("Unexpected type: $type")
     }
-    sender.send(message)
+    sender.sendMessage(message)
 }
 
 private const val TARGET = "target"
diff --git a/mimic-bukkit/src/main/kotlin/command/textUserInterface.kt b/mimic-bukkit/src/main/kotlin/command/textUserInterface.kt
@@ -18,19 +18,19 @@
  */
 package ru.endlesscode.mimic.command
 
-import org.bukkit.ChatColor
-import org.bukkit.command.CommandSender
+import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.TextComponent
+import net.kyori.adventure.text.format.NamedTextColor
+import ru.endlesscode.mimic.internal.append
+import ru.endlesscode.mimic.internal.appendLine
 
-internal fun CommandSender.send(vararg messages: String) {
-    for (message in messages) {
-        sendMessage(message.colored())
-    }
-}
+internal fun successText(text: String) = Component.text(text, NamedTextColor.GOLD)
+internal fun errorText(text: String) = Component.text(text, NamedTextColor.RED)
 
-internal fun CommandSender.send(messages: Collection<String>) {
-    for (message in messages) {
-        sendMessage(message.colored())
+internal fun TextComponent.Builder.appendStats(vararg stats: Pair<String, String>) {
+    for ((key, value) in stats) {
+        append("$key: ", NamedTextColor.DARK_AQUA)
+        append(value, NamedTextColor.GRAY)
+        appendLine()
     }
 }
-
-private fun String.colored(): String = ChatColor.translateAlternateColorCodes('&', this)
diff --git a/mimic-bukkit/src/main/kotlin/internal/Colors.kt b/mimic-bukkit/src/main/kotlin/internal/Colors.kt
@@ -17,6 +17,9 @@
  * along with BukkitMimic.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// Keep it for now
+@file:Suppress("DEPRECATION")
+
 package ru.endlesscode.mimic.internal
 
 import org.bukkit.ChatColor
diff --git a/mimic-bukkit/src/main/kotlin/internal/TextComponent.kt b/mimic-bukkit/src/main/kotlin/internal/TextComponent.kt
@@ -17,7 +17,7 @@ internal fun TextComponent.Builder.appendLine(
     vararg decorations: TextDecoration,
 ): TextComponent.Builder = append(text, color, *decorations).appendLine()
 
-internal fun TextComponent.Builder.appendLine(): TextComponent.Builder = append("\n")
+internal fun TextComponent.Builder.appendLine(): TextComponent.Builder = append(Component.newline())
 
 internal fun TextComponent.Builder.append(
     text: String,
diff --git a/mimic-bukkit/src/main/kotlin/items/WrappedItemsRegistry.kt b/mimic-bukkit/src/main/kotlin/items/WrappedItemsRegistry.kt
@@ -7,7 +7,7 @@ import ru.endlesscode.mimic.WrappedMimicService
 import ru.endlesscode.mimic.config.MimicConfig
 
 internal class WrappedItemsRegistry(
-    private val delegate: BukkitItemsRegistry,
+    internal val delegate: BukkitItemsRegistry,
     private val config: MimicConfig,
     pluginName: String,
     pluginManager: PluginManager,
@@ -27,3 +27,5 @@ internal class WrappedItemsRegistry(
 
     override fun getItem(itemId: String, payload: Any?, amount: Int) = delegate.getItem(itemId, payload, amount)
 }
+
+internal fun BukkitItemsRegistry.unwrap() = if (this is WrappedItemsRegistry) delegate else this
