Fixed command bugs.

Score2 · Score2 · commit 24134d012570 · 2021-03-03T23:18:48.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "me.scoretwo"
-version = "1.0.3-SNAPSHOT"
+version = "1.0.4-SNAPSHOT"
 description = "FastScript is a Spigot plugin, which can run JavaScript-based scripts more efficiently."
 
 defaultTasks = mutableListOf("ShadowJar", "publishToMavenLocal")
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt b/common/src/main/kotlin/me/scoretwo/fastscript/FastScript.kt
@@ -125,6 +125,11 @@ class FastScript(val plugin: ScriptPlugin) {
     fun reload(vararg modes: String) {
         if (!plugin.dataFolder.exists()) {
             plugin.dataFolder.mkdirs()
+        }
+        try {
+            commandNexus.register()
+        } catch (t: Throwable) {
+
         }
         modes.forEach {mode ->
             when (mode) {
@@ -139,9 +144,9 @@ class FastScript(val plugin: ScriptPlugin) {
                     if (::commandNexus.isInitialized) {
                         commandNexus = FSCommandNexus()
                     }
-                    commandNexus.findSubCommand("script")?.also { (it as ScriptCommand).reload() }
+                    plugin.server.dispatchCommand(plugin.server.console, "fs script :reload")
                 }
-                "plugin" ->{
+                "plugin" -> {
                     plugin.reload()
                 }
             }
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptManager.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/script/ScriptManager.kt
@@ -8,6 +8,7 @@ import me.scoretwo.fastscript.api.script.temp.TempScript
 import me.scoretwo.fastscript.api.utils.ExecType
 import me.scoretwo.fastscript.api.utils.process.ProcessResult
 import me.scoretwo.fastscript.api.utils.process.ProcessResultType
+import me.scoretwo.fastscript.command.commands.ScriptCommand
 import me.scoretwo.utils.bukkit.configuration.yaml.ConfigurationSection
 import me.scoretwo.utils.bukkit.configuration.yaml.patchs.getLowerCaseNode
 import me.scoretwo.utils.sender.GlobalSender
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/api/utils/maven/MavenArtifact.kt b/common/src/main/kotlin/me/scoretwo/fastscript/api/utils/maven/MavenArtifact.kt
@@ -61,7 +61,7 @@ class MavenArtifact {
         try {
             val url = toURL(repository)
             val folder = File(plugin.dataFolder, "lib")
-            val file = File(folder, url.substringAfterLast("/"))
+            val file = File(folder, "$artifactId-$version.jar")
             if (file.exists()) {
                 return ProcessResult(ProcessResultType.OTHER, "exists")
             }
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/command/commands/ScriptCommand.kt b/common/src/main/kotlin/me/scoretwo/fastscript/command/commands/ScriptCommand.kt
@@ -7,14 +7,15 @@ import me.scoretwo.fastscript.command.SimpleCommand
 import me.scoretwo.fastscript.languages
 import me.scoretwo.fastscript.sendMessage
 import me.scoretwo.fastscript.setPlaceholder
+import me.scoretwo.utils.command.SubCommand
 import me.scoretwo.utils.command.executor.CommandExecutor
 import me.scoretwo.utils.command.executor.Executors
+import me.scoretwo.utils.sender.GlobalPlayer
 import me.scoretwo.utils.sender.GlobalSender
 import net.md_5.bungee.api.chat.ClickEvent
 import net.md_5.bungee.api.chat.HoverEvent
 import net.md_5.bungee.api.chat.TextComponent
 import net.md_5.bungee.api.chat.hover.content.Text
-import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeFirstWord
 
 /**
  * @author Score2
@@ -26,6 +27,10 @@ class ScriptCommand: SimpleCommand(arrayOf("script")) {
 
     override var description = languages["COMMAND-NEXUS.COMMANDS.SCRIPT.DESCRIPTION"]
 
+    init {
+        instance = this
+    }
+
     private val runCommand = nextBuilder()
         .alias("execute", "run")
         .description(languages["COMMAND-NEXUS.COMMANDS.SCRIPT.EXECUTE.DESCRIPTION"])
@@ -40,12 +45,12 @@ class ScriptCommand: SimpleCommand(arrayOf("script")) {
                     return true
                 }
                 if (args.isEmpty()) {
-                    sender.sendMessage(FormatHeader.ERROR, "${languages["SUBSTANTIVE.USAGE"].capitalizeFirstWord()}: /${parents.joinToString(" ")} §f<${script.texts.keys.joinToString("/")}> §7<${script.option.main}> <args...> §8:s")
+                    sender.sendMessage(FormatHeader.ERROR, "${languages["SUBSTANTIVE.USAGE"]}: /${parents.joinToString(" ")} §f<${script.texts.keys.joinToString("/")}> §7<${script.option.main}> <args...> §8:s")
                     return true
                 }
                 val sign = args[0]
                 if (!script.texts.keys.contains(sign)) {
-                    sender.sendMessage(FormatHeader.ERROR, "${languages["SUBSTANTIVE.USAGE"].capitalizeFirstWord()}: /${parents.joinToString(" ")} §f<${script.texts.keys.joinToString("/")}> §7<${script.option.main}> <args...> §8:s")
+                    sender.sendMessage(FormatHeader.ERROR, "${languages["SUBSTANTIVE.USAGE"]}: /${parents.joinToString(" ")} §f<${script.texts.keys.joinToString("/")}> §7<${script.option.main}> <args...> §8:s")
                     return true
                 }
 
@@ -105,12 +110,12 @@ class ScriptCommand: SimpleCommand(arrayOf("script")) {
                     return true
                 }
                 if (args.isEmpty()) {
-                    sender.sendMessage(FormatHeader.ERROR, "${languages["SUBSTANTIVE.USAGE"].capitalizeFirstWord()}: /${parents.joinToString(" ")} §f<${script.texts.keys.joinToString("/")}> §7<args> §8:s")
+                    sender.sendMessage(FormatHeader.ERROR, "${languages["SUBSTANTIVE.USAGE"]}: /${parents.joinToString(" ")} §f<${script.texts.keys.joinToString("/")}> §7<args> §8:s")
                     return true
                 }
                 val sign = args[0]
                 if (!script.texts.keys.contains(sign)) {
-                    sender.sendMessage(FormatHeader.ERROR, "${languages["SUBSTANTIVE.USAGE"].capitalizeFirstWord()}: /${parents.joinToString(" ")} §f<${script.texts.keys.joinToString("/")}>")
+                    sender.sendMessage(FormatHeader.ERROR, "${languages["SUBSTANTIVE.USAGE"]}: /${parents.joinToString(" ")} §f<${script.texts.keys.joinToString("/")}>")
                     return true
                 }
                 val args0: Array<String> = when {
@@ -207,11 +212,27 @@ class ScriptCommand: SimpleCommand(arrayOf("script")) {
         })
         .build()
 
+    override fun execute(sender: GlobalSender, parents: Array<String>, args: Array<String>): Boolean {
+        if (sender !is GlobalPlayer && args.isNotEmpty()) {
+            when (args[0].toLowerCase()) {
+                ":reload" -> {
+                    reload()
+                }
+                ":clear" -> {
+                    subCommands.clear()
+                }
+            }
+            return true
+        }
+        return super.execute(sender, parents, args)
+    }
+
+    @Synchronized
     fun reload() {
         subCommands.clear()
         FastScript.instance.scriptManager.scripts.forEach {
             val subCommand = nextBuilder()
-                .alias(it.value.description.name)
+                .alias(it.value.name)
                 .description(languages["COMMAND-NEXUS.COMMANDS.SCRIPT.SUB-SCRIPT-DESCRIPTION"].setPlaceholder(mapOf("script_name" to it.key)))
                 .execute(object : CommandExecutor {
                     override fun execute(sender: GlobalSender, parents: Array<String>, args: Array<String>): Boolean {
@@ -227,9 +248,13 @@ class ScriptCommand: SimpleCommand(arrayOf("script")) {
                 .subCommand(reloadCommand)
                 .subCommand(infoCommand)
                 .build()
-            subCommands.add(subCommand)
+            register(subCommand)
         }
     }
 
+    companion object {
+        lateinit var instance: ScriptCommand
+
+    }
 
 }
diff --git a/common/src/main/kotlin/me/scoretwo/fastscript/listeners/FileListener.kt b/common/src/main/kotlin/me/scoretwo/fastscript/listeners/FileListener.kt
@@ -4,13 +4,14 @@ import org.apache.commons.io.monitor.FileAlterationListener
 import org.apache.commons.io.monitor.FileAlterationMonitor
 import org.apache.commons.io.monitor.FileAlterationObserver
 import java.io.File
+import java.util.concurrent.TimeUnit
 
 
 class FileListener: FileAlterationListener {
 
     val monitor: FileAlterationMonitor
 
-    constructor(directory: File): this(directory, 100)
+    constructor(directory: File): this(directory, 20)
 
     constructor(directory: File, interval: Long): this(interval, FileAlterationObserver(directory))
 
diff --git a/version-control/FastScript-bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/BukkitPlugin.kt b/version-control/FastScript-bukkit/src/main/kotlin/me/scoretwo/fastscript/bukkit/BukkitPlugin.kt
@@ -82,8 +82,6 @@ class BukkitPlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
             )
         }
-
-        FastScript.instance.commandNexus.registerBukkitCommands()
     }
 
     override fun setPlaceholder(player: GlobalPlayer, string: String): String {
diff --git a/version-control/FastScript-bungee/src/main/kotlin/me/scoretwo/fastscript/bungee/BungeePlugin.kt b/version-control/FastScript-bungee/src/main/kotlin/me/scoretwo/fastscript/bungee/BungeePlugin.kt
@@ -19,8 +19,6 @@ class BungeePlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
     override fun enable() {
         FastScript.instance.reload("script", "plugin")
-
-        FastScript.instance.commandNexus.registerBungeeCommands()
     }
 
     override fun setPlaceholder(player: GlobalPlayer, string: String): String {
diff --git a/version-control/FastScript-sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongePlugin.kt b/version-control/FastScript-sponge/src/main/kotlin/me/scoretwo/fastscript/sponge/SpongePlugin.kt
@@ -26,8 +26,6 @@ class SpongePlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {
     override fun enable() {
         FastScript.instance.reload("script", "plugin")
         PlaceholderAPIHook.initializePlaceholder()
-
-        FastScript.instance.commandNexus.registerSpongeCommands()
     }
 
     override fun setPlaceholder(player: GlobalPlayer, string: String): String {
diff --git a/version-control/FastScript-velocity/src/main/kotlin/me/scoretwo/fastscript/velocity/VelocityPlugin.kt b/version-control/FastScript-velocity/src/main/kotlin/me/scoretwo/fastscript/velocity/VelocityPlugin.kt
@@ -22,8 +22,6 @@ class VelocityPlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {
 
     override fun enable() {
         FastScript.instance.reload("script", "plugin")
-
-        FastScript.instance.commandNexus.registerVelocityCommands()
     }
 
     override fun setPlaceholder(player: GlobalPlayer, string: String): String {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`group = "me.scoretwo"`
`11`		`-version = "1.0.3-SNAPSHOT"`
	`11`	`+version = "1.0.4-SNAPSHOT"`
`12`	`12`	`description = "FastScript is a Spigot plugin, which can run JavaScript-based scripts more efficiently."`
`13`	`13`
`14`	`14`	`defaultTasks = mutableListOf("ShadowJar", "publishToMavenLocal")`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,11 @@ class FastScript(val plugin: ScriptPlugin) {`
`125`	`125`	`fun reload(vararg modes: String) {`
`126`	`126`	`if (!plugin.dataFolder.exists()) {`
`127`	`127`	`plugin.dataFolder.mkdirs()`
	`128`	`+ }`
	`129`	`+ try {`
	`130`	`+ commandNexus.register()`
	`131`	`+ } catch (t: Throwable) {`
	`132`	`+`
`128`	`133`	`}`
`129`	`134`	`modes.forEach {mode ->`
`130`	`135`	`when (mode) {`
`@@ -139,9 +144,9 @@ class FastScript(val plugin: ScriptPlugin) {`
`139`	`144`	`if (::commandNexus.isInitialized) {`
`140`	`145`	`commandNexus = FSCommandNexus()`
`141`	`146`	`}`
`142`		`- commandNexus.findSubCommand("script")?.also { (it as ScriptCommand).reload() }`
	`147`	`+ plugin.server.dispatchCommand(plugin.server.console, "fs script :reload")`
`143`	`148`	`}`
`144`		`- "plugin" ->{`
	`149`	`+ "plugin" -> {`
`145`	`150`	`plugin.reload()`
`146`	`151`	`}`
`147`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class MavenArtifact {`
`61`	`61`	`try {`
`62`	`62`	`val url = toURL(repository)`
`63`	`63`	`val folder = File(plugin.dataFolder, "lib")`
`64`		`- val file = File(folder, url.substringAfterLast("/"))`
	`64`	`+ val file = File(folder, "$artifactId-$version.jar")`
`65`	`65`	`if (file.exists()) {`
`66`	`66`	`return ProcessResult(ProcessResultType.OTHER, "exists")`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,6 @@ class BukkitPlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {`
`82`	`82`
`83`	`83`	`)`
`84`	`84`	`}`
`85`		`-`
`86`		`- FastScript.instance.commandNexus.registerBukkitCommands()`
`87`	`85`	`}`
`88`	`86`
`89`	`87`	`override fun setPlaceholder(player: GlobalPlayer, string: String): String {`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ class BungeePlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {`
`19`	`19`
`20`	`20`	`override fun enable() {`
`21`	`21`	`FastScript.instance.reload("script", "plugin")`
`22`		`-`
`23`		`- FastScript.instance.commandNexus.registerBungeeCommands()`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`override fun setPlaceholder(player: GlobalPlayer, string: String): String {`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,6 @@ class SpongePlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {`
`26`	`26`	`override fun enable() {`
`27`	`27`	`FastScript.instance.reload("script", "plugin")`
`28`	`28`	`PlaceholderAPIHook.initializePlaceholder()`
`29`		`-`
`30`		`- FastScript.instance.commandNexus.registerSpongeCommands()`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`override fun setPlaceholder(player: GlobalPlayer, string: String): String {`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ class VelocityPlugin(val plugin: GlobalPlugin): ScriptPlugin(plugin) {`
`22`	`22`
`23`	`23`	`override fun enable() {`
`24`	`24`	`FastScript.instance.reload("script", "plugin")`
`25`		`-`
`26`		`- FastScript.instance.commandNexus.registerVelocityCommands()`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`override fun setPlaceholder(player: GlobalPlayer, string: String): String {`