Wait for the upstream commons-utils to be updated in order to continue the project follow-up.

Author: Score2

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

@@ -1,5 +1,6 @@
 package me.scoretwo.fastscript
 
+import me.scoretwo.fastscript.api.addon.AddonManager
 import me.scoretwo.fastscript.api.format.FormatHeader
 import me.scoretwo.fastscript.api.plugin.ScriptPlugin
 import me.scoretwo.fastscript.api.script.AbstractScript
@@ -19,6 +20,7 @@ class FastScript(val plugin: ScriptPlugin) {
 
     val commandNexus: ScriptCommandNexus
     val scriptManager: ScriptManager
+    val addonManager: AddonManager
 
     fun setPlaceholder(player: GlobalPlayer, string: String) = plugin.setPlaceholder(player, string)
 
@@ -32,6 +34,7 @@ class FastScript(val plugin: ScriptPlugin) {
 
         commandNexus = ScriptCommandNexus()
         scriptManager = ScriptManager()
+        addonManager = AddonManager()
 
         if (!plugin.dataFolder.exists()) {
             plugin.dataFolder.mkdirs()

common/src/main/kotlin/me/scoretwo/fastscript/addon/javascript/JavaScript.kt

@@ -7,6 +7,7 @@ import me.scoretwo.fastscript.api.script.FileScript
 import me.scoretwo.fastscript.api.script.ScriptDescription
 import me.scoretwo.fastscript.plugin
 import me.scoretwo.fastscript.sendMessage
+import me.scoretwo.utils.sender.GlobalSender
 import me.scoretwo.utils.syntaxes.readString
 import java.io.File
 import javax.script.Invocable
@@ -38,17 +39,19 @@ class JavaScript(
         meta.forEach {
             engine.put(it.key, it.value)
         }
-        engine.put("api", plugin.abstractScriptUtils)
+        engine.put("server", plugin.server)
     }
-    fun directEval(): Any? {
+    fun directEval(sender: GlobalSender): Any? {
+        engine.put("sender", sender)
+        engine.put("originalsender", plugin.toOriginalSender(sender))
         return try {
             engine.eval(mergedString)
         } catch (e: ScriptException) {
             plugin.server.console.sendMessage(FormatHeader.ERROR,"脚本 §c${description.name} §7解析时出现错误, 请检查脚本格式.")
         }
     }
 
-    fun execute(function: String = options.main, args: Array<Any?> = arrayOf()): Any? {
+    fun execute(sender: GlobalSender, function: String = options.main, args: Array<Any?> = arrayOf()): Any? {
         /*if (engine !is Invocable)*/
         return try {
             directEval()

common/src/main/kotlin/me/scoretwo/fastscript/api/addon/Addon.kt

@@ -0,0 +1,14 @@
+package me.scoretwo.fastscript.api.addon
+
+import me.scoretwo.fastscript.api.script.AbstractScript
+
+interface Addon {
+
+    val name: String
+    val sign: String
+
+    fun processScript(script: AbstractScript)
+
+    fun executeScript(script: AbstractScript)
+
+}

common/src/main/kotlin/me/scoretwo/fastscript/api/addon/AddonManager.kt

@@ -0,0 +1,26 @@
+package me.scoretwo.fastscript.api.addon
+
+class AddonManager {
+
+    val addons = mutableSetOf<Addon>()
+
+    init {
+
+    }
+
+    fun register(addon: Addon) {
+        addons.add(addon)
+    }
+
+    fun unregister(addon: Addon) {
+        addons.remove(addon)
+    }
+
+    fun unregister(name: String) = addons.forEach {
+        if (it.name == name) {
+            addons.remove(it)
+            return@forEach
+        }
+    }
+
+}

common/src/main/kotlin/me/scoretwo/fastscript/api/addon/AddonPlugin.kt

@@ -0,0 +1,17 @@
+package me.scoretwo.fastscript.api.addon
+
+import me.scoretwo.fastscript.scripts
+
+abstract class AddonPlugin: Addon {
+
+    init {
+
+    }
+
+    abstract fun ionizing()
+
+    abstract fun disable()
+
+
+
+}

common/src/main/kotlin/me/scoretwo/fastscript/api/plugin/ScriptPlugin.kt

@@ -5,14 +5,19 @@ import me.scoretwo.utils.plugin.GlobalPlugin
 import me.scoretwo.utils.plugin.PluginDescription
 import me.scoretwo.utils.plugin.logging.GlobalLogger
 import me.scoretwo.utils.sender.GlobalPlayer
+import me.scoretwo.utils.sender.GlobalSender
 import me.scoretwo.utils.server.GlobalServer
 import java.io.File
 
 abstract class ScriptPlugin(plugin: GlobalPlugin): GlobalPlugin {
 
     abstract fun setPlaceholder(player: GlobalPlayer, string: String): String
 
-    abstract val abstractScriptUtils: AbstractScriptUtils
+    val scriptKits = mutableMapOf<String, Any?>()
+
+    abstract fun toOriginalSender(sender: GlobalSender): Any?
+    abstract fun toOriginalPlayer(player: GlobalPlayer): Any?
+    abstract fun toOriginalServer(): Any?
 
     open fun load() {}
     open fun reload() {}

common/src/main/kotlin/me/scoretwo/fastscript/api/utils/AbstractScriptUtils.kt

@@ -6,9 +6,6 @@ import me.scoretwo.utils.server.GlobalServer
 
 abstract class AbstractScriptUtils {
 
-    abstract fun toSender(sender: GlobalSender): Any?
-    abstract fun toPlayer(player: GlobalPlayer): Any?
-    abstract fun toServer(): Any?
 
 
 }