拓展脚本机制

EikoocS · Jun 21, 2022 · aa26462 · aa26462
1 parent 4d84729
commit aa26462
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/src/main/kotlin/tech/cookiepower/jythonengine/script/ScriptCommands.kt b/src/main/kotlin/tech/cookiepower/jythonengine/script/ScriptCommands.kt
@@ -27,7 +27,7 @@ object ScriptCommands {
     val reload = subCommand {
         execute<ProxyCommandSender> { sender, _, _ ->
             sender.sendLang("script-reloading")
-            ScriptManager.reloadAllScripts()
+            ScriptManager.reloadAll()
             sender.sendLang("script-reloaded")
         }
     }

diff --git a/src/main/kotlin/tech/cookiepower/jythonengine/script/ScriptManager.kt b/src/main/kotlin/tech/cookiepower/jythonengine/script/ScriptManager.kt
@@ -2,7 +2,6 @@ package tech.cookiepower.jythonengine.script
 
 import taboolib.common.LifeCycle
 import taboolib.common.platform.Awake
-import taboolib.common.platform.function.info
 import tech.cookiepower.jythonengine.event.ScriptLoadEvent
 import tech.cookiepower.jythonengine.event.ScriptUnloadEvent
 import java.io.File
@@ -32,26 +31,26 @@ object ScriptManager {
         scripts.remove(script)
     }
 
-    private fun unRemoveUnload(script: Script){
-        ScriptUnloadEvent(script).call()
-        namespacedKeys.remove(script.namespacedKey)
-    }
-
-    fun loadScripts(){
-        rootDir.walk().filter {
+    fun loadByDir(dir: File = rootDir){
+        dir.walk().filter {
             it.isFile && it.extension == "jy"
         }.forEach {
             load(Script(it))
         }
     }
 
-    fun unloadScripts(){
-        scripts
+    fun unloadAll(){
+        scripts.forEach {
+            namespacedKeys.remove(it.namespacedKey)
+            ScriptUnloadEvent(it).call()
+            unload(it)
+        }
+        scripts.clear()
     }
 
     @Awake(LifeCycle.ENABLE)
-    fun reloadAllScripts(){
-        unloadScripts()
-        loadScripts()
+    fun reloadAll(){
+        unloadAll()
+        loadByDir()
     }
 }
diff --git a/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/SchedulerTrigger.kt b/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/SchedulerTrigger.kt
@@ -24,6 +24,9 @@ object SchedulerTrigger : Trigger<List<SchedulerTriggerTask>>(){
 
     @SubscribeEvent(ignoreCancelled = true)
     fun onScriptUnload(event: ScriptUnloadEvent){
+        info("####################################################################################")
+        info("event subscriber: ScriptUnloadEvent")
+        info("####################################################################################")
         if(event.script.isSchedulerScript){
             onUnsubscribe(event.script)
         }

diff --git a/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/StatusTrigger.kt b/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/StatusTrigger.kt
@@ -1,6 +1,5 @@
 package tech.cookiepower.jythonengine.script.trigger
 
-import taboolib.common.platform.event.EventPriority
 import taboolib.common.platform.event.SubscribeEvent
 import tech.cookiepower.jythonengine.event.ScriptExecuteEvent
 import tech.cookiepower.jythonengine.event.ScriptLoadEvent