Update script loading method.

Author: Score2

common/src/main/kotlin/me/scoretwo/fastscript/api/exception/ProcessException.kt

@@ -0,0 +1,4 @@
+package me.scoretwo.fastscript.api.exception
+
+class ProcessException(message: String): Exception(message) {
+}

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

@@ -9,6 +9,9 @@ open class Script(
     val options: ScriptOptions,
     val scriptFiles: MutableList<File> = mutableListOf()
 ) {
+
+    val name = description.name
+
     // sign, processor
     val scriptProcessor = mutableMapOf<String, ScriptProcessor>()
     // sign, mergedText

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

@@ -1,6 +1,8 @@
 package me.scoretwo.fastscript.api.script
 
 import me.scoretwo.fastscript.FastScript
+import me.scoretwo.fastscript.api.utils.process.ProcessResult
+import me.scoretwo.fastscript.api.utils.process.ProcessResultType
 import me.scoretwo.fastscript.plugin
 import me.scoretwo.fastscript.settings
 import me.scoretwo.utils.bukkit.configuration.yaml.ConfigurationSection
@@ -13,6 +15,8 @@ class ScriptManager {
 
     val scripts = mutableMapOf<String, Script>()
 
+    private val optionFiles =
+
     fun getScript(name: String) = scripts[name]
 
     fun loadScript(file: File) {
@@ -60,4 +64,30 @@ class ScriptManager {
         files
     }
 
+
+    fun loadFromFolderScript(folder: File): ProcessResult {
+        val optionFile: File = arrayOf(
+            "option.yml",
+            "${folder.name}.yml",
+            "setting.yml"
+        ).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 scriptFiles = mutableListOf<File>().also {
+
+        }
+
+
+    }
+
+
 }

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

@@ -3,9 +3,10 @@ package me.scoretwo.fastscript.api.script
 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 me.scoretwo.utils.bukkit.configuration.yaml.patchs.loadConfiguration
 import java.io.File
 
-open class ScriptOptions(val file: File, val config: YamlConfiguration) {
+open class ScriptOptions(val file: File, val config: YamlConfiguration = file.loadConfiguration()) {
     val main: String = config.getString(config.getLowerCaseNode("main"))
     open val meta = mutableMapOf<String, String>().also { map ->
         config.getStringList(config.getLowerCaseNode("meta")).forEach {

common/src/main/kotlin/me/scoretwo/fastscript/api/utils/process/ProcessResult.kt

@@ -0,0 +1,17 @@
+package me.scoretwo.fastscript.api.utils.process
+
+import me.scoretwo.fastscript.api.exception.ProcessException
+
+class ProcessResult(type: ProcessResultType, message: String? = null) {
+
+    var message: String = message ?: type.message
+
+    fun throwException() {
+        throw ProcessException(message)
+    }
+
+    fun message(message: String) = this.also {
+        this.message = message
+    }
+
+}

common/src/main/kotlin/me/scoretwo/fastscript/api/utils/process/ProcessResultType.kt

@@ -0,0 +1,8 @@
+package me.scoretwo.fastscript.api.utils.process
+
+enum class ProcessResultType(val message: String) {
+    SUCCESS("The process runs successfully."),
+    FAILED("The process failed!"),
+    OTHER("Other problems in the process."),
+    DISABILITY("The process ran successfully, but was incomplete!")
+}

common/src/main/kotlin/me/scoretwo/fastscript/expansion/typeengine/TypeEngineExpansion.kt

@@ -6,9 +6,24 @@ import me.scoretwo.utils.sender.GlobalSender
 
 abstract class TypeEngineExpansion: FastScriptExpansion() {
 
+    private val typeEngineScripts = mutableMapOf<String, TypeEngineScript>()
+
     override fun convertScriptProcessor(script: Script) =
         if (script.options.otherSection.containsKey(sign)) {
-            script.scriptProcessor[sign] = TypeEngineScriptProcessor(script, this)
+            if (typeEngineScripts.containsKey(script.name))
+                script.scriptProcessor[sign] = TypeEngineScriptProcessor(
+                    typeEngineScripts[script.name]!!,
+                    this
+                )
+            else
+                script.scriptProcessor[sign] = TypeEngineScriptProcessor(
+                    TypeEngineScript(
+                        script.description,
+                        TypeEngineScriptOptions(this, script.options.file, script.options.config)
+                    ),
+                    this
+                )
+
             true
         } else {
             false

common/src/main/kotlin/me/scoretwo/fastscript/expansion/typeengine/TypeEngineScriptOptions.kt

@@ -7,7 +7,7 @@ import java.io.File
 
 class TypeEngineScriptOptions(expansion: TypeEngineExpansion, file: File, section: YamlConfiguration): ScriptOptions(file, section) {
 
-    val javaScriptSection = section.getConfigurationSection(section.getLowerCaseNode(expansion.sign))
+    val typeEngineSection = section.getConfigurationSection(section.getLowerCaseNode(expansion.sign))
 
     val engine: String
     val includes = mutableMapOf<String, ScriptInclude>()

common/src/main/kotlin/me/scoretwo/fastscript/expansion/typeengine/TypeEngineScriptProcessor.kt

@@ -14,11 +14,10 @@ import javax.script.ScriptException
 
 class TypeEngineScriptProcessor(script: TypeEngineScript, expansion: TypeEngineExpansion): ScriptProcessor(script, expansion) {
 
-    val engine: ScriptEngine
+    val engine: ScriptEngine = ScriptEngineManager(plugin.pluginClassLoader).getEngineByName(script.engineOption.engine)
     override val needEval = true
 
     init {
-        engine = ScriptEngineManager(plugin.pluginClassLoader).getEngineByName(script.engineOption.engine)
         script.engineOption.includes.forEach {
             engine.put(it.key, it.value[script])
         }