Fix paper item not fully showed

dadus33-plugins · Apr 26, 2024 · 7c8b61c · 7c8b61c
1 parent f502cfa
commit 7c8b61c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...main/java/me/dadus33/chatitem/chatmanager/v1/basecomp/hook/AdventureComponentManager.java b/...main/java/me/dadus33/chatitem/chatmanager/v1/basecomp/hook/AdventureComponentManager.java
@@ -77,7 +77,12 @@ public Object manageItem(Player p, Chat chat, ChatItemPacket packet, ItemStack i
 		if (action.isItem()) {
 			String itemName = ChatManager.getNameOfItem(chat.getPlayer(), item, c);
 			ChatItem.debug("NBT tag: " + PacketUtils.getNbtTag(item));
-			return manage(p, chat, packet, itemName, HoverEvent.showItem(Key.key(item.getType().getKey().getKey()), item.getAmount(), BinaryTagHolder.of(PacketUtils.getNbtTag(item))), null);
+			HoverEvent<?> hover;
+			if(PacketUtils.IS_PAPER)
+				hover = item.asHoverEvent();
+			else
+				hover = HoverEvent.showItem(Key.key(item.getType().getKey().getKey()), item.getAmount(), BinaryTagHolder.of(PacketUtils.getNbtTag(item)));
+			return manage(p, chat, packet, itemName, hover, null);
 		}
 		return manage(p, chat, packet, Messages.getMessage(action.getSlot().name().toLowerCase() + ".chat", "%cible%", chat.getPlayer().getName()),
 				HoverEvent.showText(Component.text(Messages.getMessage(action.getSlot().name().toLowerCase() + ".hover", "%cible%", chat.getPlayer().getName()))),

diff --git a/src/main/java/me/dadus33/chatitem/chatmanager/v3/PaperListener.java b/src/main/java/me/dadus33/chatitem/chatmanager/v3/PaperListener.java
@@ -12,13 +12,9 @@
 import me.dadus33.chatitem.chatmanager.Chat;
 import me.dadus33.chatitem.chatmanager.ChatAction;
 import me.dadus33.chatitem.chatmanager.ChatManager;
-import me.dadus33.chatitem.utils.PacketUtils;
-import net.kyori.adventure.key.Key;
-import net.kyori.adventure.nbt.api.BinaryTagHolder;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
 import net.kyori.adventure.text.TextReplacementConfig;
-import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 
 public class PaperListener implements Listener {
@@ -56,7 +52,7 @@ public void onChat(AsyncChatEvent e) {
 		if(action.isItem() && !ChatManager.canShowItem(p, action.getItem(), slot, e))
 			return;
 	    ItemStack item = action.getItem();
-	    ComponentLike like = Component.text(ChatManager.getNameOfItem(p, item, getStorage())).hoverEvent(HoverEvent.showItem(Key.key(item.getType().getKey().getKey()), item.getAmount(), BinaryTagHolder.of(PacketUtils.getNbtTag(item))));
+	    ComponentLike like = Component.text(ChatManager.getNameOfItem(p, item, getStorage())).hoverEvent(item.asHoverEvent());
 	    for(String s : slot.getPlaceholders())
 	    	message = message.replaceText(TextReplacementConfig.builder().matchLiteral(s).replacement(like).build());
 	    e.message(message);