Fix bugs.

Author: Score2

common/build.gradle.kts

@@ -16,6 +16,11 @@ dependencies {
     compileOnly("org.apache.commons:commons-lang3:3.10")
     compileOnly("com.google.code.gson:gson:2.8.6")
     compileOnly("org.slf4j:slf4j-log4j12:1.7.30")
+
+    implementation("org.jetbrains.kotlin:kotlin-script-util:${KotlinVersion.CURRENT}")
+    implementation("org.jetbrains.kotlin:kotlin-compiler:${KotlinVersion.CURRENT}")
+    implementation("commons-cli:commons-cli:1.4")
+
     implementation("commons-io:commons-io:2.7")
     implementation("me.scoretwo:commons-syntaxes:${rootProject.extra.get("commonsVersion")}")
     implementation("me.scoretwo:commons-command:${rootProject.extra.get("commonsVersion")}")

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

@@ -1,11 +1,15 @@
 package me.scoretwo.fastscript.api.expansion
 
+import me.scoretwo.fastscript.expansion.javascript.JavaScriptExpansion
+import me.scoretwo.fastscript.expansion.kotlinscript.KotlinScriptExpansion
+
 class ExpansionManager {
 
     val expansions = mutableSetOf<FastScriptExpansion>()
 
     init {
-
+        register(KotlinScriptExpansion())
+        register(JavaScriptExpansion())
     }
 
     fun register(expansion: FastScriptExpansion) {

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

@@ -23,9 +23,9 @@ interface ScriptDescription {
             section.getString(section.getLowerCaseNode("version")),
             section.getString(section.getLowerCaseNode("description")),
             if (section.isList(section.getLowerCaseNode("authors")))
-                section.getStringList(section.getLowerCaseNode("authors"))!!
+                section.getStringList(section.getLowerCaseNode("authors"))
             else
-                mutableListOf(section[section.getLowerCaseNode("authors")])
+                mutableListOf(section.getString(section.getLowerCaseNode("authors")))
         )
 
         fun parseDescription(

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

@@ -3,12 +3,13 @@ package me.scoretwo.fastscript.api.script
 import me.scoretwo.fastscript.FastScript
 import me.scoretwo.fastscript.plugin
 import me.scoretwo.fastscript.settings
+import me.scoretwo.utils.bukkit.configuration.yaml.ConfigurationSection
 import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
 import java.io.File
 
 class ScriptManager {
 
-    val defaultScriptPath = File(plugin.dataFolder, "scripts")
+    val folders = mutableListOf(File(plugin.dataFolder, "scripts"))
 
     val scripts = mutableMapOf<String, Script>()
 
@@ -43,12 +44,17 @@ class ScriptManager {
         }
     }
 
+    fun isConfigScriptOption(section: ConfigurationSection) =
+        section.isString(section.getLowerCaseNode("name")) &&
+        (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(".js", true)) {
+        } else if (file.name.endsWith(".yml", true)) {
             files.add(file)
         }
         files

common/src/main/kotlin/me/scoretwo/fastscript/expansion/kotlinscript/KotlinScriptExpansion.kt

@@ -0,0 +1,9 @@
+package me.scoretwo.fastscript.expansion.kotlinscript
+
+import me.scoretwo.fastscript.expansion.typeengine.TypeEngineExpansion
+
+class KotlinScriptExpansion: TypeEngineExpansion() {
+    override val name = "KotlinScript"
+    override val sign = "kts"
+    override val fileSuffix = "kts"
+}