Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YsGqHY merged 4 commits into from
Jul 7, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41c2215
build(version): Version 1.21.7 Support
YsGqHY Jul 3, 2025
aba16f2
fix(api): 修复高版本 chat 动作无法使用
YsGqHY Jul 7, 2025
dcbfdeb
build: 更新 TabooLib 版本
YsGqHY Jul 7, 2025
93d6a28
Merge branch 'CoderKuo:stable/v3' into stable/v3
YsGqHY Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Chat.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down
2 changes: 1 addition & 1 deletion api/action/src/main/kotlin/trplugins/menu/api/action/impl/send/Command.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api/action/src/main/kotlin/trplugins/menu/api/utils/FoliaUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
group=me.arasple.mc.trmenu
version=3.6.5
version=3.6.7
3 changes: 2 additions & 1 deletion plugin/src/main/kotlin/trplugins/menu/module/conf/Loader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand Down