whisper coloring and chat color hack fix

Author: bierdosenhalter

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 keinBkeinT
+Copyright (c) 2022 0b0t
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -45,7 +45,7 @@ the changes take effect.
 - **spoilers** - enables or disables spoilers, is **disabled** by default.
 - **whispers** - enables or disables whisper changes, is **enabled** by default.
 - **newcommands** - enables or disables new whisper commands, is **enabled** by default.
-- **whisperlog** - enables or disables whisper logging (whisper logs are saved in /ChatCo/whisperlog.txt), is **
+- **whisperlog** - enables or disables whisper logging (whisper logs are saved in /ChatCo/whisperlog.txt, is **
   disabled**
   by default.)
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.zeroBzeroT.chatCo</groupId>
     <artifactId>ChatCoPlus</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
 
@@ -112,18 +112,6 @@
             <version>${minecraft.version}-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>2.0.9</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>2.0.9</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>

src/main/java/org/zeroBzeroT/chatCo/ChatPlayer.java

@@ -9,17 +9,17 @@
 import java.util.UUID;
 
 public class ChatPlayer {
-    public final Player player;
+    public final String name;
     public final UUID playerUUID;
     public boolean chatDisabled;
     public boolean tellsDisabled;
     public String LastMessenger;
     public String LastReceiver;
-    private File IgnoreList;
+    private File IgnoresFile;
     private List<String> ignores;
 
     public ChatPlayer(final Player p) throws IOException {
-        player = p;
+        name = p.getName();
         playerUUID = p.getUniqueId();
         chatDisabled = false;
         tellsDisabled = false;
@@ -32,31 +32,31 @@ public ChatPlayer(final Player p) throws IOException {
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
     public void saveIgnoreList(final String p) throws IOException {
-        File oldIgnores = new File(Main.dataFolder, "/ignorelists/" + this.player.getName() + ".txt");
-        this.IgnoreList = new File(Main.dataFolder, "/ignorelists/" + this.playerUUID + ".txt");
+        File oldIgnores = new File(Main.dataFolder, "/ignorelists/" + this.name + ".txt");
+        this.IgnoresFile = new File(Main.dataFolder, "/ignorelists/" + this.playerUUID + ".txt");
 
         if (oldIgnores.exists()) {
-            oldIgnores.renameTo(this.IgnoreList);
+            oldIgnores.renameTo(this.IgnoresFile);
         }
 
-        if (!this.IgnoreList.exists()) {
-            this.IgnoreList.getParentFile().mkdir();
-            final FileWriter fwo = new FileWriter(this.IgnoreList, true);
+        if (!this.IgnoresFile.exists()) {
+            this.IgnoresFile.getParentFile().mkdir();
+            final FileWriter fwo = new FileWriter(this.IgnoresFile, true);
             final BufferedWriter bwo = new BufferedWriter(fwo);
             bwo.close();
         }
 
         if (!p.isEmpty()) {
             if (!this.isIgnored(p)) {
-                final FileWriter fwo = new FileWriter(this.IgnoreList, true);
+                final FileWriter fwo = new FileWriter(this.IgnoresFile, true);
                 final BufferedWriter bwo = new BufferedWriter(fwo);
                 bwo.write(p);
                 bwo.newLine();
                 bwo.close();
             } else {
                 this.ignores.remove(p);
                 this.ignores.remove("");
-                final FileWriter fwo = new FileWriter(this.IgnoreList);
+                final FileWriter fwo = new FileWriter(this.IgnoresFile);
                 final BufferedWriter bwo = new BufferedWriter(fwo);
 
                 for (final String print : this.ignores) {
@@ -72,7 +72,7 @@ public void saveIgnoreList(final String p) throws IOException {
     }
 
     public void unIgnoreAll() throws IOException {
-        final FileWriter fwo = new FileWriter(this.IgnoreList, false);
+        final FileWriter fwo = new FileWriter(this.IgnoresFile, false);
         final BufferedWriter bwo = new BufferedWriter(fwo);
         bwo.flush();
         bwo.close();
@@ -105,7 +105,7 @@ public void setLastReceiver(final Player sender) {
     }
 
     private void updateIgnoreList() throws IOException {
-        final FileInputStream file = new FileInputStream(this.IgnoreList);
+        final FileInputStream file = new FileInputStream(this.IgnoresFile);
         final InputStreamReader fileReader = new InputStreamReader(file);
         final BufferedReader inIgnores = new BufferedReader(fileReader);
         String data = inIgnores.readLine();
@@ -123,7 +123,7 @@ public boolean isIgnored(final String p) {
         return this.ignores.contains(p);
     }
 
-    public List<String> getIgnoreList() {
+    public List<String> getIgnoresFile() {
         return this.ignores;
     }
 }

src/main/java/org/zeroBzeroT/chatCo/Components.java

@@ -1,14 +1,10 @@
 package org.zeroBzeroT.chatCo;
 
-import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.event.ClickEvent;
-import net.kyori.adventure.text.event.HoverEvent;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -125,16 +121,16 @@ public boolean onCommand(final @NotNull CommandSender sender, final @NotNull Com
         if (sender instanceof Player) {
             if (cmd.getName().equalsIgnoreCase("togglechat") && getConfig().getBoolean("toggleChatEnabled", true)) {
                 if (toggleChat((Player) sender)) {
-                    sender.sendMessage(ChatColor.RED + "Your chat is now disabled until you type /togglechat or relog.");
+                    sender.sendMessage(Component.text("Your chat is now disabled until you type /togglechat or relog.", NamedTextColor.RED));
                 } else {
-                    sender.sendMessage(ChatColor.RED + "Your chat has been re-enabled, type /togglechat to disable it again.");
+                    sender.sendMessage(Component.text("Your chat has been re-enabled, type /togglechat to disable it again.", NamedTextColor.RED));
                 }
                 return true;
             } else if (cmd.getName().equalsIgnoreCase("toggletells")) {
                 if (toggleTells((Player) sender)) {
-                    sender.sendMessage(ChatColor.RED + "You will no longer receive tells, type /toggletells to see them again.");
+                    sender.sendMessage(Component.text("You will no longer receive tells, type /toggletells to see them again.", NamedTextColor.RED));
                 } else {
-                    sender.sendMessage(ChatColor.RED + "You now receive tells, type /toggletells to disable them again.");
+                    sender.sendMessage(Component.text("You now receive tells, type /toggletells to disable them again.", NamedTextColor.RED));
                 }
                 return true;
             } else if (cmd.getName().equalsIgnoreCase("unignoreall") && getConfig().getBoolean("ignoresEnabled", true)) {
@@ -147,19 +143,19 @@ public boolean onCommand(final @NotNull CommandSender sender, final @NotNull Com
             } else if (cmd.getName().equalsIgnoreCase("ignore") && getConfig().getBoolean("ignoresEnabled", true)) {
                 try {
                     if (args.length < 1) {
-                        sender.sendMessage(ChatColor.RED + "You forgot to type the name of the player.");
+                        sender.sendMessage(Component.text("You forgot to type the name of the player.", NamedTextColor.RED));
                         return true;
                     }
 
                     if (args[0].length() > 16) {
-                        sender.sendMessage(ChatColor.RED + "You entered an invalid player name.");
+                        sender.sendMessage(Component.text("You entered an invalid player name.", NamedTextColor.RED));
                         return true;
                     }
 
                     final Player ignorable = Bukkit.getServer().getPlayer(args[0]);
 
                     if (ignorable == null) {
-                        sender.sendMessage(ChatColor.RED + "You have entered a player who does not exist or is offline.");
+                        sender.sendMessage(Component.text("You have entered a player who does not exist or is offline.", NamedTextColor.RED));
                         return true;
                     }
 
@@ -169,15 +165,16 @@ public boolean onCommand(final @NotNull CommandSender sender, final @NotNull Com
                     e.printStackTrace();
                 }
             } else if (cmd.getName().equalsIgnoreCase("ignorelist") && getConfig().getBoolean("ignoresEnabled", true)) {
-                sender.sendMessage(ChatColor.YELLOW + "Ignored players:");
+                sender.sendMessage(Component.text("Ignored players:", NamedTextColor.YELLOW));
                 int i = 0;
 
-                for (final String ignores : getChatPlayer((Player) sender).getIgnoreList()) {
-                    sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.ITALIC + ignores);
+                for (final String ignores : getChatPlayer((Player) sender).getIgnoresFile()) {
+                    sender.sendMessage(Component.text(ignores, NamedTextColor.YELLOW, TextDecoration.ITALIC));
+                    ++i;
                     ++i;
                 }
 
-                sender.sendMessage(ChatColor.YELLOW + "" + i + " players ignored.");
+                sender.sendMessage(Component.text("You have " + i + " players ignored.", NamedTextColor.YELLOW));
                 return true;
             }
         }
@@ -240,7 +237,7 @@ public boolean onCommand(final @NotNull CommandSender sender, final @NotNull Com
 
     public ChatPlayer getChatPlayer(final Player p) {
         for (final ChatPlayer chatPlayer : playerList) {
-            if (chatPlayer.playerUUID.equals(p .getUniqueId())) {
+            if (chatPlayer.playerUUID.equals(p.getUniqueId())) {
                 return chatPlayer;
             }
         }
@@ -274,26 +271,25 @@ private boolean toggleTells(final Player p) {
     }
 
     private void ignorePlayer(final Player p, final String target) throws IOException {
-        String message = ChatColor.YELLOW + "Chat messages from " + target + " will be ";
+        Component message = Component.text("Chat messages from " + target + " will be ");
 
         if (getChatPlayer(p).isIgnored(target)) {
-            message += "shown.";
+            message = message.append(Component.text("shown."));
         } else {
-            message += "hidden.";
+            message = message.append(Component.text("hidden."));
         }
 
-        p.sendMessage(message);
+        p.sendMessage(message.color(NamedTextColor.YELLOW));
         getChatPlayer(p).saveIgnoreList(target);
     }
 
     private void unIgnoreAll(final Player p) throws IOException {
         getChatPlayer(p).unIgnoreAll();
-        String message = ChatColor.YELLOW + "Ignore list deleted.";
-        p.sendMessage(message);
+        p.sendMessage(Component.text("Ignore list deleted.", NamedTextColor.YELLOW));
     }
 
     public void remove(Player player) {
-        playerList.removeIf(p -> p.player.equals(player));
+        playerList.removeIf(p -> p.playerUUID.equals(player.getUniqueId()));
     }
 }
 

src/main/java/org/zeroBzeroT/chatCo/Main.java

@@ -18,8 +18,7 @@
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import java.io.File;
-
-import static org.zeroBzeroT.chatCo.Components.mm;
+import java.util.Objects;
 
 public class PublicChat implements Listener {
     public final Main plugin;
@@ -33,7 +32,7 @@ public PublicChat(final Main plugin) {
 
     public String replacePrefixColors(String message, final Player player) {
         for (ChatColor color : ChatColor.values()) {
-            if (plugin.getConfig().getString("ChatCo.chatPrefixes." + color.name()) != null && message.startsWith(plugin.getConfig().getString("ChatCo.chatPrefixes." + color.name()))) {
+            if (plugin.getConfig().getString("ChatCo.chatPrefixes." + color.name()) != null && message.startsWith(Objects.requireNonNull(plugin.getConfig().getString("ChatCo.chatPrefixes." + color.name())))) {
 
                 // check for global or player permission
                 if (permissionConfig.getBoolean("ChatCo.chatPrefixes." + color.name(), false) || player.hasPermission("ChatCo.chatPrefixes." + color.name())) {
@@ -50,32 +49,28 @@ public String replacePrefixColors(String message, final Player player) {
 
     public String replaceInlineColors(String message, final Player player) {
         for (ChatColor color : ChatColor.values()) {
-            if ((permissionConfig.getBoolean("ChatCo.chatColors." + color.name(), false) || player.hasPermission("ChatCo.chatColors." + color.name()))
-                    && plugin.getConfig().getString("ChatCo.chatColors." + color.name()) != null) {
-                message = message.replace(plugin.getConfig().getString("ChatCo.chatColors." + color.name()), color.toString());
+            if ((permissionConfig.getBoolean("ChatCo.chatColors." + color.name(), false) || player.hasPermission("ChatCo.chatColors." + color.name())) && plugin.getConfig().getString("ChatCo.chatColors." + color.name()) != null) {
+                message = message.replace(Objects.requireNonNull(plugin.getConfig().getString("ChatCo.chatColors." + color.name())), color.toString());
             }
         }
 
         return message;
     }
 
     /**
-     * @url https://docs.advntr.dev/text.html
+     * See <a href="https://docs.advntr.dev/text.html">Text (Chat Components)</a>
      */
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onAsyncChat(AsyncChatEvent event) {
-        // Set format to the plain message, since the player is not needed
-        //String oldFormat = event.getFormat();
-        //event.setFormat("%2$s");
-
         // Plain message
         final Player player = event.getPlayer();
+
         String legacyMessage = LegacyComponentSerializer.legacyAmpersand().serialize(event.message());
         legacyMessage = replacePrefixColors(legacyMessage, player);
         legacyMessage = replaceInlineColors(legacyMessage, player);
 
         // Do not send empty messages
-        if (ChatColor.stripColor(legacyMessage).trim().isEmpty()) {
+        if (legacyMessage.trim().isEmpty()) {
             event.setCancelled(true);
             return;
         }
@@ -91,12 +86,8 @@ public void onAsyncChat(AsyncChatEvent event) {
             sender = sender.hoverEvent(HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT, Component.text("Whisper to " + player.getName())));
         }
 
-        // Message
-        TextComponent message = Component.text("")
-                .append(Component.text("<"))
-                .append(sender)
-                .append(Component.text("> "))
-                .append(messageText);
+        // Build Message
+        TextComponent message = Component.text("").append(Component.text("<")).append(sender).append(Component.text("> ")).append(messageText);
 
         // Send to the players
         if (!plugin.getConfig().getBoolean("ChatCo.chatDisabled", false)) {
@@ -105,8 +96,7 @@ public void onAsyncChat(AsyncChatEvent event) {
                     if (recipient instanceof Player) {
                         ChatPlayer chatPlayer = plugin.getChatPlayer((Player) recipient);
 
-                        if (chatPlayer.chatDisabled)
-                            continue;
+                        if (chatPlayer.chatDisabled) continue;
 
                         if (chatPlayer.isIgnored(player.getName()) && plugin.getConfig().getBoolean("ChatCo.ignoresEnabled", true))
                             continue;

src/main/java/org/zeroBzeroT/chatCo/PublicChat.java

@@ -30,7 +30,7 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {
 
             final int Length = event.getMessage().length();
             final Player name = event.getPlayer();
-            this.Spoiler[0] = "[ " + event.getMessage().substring(9, Length - 10) + " ] by R%)[".replace("R%)", ChatColor.RED.toString()) + name.getDisplayName() + "]";
+            this.Spoiler[0] = "[ " + event.getMessage().substring(9, Length - 10) + " ] by R%)[".replace("R%)", ChatColor.RED.toString()) + name.displayName() + "]";
             event.setMessage(ChatColor.BLACK + "SPOILER");
         } else {
             event.setMessage(check);

src/main/java/org/zeroBzeroT/chatCo/Spoilers.java

@@ -1,7 +1,7 @@
 package org.zeroBzeroT.chatCo;
 
-import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.entity.Player;
 
 import java.io.File;
@@ -22,18 +22,15 @@ public class Utils {
      */
     public static boolean isVanished(Player player) {
         if (player != null && player.hasMetadata("vanished") && !player.getMetadata("vanished").isEmpty()) {
-            return player.getMetadata("vanished").get(0).asBoolean();
+            return player.getMetadata("vanished").getFirst().asBoolean();
         }
 
         return false;
     }
 
-    ///**
-    // * Converts a string into a single text component while retaining the old formatting
-    // */
-    //public static TextComponent componentFromLegacyText(String legacyText) {
-    //    return LegacyComponentSerializer.legacyAmpersand().deserialize(legacyText);
-    //}
+    public static Component mm(String miniMessageString) { // mm, short for MiniMessage
+        return MiniMessage.miniMessage().deserialize(miniMessageString);
+    }
 
     /**
      * Saves a stream to a file