Message: separate permissions flectonechat.formatting and flectonecha…

…t.placeholders
Flectone · Sep 24, 2023 · ea5af03 · ea5af03
1 parent 69b276e
commit ea5af03
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/src/main/java/net/flectone/messages/MessageBuilder.java b/src/main/java/net/flectone/messages/MessageBuilder.java
@@ -344,8 +344,12 @@ public String getMessage(String color) {
                 word = ChatColor.stripColor(word);
             }
 
+            if (sender.hasPermission("flectonechat.placeholders")) {
+                word = ObjectUtil.formatPAPI(word, sender, sender);
+            }
+
             if (sender.hasPermission("flectonechat.formatting")) {
-                word = ObjectUtil.formatString(true, word, sender, sender);
+                word = ObjectUtil.formatString(word, sender, sender);
             }
 
             color = ChatColor.getLastColors(color) + ChatColor.getLastColors(word);
@@ -399,10 +403,14 @@ public BaseComponent[] buildMessage(@NotNull String lastColor, @NotNull CommandS
                 word = ObjectUtil.formatString(word, recipient, sender);
             }
 
+            if (sender.hasPermission("flectonechat.placeholders")) {
+                word = ObjectUtil.formatPAPI(word, sender, sender);
+            }
+
             if (sender.hasPermission("flectonechat.formatting") && !wordParams.isEdited()) {
                 wordParams.setFormatted(true);
 
-                String newWord = ObjectUtil.formatString(true, lastColor + wordParams.getText(), recipient, sender);
+                String newWord = ObjectUtil.formatString(lastColor + wordParams.getText(), recipient, sender);
                 lastColor = ChatColor.getLastColors(newWord);
 
                 word = lastColor + wordParams.getFormatting() + ChatColor.stripColor(newWord);

diff --git a/src/main/java/net/flectone/utils/ObjectUtil.java b/src/main/java/net/flectone/utils/ObjectUtil.java
@@ -94,20 +94,11 @@ public static String translateHexToColor(@NotNull String string) {
 
     @NotNull
     public static String formatString(@NotNull String string, @Nullable CommandSender recipient, @Nullable CommandSender sender) {
-        return formatString(false, string, recipient, sender);
-    }
-
-    @NotNull
-    public static String formatString(boolean neededPermission, @NotNull String string, @Nullable CommandSender recipient, @Nullable CommandSender sender) {
         String[] colors = null;
 
         if (recipient instanceof Player playerRecipient) {
-            if (HookManager.enabledPlaceholderAPI && sender instanceof Player playerSender
-                    && (!neededPermission || sender.hasPermission("flectonechat.placeholders"))) {
 
-                string = PlaceholderAPI.setPlaceholders(playerSender, string);
-                string = PlaceholderAPI.setRelationalPlaceholders(playerSender, playerRecipient, string);
-            }
+            string = formatPAPI(string, recipient, sender);
 
             FPlayer fPlayer = FPlayerManager.getPlayer(playerRecipient);
             colors = fPlayer != null ? fPlayer.getColors() : null;
@@ -120,6 +111,21 @@ public static String formatString(boolean neededPermission, @NotNull String stri
                 .replace("&&2", colors[1]));
     }
 
+    @NotNull
+    public static String formatPAPI(@NotNull String string, @Nullable CommandSender recipient, @Nullable CommandSender sender) {
+        if (recipient instanceof Player playerRecipient) {
+            if (HookManager.enabledPlaceholderAPI
+                    && sender instanceof Player playerSender
+                    && sender.hasPermission("flectonechat.placeholders")) {
+
+                string = PlaceholderAPI.setPlaceholders(playerSender, string);
+                string = PlaceholderAPI.setRelationalPlaceholders(playerSender, playerRecipient, string);
+            }
+        }
+
+        return string;
+    }
+
     @NotNull
     public static String formatString(@NotNull String string, @Nullable CommandSender sender) {
         return formatString(string, sender, sender);