Support Sponge and Velocity servers.

Fixed some bugs.

Author: Score2

build.gradle

@@ -7,69 +7,112 @@ buildscript {
         classpath("com.github.jengelman.gradle.plugins:shadow:5.2.0")
     }
 }
+
 plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.4.10'
     id 'com.github.johnrengelman.shadow' version '5.2.0'
 }
 
+apply plugin: 'maven'
+
 group 'me.scoretwo'
-version '0.11'
+version '1.0.1-SNAPSHOT'
+description 'FastScript is a Spigot plugin, which can run JavaScript-based scripts more efficiently.'
 
 defaultTasks 'clean', 'build', 'test', 'shadowJar'
 
 repositories {
     jcenter()
     mavenCentral()
+    maven {url 'https://jitpack.io'}
+    maven {url 'http://repo.drnaylor.co.uk/artifactory/list/minecraft'}
+    maven {url 'https://repo.velocitypowered.com/snapshots/'}
+    maven {url 'https://raw.github.com/FabioZumbi12/UltimateChat/mvn-repo/'}
     maven {url 'https://repo.codemc.org/repository/maven-public'}
     maven {url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'}
     maven {url 'https://oss.sonatype.org/content/repositories/snapshots'}
     maven {url 'https://repo.md-5.net/repository/public'}
     maven {url 'https://repo.extendedclip.com/content/repositories/placeholderapi/'}
     maven {url 'http://maven.aliyun.com/nexus/content/groups/public'}
+    maven {url 'https://repo.spongepowered.org/maven'}
 }
 
 dependencies {
-    compile "org.bstats:bstats-bukkit:1.7"
-    compile "commons-io:commons-io:2.7"
-    compile "com.alibaba:fastjson:1.2.9"
-    compile "org.jetbrains.kotlin:kotlin-stdlib"
-    compile "com.andreapivetta.kolor:kolor:1.0.0"
-    implementation "org.yaml:snakeyaml:1.27"
-    implementation "org.apache.commons:commons-lang3:3.10"
-    implementation "org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT"
-    implementation "net.md-5:bungeecord-api:1.16-R0.3"
-    implementation "me.clip:placeholderapi:2.10.9"
+    // Other
+    compile 'commons-io:commons-io:2.7'
+    compile 'org.jetbrains.kotlin:kotlin-stdlib'
+    implementation 'org.yaml:snakeyaml:1.27'
+    implementation 'org.apache.commons:commons-lang3:3.10'
     implementation fileTree(dir: 'libs', includes: ['*.jar'])
+
+    // Sponge
+    implementation 'org.spongepowered:spongeapi:7.2.0'
+    implementation 'com.github.rojo8399:PlaceholderAPI:master-SNAPSHOT'
+
+    // Bukkit
+    implementation 'org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT'
+    implementation 'me.clip:placeholderapi:2.10.9'
+    compile 'org.bstats:bstats-bukkit:1.7'
+
+    // Bungee
+    implementation 'net.md-5:bungeecord-api:1.16-R0.3'
+
+    // Velocity
+    implementation 'com.velocitypowered:velocity-api:1.0.11-SNAPSHOT'
 }
 
 shadowJar {
     dependencies {
         include(dependency('org.bstats:bstats-bukkit:1.7'))
         include(dependency('commons-io:commons-io:2.7'))
-        include(dependency('com.alibaba:fastjson:1.2.9'))
         include(dependency('org.jetbrains.kotlin:kotlin-stdlib'))
         include(dependency(fileTree(dir: 'libs', includes: ['*.jar'])))
     }
-    relocate("org.bstats", "me.scoretwo.fastscript.libs.bstats")
-    relocate("org.apache", "me.scoretwo.fastscript.libs.apache")
+    relocate("org.bstats", "me.scoretwo.utils.bstats")
+    relocate("org.apache.commons.io", "me.scoretwo.utils.apache.commons.io")
     archiveFileName = "${project.name}-${project.version}.jar"
 }
 
+artifacts {
+    archives shadowJar
+}
+
 processResources {
     from(sourceSets.main.resources.srcDirs) {
         include 'plugin.yml'
         expand(
                 'name': project.name,
-                'main': project.group + "." + project.name.toLowerCase() + ".bukkit.BukkitSection",
+                'main': project.group + "." + project.name.toLowerCase() + ".bukkit.BukkitPlugin",
                 'version': project.version,
+                'description': project.description,
         )
     }
     from(sourceSets.main.resources.srcDirs) {
         include 'bungee.yml'
         expand(
                 'name': project.name,
-                'main': project.group + "." + project.name.toLowerCase() + ".bungee.BungeeSection",
+                'main': project.group + "." + project.name.toLowerCase() + ".bungee.BungeePlugin",
+                'version': project.version,
+                'description': project.description,
+        )
+    }
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+        expand(
+                'modid': "fastscript",
+                'name': project.name,
+                'version': project.version,
+                'description': project.description,
+        )
+    }
+    from(sourceSets.main.resources.srcDirs) {
+        include 'velocity-plugin.json'
+        expand(
+                'modid': "fastscript",
+                'name': project.name,
+                'main': project.group + "." + project.name.toLowerCase() + ".veloity.VeloityPlugin",
                 'version': project.version,
+                'description': project.description,
         )
     }
 }

libs/commons-configuration-1.0-SNAPSHOT.jar

@@ -5,26 +5,39 @@ import me.scoretwo.fastscript.api.script.ScriptManager
 import me.scoretwo.fastscript.commands.CommandManager
 import me.scoretwo.fastscript.config.MessageConfig
 import me.scoretwo.fastscript.config.SettingConfig
+import me.scoretwo.utils.configuration.patchs.getLowerCaseNode
 import java.io.File
 
 class FastScript(main: FastScriptMain) {
 
     private val main: FastScriptMain = main
 
-    val scriptManager = ScriptManager()
-    val commandManager = CommandManager()
+    val dataFolder: File
+    val classLoader: ClassLoader
 
-    val dataFolder = main.getDataFolder()
-    val classLoader = main.getPluginClassLoader()
+    val scriptManager: ScriptManager
+    val commandManager: CommandManager
 
     fun hasPermission(sender: Any, string: String) = main.hasPermission(sender, string)
     fun setPlaceholder(player: Any, string: String) = main.setPlaceholder(player, string)
     fun sendMessage(sender: Any, string: String, colorIndex: Boolean) = main.sendMessage(sender, string, colorIndex)
     fun translateStringColors(string: String): String = main.translateStringColors(string)
 
     init {
+        instance = this
         CONSOLE = main.CONSOLE
         printLogo()
+
+        dataFolder = main.getDataFolder()
+        classLoader = main.getPluginClassLoader()
+        scriptManager = ScriptManager()
+        commandManager = CommandManager()
+
+        if (!dataFolder.exists()) {
+            dataFolder.mkdirs()
+        }
+
+        SettingConfig.init()
     }
 
    /**
@@ -36,6 +49,9 @@ class FastScript(main: FastScriptMain) {
     }
 
     fun onReload() {
+        if (!dataFolder.exists()) {
+            dataFolder.mkdirs()
+        }
         main.onReload()
         initInternalScripts()
         scriptManager.loadScripts()
@@ -59,7 +75,7 @@ class FastScript(main: FastScriptMain) {
         it.forEachIndexed { index, raw ->
             if (raw.isNotBlank()) {
                 val line = raw.toCharArray()
-                val width = (2..8).random()
+                val width = (2..6).random()
                 var randomIndex: Int
                 do {
                     randomIndex = (2..line.size - width).random()
@@ -79,7 +95,7 @@ class FastScript(main: FastScriptMain) {
             /*if (initialized) {
                 throw UnsupportedOperationException("Cannot redefine instance")
             }*/
-            instance = FastScript(main)
+            FastScript(main)
         }
 /*
         @JvmStatic
@@ -163,7 +179,9 @@ fun Any.sendMessage(formatHeader: FormatHeader, strings: Array<String>, colorInd
 }
 
 fun Any.sendMessage(formatHeader: FormatHeader, string: String, colorIndex: Boolean = false) {
-    this.sendMessage("${SettingConfig.instance.defaultLanguage.getLowerCaseYAMLObject("FORMAT-HEADER").getLowerCaseString(formatHeader.name)}${string}", colorIndex)
+    this.sendMessage("${
+        SettingConfig.instance.defaultLanguage.getString(SettingConfig.instance.defaultLanguage.getLowerCaseNode("format-header.${formatHeader.name.toLowerCase()}"))
+    }${string}", colorIndex)
 }
 
 fun Any.sendMessage(string: String, colorIndex: Boolean = false) {

libs/commons-language-1.0-SNAPSHOT.jar

@@ -0,0 +1,9 @@
+package me.scoretwo.fastscript.api.placeholder
+
+object Placeholders {
+
+    fun parse(player: Any, params: String): String {
+        TODO()
+    }
+
+}

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

@@ -2,12 +2,13 @@ package me.scoretwo.fastscript.api.script
 
 import me.scoretwo.fastscript.FastScript
 import me.scoretwo.fastscript.FormatHeader
-import me.scoretwo.fastscript.api.script.ScriptImport.Companion.TYPE.*
-import me.scoretwo.fastscript.api.yaml.YAMLObject
+import me.scoretwo.fastscript.api.script.options.ScriptOption
+import me.scoretwo.fastscript.api.script.options.imports.ScriptImportType.*
 import me.scoretwo.fastscript.config.SettingConfig
 import me.scoretwo.fastscript.sendMessage
 import me.scoretwo.fastscript.utils.StreamUtils
 import me.scoretwo.fastscript.utils.Utils
+import me.scoretwo.utils.configuration.file.YamlConfiguration
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
@@ -38,7 +39,7 @@ abstract class Script {
         if (scriptFile != null && !optionFile!!.exists()) {
             this.scriptOption = SettingConfig.instance.defaultScriptOption
         } else {
-            this.scriptOption = ScriptOption.fromConfigSection(YAMLObject.loadConfiguration(optionFile!!))
+            this.scriptOption = ScriptOption.fromConfig(YamlConfiguration.loadConfiguration(optionFile!!))
         }
 
         onReload()
@@ -67,7 +68,7 @@ abstract class Script {
         scriptOption.import.forEach {
 
             when (it.type) {
-                INIT -> {
+                OBJECT_INIT -> {
                     this.scriptEngine.put(
                             it.name,
                             Utils.getObjectInit(this, Utils.findClass(this, it.obj!!.clazz)!!, it.obj.args)

src/main/kotlin/me/scoretwo/fastscript/api/placeholder/Placeholders.kt

@@ -0,0 +1,29 @@
+package me.scoretwo.fastscript.api.script.options
+
+import me.scoretwo.fastscript.api.script.options.imports.ScriptImport
+import me.scoretwo.utils.configuration.ConfigurationSection
+import me.scoretwo.utils.configuration.patchs.getLowerCaseNode
+
+class ScriptOption(val engine: String, val import: MutableList<ScriptImport>, val main: String? = null) {
+
+    companion object {
+
+        fun fromConfig(section: ConfigurationSection): ScriptOption {
+            val engine = section.getString(section.getLowerCaseNode("engine"))!!
+            val main = section.getString(section.getLowerCaseNode("main"))!!
+
+            val import = mutableListOf<ScriptImport>()
+
+            val importSection = section.getConfigurationSection(section.getLowerCaseNode("import"))!!
+
+            for (name in importSection.getKeys(false)) {
+                import.add(ScriptImport.fromConfig(name, section.getConfigurationSection(name)!!))
+            }
+
+            return ScriptOption(engine, import, main)
+        }
+
+
+    }
+
+}