From 4bf9a00b3216b9ffab57ef1abd649b3e0ce35d71 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Fri, 21 Feb 2025 18:26:27 +0800
Subject: [PATCH] Fixed spigot mapping

---
 .../compatibility/chat/AdvancedChatProvider.java     | 12 ++++++++++++
 .../customnameplates/bukkit/util/Reflections.java    |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/AdvancedChatProvider.java b/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/AdvancedChatProvider.java
index c92afa4..38fd9ec 100644
--- a/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/AdvancedChatProvider.java
+++ b/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/AdvancedChatProvider.java
@@ -19,6 +19,7 @@ package net.momirealms.customnameplates.bukkit.compatibility.chat;
 
 import net.advancedplugins.chat.api.AdvancedChannelChatEvent;
 import net.advancedplugins.chat.api.AdvancedChatAPI;
+import net.advancedplugins.chat.api.AdvancedChatEvent;
 import net.advancedplugins.chat.channel.ChatChannel;
 import net.momirealms.customnameplates.api.CNPlayer;
 import net.momirealms.customnameplates.api.CustomNameplates;
@@ -38,6 +39,17 @@ public class AdvancedChatProvider extends AbstractChatMessageProvider implements
         super(plugin, manager);
     }
 
+    @EventHandler(ignoreCancelled = true)
+    public void onAdvancedChat(AdvancedChatEvent event) {
+        Player player = event.getChatEvent().getPlayer();
+        if (!player.isOnline()) return;
+        CNPlayer cnPlayer = plugin.getPlayer(player.getUniqueId());
+        if (cnPlayer == null) return;
+        plugin.getScheduler().async().execute(() -> {
+            manager.onChat(cnPlayer, event.getMessage(), "");
+        });
+    }
+
     @EventHandler(ignoreCancelled = true)
     public void onAdvancedChat(AdvancedChannelChatEvent event) {
         String channel = event.getChannel().getSectionName();
diff --git a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/util/Reflections.java b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/util/Reflections.java
index c4c0fb2..6f4f346 100644
--- a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/util/Reflections.java
+++ b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/util/Reflections.java
@@ -324,18 +324,18 @@ public class Reflections {
 
     public static final Class<?> clazz$HolderLookup$Provider = ReflectionUtils.getClazz(
             BukkitReflectionUtils.assembleMCClass("core.HolderLookup$Provider"),
-            BukkitReflectionUtils.assembleMCClass("core.HolderLookup$b")
+            BukkitReflectionUtils.assembleMCClass(VersionHelper.isVersionNewerThan1_20_5() ? "core.HolderLookup$a" : "core.HolderLookup$b")
     );
 
     public static final Method method$Component$Serializer$fromJson = ReflectionUtils.getMethod(
             clazz$Component$Serializer,
-            new String[] { "fromJson" },
+            new String[] { "fromJson", "a" },
             String.class, clazz$HolderLookup$Provider
     );
 
     public static final Method method$Component$Serializer$toJson = ReflectionUtils.getMethod(
             clazz$Component$Serializer,
-            new String[] { "toJson" },
+            new String[] { "toJson", "a" },
             clazz$Component, clazz$HolderLookup$Provider
     );
 
@@ -601,7 +601,7 @@ public class Reflections {
     public static final Class<?> clazz$SynchedEntityData$DataValue = requireNonNull(
             ReflectionUtils.getClazz(
                     BukkitReflectionUtils.assembleMCClass("network.syncher.SynchedEntityData$DataValue"),
-                    BukkitReflectionUtils.assembleMCClass("network.syncher.DataWatcher$b")
+                    BukkitReflectionUtils.assembleMCClass(VersionHelper.isVersionNewerThan1_20_5() ? "network.syncher.DataWatcher$c" : "network.syncher.DataWatcher$b")
             )
     );