feat: 🎸 japanize変換の状態を保存するファイルの仕様を変更

BlueSheep2804 · Jul 19, 2023 · d28c4d7 · d28c4d7
1 parent 00add08
commit d28c4d7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 28 deletions.
diff --git a/src/main/kotlin/io/github/bluesheep2804/selenechat/IPlugin.kt b/src/main/kotlin/io/github/bluesheep2804/selenechat/IPlugin.kt
@@ -2,7 +2,6 @@ package io.github.bluesheep2804.selenechat
 
 import io.github.bluesheep2804.selenechat.config.SeleneChatConfigData
 import io.github.bluesheep2804.selenechat.config.SeleneChatConfigManager
-import io.github.bluesheep2804.selenechat.japanize.JapanizePlayers
 import io.github.bluesheep2804.selenechat.japanize.JapanizePlayersManager
 import io.github.bluesheep2804.selenechat.player.SeleneChatPlayer
 import io.github.bluesheep2804.selenechat.resource.ResourceData
@@ -17,7 +16,7 @@ interface IPlugin {
     val resource: ResourceData
         get() = resourceManager.resource
     val japanizePlayersManager: JapanizePlayersManager
-    val japanizePlayers: JapanizePlayers
+    val japanizePlayers: MutableMap<String, Boolean>
         get() = japanizePlayersManager.japanizePlayers
     fun getAllPlayers(): List<SeleneChatPlayer>
     fun getPlayer(name: String): SeleneChatPlayer

diff --git a/src/main/kotlin/io/github/bluesheep2804/selenechat/SeleneChat.kt b/src/main/kotlin/io/github/bluesheep2804/selenechat/SeleneChat.kt
@@ -2,7 +2,6 @@ package io.github.bluesheep2804.selenechat
 
 import io.github.bluesheep2804.selenechat.config.SeleneChatConfigData
 import io.github.bluesheep2804.selenechat.config.SeleneChatConfigManager
-import io.github.bluesheep2804.selenechat.japanize.JapanizePlayers
 import io.github.bluesheep2804.selenechat.japanize.JapanizePlayersManager
 import io.github.bluesheep2804.selenechat.resource.ResourceData
 import io.github.bluesheep2804.selenechat.resource.ResourceManager
@@ -17,8 +16,8 @@ object SeleneChat {
         get() = resourceManager.resource
     val japanizePlayersManager: JapanizePlayersManager
         get() = plugin.japanizePlayersManager
-    val japanizePlayers: JapanizePlayers
-        get() = japanizePlayersManager.japanizePlayers
+    val japanizePlayers: MutableMap<String, Boolean>
+        get() = plugin.japanizePlayers
 
     fun setPluginInstance(plugin: IPlugin) {
         this.plugin = plugin

diff --git a/src/main/kotlin/io/github/bluesheep2804/selenechat/japanize/JapanizePlayers.kt b/src/main/kotlin/io/github/bluesheep2804/selenechat/japanize/JapanizePlayers.kt
diff --git a/src/main/kotlin/io/github/bluesheep2804/selenechat/japanize/JapanizePlayersManager.kt b/src/main/kotlin/io/github/bluesheep2804/selenechat/japanize/JapanizePlayersManager.kt
@@ -1,12 +1,15 @@
 package io.github.bluesheep2804.selenechat.japanize
 
 import com.charleskorn.kaml.Yaml
+import kotlinx.serialization.builtins.MapSerializer
+import kotlinx.serialization.builtins.serializer
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
 
 class JapanizePlayersManager(private val file: File) {
-    lateinit var japanizePlayers: JapanizePlayers
+    lateinit var japanizePlayers: MutableMap<String, Boolean>
+    private val japanizePlayersSerializer = MapSerializer(String.serializer(), Boolean.serializer())
     init {
         reload()
     }
@@ -17,19 +20,19 @@ class JapanizePlayersManager(private val file: File) {
         }
         if (!japanizeFile.exists()) {
             japanizeFile.createNewFile()
-            val japanizePlayers = JapanizePlayers()
+            val japanizePlayers = emptyMap<String, Boolean>()
             val output = FileOutputStream(japanizeFile)
-            Yaml.default.encodeToStream(JapanizePlayers.serializer(), japanizePlayers, output)
+            Yaml.default.encodeToStream(japanizePlayersSerializer, japanizePlayers, output)
         }
         val japanizeFileInputStream = FileInputStream(japanizeFile)
-        japanizePlayers = Yaml.default.decodeFromStream(JapanizePlayers.serializer(), japanizeFileInputStream)
+        japanizePlayers = Yaml.default.decodeFromStream(japanizePlayersSerializer, japanizeFileInputStream).toMutableMap()
     }
     fun save() {
         val japanizeFile = File(file, "jp.yml")
         if (!file.exists()) {
             file.mkdir()
         }
         val output = FileOutputStream(japanizeFile)
-        Yaml.default.encodeToStream(JapanizePlayers.serializer(), japanizePlayers, output)
+        Yaml.default.encodeToStream(japanizePlayersSerializer, japanizePlayers, output)
     }
 }
diff --git a/src/main/kotlin/io/github/bluesheep2804/selenechat/player/SeleneChatPlayer.kt b/src/main/kotlin/io/github/bluesheep2804/selenechat/player/SeleneChatPlayer.kt
@@ -15,25 +15,21 @@ abstract class SeleneChatPlayer {
     open val isOnline = true
     val isEnabledJapanize: Boolean
         get() {
-            return if (!SeleneChat.japanizePlayers.enable.contains(uniqueId.toString()) && !SeleneChat.japanizePlayers.disable.contains(uniqueId.toString())) {
-                config.japanizeDefault
+            return if (SeleneChat.japanizePlayers.containsKey(uniqueId.toString())) {
+                SeleneChat.japanizePlayers[uniqueId.toString()]!!
             } else {
-                SeleneChat.japanizePlayers.enable.contains(uniqueId.toString())
+                config.japanizeDefault
             }
         }
     abstract fun sendMessage(msg: Component)
     open fun asHoverEvent(): HoverEvent<out Examinable> {
         return HoverEvent.showEntity(HoverEvent.ShowEntity.of(Key.key("player"), uniqueId, Component.text(displayName)))
     }
     fun enableJapanize() {
-        if (this.isEnabledJapanize) return
-        SeleneChat.japanizePlayers.enable.add(uniqueId.toString())
-        SeleneChat.japanizePlayers.disable.remove(uniqueId.toString())
+        SeleneChat.japanizePlayers[uniqueId.toString()] = true
     }
     fun disableJapanize() {
-        if (!this.isEnabledJapanize) return
-        SeleneChat.japanizePlayers.disable.add(uniqueId.toString())
-        SeleneChat.japanizePlayers.enable.remove(uniqueId.toString())
+        SeleneChat.japanizePlayers[uniqueId.toString()] = false
     }
     fun toggleJapanize() {
         if (isEnabledJapanize) disableJapanize() else enableJapanize()