Update TypeEngine.

Author: Score2

common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt

@@ -3,14 +3,11 @@ package me.scoretwo.fastscript
 import me.scoretwo.fastscript.api.expansion.ExpansionManager
 import me.scoretwo.fastscript.api.format.FormatHeader
 import me.scoretwo.fastscript.api.plugin.ScriptPlugin
-import me.scoretwo.fastscript.api.script.AbstractScript
-import me.scoretwo.fastscript.api.script.FileScript
+import me.scoretwo.fastscript.api.script.Script
 import me.scoretwo.fastscript.command.ScriptCommandNexus
 import me.scoretwo.fastscript.config.SettingConfig
-import me.scoretwo.fastscript.script.ScriptManager
+import me.scoretwo.fastscript.api.script.ScriptManager
 import me.scoretwo.fastscript.utils.Utils
-import me.scoretwo.utils.bukkit.configuration.yaml.file.YamlConfiguration
-import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
 import me.scoretwo.utils.sender.GlobalPlayer
 import me.scoretwo.utils.sender.GlobalSender
 import me.scoretwo.utils.syntaxes.StreamUtils
@@ -109,7 +106,7 @@ class FastScript(val plugin: ScriptPlugin) {
 
 }
 lateinit var plugin: ScriptPlugin
-val scripts = mutableListOf<FileScript>()
+val scripts = mutableListOf<Script>()
 
 lateinit var settings: SettingConfig
 

common/src/main/kotlin/me/scoretwo/fastscript/api/expansion/CoreScript.kt

@@ -1,18 +1,24 @@
 package me.scoretwo.fastscript.api.expansion
 
-import me.scoretwo.fastscript.api.script.AbstractScript
-import me.scoretwo.fastscript.api.script.FileScript
+import me.scoretwo.fastscript.api.script.Script
 import me.scoretwo.fastscript.scripts
 import me.scoretwo.utils.sender.GlobalSender
 
 abstract class FastScriptExpansion {
 
     abstract val name: String
     abstract val sign: String
+    abstract val fileSuffix: String
 
-    fun getHookedScripts() = mutableListOf<FileScript>().also { list ->
+    abstract fun convertScriptProcessor(script: Script): Boolean
+
+    // abstract fun eval(script: Script, sender: GlobalSender): Any?
+
+    // abstract fun execute(script: Script, sender: GlobalSender, main: String, args: Array<Any?>): Any?
+
+    fun getHookedScripts() = mutableListOf<Script>().also { list ->
         scripts.forEach {
-            if (it.hookExpansions.contains(this)) list.add(it)
+            if (it.scriptProcessor.containsKey(sign)) list.add(it)
         }
     }
 }

common/src/main/kotlin/me/scoretwo/fastscript/api/expansion/FastScriptExpansion.kt

@@ -0,0 +1,53 @@
+package me.scoretwo.fastscript.api.script
+
+import me.scoretwo.fastscript.FastScript
+import me.scoretwo.utils.sender.GlobalSender
+import java.io.File
+
+abstract class Script(
+    val description: ScriptDescription,
+    val options: ScriptOptions,
+    val scriptFiles: MutableList<File> = mutableListOf()
+) {
+    // sign, processor
+    val scriptProcessor = mutableMapOf<String, ScriptProcessor>()
+    // sign, mergedText
+    val mergedTexts = mutableMapOf<String, StringBuilder>()
+
+    open fun eval(sign: String, sender: GlobalSender): Any? {
+        if (!scriptProcessor.containsKey(sign)) {
+            return null
+        }
+        return scriptProcessor[sign]!!.eval(sender)
+    }
+    open fun execute(sign: String, sender: GlobalSender, main: String = options.main, args: Array<Any?> = arrayOf()): Any? {
+        if (!scriptProcessor.containsKey(sign)) {
+            return null
+        }
+        return scriptProcessor[sign]!!.execute(sender, main, args)
+    }
+
+    open fun reload() {
+        if (!options.file.exists()) {
+            options.config.save(options.file)
+        }
+    }
+
+    fun mergeToTexts() {
+        mergedTexts.clear()
+        FastScript.instance.expansionManager.expansions.forEach {
+            mergeToText(it.sign)
+        }
+    }
+
+    fun mergeToText(sign: String) {
+        mergedTexts[sign] = StringBuilder().also {
+            scriptFiles.forEach { file ->
+                if (file.exists() && file.name.endsWith(".$sign")) {
+                    it.append(file.readText()).append("\n")
+                }
+            } }
+
+    }
+
+}

common/src/main/kotlin/me/scoretwo/fastscript/api/script/AbstractScript.kt

@@ -1,8 +1,6 @@
-package me.scoretwo.fastscript.script
+package me.scoretwo.fastscript.api.script
 
 import me.scoretwo.fastscript.FastScript
-import me.scoretwo.fastscript.api.script.FileScript
-import me.scoretwo.fastscript.config.SettingConfig
 import me.scoretwo.fastscript.plugin
 import me.scoretwo.fastscript.settings
 import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
@@ -12,7 +10,7 @@ class ScriptManager {
 
     val defaultScriptPath = File(plugin.dataFolder, "scripts")
 
-    val scripts = mutableMapOf<String, FileScript>()
+    val scripts = mutableMapOf<String, Script>()
 
     fun getScript(name: String) = if (scripts.containsKey(name)) scripts[name] else null
 

common/src/main/kotlin/me/scoretwo/fastscript/api/script/ConfigScriptOptions.kt

@@ -1,9 +1,23 @@
 package me.scoretwo.fastscript.api.script
 
-interface ScriptOptions {
+import me.scoretwo.utils.bukkit.configuration.yaml.ConfigurationSection
+import me.scoretwo.utils.bukkit.configuration.yaml.file.YamlConfiguration
+import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
+import java.io.File
 
-    val main: String
+abstract class ScriptOptions(val file: File, val config: YamlConfiguration) {
+    val main: String = config.getString(config.getLowerCaseNode("main"))
+    val meta = mutableMapOf<String, String>().also { map ->
+        config.getStringList(config.getLowerCaseNode("meta")).forEach {
+            map[it.substringBefore(":")] = it.substringAfter(":")
+        }
+    }
 
-    val meta: MutableMap<String, String>
+    val otherSection = mutableMapOf<String, ConfigurationSection>().also { sections ->
+        config.getKeys(false).forEach {
+            if (!arrayOf("main", "meta").contains(it.toLowerCase()))
+                sections[it] = config.getConfigurationSection(it)
+        }
+    }
 
 }

common/src/main/kotlin/me/scoretwo/fastscript/api/script/FileScript.kt

@@ -0,0 +1,11 @@
+package me.scoretwo.fastscript.api.script
+
+import me.scoretwo.fastscript.api.expansion.FastScriptExpansion
+import me.scoretwo.utils.sender.GlobalSender
+
+abstract class ScriptProcessor(val script: Script, val expansion: FastScriptExpansion) {
+
+    abstract fun eval(sender: GlobalSender): Any?
+    abstract fun execute(sender: GlobalSender, main: String = script.options.main, args: Array<Any?> = arrayOf()): Any?
+
+}