Enter the first round of testing.

Author: Score2

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

@@ -29,7 +29,7 @@ class FastScript(val plugin: ScriptPlugin) {
 
         printLogo()
 
-        plugin.server.console.sendMessage(FormatHeader.INFO, "Initializing...")
+        plugin.server.console.sendMessage("§3FastScript initializing...")
 
         if (!plugin.dataFolder.exists()) {
             plugin.dataFolder.mkdirs()
@@ -58,6 +58,7 @@ class FastScript(val plugin: ScriptPlugin) {
             plugin.dataFolder.mkdirs()
         }
         plugin.reload()
+        expansionManager.reload()
         initInternalScripts()
         scriptManager.loadScripts()
     }

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

@@ -1,13 +1,24 @@
 package me.scoretwo.fastscript.api.expansion
 
+import me.scoretwo.fastscript.FastScript
+import me.scoretwo.fastscript.api.format.FormatHeader
 import me.scoretwo.fastscript.expansion.javascript.JavaScriptExpansion
+import me.scoretwo.fastscript.plugin
+import me.scoretwo.fastscript.sendMessage
+import me.scoretwo.utils.syntaxes.findClass
+import java.io.File
+import java.net.URL
+import java.net.URLClassLoader
 
 class ExpansionManager {
 
+    val expansionFolder = File(plugin.dataFolder, "expansions")
     val expansions = mutableSetOf<FastScriptExpansion>()
 
     init {
         register(JavaScriptExpansion())
+
+        if (!expansionFolder.exists()) expansionFolder.mkdirs()
     }
 
     fun register(expansion: FastScriptExpansion) {
@@ -18,6 +29,40 @@ class ExpansionManager {
         expansions.remove(expansion)
     }
 
+    @Synchronized
+    fun reload() {
+        expansions.clear()
+
+        register(JavaScriptExpansion())
+
+        if (!expansionFolder.exists())
+            expansionFolder.mkdirs()
+
+        for (file in expansionFolder.listFiles() ?: arrayOf()) {
+            val expansionClass = try {
+                file.findClass(FastScriptExpansion::class.java)
+            } catch (e: Exception) {
+                e.printStackTrace()
+                plugin.server.console.sendMessage(FormatHeader.ERROR, "An exception occurred when loading extended ${file.name}, the reason:\n${e.message}")
+                continue
+            }
+
+            if (expansionClass == null) {
+                plugin.server.console.sendMessage(FormatHeader.ERROR, "Unable to load the extension ${file.name} because it has no FastScriptExpansion class available!")
+                continue
+            }
+
+            try {
+                expansions.add(expansionClass.newInstance())
+            } catch (e: Exception) {
+                e.printStackTrace()
+                plugin.server.console.sendMessage(FormatHeader.ERROR, "An exception occurred when loading extended ${file.name}, the reason:\n${e.message}")
+            }
+        }
+
+
+    }
+
     fun unregister(name: String) = expansions.forEach {
         if (it.name == name) {
             expansions.remove(it)

FastScript-common/src/main/kotlin/me/scoretwo/fastscript/api/language/LanguageManager.kt

@@ -2,12 +2,12 @@ package me.scoretwo.fastscript.api.language
 
 class LanguageManager {
 
+    val defaultLanguage = Language()
     val languages = mutableMapOf<String, Language>().also {
-        it["en_US"] = Language()
+        it["en_US"] = defaultLanguage
     }
 
-    var current = languages["en_US"]!!
-
+    var current = defaultLanguage
 
     operator fun set(node: String, any: Any?) = current.set(node, any)
 

FastScript-common/src/main/kotlin/me/scoretwo/fastscript/config/MessageConfig.kt

@@ -35,10 +35,10 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
         include(dependency("org.jetbrains.kotlin:kotlin-stdlib"))
 
         include(dependency(":FastScript-common"))
-        include(dependency(":version-control:FastScript-bukkit"))
-        include(dependency(":version-control:FastScript-bungee"))
-        include(dependency(":version-control:FastScript-sponge"))
-        include(dependency(":version-control:FastScript-velocity"))
+        include(dependency(":FastScript-bukkit"))
+        include(dependency(":FastScript-bungee"))
+        include(dependency(":FastScript-sponge"))
+        include(dependency(":FastScript-velocity"))
 
         include(dependency("me.scoretwo:commons-velocity-plugin:${rootProject.extra.get("commonsVersion")}"))
         include(dependency("me.scoretwo:commons-sponge-plugin:${rootProject.extra.get("commonsVersion")}"))
@@ -59,4 +59,44 @@ tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
     relocate("org.bstats","me.scoretwo.utils.libs.org.bstats")
 
     classifier = null
+}
+
+tasks.processResources {
+    from("src/main/resources") {
+        include("plugin.yml")
+        expand(mapOf(
+            "name" to rootProject.name,
+            "main" to "${rootProject.group}.${rootProject.name.toLowerCase()}.bukkit.BukkitBootStrap",
+            "version" to rootProject.version,
+            "description" to rootProject.description
+        ))
+    }
+    from("src/main/resources") {
+        include("bungee.yml")
+        expand(mapOf(
+            "name" to project.name,
+            "main" to "${rootProject.group}.${rootProject.name.toLowerCase()}.bungee.BungeeBootStrap",
+            "version" to project.version,
+            "description" to project.description
+        ))
+    }
+    from("src/main/resources") {
+        include("mcmod.info")
+        expand(mapOf(
+            "id" to project.name.toLowerCase(),
+            "name" to project.name,
+            "version" to project.version,
+            "description" to project.description
+        ))
+    }
+    from("src/main/resources") {
+        include("velocity-plugin.json")
+        expand(mapOf(
+            "id" to project.name.toLowerCase(),
+            "name" to project.name,
+            "version" to project.version,
+            "main" to "${rootProject.group}.${rootProject.name.toLowerCase()}.velocity.VelocityBootStrap",
+            "description" to project.description
+        ))
+    }
 }

FastScript-plugin/build.gradle.kts

@@ -4,6 +4,6 @@
         "name": "${name}",
         "version": "${version}",
         "description": "${description}",
-        "authorList": ["Score2"],
+        "authorList": ["Score2"]
     }
 ]

…ipt-bungee/src/main/resources/bungee.yml …ipt-plugin/src/main/resources/bungee.ymlversion-control/FastScript-bungee/src/main/resources/bungee.yml renamed to FastScript-plugin/src/main/resources/bungee.yml version-control/FastScript-bungee/src/main/resources/bungee.yml renamed to FastScript-plugin/src/main/resources/bungee.yml

@@ -51,13 +51,13 @@ class MergeBuilder {
         return MergeBuilder(nodes, addNodes)
     }
 }
-
 include("FastScript-common")
-include("FastScript-plugin")
 
 MergeBuilder("version-control").also {
     it.add("FastScript-bukkit")
     it.add("FastScript-bungee")
     it.add("FastScript-sponge")
     it.add("FastScript-velocity")
-}
+}
+
+include("FastScript-plugin")