Update language system.

Score2 · Score2 · commit 0468606e835a · 2021-02-03T11:27:41.000+08:00
Update and repair plugin BootStrap.
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt b/common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt
@@ -2,6 +2,7 @@ package me.scoretwo.fastscript
 
 import me.scoretwo.fastscript.api.expansion.ExpansionManager
 import me.scoretwo.fastscript.api.format.FormatHeader
+import me.scoretwo.fastscript.api.language.LanguageManager
 import me.scoretwo.fastscript.api.plugin.ScriptPlugin
 import me.scoretwo.fastscript.api.script.Script
 import me.scoretwo.fastscript.command.ScriptCommandNexus
@@ -36,6 +37,9 @@ class FastScript(val plugin: ScriptPlugin) {
 
         settings = SettingConfig()
 
+        language = LanguageManager()
+        language.current = language.languages[settings.getString("Options.Language")]!!
+
         commandNexus = ScriptCommandNexus()
         scriptManager = ScriptManager()
         expansionManager = ExpansionManager()
@@ -49,17 +53,11 @@ class FastScript(val plugin: ScriptPlugin) {
 
     }
 
-    fun initLanguageFiles() {
-        Utils.saveDefaultResource(File("${plugin.dataFolder}/languages", "en_US.yml"), StreamUtils.getResource("lang/en_US.yml")!!)
-        Utils.saveDefaultResource(File("${plugin.dataFolder}/languages", "zh_CN.yml"), StreamUtils.getResource("lang/zh_CN.yml")!!)
-    }
-
     fun onReload() {
         if (!plugin.dataFolder.exists()) {
             plugin.dataFolder.mkdirs()
         }
         plugin.reload()
-        initLanguageFiles()
         initInternalScripts()
         scriptManager.loadScripts()
     }
@@ -109,6 +107,7 @@ lateinit var plugin: ScriptPlugin
 val scripts = mutableListOf<Script>()
 
 lateinit var settings: SettingConfig
+lateinit var language: LanguageManager
 
 fun GlobalSender.sendMessage(formatHeader: FormatHeader, strings: Array<String>, colorIndex: Boolean = true) {
     strings.forEach {
@@ -118,12 +117,10 @@ fun GlobalSender.sendMessage(formatHeader: FormatHeader, strings: Array<String>,
 
 fun GlobalSender.sendMessage(formatHeader: FormatHeader, string: String, colorIndex: Boolean = true) {
     if (colorIndex)
-        this.sendMessage("${settings.defaultLanguage.getString(settings.defaultLanguage.getLowerCaseNode("format-header.${formatHeader.name.toLowerCase()}"))}${string}")
+        this.sendMessage("${language["format-header.${formatHeader.name}"]}${string}")
     else
         this.sendMessage(
-            ChatColor.translateAlternateColorCodes('&',"${
-                settings.defaultLanguage.getString(
-                    settings.defaultLanguage.getLowerCaseNode("format-header.${formatHeader.name.toLowerCase()}"))}${string}"))
+            ChatColor.translateAlternateColorCodes('&',"${"${language["format-header.${formatHeader.name}"]}${string}"}${string}"))
 }
 
 fun String.setPlaceholder(player: GlobalPlayer): String {
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/language/Language.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/language/Language.kt
@@ -0,0 +1,57 @@
+package me.scoretwo.fastscript.api.language
+
+import me.scoretwo.fastscript.FastScript
+import me.scoretwo.fastscript.plugin
+import me.scoretwo.utils.bukkit.configuration.yaml.file.YamlConfiguration
+import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
+import me.scoretwo.utils.bukkit.configuration.yaml.patchs.saveConfiguration
+import java.io.File
+
+class Language {
+
+    val name: String
+    val file: File
+
+    constructor(name: String = "en_US") {
+        this.name = name
+        this.file = File(plugin.dataFolder, "language/$name.yml")
+        if (!file.exists()) {
+            file.saveConfiguration(config)
+        }
+    }
+
+    constructor(file: File) {
+        this.name = file.name.substringBeforeLast(".")
+        this.file = file
+        if (!file.exists()) {
+            file.saveConfiguration(config)
+        }
+    }
+
+    val config = YamlConfiguration().also {
+        it.addDefault("FORMAT-HEADER", YamlConfiguration().also {
+            it.addDefault("INFO", "&7[&2Fast&aScript&7] &bINFO &8| &7")
+            it.addDefault("WARN", "&7[&2Fast&aScript&7] &eWARN &8| &7")
+            it.addDefault("ERROR", "&7[&2Fast&aScript&7] &cERROR &8| &7")
+            it.addDefault("TIPS", "&7[&2Fast&aScript&7] &2TIPS &8| &7")
+            it.addDefault("HOOKED", "&7[&2Fast&aScript&7] &6HOOKED &8| &7")
+            it.addDefault("DEBUG", "&7[&2Fast&aScript&7] &3DEBUG &8| &7")
+        })
+
+    }
+
+    operator fun set(node: String, any: Any?) = config.set(
+        let {
+            if (config.contains(config.getLowerCaseNode(node))) {
+                config.getLowerCaseNode(node)
+            } else {
+                node.toUpperCase()
+            }
+        }
+        , any)
+
+    operator fun get(node: String) = config.getString(config.getLowerCaseNode(node))!!
+
+    fun getList(node: String) = config.getStringList(config.getLowerCaseNode(node))!!
+
+}
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/language/LanguageManager.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/language/LanguageManager.kt
@@ -0,0 +1,19 @@
+package me.scoretwo.fastscript.api.language
+
+class LanguageManager {
+
+    val languages = mutableMapOf<String, Language>().also {
+        it["en_US"] = Language()
+    }
+
+    var current = languages["en_US"]!!
+
+
+    operator fun set(node: String, any: Any?) = current.set(node, any)
+
+    operator fun get(node: String) = current[node]
+
+
+    fun getList(node: String) = current.getList(node)
+
+}
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptManager.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptManager.kt
@@ -21,38 +21,45 @@ class ScriptManager {
      * 仅接受文件后缀为yml的文件或者可用的脚本文件夹才能被处理
      */
     private fun loadScript(file: File): ProcessResult {
+        if (file.name.contains(" ")) return ProcessResult(ProcessResultType.FAILED, "File name cannot contain spaces!")
         if (file.isDirectory) {
             return loadFromFolderScript(file)
         }
 
-        if (file.name.endsWith(".yml")) {
-            val scriptName = file.name.substringBeforeLast(".")
+        val scriptName= if (file.name.endsWith(".yml"))
+            file.name.substringBeforeLast(".")
+        else
+            return ProcessResult(ProcessResultType.OTHER, "The file does not belong to the script, skip reading!")
 
-            val option = ScriptOptions(file)
+        val options = ScriptOptions(file)
+        val script = Script(ScriptDescription.fromSection(options.config), options)
 
+        script.scriptFiles = mutableListOf<File>().also { files ->
+            FastScript.instance.expansionManager.expansions.forEach { expansion ->
+                val candidateFile = File(file.parentFile, "$scriptName.${expansion.fileSuffix}")
+                if (candidateFile.exists()) {
+                    files.add(candidateFile)
+                }
+            }
         }
 
-        FastScript.instance.expansionManager.expansions.forEach { expansion ->
-
-            // 載入脚本
-            scripts[file.name.substringBeforeLast(".")]
-        }
-
+        scripts[file.name.substringBeforeLast(".")] = script
+        return ProcessResult(ProcessResultType.SUCCESS)
     }
 
     private fun loadFromFolderScript(folder: File): ProcessResult {
-        val optionFiles = arrayOf("option.yml", "${folder.name}.yml", "setting.yml")
+        val optionsFiles = arrayOf("option.yml", "${folder.name}.yml", "setting.yml")
 
-        val optionFile: File = optionFiles.let {
+        val optionsFile: File = optionsFiles.let {
             for (fileName in it) {
                 val file = File(fileName)
                 if (file.exists()) return@let file
             }
 
             return ProcessResult(ProcessResultType.FAILED, "Option file not found in ${folder.name}.")
         }
-        val option = ScriptOptions(optionFile)
-        val script = Script(ScriptDescription.fromSection(option.config), option)
+        val options = ScriptOptions(optionsFile)
+        val script = Script(ScriptDescription.fromSection(options.config), options)
 
         script.scriptFiles = mutableListOf<File>().also { files ->
             folder.listFiles()?.forEach { file ->
@@ -81,7 +88,7 @@ class ScriptManager {
         settings.getStringList(settings.getLowerCaseNode("load-script-files")).forEach {
             val file = File(it)
 
-            if (file.exists()) selectScriptFiles(file).forEach { loadScript(it) }
+            if (file.isDirectory && file.exists()) file.listFiles()?.forEach { loadScript(it) }
 
         }
     }
@@ -91,16 +98,6 @@ class ScriptManager {
         (section.isString(section.getLowerCaseNode("version")) || section.isInt(section.getLowerCaseNode("version"))) &&
         section.isString(section.getLowerCaseNode("main"))
 
-    fun selectScriptFiles(file: File): MutableList<File> = mutableListOf<File>().let { files ->
-        if (file.isDirectory) {
-            file.listFiles()?.forEach {
-                files.addAll(selectScriptFiles(it))
-            }
-        } else if (file.name.endsWith(".yml", true)) {
-            files.add(file)
-        }
-        files
-    }
 
 
 
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/config/SettingConfig.kt b/common/src/main/kotlin/me/scoretwo/fastscript/config/SettingConfig.kt
@@ -10,7 +10,7 @@ class SettingConfig(): Config(File(plugin.dataFolder, "settings.yml")) {
     val default = YamlConfiguration().also {
         it.set("Options", YamlConfiguration().also {
             it.set("Debug", false)
-            it.set("Language", "en_Us")
+            it.set("Language", "en_US")
             it.set("File-Listener", true)
         })
         it.set("Load-Script-Files", listOf("plugins/CustomScriptFolder"))
diff --git a/version-control/bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/BukkitPlugin.kt b/version-control/bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/BukkitPlugin.kt
@@ -5,10 +5,7 @@ import me.scoretwo.fastscript.api.format.FormatHeader
 import me.scoretwo.fastscript.api.plugin.ScriptPlugin
 import me.scoretwo.fastscript.bukkit.hook.PlaceholderAPIHook
 import me.scoretwo.fastscript.sendMessage
-import me.scoretwo.utils.bukkit.command.bukkitCommandMap
-import me.scoretwo.utils.bukkit.command.toBukkitPlayer
-import me.scoretwo.utils.bukkit.command.toBukkitSender
-import me.scoretwo.utils.bukkit.command.toGlobalSender
+import me.scoretwo.utils.bukkit.command.*
 import me.scoretwo.utils.bukkit.plugin.toBukkitPlugin
 import me.scoretwo.utils.plugin.GlobalPlugin
 import me.scoretwo.utils.sender.GlobalPlayer
@@ -24,16 +21,9 @@ class BukkitPlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {
     }
 
     override fun enable() {
-        bukkitCommandMap.register(description.name, object : Command(description.name, "", "/" + description.name, listOf("script","bukkitScript")) {
-            override fun execute(sender: CommandSender, label: String, args: Array<String>): Boolean {
-                FastScript.instance.commandNexus.execute(sender.toGlobalSender(), mutableListOf(label), args.toMutableList())
-                return true
-            }
+        FastScript.instance.onReload()
 
-            override fun tabComplete(sender: CommandSender, alias: String, args: Array<String>): MutableList<String> {
-                return FastScript.instance.commandNexus.tabComplete(sender.toGlobalSender(), mutableListOf(label), args.toMutableList()) ?: mutableListOf()
-            }
-        })
+        FastScript.instance.commandNexus.registerBukkitCommands()
     }
 
     override fun setPlaceholder(player: GlobalPlayer, string: String): String {
diff --git a/version-control/bungee/src/main/kotlin/me/scoretwo/fastscript/bungee/BungeeBootStrap.kt b/version-control/bungee/src/main/kotlin/me/scoretwo/fastscript/bungee/BungeeBootStrap.kt
@@ -0,0 +1,22 @@
+package me.scoretwo.fastscript.bungee
+
+import me.scoretwo.utils.bungee.plugin.toGlobalPlugin
+import net.md_5.bungee.api.plugin.Plugin
+
+class BungeeBootStrap: Plugin() {
+
+    val bungeePlugin = BungeePlugin(toGlobalPlugin())
+
+    override fun onLoad() {
+        bungeePlugin.load()
+    }
+
+    override fun onEnable() {
+        bungeePlugin.enable()
+    }
+
+    override fun onDisable() {
+        bungeePlugin.disable()
+    }
+
+}
diff --git a/version-control/bungee/src/main/kotlin/me/scoretwo/fastscript/bungee/BungeePlugin.kt b/version-control/bungee/src/main/kotlin/me/scoretwo/fastscript/bungee/BungeePlugin.kt
@@ -2,48 +2,44 @@ package me.scoretwo.fastscript.bungee
 
 import me.scoretwo.fastscript.FastScript
 import me.scoretwo.fastscript.api.plugin.ScriptPlugin
+import me.scoretwo.utils.bungee.command.registerBungeeCommands
+import me.scoretwo.utils.bungee.command.toBungeePlayer
+import me.scoretwo.utils.bungee.command.toBungeeSender
+import me.scoretwo.utils.bungee.command.toGlobalSender
+import me.scoretwo.utils.bungee.plugin.toBungeePlugin
+import me.scoretwo.utils.plugin.GlobalPlugin
+import me.scoretwo.utils.sender.GlobalPlayer
+import me.scoretwo.utils.sender.GlobalSender
 import net.md_5.bungee.api.ChatColor
 import net.md_5.bungee.api.CommandSender
 import net.md_5.bungee.api.ProxyServer
 import net.md_5.bungee.api.plugin.Command
 import net.md_5.bungee.api.plugin.Plugin
 import net.md_5.bungee.api.plugin.TabExecutor
 
-class BungeePlugin: Plugin(), ScriptPlugin {
+class BungeePlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
-    override fun onLoad() {
-    }
-
-    override fun onEnable() {
+    override fun load() {
         FastScript.setBootstrap(this)
-        FastScript.instance.onReload()
-
-        ProxyServer.getInstance().pluginManager.registerCommand(this, object : Command("FastScript", null, "script"), TabExecutor {
-            override fun execute(sender: CommandSender, args: Array<String>) {
-                FastScript.instance.commandManager.execute(sender, args)
-            }
-
-            override fun onTabComplete(sender: CommandSender, args: Array<String>): MutableIterable<String> {
-                return FastScript.instance.commandManager.tabComplete(sender, args)
-            }
-        })
     }
 
-    override val console: Any = ProxyServer.getInstance().console
+    override fun enable() {
+        FastScript.instance.onReload()
 
-    override fun getPluginClassLoader(): ClassLoader {
-        return javaClass.classLoader
+        FastScript.instance.commandNexus.registerBungeeCommands()
     }
 
-    override fun setPlaceholder(player: Any, string: String): String {
+    override fun setPlaceholder(player: GlobalPlayer, string: String): String {
         return string
     }
 
-    override fun translateStringColors(string: String): String {
-        return ChatColor.translateAlternateColorCodes('&', string)
-    }
+    override fun toOriginalSender(sender: GlobalSender) = sender.toBungeeSender()
+
+    override fun toOriginalPlayer(player: GlobalPlayer) = player.toBungeePlayer()
+
+    override fun toOriginalServer(): Any? = ProxyServer.getInstance()
 
-    override fun onReload() {
+    override fun reload() {
 
     }
 
diff --git a/version-control/sponge/build.gradle.kts b/version-control/sponge/build.gradle.kts
@@ -17,7 +17,7 @@ repositories {
 }
 
 blossom {
-    replaceTokenIn("src/main/kotlin/me/scoretwo/fastscript/sponge/SpongePlugin.kt")
+    replaceTokenIn("src/main/kotlin/me/scoretwo/fastscript/sponge/SpongeBootStrap.kt")
     replaceToken("%%version%%", rootProject.version)
     replaceToken("%%description%%", rootProject.description)
 }
diff --git a/version-control/sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongeBootStrap.kt b/version-control/sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongeBootStrap.kt
diff --git a/version-control/sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongePlugin.kt b/version-control/sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongePlugin.kt
diff --git a/version-control/velocity/src/main/kotlin/me/scoretwo/fastscript/velocity/VelocityBootStrap.kt b/version-control/velocity/src/main/kotlin/me/scoretwo/fastscript/velocity/VelocityBootStrap.kt
diff --git a/version-control/velocity/src/main/kotlin/me/scoretwo/fastscript/velocity/VelocityPlugin.kt b/version-control/velocity/src/main/kotlin/me/scoretwo/fastscript/velocity/VelocityPlugin.kt

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ repositories {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`blossom {`
`20`		`- replaceTokenIn("src/main/kotlin/me/scoretwo/fastscript/sponge/SpongePlugin.kt")`
	`20`	`+ replaceTokenIn("src/main/kotlin/me/scoretwo/fastscript/sponge/SpongeBootStrap.kt")`
`21`	`21`	`replaceToken("%%version%%", rootProject.version)`
`22`	`22`	`replaceToken("%%description%%", rootProject.description)`
`23`	`23`	`}`