Added script apis.

Author: Score2

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

@@ -19,7 +19,9 @@ abstract class ScriptPlugin(val plugin: GlobalPlugin): GlobalPlugin {
 
     abstract fun toOriginalPlugin(): Any?
     abstract fun toOriginalSender(sender: GlobalSender): Any?
+    abstract fun toGlobalSender(any: Any?): GlobalSender
     abstract fun toOriginalPlayer(player: GlobalPlayer): Any?
+    abstract fun toGlobalPlayer(any: Any?): GlobalPlayer
     abstract fun toOriginalServer(): Any?
 
     abstract fun registerListener(any: Any?): Boolean

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

@@ -50,6 +50,14 @@ abstract class Script(
     fun execute(expansion: FastScriptExpansion?, sender: GlobalSender, main: String = option.main, args: Array<Any?> = arrayOf()): Any? =
         expansion?.execute(this, sender, main, args)
 
+    fun eval(script: String, sign: String, sender: GlobalSender, vararg args: String) = let {
+        FastScript.instance.scriptManager.eval(FastScript.instance.scriptManager.getScript(script) ?: return@let null, sign, sender, *args)
+    }
+
+    fun execute(script: String, sign: String, sender: GlobalSender, main: String = FastScript.instance.scriptManager.getScript(script)?.configOption?.main ?: "main", args: Array<Any?> = arrayOf()) = let {
+        FastScript.instance.scriptManager.execute(FastScript.instance.scriptManager.getScript(script) ?: return@let null, sign, sender, main, args)
+    }
+
     fun registerListener(any: Any?) {
         if (!plugin.registerListener(any))
             plugin.server.console.sendMessage(

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

@@ -10,6 +10,7 @@ import me.scoretwo.fastscript.api.utils.process.ProcessResultType
 import me.scoretwo.fastscript.listeners.ScriptFileListener
 import me.scoretwo.utils.bukkit.configuration.yaml.ConfigurationSection
 import me.scoretwo.utils.bukkit.configuration.yaml.patchs.ignoreCase
+import me.scoretwo.utils.sender.GlobalPlayer
 import me.scoretwo.utils.sender.GlobalSender
 import me.scoretwo.utils.server.task.TaskType
 import org.apache.commons.io.monitor.FileAlterationListener
@@ -242,10 +243,23 @@ class ScriptManager {
         section.isString(section.ignoreCase("main"))
 
 
+
     fun eval(script: CustomScript, sign: String, sender: GlobalSender, vararg args: String) =
         script.eval(sign, sender, *args).also { evaluateCount += 1; operationCount += 1 }
 
     fun execute(script: CustomScript, sign: String, sender: GlobalSender, main: String = script.configOption.main, args: Array<Any?> = arrayOf()) =
         script.execute(sign, sender, main, args).also { executeCount += 1; operationCount += 1 }
 
+
+    fun eval(script: String, sign: String, sender: GlobalSender, vararg args: String) = let {
+        eval(getScript(script) ?: return@let null, sign, sender, *args)
+    }
+
+    fun execute(script: String, sign: String, sender: GlobalSender, main: String = getScript(script)?.configOption?.main ?: "main", args: Array<Any?> = arrayOf()) = let {
+        execute(getScript(script) ?: return@let null, sign, sender, main, args)
+    }
+
+    fun setPlaceholder(player: GlobalPlayer, text: String) = plugin.setPlaceholder(player, text)
+
+    fun setPlaceholder(sender: Any, text: String) = plugin.setPlaceholder(plugin.toGlobalPlayer(sender), text)
 }

common/src/main/kotlin/me/scoretwo/fastscript/expansion/typeengine/TypeEngineExpansion.kt

@@ -33,6 +33,7 @@ abstract class TypeEngineExpansion: FastScriptExpansion() {
         newEngine.put("plugin", plugin.toOriginalPlugin())
         newEngine.put("script", script)
         newEngine.put("server", plugin.toOriginalServer())
+        newEngine.put("setPlaceholder", FastScript.instance.scriptManager::setPlaceholder)
         newEngine.put("globalServer", plugin.server)
         newEngine.put("scriptManager", FastScript.instance.scriptManager)
         newEngine.put("expansionManager", FastScript.instance.expansionManager)

version-control/FastScript-bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/BukkitPlugin.kt

@@ -19,6 +19,7 @@ import org.bukkit.Sound
 import org.bukkit.entity.Player
 import org.bukkit.event.HandlerList
 import org.bukkit.event.Listener
+import org.omg.CORBA.portable.UnknownException
 
 class BukkitPlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
@@ -103,6 +104,20 @@ class BukkitPlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
     override fun toOriginalServer() = Bukkit.getServer()
 
+    override fun toGlobalPlayer(any: Any?): GlobalPlayer {
+        if (any !is Player) {
+            throw Exception("$any not a player!")
+        }
+        return any.toGlobalPlayer()
+    }
+
+    override fun toGlobalSender(any: Any?): GlobalSender {
+        if (any !is Player) {
+            throw Exception("$any not a player!")
+        }
+        return any.toGlobalPlayer()
+    }
+
     override fun registerListener(any: Any?): Boolean {
         if (any !is Listener) {
             return false

version-control/FastScript-bungee/src/main/kotlin/me/scoretwo/fastscript/bungee/BungeePlugin.kt

@@ -6,11 +6,13 @@ import me.scoretwo.fastscript.api.utils.ExecType
 import me.scoretwo.utils.bungee.command.registerBungeeCommands
 import me.scoretwo.utils.bungee.command.toBungeePlayer
 import me.scoretwo.utils.bungee.command.toBungeeSender
+import me.scoretwo.utils.bungee.command.toGlobalPlayer
 import me.scoretwo.utils.bungee.plugin.toBungeePlugin
 import me.scoretwo.utils.plugin.GlobalPlugin
 import me.scoretwo.utils.sender.GlobalPlayer
 import me.scoretwo.utils.sender.GlobalSender
 import net.md_5.bungee.api.ProxyServer
+import net.md_5.bungee.api.connection.ProxiedPlayer
 import net.md_5.bungee.api.plugin.Listener
 
 class BungeePlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
@@ -34,6 +36,19 @@ class BungeePlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
     override fun toOriginalPlayer(player: GlobalPlayer) = player.toBungeePlayer()
 
     override fun toOriginalServer(): Any? = ProxyServer.getInstance()
+    override fun toGlobalPlayer(any: Any?): GlobalPlayer {
+        if (any !is ProxiedPlayer) {
+            throw Exception("$any not a player!")
+        }
+        return any.toGlobalPlayer()
+    }
+
+    override fun toGlobalSender(any: Any?): GlobalSender {
+        if (any !is ProxiedPlayer) {
+            throw Exception("$any not a player!")
+        }
+        return any.toGlobalPlayer()
+    }
 
     override fun registerListener(any: Any?): Boolean {
         if (any !is Listener) {

version-control/FastScript-nukkit/src/main/kotlin/me/scoretwo/fastscript/nukkit/NukkitPlugin.kt

@@ -1,10 +1,12 @@
 package me.scoretwo.fastscript.nukkit
 
+import cn.nukkit.Player
 import cn.nukkit.Server
 import cn.nukkit.event.HandlerList
 import cn.nukkit.event.Listener
 import me.scoretwo.fastscript.FastScript
 import me.scoretwo.fastscript.api.plugin.ScriptPlugin
+import me.scoretwo.utils.nukkit.command.toGlobalPlayer
 import me.scoretwo.utils.nukkit.command.toNukkitSender
 import me.scoretwo.utils.nukkit.plugin.toNukkitPlugin
 import me.scoretwo.utils.plugin.GlobalPlugin
@@ -39,6 +41,20 @@ class NukkitPlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
     override fun toOriginalServer(): Any = Server.getInstance()
 
+    override fun toGlobalPlayer(any: Any?): GlobalPlayer {
+        if (any !is Player) {
+            throw Exception("$any not a player!")
+        }
+        return any.toGlobalPlayer()
+    }
+
+    override fun toGlobalSender(any: Any?): GlobalSender {
+        if (any !is Player) {
+            throw Exception("$any not a player!")
+        }
+        return any.toGlobalPlayer()
+    }
+
     override fun registerListener(any: Any?): Boolean {
         if (any !is Listener) {
             return false

version-control/FastScript-sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongePlugin.kt

@@ -11,10 +11,12 @@ import me.scoretwo.utils.plugin.GlobalPlugin
 import me.scoretwo.utils.sender.GlobalPlayer
 import me.scoretwo.utils.sender.GlobalSender
 import me.scoretwo.utils.sponge.command.registerSpongeCommands
+import me.scoretwo.utils.sponge.command.toGlobalPlayer
 import me.scoretwo.utils.sponge.command.toSpongePlayer
 import me.scoretwo.utils.sponge.command.toSpongeSender
 import me.scoretwo.utils.sponge.plugin.toSpongePlugin
 import org.spongepowered.api.Sponge
+import org.spongepowered.api.entity.living.player.Player
 
 class SpongePlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
@@ -40,6 +42,19 @@ class SpongePlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
     override fun toOriginalPlayer(player: GlobalPlayer) = player.toSpongePlayer()
 
     override fun toOriginalServer(): Any? = Sponge.getServer()
+    override fun toGlobalPlayer(any: Any?): GlobalPlayer {
+        if (any !is Player) {
+            throw Exception("$any not a player!")
+        }
+        return any.toGlobalPlayer()
+    }
+
+    override fun toGlobalSender(any: Any?): GlobalSender {
+        if (any !is Player) {
+            throw Exception("$any not a player!")
+        }
+        return any.toGlobalPlayer()
+    }
 
     override fun registerListener(any: Any?): Boolean = try {
         Sponge.getEventManager().registerListeners(toSpongePlugin(), any ?: false)

version-control/FastScript-velocity/src/main/kotlin/me/scoretwo/fastscript/velocity/VelocityPlugin.kt

@@ -1,5 +1,6 @@
 package me.scoretwo.fastscript.velocity
 
+import com.velocitypowered.api.proxy.Player
 import me.scoretwo.fastscript.FastScript
 import me.scoretwo.fastscript.api.plugin.ScriptPlugin
 import me.scoretwo.fastscript.api.utils.ExecType
@@ -8,6 +9,7 @@ import me.scoretwo.utils.plugin.GlobalPlugin
 import me.scoretwo.utils.sender.GlobalPlayer
 import me.scoretwo.utils.sender.GlobalSender
 import me.scoretwo.utils.velocity.command.registerVelocityCommands
+import me.scoretwo.utils.velocity.command.toGlobalPlayer
 import me.scoretwo.utils.velocity.command.toVelocityPlayer
 import me.scoretwo.utils.velocity.command.toVelocitySender
 import me.scoretwo.utils.velocity.plugin.toVelocityPlugin
@@ -37,6 +39,20 @@ class VelocityPlugin(plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
     override fun toOriginalServer() = proxyServer
 
+    override fun toGlobalPlayer(any: Any?): GlobalPlayer {
+        if (any !is Player) {
+            throw Exception("$any not a player!")
+        }
+        return any.toGlobalPlayer()
+    }
+
+    override fun toGlobalSender(any: Any?): GlobalSender {
+        if (any !is Player) {
+            throw Exception("$any not a player!")
+        }
+        return any.toGlobalPlayer()
+    }
+
     override fun registerListener(any: Any?): Boolean = try {
         proxyServer.eventManager.register(toVelocityPlugin(), any ?: false)
         true