Merge pull request #189 from YsGqHY/stable/v3

fix(api): 修复高版本 chat 动作无法使用

Author: YsGqHY

api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Chat.kt

@@ -17,7 +17,7 @@ class Chat(handle: ActionHandle) : ActionBase(handle) {
     override val regex = "chat|send|say".toRegex()
 
     override fun onExecute(contents: ActionContents, player: ProxyPlayer, placeholderPlayer: ProxyPlayer) {
-        contents.stringContent().parseContentSplited(placeholderPlayer, contents.stringContent()).forEach {
+        contents.stringContent().parseContentSplited(placeholderPlayer).forEach {
             player.chat(it)
         }
     }

api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Command.kt

@@ -23,7 +23,7 @@ class Command(handle: ActionHandle) : ActionBase(handle) {
         placeholderPlayer.parseContentSplited(contents.stringContent(), ";").forEach {
             // Folia 必须使用实体调度器 暂时不做优雅的兼容性处理 后期其他功能需要单独处理Folia时再修改
             if (Folia.isFolia) {
-                FoliaUtil.invokeCommandWithEntityScheduler(player,it)
+                FoliaUtil.invokeCommandWithEntityScheduler(player, it)
             }else{
                 submit(async = false) {
                     player.performCommand(it)

api/action/src/main/kotlin/trplugins/menu/api/utils/FoliaUtil.kt

@@ -11,7 +11,7 @@ import taboolib.platform.BukkitPlugin
  */
 object FoliaUtil {
 
-    fun invokeCommandWithEntityScheduler(player: ProxyPlayer,command:String){
+    fun invokeCommandWithEntityScheduler(player: ProxyPlayer, command:String){
         getEntityScheduler(player).execute(BukkitPlugin.getInstance(),{
             player.performCommand(command)
         },null,0)

build.gradle.kts

@@ -61,7 +61,7 @@ subprojects {
             repoTabooLib = "https://repo.aeoliancloud.com/repository/releases"
         }
         version {
-            taboolib = "6.2.3-052537b"
+            taboolib = "6.2.3-5297ae6"
             coroutines = null
         }
     }

gradle.properties

@@ -1,2 +1,2 @@
 group=me.arasple.mc.trmenu
-version=3.6.5
+version=3.6.7

plugin/src/main/kotlin/trplugins/menu/module/conf/Loader.kt

@@ -3,6 +3,7 @@ package trplugins.menu.module.conf
 import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
 import taboolib.common.platform.function.console
+import taboolib.common.platform.function.getDataFolder
 import taboolib.common.platform.function.releaseResourceFile
 import taboolib.module.lang.sendLang
 import taboolib.platform.util.sendLang
@@ -23,7 +24,7 @@ object Loader {
 
     private val folder by lazy {
         Menu.menus.clear()
-        val folder = File(TrMenu.plugin.dataFolder, "menus")
+        val folder = File(getDataFolder(), "menus")
 
         if (!folder.exists()) {
             arrayOf(