Thoughts confused...

Author: Score2

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

@@ -4,10 +4,12 @@ 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.command.ScriptCommandNexus
 import me.scoretwo.fastscript.config.SettingConfig
 import me.scoretwo.fastscript.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
@@ -31,15 +33,15 @@ class FastScript(val plugin: ScriptPlugin) {
 
         plugin.server.console.sendMessage(FormatHeader.INFO, "Initializing...")
 
-        commandNexus = ScriptCommandNexus()
-        scriptManager = ScriptManager()
-        expansionManager = ExpansionManager()
-
         if (!plugin.dataFolder.exists()) {
             plugin.dataFolder.mkdirs()
         }
 
-        SettingConfig.init()
+        settings = SettingConfig()
+
+        commandNexus = ScriptCommandNexus()
+        scriptManager = ScriptManager()
+        expansionManager = ExpansionManager()
     }
 
     /**
@@ -107,7 +109,9 @@ class FastScript(val plugin: ScriptPlugin) {
 
 }
 lateinit var plugin: ScriptPlugin
-val scripts = mutableListOf<AbstractScript>()
+val scripts = mutableListOf<FileScript>()
+
+lateinit var settings: SettingConfig
 
 fun GlobalSender.sendMessage(formatHeader: FormatHeader, strings: Array<String>, colorIndex: Boolean = true) {
     strings.forEach {
@@ -117,12 +121,12 @@ fun GlobalSender.sendMessage(formatHeader: FormatHeader, strings: Array<String>,
 
 fun GlobalSender.sendMessage(formatHeader: FormatHeader, string: String, colorIndex: Boolean = true) {
     if (colorIndex)
-        this.sendMessage("${SettingConfig.instance.defaultLanguage.getString(SettingConfig.instance.defaultLanguage.getLowerCaseNode("format-header.${formatHeader.name.toLowerCase()}"))}${string}")
+        this.sendMessage("${settings.defaultLanguage.getString(settings.defaultLanguage.getLowerCaseNode("format-header.${formatHeader.name.toLowerCase()}"))}${string}")
     else
         this.sendMessage(
             ChatColor.translateAlternateColorCodes('&',"${
-                SettingConfig.instance.defaultLanguage.getString(
-                    SettingConfig.instance.defaultLanguage.getLowerCaseNode("format-header.${formatHeader.name.toLowerCase()}"))}${string}"))
+                settings.defaultLanguage.getString(
+                    settings.defaultLanguage.getLowerCaseNode("format-header.${formatHeader.name.toLowerCase()}"))}${string}"))
 }
 
 fun String.setPlaceholder(player: GlobalPlayer): String {

common/src/main/kotlin/me/scoretwo/fastscript/api/config/Config.kt

@@ -3,12 +3,14 @@ package me.scoretwo.fastscript.config
 import me.scoretwo.utils.bukkit.configuration.yaml.file.YamlConfiguration
 import java.io.File
 
-abstract class Config: YamlConfiguration {
+abstract class Config(val file: File) : YamlConfiguration() {
 
-    val file: File
+    init {
+        reload()
+    }
 
-    constructor(file: File) {
-        this.file = file
+    open fun reload() {
+        onReload()
         this.load(file)
     }
 

common/src/main/kotlin/me/scoretwo/fastscript/api/config/SettingConfig.kt

@@ -0,0 +1,8 @@
+package me.scoretwo.fastscript.api.expansion
+
+import me.scoretwo.utils.sender.GlobalSender
+
+interface CoreScript {
+    fun directEval(sender: GlobalSender): Any?
+    fun execute(sender: GlobalSender, main: String, args: Array<Any?>)
+}

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

@@ -2,14 +2,17 @@ package me.scoretwo.fastscript.api.expansion
 
 import me.scoretwo.fastscript.api.script.AbstractScript
 import me.scoretwo.fastscript.api.script.FileScript
+import me.scoretwo.fastscript.scripts
 import me.scoretwo.utils.sender.GlobalSender
 
 abstract class FastScriptExpansion {
 
     abstract val name: String
     abstract val sign: String
 
-    abstract fun processScripts(scripts: MutableList<FileScript>)
-
-    abstract fun executeScript(sender: GlobalSender, script: FileScript, function: String, args: Array<Any?>)
+    fun getHookedScripts() = mutableListOf<FileScript>().also { list ->
+        scripts.forEach {
+            if (it.hookExpansions.contains(this)) list.add(it)
+        }
+    }
 }

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

@@ -12,5 +12,6 @@ abstract class AbstractScript (
 ) {
     val meta = mutableMapOf<String, Any?>()
 
+    val hookExpansions = mutableListOf<FastScriptExpansion>()
 
 }

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

@@ -0,0 +1,30 @@
+package me.scoretwo.fastscript.config
+
+import me.scoretwo.fastscript.plugin
+import me.scoretwo.utils.bukkit.configuration.yaml.file.YamlConfiguration
+import me.scoretwo.utils.bukkit.configuration.yaml.patchs.saveConfiguration
+import java.io.File
+
+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("File-Listener", true)
+        })
+        it.set("Load-Script-Files", listOf("plugins/CustomScriptFolder"))
+        it.set("Default-Script-Options", YamlConfiguration().also {
+            it.set("Main", "main")
+            it.set("Meta", listOf("key:value"))
+        })
+    }
+
+    override fun onReload() {
+        if (!file.exists()) {
+            file.parentFile.mkdirs()
+            file.saveConfiguration(default)
+        }
+    }
+
+}

…o/fastscript/api/config/MessageConfig.kt …retwo/fastscript/config/MessageConfig.ktcommon/src/main/kotlin/me/scoretwo/fastscript/api/config/MessageConfig.kt renamed to common/src/main/kotlin/me/scoretwo/fastscript/config/MessageConfig.kt common/src/main/kotlin/me/scoretwo/fastscript/api/config/MessageConfig.kt renamed to common/src/main/kotlin/me/scoretwo/fastscript/config/MessageConfig.kt

@@ -9,9 +9,7 @@ class JavaScriptExpansion: FastScriptExpansion() {
     override val name: String = "JavaScript"
     override val sign: String = name.toLowerCase()
 
-    val scripts = mutableListOf<JavaScript>()
-
-    override fun processScripts(scripts: MutableList<FileScript>) = scripts.forEachIndexed { i, fileScript ->
+    override fun processScript(script: FileScript): Boolean {
 
     }