🐛 修复输出格式化问题

Author: wling-art

gradle.properties

@@ -1,2 +1,2 @@
-version=0.0.3
+version=0.0.4
 group=org.crashvibe

src/main/kotlin/org/crashvibe/CalcStack/Command.kt

@@ -81,7 +81,7 @@ class Command : TabExecutor {
           )
         )
         sender.sendMessage(results.quantity.replace("{quantity}", quantity.toString()))
-        sender.sendMessage(formatResultMessage(material.name.lowercase(), "", stackInfo, results.stacks))
+        sender.sendMessage(formatResultMessage(material.name.lowercase(), null, stackInfo, results.stacks))
         sender.sendMessage(results.remaining.replace("{remaining}", stackInfo.remainingItems.toString()))
         sender.sendMessage(
           results.chests.replace("{chests}", stackInfo.chests.toString()).replace("{chest_size}", chestSize.toString())
@@ -194,14 +194,13 @@ fun getCraftingMaterials(
   }
 }
 
-
 fun formatResultMessage(
   ingredient: String,
-  translatedName: String = "",
+  translatedName: Component?,
   stackInfo: StackInfo,
   template: String
-): String {
-  return template
+): Component {
+  val base = template
     .replace("{item}", ingredient)
     .replace("{ingredient}", ingredient)
     .replace("{quantity}", stackInfo.totalStacks.toString())
@@ -210,26 +209,42 @@ fun formatResultMessage(
     .replace("{remaining}", stackInfo.remainingItems.toString())
     .replace("{chests}", stackInfo.chests.toString())
     .replace("{chest_size}", Config.configData.chest_size.toString())
-    .let { if (translatedName.isNotEmpty()) it.replace("{translated_name}", translatedName) else it }
+  return if (translatedName != null) {
+    Component.text(base).replaceText { builder ->
+      builder.matchLiteral("{translated_name}").replacement(translatedName)
+    }
+  } else {
+    Component.text(base)
+  }
 }
 
 fun formatMaterialComponent(material: Material, stackInfo: StackInfo): Component {
   val translated = material.itemTranslationKey?.let { Component.translatable(it) }
     ?: Component.text(material.name.lowercase(Locale.getDefault()))
-  val template = Config.langData.results.ingredients.item
+
+  val itemTpl = Config.langData.results.ingredients.item
+  val stacksTpl = Config.langData.results.ingredients.stacks
+  val remainingTpl = Config.langData.results.ingredients.remaining
+  val chestsTpl = Config.langData.results.ingredients.chests
+
+  val template = listOf(itemTpl, stacksTpl, remainingTpl, chestsTpl).joinToString("\n")
     .replace("{ingredient}", material.name.lowercase(Locale.getDefault()))
     .replace("{quantity}", stackInfo.totalStacks.toString())
     .replace("{stacks}", stackInfo.totalStacks.toString())
     .replace("{stack_size}", stackInfo.maxStackSize.toString())
     .replace("{remaining}", stackInfo.remainingItems.toString())
     .replace("{chests}", stackInfo.chests.toString())
     .replace("{chest_size}", Config.configData.chest_size.toString())
+
   return Component.text(template).replaceText { builder ->
     builder.matchLiteral("{translated_name}").replacement(translated)
   }
 }
 
-
-private fun getTranslatedItemName(material: Material): String {
-  return material.itemTranslationKey ?: material.name.lowercase(Locale.getDefault())
+private fun getTranslatedItemName(material: Material): Component {
+  return material.itemTranslationKey?.let { Component.translatable(it) } ?: Component.text(
+    material.name.lowercase(
+      Locale.getDefault()
+    )
+  )
 }

src/main/kotlin/org/crashvibe/CalcStack/config/Lang.kt

@@ -19,21 +19,21 @@ data class Lang(
   @Configuration
   data class Results(
     var header: String = "§a===== 计算结果 =====",
-    var item: String = "§b物品: {item}({translated_name})",
-    var quantity: String = "§b数量: {quantity}",
-    var stacks: String = "§b堆叠: {stacks} 组 ({stack_size} 个/组)",
-    var remaining: String = "§b剩余: {remaining} 个",
-    var chests: String = "§b需要箱子: {chests} 个 (每个箱子 {chest_size} 格)",
-    var footer: String = "§a====================",
+    var item: String = "§b物品: §r{item}§b(§r{translated_name}§b)",
+    var quantity: String = "§b数量: §r{quantity}",
+    var stacks: String = "§b堆叠: §r{stacks} §b组 (§r{stack_size} §b个/组)",
+    var remaining: String = "§b剩余: §r{remaining} §b个",
+    var chests: String = "§b需要箱子: §r{chests} §b个 (每个箱子 §r{chest_size} §b格)",
     var ingredients: Ingredients = Ingredients(),
+    var footer: String = "§a====================",
   ) {
     @Configuration
     data class Ingredients(
       var header: String = "§a===== 原材料 =====",
-      var item: String = "§b- {ingredient}({translated_name}): {quantity} 个",
-      var stacks: String = "  §7- {stacks} 组 ({stack_size} 个/组)",
-      var remaining: String = "  §7- 剩余 {remaining} 个",
-      var chests: String = "  §7- 需要箱子: {chests} 个 (每个箱子 {chest_size} 格)",
+      var item: String = "§b- §r{ingredient}§b(§r{translated_name}§b): §r{quantity} §b个",
+      var stacks: String = "  §7- §r{stacks} §7组 (§r{stack_size} §7个/组)",
+      var remaining: String = "  §7- 剩余 §r{remaining} §7个",
+      var chests: String = "  §7- 需要箱子: §r{chests} §7个 (每个箱子 §r{chest_size} §7格)",
     )
   }
 }