From be3a09efbe3f3142cc0813a0fc887c0ea60ffa5c Mon Sep 17 00:00:00 2001
From: ItsFlicker <1812496278@qq.com>
Date: Tue, 31 Dec 2024 19:20:20 +0800
Subject: [PATCH] [2.2.0-beta7] 1.21.3

---
 build.gradle.kts                                     |  4 ++--
 gradle.properties                                    |  2 +-
 .../module/internal/hook/impl/HookItemsAdder.kt      |  7 ++++---
 .../me/arasple/mc/trchat/module/conf/Loader.kt       | 12 ++++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e85e35d..81240a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     java
-    id("io.izzel.taboolib") version "2.0.18"
+    id("io.izzel.taboolib") version "2.0.22"
     id("org.jetbrains.kotlin.jvm") version "1.8.22"
 }
 
@@ -37,7 +37,7 @@ subprojects {
             install(Bukkit, BungeeCord, Velocity)
         }
         version {
-            taboolib = "6.2.0-beta20"
+            taboolib = "6.2.1-df22fb1"
             coroutines = null
 //            isSkipKotlin = true
 //            isSkipKotlinRelocate = true
diff --git a/gradle.properties b/gradle.properties
index af87d17..e86869e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group=me.arasple.mc.trchat
-version=2.2.0-beta6
+version=2.2.0-beta7
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.incremental.useClasspathSnapshot=true
diff --git a/project/module-compat/src/main/kotlin/me/arasple/mc/trchat/module/internal/hook/impl/HookItemsAdder.kt b/project/module-compat/src/main/kotlin/me/arasple/mc/trchat/module/internal/hook/impl/HookItemsAdder.kt
index 3ad3f07..ece52f9 100644
--- a/project/module-compat/src/main/kotlin/me/arasple/mc/trchat/module/internal/hook/impl/HookItemsAdder.kt
+++ b/project/module-compat/src/main/kotlin/me/arasple/mc/trchat/module/internal/hook/impl/HookItemsAdder.kt
@@ -3,6 +3,7 @@ package me.arasple.mc.trchat.module.internal.hook.impl
 import dev.lone.itemsadder.api.FontImages.FontImageWrapper
 import me.arasple.mc.trchat.module.internal.hook.HookAbstract
 import org.bukkit.entity.Player
+import taboolib.module.nms.MinecraftVersion.majorLegacy
 
 /**
  * @author ItsFlicker
@@ -14,14 +15,14 @@ class HookItemsAdder : HookAbstract() {
         if (!isHooked) {
             return message
         }
-        try {
-            return if (player == null) {
+        return try {
+            if (player == null || majorLegacy >= 12005) {
                 FontImageWrapper.replaceFontImages(message)
             } else {
                 FontImageWrapper.replaceFontImages(player, message)
             }
         } catch (_: Throwable) {
-            return message
+            message
         }
     }
 }
\ No newline at end of file
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/conf/Loader.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/conf/Loader.kt
index e5b933e..de6f7c5 100644
--- a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/conf/Loader.kt
+++ b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/conf/Loader.kt
@@ -31,7 +31,6 @@ import taboolib.common.util.asList
 import taboolib.common.util.orNull
 import taboolib.common.util.unsafeLazy
 import taboolib.common5.Coerce
-import taboolib.common5.FileWatcher
 import taboolib.library.configuration.ConfigurationSection
 import taboolib.module.configuration.util.getMap
 import taboolib.module.lang.sendLang
@@ -72,11 +71,12 @@ object Loader {
         Channel.channels.clear()
 
         filterChannelFiles(folder).forEach {
-            if (FileWatcher.INSTANCE.hasListener(it)) {
-                loadChannel(it)
-            } else {
-                FileWatcher.INSTANCE.addSimpleListener(it, { loadChannel(it) }, true)
-            }
+//            if (FileWatcher.INSTANCE.hasListener(it)) {
+//                loadChannel(it)
+//            } else {
+//                FileWatcher.INSTANCE.addSimpleListener(it, { loadChannel(it) }, true)
+//            }
+            loadChannel(it)
         }
 
         TrChatReloadEvent.Channel(Channel.channels).call()