完善脚本调用问题

//TODO event 调用待优化
EikoocS · Jun 21, 2022 · d375a98 · d375a98
1 parent aa26462
commit d375a98
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 40 deletions.
diff --git a/src/main/kotlin/tech/cookiepower/jythonengine/script/ScriptManager.kt b/src/main/kotlin/tech/cookiepower/jythonengine/script/ScriptManager.kt
@@ -20,8 +20,12 @@ object ScriptManager {
             throw IllegalArgumentException("Can't load ${script.path} Script with namespaced key $namespacedKey " +
                     "already loaded by ${getScript(namespacedKey)?.path}")
         }
+
         val event = ScriptLoadEvent(script)
-        if(event.call()){ return }
+        if(!event.call()){
+            ScriptUnloadEvent(script).call()
+            return
+        }
         scripts.add(script)
     }
 
@@ -41,14 +45,13 @@ object ScriptManager {
 
     fun unloadAll(){
         scripts.forEach {
-            namespacedKeys.remove(it.namespacedKey)
             ScriptUnloadEvent(it).call()
-            unload(it)
         }
+        namespacedKeys.clear()
         scripts.clear()
     }
 
-    @Awake(LifeCycle.ENABLE)
+    @Awake(LifeCycle.ACTIVE)
     fun reloadAll(){
         unloadAll()
         loadByDir()

diff --git a/src/main/kotlin/tech/cookiepower/jythonengine/script/modifier/AsyncModifier.kt b/src/main/kotlin/tech/cookiepower/jythonengine/script/modifier/AsyncModifier.kt
@@ -9,8 +9,10 @@ object AsyncModifier : Modifier(){
     @SubscribeEvent(ignoreCancelled = true)
     fun onLoad(event: ScriptLoadEvent){
         val script = event.script
-        if (script.async && script.sync) throw IllegalArgumentException("Script cannot be async and sync at the same time")
-        event.isCancelled = true
+        if (script.async && script.sync){
+            event.isCancelled = true
+            throw IllegalArgumentException("Script cannot be async and sync at the same time")
+        }
     }
     @SubscribeEvent(ignoreCancelled = true)
     fun onExecute(event: ScriptExecuteEvent){

diff --git a/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/EventListener.kt b/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/EventListener.kt
@@ -0,0 +1,30 @@
+package tech.cookiepower.jythonengine.script.trigger
+
+import org.bukkit.event.EventPriority
+import org.bukkit.event.HandlerList
+import org.bukkit.event.Listener
+import org.bukkit.plugin.RegisteredListener
+import taboolib.common.platform.function.submit
+import taboolib.platform.BukkitPlugin
+
+class EventListener : Listener {
+    private val handlers = ArrayList<HandlerList>()
+    private val listener = RegisteredListener( this,
+        { _, event -> EventTrigger.onEventCall(event) },
+        EventPriority.NORMAL,
+        BukkitPlugin.getInstance(),
+        false
+    )
+    private var lastSize = 0
+    val task = submit(period = 20, async = true) {
+        if (lastSize != HandlerList.getHandlerLists().size){
+            HandlerList.getHandlerLists().filter {
+                it !in handlers
+            }.forEach {
+                it.register(listener)
+                handlers.add(it)
+            }
+            lastSize = HandlerList.getHandlerLists().size
+        }
+    }
+}
diff --git a/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/EventTrigger.kt b/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/EventTrigger.kt
@@ -1,7 +1,15 @@
 package tech.cookiepower.jythonengine.script.trigger
 
+import org.bukkit.Bukkit
+import org.bukkit.event.Event
+import taboolib.common.LifeCycle
+import taboolib.common.platform.Awake
+import taboolib.common.platform.Platform
+import taboolib.common.platform.PlatformSide
 import taboolib.common.platform.event.SubscribeEvent
+import taboolib.platform.BukkitPlugin
 import tech.cookiepower.jythonengine.annotation.ReflexCall
+import tech.cookiepower.jythonengine.event.ScriptExecuteEvent
 import tech.cookiepower.jythonengine.event.ScriptLoadEvent
 import tech.cookiepower.jythonengine.event.ScriptUnloadEvent
 import tech.cookiepower.jythonengine.script.Script
@@ -22,35 +30,27 @@ object EventTrigger : Trigger<Map<String, MutableList<Script>>>() {
         }
     }
 
-    @SubscribeEvent(ignoreCancelled = true)
+    @SubscribeEvent
     fun onScriptUnload(event: ScriptUnloadEvent){
         if(event.script.isEventScript){
             onUnsubscribe(event.script)
         }
     }
 
-//    @SubscribeEvent
-//    fun onEventCall(event: Event){
-//        event.javaClass.name.let {
-//            event2Scripts[it]?.forEach { script ->
-//                val exeEvent = ScriptExecuteEvent(script,defaultInterpreter)
-//                exeEvent.argument("__EVENT__" to event)
-//                defaultHandlerAndPost(exeEvent)
-//            }
-//        }
-//    }
+    @Awake(LifeCycle.ACTIVE)
+    @PlatformSide([Platform.BUKKIT])
+    fun registerListener(){
+        Bukkit.getPluginManager().registerEvents(EventListener(), BukkitPlugin.getInstance())
+    }
 
-//    @SubscribeEvent(bind = "org.bukkit.event.Event")
-//    fun onEventCall(ope: OptionalEvent){
-//        val event = ope.get<Event>()
-//        event.javaClass.name.let {
-//            event2Scripts[it]?.forEach { script ->
-//                val exeEvent = ScriptExecuteEvent(script,defaultInterpreter)
-//                exeEvent.argument("__EVENT__" to event)
-//                defaultHandlerAndPost(exeEvent)
-//            }
-//        }
-//    }
+    fun onEventCall(event: Event){
+        val name = event.javaClass.name
+        event2Scripts[name]?.forEach { script ->
+            val exeEvent = ScriptExecuteEvent(script,defaultInterpreter)
+            exeEvent.argument("__EVENT__" to event)
+            defaultHandlerAndPost(exeEvent)
+        }
+    }
 
     override fun onSubscribe(script: Script) {
         val events = script.events

diff --git a/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/SchedulerTrigger.kt b/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/SchedulerTrigger.kt
@@ -2,7 +2,6 @@ package tech.cookiepower.jythonengine.script.trigger
 
 import org.python.util.PythonInterpreter
 import taboolib.common.platform.event.SubscribeEvent
-import taboolib.common.platform.function.info
 import tech.cookiepower.jythonengine.event.ScriptLoadEvent
 import tech.cookiepower.jythonengine.event.ScriptUnloadEvent
 import tech.cookiepower.jythonengine.script.Script
@@ -14,19 +13,13 @@ object SchedulerTrigger : Trigger<List<SchedulerTriggerTask>>(){
 
     @SubscribeEvent(ignoreCancelled = true)
     fun onScriptLoad(event: ScriptLoadEvent){
-        info("####################################################################################")
-        info("event subscriber: ScriptLoadEvent")
-        info("####################################################################################")
         if(event.script.isSchedulerScript){
             onSubscribe(event.script)
         }
     }
 
-    @SubscribeEvent(ignoreCancelled = true)
+    @SubscribeEvent
     fun onScriptUnload(event: ScriptUnloadEvent){
-        info("####################################################################################")
-        info("event subscriber: ScriptUnloadEvent")
-        info("####################################################################################")
         if(event.script.isSchedulerScript){
             onUnsubscribe(event.script)
         }
@@ -39,10 +32,11 @@ object SchedulerTrigger : Trigger<List<SchedulerTriggerTask>>(){
     }
 
     override fun onUnsubscribe(script: Script): Boolean {
-        val task = tasks.find { it.script == script }
-        task?.stop()
+        val task = tasks.find { it.script.path == script.path } ?:
+            throw IllegalStateException("Scheduler Script is not subscribed")
+        task.stop()
         tasks.remove(task)
-        return task!=null
+        return true
     }
 
     override fun getAll(): List<SchedulerTriggerTask> = tasks

diff --git a/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/StatusTrigger.kt b/src/main/kotlin/tech/cookiepower/jythonengine/script/trigger/StatusTrigger.kt
@@ -16,7 +16,7 @@ object StatusTrigger : Trigger<Unit>() {
         }
     }
 
-    @SubscribeEvent(ignoreCancelled = true)
+    @SubscribeEvent
     fun onScriptUnload(event: ScriptUnloadEvent){
         if(event.script.release){
             onUnsubscribe(event.script)