feat: 🎸 一時的に日本語化を無効化できるように

BlueSheep2804 · Jul 11, 2023 · 9e42abf · 9e42abf
1 parent b14fd9f
commit 9e42abf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/kotlin/io/github/bluesheep2804/selenechat/config/SeleneChatConfigData.kt b/src/main/kotlin/io/github/bluesheep2804/selenechat/config/SeleneChatConfigData.kt
@@ -10,6 +10,8 @@ data class SeleneChatConfigData(
 
         @YamlComment("Specifying the chat conversion mode.", "Possible values: none, hiragana, ime")
         var convertMode: ConvertMode = ConvertMode.IME,
+        @YamlComment("Set a marker to indicate that you do not want to Japanize temporarily.")
+        var nonJapanizeMarker: String = "$",
         @YamlComment("Whether to send message content to proxy servers using plugin messages.", "Applies to Spigot only.")
         var shouldSendPluginMessage: Boolean = false,
         @YamlComment("Choose whether to send the message in the standard Minecraft message format or in SeleneChat's own format.", "If true, SeleneChat's format will be used.", "Applies to Spigot only.")

diff --git a/src/main/kotlin/io/github/bluesheep2804/selenechat/message/ChatMessage.kt b/src/main/kotlin/io/github/bluesheep2804/selenechat/message/ChatMessage.kt
@@ -27,9 +27,9 @@ object ChatMessage {
     fun message(msg: String): Component {
         val mm = MiniMessage.miniMessage()
         val serializedMessage = if (config.useColorCode) {
-            LegacyComponentSerializer.legacyAmpersand().deserialize(msg)
+            LegacyComponentSerializer.legacyAmpersand().deserialize(msg.removePrefix("$"))
         } else {
-            Component.text(msg)
+            Component.text(msg.removePrefix("$"))
         }
         val japaneseConversion = Japanizer(PlainTextComponentSerializer.plainText().serialize(serializedMessage))
         val messageTagResolver = Placeholder.component(
@@ -38,7 +38,7 @@ object ChatMessage {
         )
         val jpTagResolver = TagResolver.resolver("jp")
         { args: ArgumentQueue, _: Context ->
-            if (config.convertMode == ConvertMode.NONE || !japaneseConversion.shouldConvert()) {
+            if (config.convertMode == ConvertMode.NONE || !japaneseConversion.shouldConvert() || msg[0] == '$') {
                 return@resolver Tag.selfClosingInserting(Component.text(""))
             }
             val prefix = args.popOr("prefix").value()