fix [item]

Author: EBro912

build.gradle

@@ -8,7 +8,7 @@ plugins {
 
 group = 'org.parallelmc'
 
-version = '2.6.5'
+version = '2.6.6'
 description = 'A set of utilities and features for use on the Parallel Minecraft server'
 
 java {

src/main/java/parallelmc/parallelutils/Constants.java

@@ -2,7 +2,7 @@
 
 public class Constants {
 
-	public static final Version VERSION = new Version(2, 6, 5);
+	public static final Version VERSION = new Version(2, 6, 6);
 	public static final String PLUGIN_NAME = "ParallelUtils";
 	public static final String DEFAULT_WORLD = "world2";
 }

src/main/java/parallelmc/parallelutils/modules/parallelchat/ParallelChat.java

@@ -16,6 +16,7 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.jetbrains.annotations.NotNull;
@@ -397,7 +398,7 @@ public Component formatForGroup(@NotNull Player source, @NotNull Component displ
                         PlaceholderAPI.setPlaceholders(source, "%pronouns_pronouns%")).asHoverEvent())),
                 Placeholder.component("tag", getTagForPlayer(source)),
                 Placeholder.component("donorrank", getDonorRankForPlayer(source)),
-                Placeholder.component("message", LegacyComponentSerializer.legacyAmpersand().deserialize(LegacyComponentSerializer.legacyAmpersand().serialize(message)))
+                Placeholder.component("message", message)
         );
 
         if (isUsingDefault) {

src/main/java/parallelmc/parallelutils/modules/parallelchat/events/OnChatMessage.java

@@ -2,11 +2,16 @@
 
 import io.papermc.paper.chat.ChatRenderer;
 import io.papermc.paper.event.player.AsyncChatEvent;
+import me.clip.placeholderapi.PlaceholderAPI;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.ComponentBuilder;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import net.minecraft.network.chat.HoverEvent;
 import org.bukkit.Material;
 import org.bukkit.Server;
 import org.bukkit.Sound;
@@ -166,20 +171,6 @@ public void onChatMessage(AsyncChatEvent event) {
         }
 
 
-        // Item chat
-        ItemStack item = player.getInventory().getItemInMainHand();
-
-        if (item.getType() != Material.AIR) {
-            Component itemName = item.displayName().hoverEvent(item.asHoverEvent());
-
-            TextComponent itemComponent = Component.text()
-                    .append(itemName)
-                    .append(Component.text(" x" + item.getAmount(), item.displayName().color()))
-                    .build();
-
-            event.message(event.message().replaceText(x -> x.once().match("\\[item\\]").replacement(itemComponent)));
-        }
-
         // remove dnd players from the recipient list if they have not been mentioned
         // also show the message to the player if they send it
         event.viewers().removeAll(ParallelChat.dndPlayers.keySet()
@@ -189,8 +180,22 @@ public void onChatMessage(AsyncChatEvent event) {
              .collect(Collectors.toSet()));
 
         // re-render the formatted message and send it
-        event.renderer(ChatRenderer.viewerUnaware((source, sourceDisplayName, message)
-                -> ParallelChat.get().formatForGroup(source, sourceDisplayName, message)));
+        event.renderer(ChatRenderer.viewerUnaware((source, sourceDisplayName, message) ->
+        {
+            message =  LegacyComponentSerializer.legacyAmpersand().deserialize(LegacyComponentSerializer.legacyAmpersand().serialize(message));
+            // Item chat
+            ItemStack item = player.getInventory().getItemInMainHand();
+
+            if (item.getType() != Material.AIR) {
+                TextComponent itemComponent = Component.text()
+                        .append(item.displayName().hoverEvent(item.asHoverEvent()))
+                        .append(Component.text(" x" + item.getAmount(), item.displayName().color()))
+                        .build();
+
+                message = message.replaceText(x -> x.once().match("\\[item\\]").replacement(itemComponent));
+            }
+            return ParallelChat.get().formatForGroup(source, sourceDisplayName, message);
+        }));
         // not sure if this is necessary but I don't want to touch it
         event.message(event.message());
     }