Fix ParallelChat bug, improve formatting, and bump version

This was unreasonably difficult to fix the formatting...

Author: UnknownSilicon

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>parallelmc</groupId>
     <artifactId>parallelutils</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
     <packaging>jar</packaging>
 
     <name>Parallelutils</name>
@@ -46,6 +46,10 @@
             <name>m2-dv8tion</name>
             <url>https://m2.dv8tion.net/releases</url>
         </repository>
+        <repository>
+            <id>placeholderapi</id>
+            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>
@@ -128,6 +132,13 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>me.clip</groupId>
+            <artifactId>placeholderapi</artifactId>
+            <version>2.10.10</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.eclipsekingdom</groupId>
             <artifactId>FractalForest</artifactId>

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

@@ -2,7 +2,7 @@
 
 public class Constants {
 
-	public static final Version VERSION = new Version(1, 4, 0);
+	public static final Version VERSION = new Version(1, 4, 1);
 	public static final String PLUGIN_NAME = "ParallelUtils";
 	public static final String DEFAULT_WORLD = "world";
 }

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

@@ -2,31 +2,42 @@
 
 import io.papermc.paper.chat.ChatRenderer;
 import io.papermc.paper.event.player.AsyncChatEvent;
+import io.papermc.paper.text.PaperComponents;
+import me.clip.placeholderapi.PlaceholderAPI;
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.inventory.ItemStack;
 import parallelmc.parallelutils.Parallelutils;
 
+import java.util.HashMap;
 import java.util.logging.Level;
 
+import static io.papermc.paper.chat.ChatRenderer.viewerUnaware;
+
 public class OnChatMessage implements Listener {
+
+
+	private final HashMap<String, String> nameformats = new HashMap<>();
+
 	/**
 	 * This event handler allows players to link their held item in chat if they type [item]
 	 */
-	@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
 	public void onChatMessage(AsyncChatEvent event) {
 		Player player = event.getPlayer();
 		ItemStack item = player.getInventory().getItemInMainHand();
 
 		Component name = item.displayName().hoverEvent(item.asHoverEvent());
-		Parallelutils.log(Level.INFO, item.asHoverEvent().toString());
 
 		TextComponent component = Component.text()
 				.append(name)
@@ -35,22 +46,50 @@ public void onChatMessage(AsyncChatEvent event) {
 
 		Component incomingMessage = event.message();
 
+		String format = nameformats.get(player.getName());
+
+		if (format == null) {
+			format = player.getName() + " > ";
+			Parallelutils.log(Level.INFO, format);
+		} else {
+			nameformats.remove(player.getName());
+		}
+
+		String formatted = PlaceholderAPI.setBracketPlaceholders(player, String.format(format, player.getName(), "")
+				.replace("&r", "").replace("§r", "")); // Clear the reset characters
+
 		Component outgoingMessage = incomingMessage.replaceText(x -> x.once().match("\\[item\\]").replacement(component));
 
+		if (incomingMessage.contains(outgoingMessage)) {
+			// [item] was not found. No need to stop the message
+			return;
+		}
+
 		// can't put nothing in chat
 		if (item.getType() == Material.AIR) {
-			if (incomingMessage.contains(outgoingMessage)) {
-				// [item] was not found. No need to stop the message
-				return;
-			}
 			player.sendMessage(Component.text("[", NamedTextColor.DARK_AQUA)
 					.append(Component.text("P", NamedTextColor.WHITE, TextDecoration.BOLD))
 					.append(Component.text("]", NamedTextColor.DARK_AQUA))
 					.append(Component.text(" Cannot link Air into chat!", NamedTextColor.WHITE)));
 			event.setCancelled(true);
 		} else {
-			event.renderer(ChatRenderer.defaultRenderer());
+			event.renderer(viewerUnaware((source, sourceDisplayName, message) ->
+					LegacyComponentSerializer.legacyAmpersand().deserialize(formatted).append(message)));
+
 			event.message(outgoingMessage);
 		}
 	}
+
+	/**
+	 * This event is purely to capture the format
+	 */
+	@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
+	public void onDeprecatedChatMessage(AsyncPlayerChatEvent event) {
+		String format = event.getFormat();
+		String playerName = event.getPlayer().getName();
+
+		Parallelutils.log(Level.INFO, format);
+
+		nameformats.put(playerName, format);
+	}
 }

src/main/resources/plugin.yml

@@ -4,7 +4,7 @@ main: parallelmc.parallelutils.Parallelutils
 api-version: 1.17
 authors: [Jake, Evelyn]
 description: A plugin containing miscellaneous features and changes for play.parallel.ga
-depend: []
+depend: [PlaceholderAPI]
 softdepend: [Multiverse-Core, FractalForest, WorldGuard, VoteParty, FrozenJoin]
 commands:
   parallelutils: