From 90ef97a6c05b8a95b4ce89e5fcce37b4709225ed Mon Sep 17 00:00:00 2001 From: OptimisticDeving <173472493+OptimisticDeving@users.noreply.github.com> Date: Sun, 23 Jun 2024 15:40:21 +0000 Subject: [PATCH] Allow players to select the vanilla chat format --- .../pw/kaboom/extras/modules/player/PlayerChat.java | 4 ++++ .../kaboom/extras/modules/player/PlayerPrefix.java | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerChat.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerChat.java index 89052d3..2bbc187 100644 --- a/src/main/java/pw/kaboom/extras/modules/player/PlayerChat.java +++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerChat.java @@ -41,6 +41,10 @@ public final class PlayerChat implements Listener { @EventHandler(priority = EventPriority.MONITOR) void onAsyncChatEventRenderer(final AsyncChatEvent event) { + if (PlayerPrefix.isUsingVanillaFormat(event.getPlayer())) { + return; + } + event.renderer(CHAT_RENDERER); } diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerPrefix.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerPrefix.java index d67e59b..1e5a7fd 100644 --- a/src/main/java/pw/kaboom/extras/modules/player/PlayerPrefix.java +++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerPrefix.java @@ -74,6 +74,14 @@ public final class PlayerPrefix implements Listener { return prefix; } + public static boolean isUsingVanillaFormat(Player player) { + final UUID playerUUID = player.getUniqueId(); + final String stringifiedUUID = playerUUID.toString(); + final String legacyPrefix = PREFIX_CONFIG.getString(stringifiedUUID); + + return legacyPrefix != null && legacyPrefix.equals("%"); + } + public static Component getPrefix(Player player) throws IOException { final UUID playerUUID = player.getUniqueId(); final String stringifiedUUID = playerUUID.toString(); @@ -94,7 +102,10 @@ public final class PlayerPrefix implements Listener { private static void onUpdate(Player player) throws IOException { final Component component = Component.empty() - .append(getPrefix(player)) + .append( + isUsingVanillaFormat(player) ? + Component.empty() : getPrefix(player) + ) .append(player.displayName()); player.playerListName(component);