Update and Fixed bugs.

Author: Score2

build.gradle

@@ -13,18 +13,27 @@ repositories {
     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'}
 }
 
 dependencies {
     compile 'commons-io:commons-io:2.7'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib"
+    compile 'com.alibaba:fastjson:1.2.9'
+    compile "org.jetbrains.kotlin:kotlin-stdlib"
+    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'
 }
 
+jar {
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+}
+
 processResources {
     from(sourceSets.main.resources.srcDirs) {
         include 'plugin.yml'

src/main/kotlin/me/scoretwo/fastscript/api/exception/ScriptException.kt

@@ -1,4 +1,3 @@
 package me.scoretwo.fastscript.api.exception
 
-class ScriptException: Exception() {
-}
+open class ScriptException(msg: String): Exception(msg)

src/main/kotlin/me/scoretwo/fastscript/api/exception/ScriptNotFound.kt

@@ -0,0 +1,3 @@
+package me.scoretwo.fastscript.api.exception
+
+class ScriptNotFound: ScriptException("Unknown script, it doesn't exist.")

src/main/kotlin/me/scoretwo/fastscript/api/script/InternalScript.kt

@@ -5,6 +5,4 @@ import java.io.File
 
 class InternalScript(file: File): Script(file) {
 
-
-
 }

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

@@ -1,4 +1,14 @@
 package me.scoretwo.fastscript.api.script
 
 class ScriptManager {
+
+    val scripts = mutableListOf<Script>()
+
+    fun getScript(name: String): Script? {
+        for (script in scripts) {
+            if (script.name == name) return script
+        }
+        return null
+    }
+
 }

src/main/kotlin/me/scoretwo/fastscript/config/ScriptImport.kt

@@ -0,0 +1,13 @@
+package me.scoretwo.fastscript.config
+
+class ScriptImport {
+
+    companion object {
+
+        class Object(clazz: String, args: Array<Any?>)
+        class Static(clazz: String)
+        class Method(name: String, args: Array<Any?>)
+
+    }
+
+}

src/main/kotlin/me/scoretwo/fastscript/config/ScriptOption.kt

@@ -0,0 +1,6 @@
+package me.scoretwo.fastscript.config
+
+class ScriptOption {
+
+
+}

src/main/kotlin/me/scoretwo/fastscript/utils/Utils.kt

@@ -10,31 +10,58 @@ import java.lang.reflect.Method
 object Utils {
 
     enum class MethodTypes { OBJECT, STATIC }
-    class Empty { companion object { val instance = Empty() } }
 
     /**
      * 直接对指定对象 new 来获得 instance
     */
-    fun findClass(script: Script, target: String): Class<*> {
+    fun findClass(script: Script, target: String): Class<*>? {
         return try {
             Class.forName(target)
         } catch (e: ClassNotFoundException) {
             e.printStackTrace()
             FastScript.main.sendConsoleMessage("&7[&2Fast&aScript&7] &cERROR &8| &c脚本 &4${script.name} 没有找到类 ${target}, 依赖于该类的方法将不会起作用!")
-            Empty.instance.javaClass
+            null
         }
     }
 
+    /**
+     * 对指定动态对象执行某个方法并返回结果
+     */
     fun getObjectMethodResults(script: Script, clazz: Class<*>, methodName: String, args: Array<Any?> = arrayOf()): Any? {
+        return getObjectMethodResults(script, clazz, arrayOf(), methodName, args)
+    }
+
+    /**
+     * 对指定动态对象执行某个方法并返回结果
+     */
+    fun getObjectMethodResults(script: Script, clazz: Class<*>, initArgs: Array<Any?>, methodName: String, args: Array<Any?> = arrayOf()): Any? {
         val method = clazz.getMethod(methodName)
-        return getMethodResults(script, method, clazz.newInstance(), args)
+        val constructor = clazz.getDeclaredConstructor()
+        constructor.isAccessible = true
+        return getMethodResults(script, method, constructor.newInstance(initArgs), args)
     }
 
+    /**
+     * 对指定动态对象执行某个方法并返回结果
+     * 给定指定对象
+     */
+    fun getObjectMethodResults(script: Script, objects: Any?, methodName: String, args: Array<Any?> = arrayOf()): Any? {
+        if (objects == null) return null
+        val method = objects.javaClass.getMethod(methodName)
+        return getMethodResults(script, method, objects, args)
+    }
+
+    /**
+     * 对指定静态对象执行某个方法并返回结果
+     */
     fun getStaticMethodResults(script: Script, clazz: Class<*>, methodName: String, args: Array<Any?> = arrayOf()): Any? {
         val method = clazz.getMethod(methodName)
         return getMethodResults(script, method, null, args)
     }
 
+    /**
+     * 对指定对象执行某个方法并返回结果
+     */
     private fun getMethodResults(script: Script, method: Method, obj: Any?, args: Array<Any?>): Any? {
         try {
             return method.invoke(obj, args)

src/main/resources/scripts/example.js

@@ -0,0 +1,9 @@
+
+function main() {
+    server.getConsoleSender().sendMessage("[Example] Running script: example")
+}
+
+
+function playerJoinEvent() {
+    player.sendMessage("[Example] Welcome to the server!")
+}

src/main/resources/scripts/example.yml

@@ -0,0 +1,30 @@
+# 脚本引擎
+engine: nashorn
+
+# 导入自定义 object 作为变量
+import:
+#  a: 'static|org.bukkit.Bukkit#getServer|args1|args2...'
+
+#  b: 'object|org.bukkit.util.Vector|1|2...'
+
+  c:
+    init:
+      class: 'org.bukkit.util.Vector'
+      args:
+        - 1
+        - 100
+        - 1
+  d:
+    object:
+      class: 'org.bukkit.util.Vector'
+      args: []
+    method:
+      name: 'length'
+      args: []
+
+  e:
+    static:
+      class: 'org.bukkit.Bukkit'
+    method:
+      name: 'getServer'
+      args: []