1.1.3 bypass java8 default key words

WetABQ · Mar 18, 2020 · 9a03280 · 9a03280
1 parent 3294d99
commit 9a03280
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 33 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>top.wetabq.easyapi</groupId>
     <artifactId>EasyAPI</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
 
 
     <licenses>

diff --git a/...etabq/easyapi/api/default/AsyncTaskAPI.kt → ...tabq/easyapi/api/defaults/AsyncTaskAPI.kt b/...etabq/easyapi/api/default/AsyncTaskAPI.kt → ...tabq/easyapi/api/defaults/AsyncTaskAPI.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.api.default
+package top.wetabq.easyapi.api.defaults
 
 import cn.nukkit.plugin.Plugin
 import cn.nukkit.scheduler.AsyncTask

diff --git a/.../wetabq/easyapi/api/default/CommandAPI.kt → ...wetabq/easyapi/api/defaults/CommandAPI.kt b/.../wetabq/easyapi/api/default/CommandAPI.kt → ...wetabq/easyapi/api/defaults/CommandAPI.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.api.default
+package top.wetabq.easyapi.api.defaults
 
 import top.wetabq.easyapi.EasyAPI
 import top.wetabq.easyapi.api.CommonDynamicIntegrateAPI

diff --git a/...p/wetabq/easyapi/api/default/ConfigAPI.kt → .../wetabq/easyapi/api/defaults/ConfigAPI.kt b/...p/wetabq/easyapi/api/default/ConfigAPI.kt → .../wetabq/easyapi/api/defaults/ConfigAPI.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.api.default
+package top.wetabq.easyapi.api.defaults
 
 import top.wetabq.easyapi.api.CommonDynamicIntegrateAPI
 import top.wetabq.easyapi.config.EasyConfig

diff --git a/.../wetabq/easyapi/api/default/EconomyAPI.kt → ...wetabq/easyapi/api/defaults/EconomyAPI.kt b/.../wetabq/easyapi/api/default/EconomyAPI.kt → ...wetabq/easyapi/api/defaults/EconomyAPI.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.api.default
+package top.wetabq.easyapi.api.defaults
 
 import cn.nukkit.Player
 import me.onebone.economyapi.EconomyAPI

diff --git a/...q/easyapi/api/default/MessageFormatAPI.kt → .../easyapi/api/defaults/MessageFormatAPI.kt b/...q/easyapi/api/default/MessageFormatAPI.kt → .../easyapi/api/defaults/MessageFormatAPI.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.api.default
+package top.wetabq.easyapi.api.defaults
 
 import top.wetabq.easyapi.api.SimpleIntegrateAPI
 

diff --git a/.../easyapi/api/default/NukkitListenerAPI.kt → ...easyapi/api/defaults/NukkitListenerAPI.kt b/.../easyapi/api/default/NukkitListenerAPI.kt → ...easyapi/api/defaults/NukkitListenerAPI.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.api.default
+package top.wetabq.easyapi.api.defaults
 
 import cn.nukkit.event.Event
 import cn.nukkit.event.HandlerList

diff --git a/...easyapi/api/default/PermissionGroupAPI.kt → ...asyapi/api/defaults/PermissionGroupAPI.kt b/...easyapi/api/default/PermissionGroupAPI.kt → ...asyapi/api/defaults/PermissionGroupAPI.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.api.default
+package top.wetabq.easyapi.api.defaults
 
 import cn.nukkit.Player
 import net.luckperms.api.LuckPermsProvider

diff --git a/...tabq/easyapi/api/default/PluginTaskAPI.kt → ...abq/easyapi/api/defaults/PluginTaskAPI.kt b/...tabq/easyapi/api/default/PluginTaskAPI.kt → ...abq/easyapi/api/defaults/PluginTaskAPI.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.api.default
+package top.wetabq.easyapi.api.defaults
 
 import cn.nukkit.plugin.Plugin
 import top.wetabq.easyapi.EasyAPI

diff --git a/...q/easyapi/api/default/SimpleCommandAPI.kt → .../easyapi/api/defaults/SimpleCommandAPI.kt b/...q/easyapi/api/default/SimpleCommandAPI.kt → .../easyapi/api/defaults/SimpleCommandAPI.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.api.default
+package top.wetabq.easyapi.api.defaults
 
 import top.wetabq.easyapi.api.CommonDynamicIntegrateAPI
 import top.wetabq.easyapi.command.EasySubCommand

diff --git a/...bq/easyapi/api/default/SimpleConfigAPI.kt → ...q/easyapi/api/defaults/SimpleConfigAPI.kt b/...bq/easyapi/api/default/SimpleConfigAPI.kt → ...q/easyapi/api/defaults/SimpleConfigAPI.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.api.default
+package top.wetabq.easyapi.api.defaults
 
 import cn.nukkit.plugin.Plugin
 import top.wetabq.easyapi.api.CommonDynamicIntegrateAPI

diff --git a/src/main/java/top/wetabq/easyapi/module/EasyAPIModuleManager.kt b/src/main/java/top/wetabq/easyapi/module/EasyAPIModuleManager.kt
@@ -2,10 +2,10 @@ package top.wetabq.easyapi.module
 
 import top.wetabq.easyapi.EasyAPI
 import top.wetabq.easyapi.api.DisableNotRemoveAll
-import top.wetabq.easyapi.module.default.AsyncListenerModule
-import top.wetabq.easyapi.module.default.ChatNameTagFormatModule
-import top.wetabq.easyapi.module.default.EasyBaseModule
-import top.wetabq.easyapi.module.default.ScreenShowModule
+import top.wetabq.easyapi.module.defaults.AsyncListenerModule
+import top.wetabq.easyapi.module.defaults.ChatNameTagFormatModule
+import top.wetabq.easyapi.module.defaults.EasyBaseModule
+import top.wetabq.easyapi.module.defaults.ScreenShowModule
 import java.util.concurrent.ConcurrentHashMap
 
 object EasyAPIModuleManager {

diff --git a/...api/module/default/AsyncListenerModule.kt → ...pi/module/defaults/AsyncListenerModule.kt b/...api/module/default/AsyncListenerModule.kt → ...pi/module/defaults/AsyncListenerModule.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.module.default
+package top.wetabq.easyapi.module.defaults
 
 import cn.nukkit.event.Event
 import cn.nukkit.plugin.Plugin

diff --git a/...module/default/ChatNameTagFormatModule.kt → ...odule/defaults/ChatNameTagFormatModule.kt b/...module/default/ChatNameTagFormatModule.kt → ...odule/defaults/ChatNameTagFormatModule.kt
@@ -1,4 +1,4 @@
-package top.wetabq.easyapi.module.default
+package top.wetabq.easyapi.module.defaults
 
 import cn.nukkit.Player
 import cn.nukkit.event.EventHandler
@@ -7,10 +7,8 @@ import cn.nukkit.event.player.PlayerChatEvent
 import cn.nukkit.event.player.PlayerDeathEvent
 import cn.nukkit.event.player.PlayerJoinEvent
 import cn.nukkit.event.player.PlayerRespawnEvent
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import top.wetabq.easyapi.EasyAPI
-import top.wetabq.easyapi.api.default.*
+import top.wetabq.easyapi.api.defaults.*
 import top.wetabq.easyapi.config.default.SimpleConfigEntry
 import top.wetabq.easyapi.module.ModuleInfo
 import top.wetabq.easyapi.module.ModuleVersion
@@ -82,26 +80,30 @@ object ChatNameTagFormatModule : SimpleEasyAPIModule() {
 
                 @EventHandler
                 fun onChatEvent(event: PlayerChatEvent) {
-                    GlobalScope.launch {
-                        coroutineCallEvent(event) {
-                            event.message = MessageFormatAPI.format(chatFormat, event)
-                        }
+                    asyncTaskCallEvent(event, getModuleInfo().moduleOwner) {
+                        event.message = MessageFormatAPI.format(chatFormat, event)
                     }
                 }
 
                 @EventHandler
                 fun onJoinEvent(event: PlayerJoinEvent) {
-                    event.player.nameTag = MessageFormatAPI.format(nameTagFormat, event.player.name)
+                    asyncTaskCallEvent(event, getModuleInfo().moduleOwner) {
+                        event.player.nameTag = MessageFormatAPI.format(nameTagFormat, event.player.name)
+                    }
                 }
 
                 @EventHandler
                 fun onRespawnEvent(event: PlayerRespawnEvent) {
-                    event.player.nameTag = MessageFormatAPI.format(nameTagFormat, event.player.name)
+                    asyncTaskCallEvent(event, getModuleInfo().moduleOwner) {
+                        event.player.nameTag = MessageFormatAPI.format(nameTagFormat, event.player.name)
+                    }
                 }
 
                 @EventHandler
                 fun onDeathEvent(event: PlayerDeathEvent) {
-                    event.entity.nameTag = MessageFormatAPI.format(nameTagFormat, event.entity.name)
+                    asyncTaskCallEvent(event, getModuleInfo().moduleOwner) {
+                        event.entity.nameTag = MessageFormatAPI.format(nameTagFormat, event.entity.name)
+                    }
                 }
 
             })

diff --git a/.../easyapi/module/default/EasyBaseModule.kt → ...easyapi/module/defaults/EasyBaseModule.kt b/.../easyapi/module/default/EasyBaseModule.kt → ...easyapi/module/defaults/EasyBaseModule.kt
@@ -1,9 +1,9 @@
-package top.wetabq.easyapi.module.default
+package top.wetabq.easyapi.module.defaults
 
 import top.wetabq.easyapi.EasyAPI
-import top.wetabq.easyapi.api.default.CommandAPI
-import top.wetabq.easyapi.api.default.ConfigAPI
-import top.wetabq.easyapi.api.default.SimpleConfigAPI
+import top.wetabq.easyapi.api.defaults.CommandAPI
+import top.wetabq.easyapi.api.defaults.ConfigAPI
+import top.wetabq.easyapi.api.defaults.SimpleConfigAPI
 import top.wetabq.easyapi.command.default.EasyAPICommand
 import top.wetabq.easyapi.config.default.SimpleConfig
 import top.wetabq.easyapi.config.default.SimpleConfigEntry

diff --git a/...asyapi/module/default/ScreenShowModule.kt → ...syapi/module/defaults/ScreenShowModule.kt b/...asyapi/module/default/ScreenShowModule.kt → ...syapi/module/defaults/ScreenShowModule.kt
@@ -1,10 +1,10 @@
-package top.wetabq.easyapi.module.default
+package top.wetabq.easyapi.module.defaults
 
 import cn.nukkit.Player
 import cn.nukkit.scheduler.PluginTask
 import cn.nukkit.utils.TextFormat
 import top.wetabq.easyapi.EasyAPI
-import top.wetabq.easyapi.api.default.PluginTaskAPI
+import top.wetabq.easyapi.api.defaults.PluginTaskAPI
 import top.wetabq.easyapi.module.ModuleInfo
 import top.wetabq.easyapi.module.ModuleVersion
 import top.wetabq.easyapi.module.SimpleEasyAPIModule