Updated chat and sign permissions

Author: EBro912

build.gradle

@@ -331,15 +331,37 @@ bukkit {
             description = 'Gives access to tutorialinfo command'
         }
         'parallelutils.chat' {
-            description = 'Gives access to chat elemets'
-            childrenMap = ['parallelutils.chat.colors': true, 'parallelutils.chat.formats': true,]
+            description = 'Gives access to chat elements'
+            childrenMap = ['parallelutils.chat.colors': true, 'parallelutils.chat.formats': true,'parallelutils.chat.hex': true,'parallelutils.chat.magic': true,]
         }
         'parallelutils.chat.colors' {
             description = 'Gives access to chat colors'
         }
         'parallelutils.chat.formats' {
             description = 'Gives access to chat formatting'
         }
+        'parallelutils.chat.hex' {
+            description = 'Gives access to chat hex colors'
+        }
+        'parallelutils.chat.magic' {
+            description = 'Gives access to magic chat formatting'
+        }
+        'parallelutils.sign' {
+            description = 'Gives access to chat elements on signs'
+            childrenMap = ['parallelutils.sign.colors': true, 'parallelutils.sign.formats': true,'parallelutils.sign.hex': true,'parallelutils.sign.magic': true,]
+        }
+        'parallelutils.sign.colors' {
+            description = 'Gives access to chat colors on signs'
+        }
+        'parallelutils.sign.formats' {
+            description = 'Gives access to chat formatting on signs'
+        }
+        'parallelutils.sign.hex' {
+            description = 'Gives access to chat hex colors on signs'
+        }
+        'parallelutils.sign.magic' {
+            description = 'Gives access to magic chat formatting on signs'
+        }
         'parallelutils.bypass' {
             description = 'Bypasses some ParallelUtils modules'
             childrenMap = ['parallelutils.bypass.anticaps': true, 'parallelutils.bypass.antislur': true, 'parallelutils.bypass.clearchat': true, 'parallelutils.bypass.socialspy': true, 'parallelutils.bypass.commandspy': true, 'parallelutils.bypass.mutechat': true,'parallelutils.bypass.chestshops': true, 'parallelutils.bypass.chatroomspy': true]

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

@@ -49,9 +49,19 @@ public void onChatMessage(AsyncChatEvent event) {
             event.message(Component.text(msgStr.replaceAll("&[[0-9][a-f]]", "")));
         }
 
+        // check hex permission
+        if (!player.hasPermission("parallelutils.chat.hex")) {
+            event.message(Component.text(msgStr.replaceAll("&#(.{6})", "")));
+        }
+
         // check formats permission
         if (!player.hasPermission("parallelutils.chat.formats")) {
-            event.message(Component.text(msgStr.replaceAll("&[[k-o]r]", "")));
+            event.message(Component.text(msgStr.replaceAll("&[[l-o]r]", "")));
+        }
+
+        // check magic permission
+        if (!player.hasPermission("parallel.chat.magic")) {
+            event.message(Component.text(msgStr.replaceAll("&k", "")));
         }
 
         // Chat Logger

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

@@ -1,6 +1,8 @@
 package parallelmc.parallelutils.modules.parallelchat.events;
 
+import net.kyori.adventure.text.Component;
 import org.bukkit.block.Sign;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -10,13 +12,36 @@
 public class OnSignTextSet implements Listener {
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void onSignTextSet(SignChangeEvent event) {
-        if (!event.getPlayer().hasPermission("parallelutils.bypass.antislur")) {
+        Player player = event.getPlayer();
+        if (!player.hasPermission("parallelutils.bypass.antislur")) {
             // fuck u paper im not iterating through components
             String text = String.join("\n", event.getLines());
             text = text.toLowerCase().replace(" ", "");
             if (ParallelChat.get().bannedWords.stream().anyMatch(text::contains)) {
                 event.setCancelled(true);
-                ParallelChat.sendParallelMessageTo(event.getPlayer(), "Please do not say that on signs.");
+                ParallelChat.sendParallelMessageTo(player, "Please do not say that on signs.");
+            }
+        }
+        // foreach was acting weird so regular for loop tally-ho
+        // also rip running these checks for every line
+        for (int i = 0; i < event.lines().size(); i++) {
+            // check sign colors permission
+            if (!player.hasPermission("parallelutils.chat.colors")) {
+                event.line(i, event.lines().get(i).replaceText(x -> x.match("&[[0-9][a-f]]").replacement("")));
+            }
+            // check sign hex permission
+            if (!player.hasPermission("parallelutils.chat.hex")) {
+                event.line(i, event.lines().get(i).replaceText(x -> x.match("&#(.{6})").replacement("")));
+            }
+
+            // check sign formats permission
+            if (!player.hasPermission("parallelutils.chat.formats")) {
+                event.line(i, event.lines().get(i).replaceText(x -> x.match("&[[l-o]r]").replacement("")));
+            }
+
+            // check sign magic permission
+            if (!player.hasPermission("parallel.chat.magic")) {
+                event.line(i, event.lines().get(i).replaceText(x -> x.match("&k").replacement("")));
             }
         }
     }