[6.2.0] 调整 ResourceReader 加载逻辑，不再迁移老版本 JSON 格式

TabooLib · Oct 24, 2024 · f1178ac · f1178ac
1 parent 30e5379
commit f1178ac
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 103 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=taboolib
-version=6.2.0-beta22
+version=6.2.0-beta23
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true

diff --git a/module/minecraft/minecraft-i18n/src/main/kotlin/taboolib/module/lang/ResourceReader.kt b/module/minecraft/minecraft-i18n/src/main/kotlin/taboolib/module/lang/ResourceReader.kt
@@ -4,7 +4,6 @@ package taboolib.module.lang
 
 import taboolib.common.io.newFile
 import taboolib.common.io.runningResourcesInJar
-import taboolib.common.platform.function.debug
 import taboolib.common.platform.function.pluginId
 import taboolib.common.platform.function.submitAsync
 import taboolib.common.platform.function.warning
@@ -16,7 +15,6 @@ import taboolib.module.configuration.SecuredFile
 import java.io.File
 import java.nio.charset.StandardCharsets
 import java.text.SimpleDateFormat
-import java.util.regex.Pattern
 
 /**
  * TabooLib
@@ -85,8 +83,6 @@ class ResourceReader(val clazz: Class<*>, val migrate: Boolean = true) {
      * @param code 语言代码
      */
     fun loadNodes(file: Configuration, nodesMap: HashMap<String, Type>, code: String) {
-        // 迁移旧版本
-        migrateLegacyVersion(file)
         // 加载节点
         file.getKeys(false).forEach { node ->
             when (val obj = file[node]) {
@@ -113,13 +109,6 @@ class ResourceReader(val clazz: Class<*>, val migrate: Boolean = true) {
         }
     }
 
-    /**
-     * 获取所有有效的语言文件节点
-     */
-    private fun ConfigurationSection.getLanguageNodes(): Map<String, Any?> {
-        return getValues(true).filter { it.key.endsWith(".==") || it.key.endsWith(".type") }
-    }
-
     /**
      * 从映射中加载语言节点
      *
@@ -169,99 +158,8 @@ class ResourceReader(val clazz: Class<*>, val migrate: Boolean = true) {
         }
     }
 
-    /**
-     * 迁移旧版本的配置文件格式
-     *
-     * 此函数用于处理旧版本的配置文件，将其转换为新的格式。主要进行以下操作：
-     * 1. 将包含点号的键名替换为使用连字符的键名
-     * 2. 处理特殊的值类型，如 ConfigurationSection 和 List
-     * 3. 对空字符串进行特殊处理
-     *
-     * @param file 需要迁移的配置文件对象
-     */
-    private fun migrateLegacyVersion(file: Configuration) {
-        if (file.file == null) {
-            return
-        }
-        var fixed = false
-        val values = file.getLanguageNodes().toSortedMap()
-        values.forEach {
-            if (it.key.contains('.')) {
-                fixed = true
-                file[it.key.substringBefore('.')] = null
-                file[it.key.replace('.', '-')] = when (val obj = it.value) {
-                    // 处理 ConfigurationSection
-                    is ConfigurationSection -> migrateLegacyJsonType(obj)
-                    // 处理列表
-                    is List<*> -> {
-                        obj.map { element ->
-                            when (element) {
-                                is Map<*, *> -> migrateLegacyJsonType(element.mapKeys { entry -> entry.key.toString() }.toSection(Configuration.empty()))
-                                is String -> element.ifEmpty { "&r" }
-                                else -> element
-                            }
-                        }
-                    }
-                    // 跳过
-                    else -> obj
-                }
-                debug("Migrate language: ${it.key}: ${it.key.substringBefore('.')} -> ${it.key.replace('.', '-')}: ${file[it.key.replace('.', '-')]}")
-            }
-        }
-        if (fixed) {
-            file.saveToFile()
-        }
-    }
-
-    /**
-     * 对老版本的 Json 写法进行迁移更新
-     *
-     * @param section 需要迁移的 ConfigurationSection 对象
-     * @return 迁移后的 ConfigurationSection 对象
-     */
-    private fun migrateLegacyJsonType(section: ConfigurationSection): ConfigurationSection {
-        val type = section.getString("==", section.getString("type")) ?: return section
-        if (type.lowercase() != "json") {
-            return section
-        }
-        var text = section.getString("text") ?: return section
-        val argSection = section.getConfigurationSection("args") ?: return section
-        // 对已有的变量进行转义
-        text = text.replace("[", "\\[").replace("]", "\\]")
-        val args = argSection.getKeys(false).mapNotNull { argSection.getConfigurationSection(it) }.associate { it.name to it.getValues(false) }
-        val newArgs = ArrayList<Map<String, Any?>>()
-        val matcher = legacyArgsRegex.matcher(text)
-        while (matcher.find()) {
-            val full = matcher.group(0)
-            val display = matcher.group(1)
-            val node = matcher.group(2)
-            val body = args[node]
-            if (body == null) {
-                text = text.replace(full, display)
-                continue
-            }
-            text = text.replace(full, "[$display]")
-            newArgs += body
-        }
-        section["text"] = text
-        section["args"] = newArgs
-        return section
-    }
-
-    private fun Map<*, *>.toSection(root: ConfigurationSection): ConfigurationSection {
-        forEach { (key, value) ->
-            when (value) {
-                is Map<*, *> -> root[key.toString()] = value.toSection(root.createSection(key.toString()))
-                else -> root[key.toString()] = value
-            }
-        }
-        return root
-    }
-
     companion object {
 
-        private val legacyArgsRegex = Pattern.compile("<(.+)@(.+)>")
-
         private val isFileWatcherHook by lazy {
             try {
                 FileWatcher.INSTANCE