Fix crash when rendering SkyBlock id in a string

6 files changed, 15 insertions, 30 deletions

diff --git a/src/main/kotlin/moe/nea/firmament/features/chat/QuickCommands.kt b/src/main/kotlin/moe/nea/firmament/features/chat/QuickCommands.kt
index c4a9037..47be3c1 100644
--- a/src/main/kotlin/moe/nea/firmament/features/chat/QuickCommands.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/chat/QuickCommands.kt
@@ -46,9 +46,9 @@ object QuickCommands : FirmamentFeature {
                         }
                         val joinName = getNameForFloor(what.replace(" ", "").lowercase())
                         if (joinName == null) {
-                            source.sendFeedback(Text.translatable("firmament.quick-commands.join.unknown",what))
+                            source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown", what))
                         } else {
-                            source.sendFeedback(Text.translatable("firmament.quick-commands.join.success", joinName))
+                            source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.success", joinName))
                             MC.sendCommand("joininstance $joinName")
                         }
                     }
@@ -70,7 +70,7 @@ object QuickCommands : FirmamentFeature {
                 )
             }
             if (l !in kuudraLevelNames.indices) {
-                source.sendFeedback(Text.translatable("firmament.quick-commands.join.unknown-kuudra", kuudraLevel))
+                source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown-kuudra", kuudraLevel))
                 return null
             }
             return "KUUDRA_${kuudraLevelNames[l]}"
@@ -90,7 +90,7 @@ object QuickCommands : FirmamentFeature {
                 return "CATACOMBS_ENTRANCE"
             }
             if (l !in dungeonLevelNames.indices) {
-                source.sendFeedback(Text.translatable("firmament.quick-commands.join.unknown-catacombs", kuudraLevel))
+                source.sendFeedback(Text.stringifiedTranslatable("firmament.quick-commands.join.unknown-catacombs", kuudraLevel))
                 return null
             }
             return "${if (masterLevel != null) "MASTER_" else ""}CATACOMBS_FLOOR_${dungeonLevelNames[l]}"
diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/DeveloperFeatures.kt b/src/main/kotlin/moe/nea/firmament/features/debug/DeveloperFeatures.kt
index 6bf299f..6bbbdf0 100644
--- a/src/main/kotlin/moe/nea/firmament/features/debug/DeveloperFeatures.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/debug/DeveloperFeatures.kt
@@ -47,7 +47,7 @@ object DeveloperFeatures : FirmamentFeature {
             MC.player?.sendMessage(Text.translatable("firmament.dev.resourcerebuild.start"))
             val startTime = TimeMark.now()
             process.toHandle().onExit().thenApply {
-                MC.player?.sendMessage(Text.translatable("firmament.dev.resourcerebuild.done", startTime.passedTime()))
+                MC.player?.sendMessage(Text.stringifiedTranslatable("firmament.dev.resourcerebuild.done", startTime.passedTime()))
                 Unit
             }
         } else {
diff --git a/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt b/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt
index 4140490..3545f21 100644
--- a/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/debug/PowerUserTools.kt
@@ -54,7 +54,7 @@ object PowerUserTools : FirmamentFeature {
         ItemTooltipEvent.subscribe {
             if (TConfig.showItemIds) {
                 val id = it.stack.skyBlockId ?: return@subscribe
-                it.lines.add(Text.translatable("firmament.tooltip.skyblockid", id.neuItem))
+                it.lines.add(Text.stringifiedTranslatable("firmament.tooltip.skyblockid", id.neuItem))
             }
             val (item, text) = lastCopiedStack ?: return@subscribe
             if (!ItemStack.areEqual(item, it.stack)) {
@@ -83,7 +83,7 @@ object PowerUserTools : FirmamentFeature {
                     MC.sendChat(Text.translatable("firmament.tooltip.copied.skull.fail"))
                 } else {
                     ClipboardUtils.setTextContent(id.toString())
-                    MC.sendChat(Text.translatable("firmament.tooltip.copied.skull", id.toString()))
+                    MC.sendChat(Text.stringifiedTranslatable("firmament.tooltip.copied.skull", id.toString()))
                 }
             }
         }
@@ -105,7 +105,7 @@ object PowerUserTools : FirmamentFeature {
                     return@subscribe
                 }
                 ClipboardUtils.setTextContent(sbId.neuItem)
-                lastCopiedStack = Pair(item, Text.translatable("firmament.tooltip.copied.skyblockid", sbId.neuItem))
+                lastCopiedStack = Pair(item, Text.stringifiedTranslatable("firmament.tooltip.copied.skyblockid", sbId.neuItem))
             } else if (it.matches(TConfig.copyTexturePackId)) {
                 val model = CustomItemModelEvent.getModelIdentifier(item)
                 if (model == null) {
@@ -113,7 +113,7 @@ object PowerUserTools : FirmamentFeature {
                     return@subscribe
                 }
                 ClipboardUtils.setTextContent(model.toString())
-                lastCopiedStack = Pair(item, Text.translatable("firmament.tooltip.copied.modelid", model.toString()))
+                lastCopiedStack = Pair(item, Text.stringifiedTranslatable("firmament.tooltip.copied.modelid", model.toString()))
             } else if (it.matches(TConfig.copyNbtData)) {
                 val nbt = item.orCreateNbt.toString()
                 ClipboardUtils.setTextContent(nbt)
diff --git a/src/main/kotlin/moe/nea/firmament/features/inventory/PriceData.kt b/src/main/kotlin/moe/nea/firmament/features/inventory/PriceData.kt
index 8062357..aa8982d 100644
--- a/src/main/kotlin/moe/nea/firmament/features/inventory/PriceData.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/inventory/PriceData.kt
@@ -36,24 +36,15 @@ object PriceData : FirmamentFeature {
             if (bazaarData != null) {
                 it.lines.add(Text.literal(""))
                 it.lines.add(
-                    Text.translatable(
-                        "firmament.tooltip.bazaar.sell-order",
-                        FirmFormatters.formatCurrency(bazaarData.quickStatus.sellPrice, 1)
-                    )
+                    Text.stringifiedTranslatable("firmament.tooltip.bazaar.sell-order", FirmFormatters.formatCurrency(bazaarData.quickStatus.sellPrice, 1))
                 )
                 it.lines.add(
-                    Text.translatable(
-                        "firmament.tooltip.bazaar.buy-order",
-                        FirmFormatters.formatCurrency(bazaarData.quickStatus.buyPrice, 1)
-                    )
+                    Text.stringifiedTranslatable("firmament.tooltip.bazaar.buy-order", FirmFormatters.formatCurrency(bazaarData.quickStatus.buyPrice, 1))
                 )
             } else if (lowestBin != null) {
                 it.lines.add(Text.literal(""))
                 it.lines.add(
-                    Text.translatable(
-                        "firmament.tooltip.ah.lowestbin",
-                        FirmFormatters.formatCurrency(lowestBin, 1)
-                    )
+                    Text.stringifiedTranslatable("firmament.tooltip.ah.lowestbin", FirmFormatters.formatCurrency(lowestBin, 1))
                 )
             }
         }
diff --git a/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt b/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt
index 294c835..ddda5a5 100644
--- a/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/mining/PristineProfitTracker.kt
@@ -97,15 +97,9 @@ object PristineProfitTracker : FirmamentFeature {
         val moneyPerSecond = moneyHistogram.averagePer({ it }, 1.seconds)
         if (collectionPerSecond == null || moneyPerSecond == null) return
         ProfitHud.collectionCurrent = collectionPerSecond
-        ProfitHud.collectionText = Text.translatable(
-            "firmament.pristine-profit.collection",
-            formatCurrency(collectionPerSecond * SECONDS_PER_HOUR, 1)
-        ).formattedString()
+        ProfitHud.collectionText = Text.stringifiedTranslatable("firmament.pristine-profit.collection", formatCurrency(collectionPerSecond * SECONDS_PER_HOUR, 1)).formattedString()
         ProfitHud.moneyCurrent = moneyPerSecond
-        ProfitHud.moneyText = Text.translatable(
-            "firmament.pristine-profit.money",
-            formatCurrency(moneyPerSecond * SECONDS_PER_HOUR, 1)
-        ).formattedString()
+        ProfitHud.moneyText = Text.stringifiedTranslatable("firmament.pristine-profit.money", formatCurrency(moneyPerSecond * SECONDS_PER_HOUR, 1)).formattedString()
         val data = DConfig.data
         if (data != null) {
             if (data.maxCollectionPerSecond < collectionPerSecond && collectionHistogram.oldestUpdate()
diff --git a/src/main/kotlin/moe/nea/firmament/features/world/Waypoints.kt b/src/main/kotlin/moe/nea/firmament/features/world/Waypoints.kt
index 00cbc10..05b1ba5 100644
--- a/src/main/kotlin/moe/nea/firmament/features/world/Waypoints.kt
+++ b/src/main/kotlin/moe/nea/firmament/features/world/Waypoints.kt
@@ -52,7 +52,7 @@ object Waypoints : FirmamentFeature {
                                 ?.skinTextures
                                 ?.texture
                         withFacingThePlayer(waypoint.pos.toCenterPos()) {
-                            waypoint(waypoint.pos, Text.translatable("firmament.waypoint.temporary", player))
+                            waypoint(waypoint.pos, Text.stringifiedTranslatable("firmament.waypoint.temporary", player))
                             if (skin != null) {
                                 matrixStack.translate(0F, -20F, 0F)
                                 // Head front