From b954ccea63a0e8cb9dbcf234601d65b58777b4ca Mon Sep 17 00:00:00 2001
From: Kamicjusz <kamicjusz.kontakt@gmail.com>
Date: Fri, 24 May 2024 14:51:20 +0200
Subject: [PATCH 1/7] add PlaceholderAPI support in internal placeholders
 expand default config

---
 build.gradle.kts                              |  2 +-
 .../formatter/config/PluginConfig.java        | 62 ++++++++++++-------
 .../placeholder/PlaceholderRegistry.java      | 10 +--
 .../placeholder/PlaceholderStack.java         |  4 +-
 4 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index ff63316..59e23be 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -85,7 +85,7 @@ runPaper {
 }
 
 tasks.runServer {
-    minecraftVersion("1.20.1")
+    minecraftVersion("1.20.4")
     dependsOn("shadowAll")
     pluginJars = files("/build/libs/ChatFormatter v${project.version}.jar")
 }
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
index a35cc73..71cfa02 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
@@ -6,8 +6,11 @@
 import com.google.common.collect.ImmutableMap;
 import com.eternalcode.formatter.ChatSettings;
 import com.eternalcode.formatter.placeholder.PlaceholderStack;
+import me.clip.placeholderapi.PlaceholderAPI;
 import net.dzikoysk.cdn.entity.Description;
+import org.bukkit.entity.Player;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -25,7 +28,7 @@ public class PluginConfig implements ChatSettings, PlaceholderStack, TemplateRep
     public boolean receiveUpdates = true;
 
 
-    @Description({ " ", "# Chat format for ranks (Vault) Support mini-messages and legacy colors" })
+    @Description({ " ", "# Chat rankFormat for ranks (Vault) Support mini-messages and legacy colors" })
     @Description({ " ", "# We're recommending to use webui for mini-messages: https://webui.adventure.kyori.net/" })
     @Description({ " ", "# documentation is here: https://docs.adventure.kyori.net/minimessage/format.html" })
 
@@ -44,31 +47,40 @@ public class PluginConfig implements ChatSettings, PlaceholderStack, TemplateRep
         "# RGB and gradient message usage: ",
         "# <color:#ff00ee>Example message</color>",
         "# <gradient:#ff00ee:#f79459>Example message</gradient>",
-        " "
+        "# ",
+        "# You can use three more placeholders: <displayname> <name> <message>",
+        "# "
     })
-    public String defaultFormat = "{displayname} {arrow_right} {message}";
-    public Map<String, String> format = new ImmutableMap.Builder<String, String>()
-        .put("default", "{member} &f{displayname} &8{arrow_right} {message} ")
-        .put("admin", "$template({admin}, &c)")
-        .build();
-
-
-    @Description({ " ", "# It is used to shorten the text even more and keep the clean file!" })
-    public List<Template> templates = new ImmutableList.Builder<Template>()
-        .add(Template.of("template", List.of("rank", "color"), "$rank $color{displayname} &8{arrow_right} $color{message}"))
-        .build();
+    public String defaultFormat = "{displayname} » {message}";
+    public Map<String, String> rankFormat = new ImmutableMap.Builder<String, String>()
+            .put("default", "{member} &7$hoverName({displayname}) &8» <gradient:#d4d4d4:white>{message} ")
+            .put("vip", "{vip} &f$hoverName({displayname}) <dark_gray>» <gradient:#ffd270:white>{message}")
+            .put("mod", "{mod} &f$hoverName({displayname}) <dark_gray>» <gradient:#a3ff9e:white>{message}")
+            .put("admin", "{admin} &f$hoverName({displayname}) <dark_gray>» <gradient:#bac8ff:white><b>{message}")
+            .put("owner", "{owner} &f$hoverName({displayname}) <dark_gray>» <gradient:#ff9195:white><b>{message}")
+            .build();
 
     @Description({ " ", "# Placeholders, it allows you to make a shorter text, you can use some prefixes, characters etc. " })
     public Map<String, String> placeholders = new ImmutableMap.Builder<String, String>()
-        .put("{displayname}", "<displayname>")
-        .put("{name}", "<name>")
-        .put("{message}", "<message>")
-        .put("{prefix}", "<b><gradient:#29fbff:#38b3ff>ChatFormatter</gradient></b>")
-        .put("{member}", "<b><color:#6e6764>Member</color></b>")
-        .put("{admin}", "<b><color:#ff4400>Admin</color></b>")
-        .put("{arrow_right}", "»")
-        .put("{arrow_left}", "«")
-        .build();
+            .put("{displayname}", "<displayname>")
+            .put("{name}", "<name>")
+            .put("{message}", "<message>")
+            .put("{member}", "<#6e6764>Member")
+            .put("{vip}", "<gold>VIP")
+            .put("{mod}", "<b><#00c900>Mod</b>")
+            .put("{admin}", "<b><#6e86ff>Admin</b>")
+            .put("{owner}", "<b><gradient:#c40000:#e04b4b>Owner</b>")
+            .put("{rankDescription}", "<dark_gray>Rank: <white>%vault_group%")
+            .put("{joinDate}", "<dark_gray>Joined: <white>%player_first_join_date%")
+            .put("{health}", "<dark_gray>Health: <red>%player_health%")
+            .put("{lvl}", "<dark_gray>LVL: <gold>%player_level%")
+            .put("{privateMessage}", "<gradient:#36ff39:#75ff75><i>Click to send private message</i></gradient>")
+            .build();
+
+    @Description({ " ", "# This section is made for experienced users" , "# It is used to shorten the text even more and keep the clean file!" })
+    public List<Template> templates = new ImmutableList.Builder<Template>()
+            .add(Template.of("hoverName", List.of("name"), "<hover:show_text:'<dark_gray>Name: <white>$name<br><br>{rankDescription}<br>{joinDate}<br>{health}<br>{lvl}<br><br>{privateMessage}'><click:suggest_command:'/msg {displayname} '>{displayname}</click></hover>"))
+            .build();
 
 
     @Override
@@ -78,13 +90,15 @@ public boolean isReceiveUpdates() {
 
     @Override
     public String getRawFormat(String rank) {
-        return this.format.getOrDefault(rank, this.defaultFormat);
+        return this.rankFormat.getOrDefault(rank, this.defaultFormat);
     }
 
     @Override
-    public String apply(String text) {
+    public String apply(String text, Player target) {
         String value = text;
 
+        value = PlaceholderAPI.setPlaceholders(target, value);
+
         for (Map.Entry<String, String> entry : this.placeholders.entrySet()) {
             value = value.replace(entry.getKey(), entry.getValue());
         }
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderRegistry.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderRegistry.java
index dde2b69..1f600bd 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderRegistry.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderRegistry.java
@@ -31,19 +31,15 @@ public void playerStack(PlayerPlaceholderStack stack) {
         this.playerStacks.add(stack);
     }
 
-    public String format(String text) {
+    public String format(String text, Player target) {
         for (PlaceholderStack stack : this.stacks) {
-            text = stack.apply(text);
+            text = stack.apply(text, target);
         }
 
         for (Map.Entry<String, Placeholder> entry : this.placeholders.entrySet()) {
             text = text.replace(entry.getKey(), entry.getValue().extract());
         }
 
-        return text;
-    }
-
-    public String format(String text, Player target) {
         for (PlayerPlaceholderStack stack : this.playerStacks) {
             text = stack.apply(text, target);
         }
@@ -52,7 +48,7 @@ public String format(String text, Player target) {
             text = text.replace(entry.getKey(), entry.getValue().extract(target));
         }
 
-        return this.format(text);
+        return text;
     }
 
 }
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderStack.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderStack.java
index 6be5a95..f601e1e 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderStack.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderStack.java
@@ -1,7 +1,9 @@
 package com.eternalcode.formatter.placeholder;
 
+import org.bukkit.entity.Player;
+
 public interface PlaceholderStack {
 
-    String apply(String text);
+    String apply(String text, Player target);
 
 }

From e7667050d439657633baeff55a7f81b683ac1787 Mon Sep 17 00:00:00 2001
From: Kamicjusz <kamicjusz.kontakt@gmail.com>
Date: Wed, 29 May 2024 22:12:09 +0200
Subject: [PATCH 2/7] more config description

---
 .../formatter/config/PluginConfig.java            | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
index 71cfa02..1873007 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
@@ -28,11 +28,13 @@ public class PluginConfig implements ChatSettings, PlaceholderStack, TemplateRep
     public boolean receiveUpdates = true;
 
 
-    @Description({ " ", "# Chat rankFormat for ranks (Vault) Support mini-messages and legacy colors" })
+    @Description({ " ", "# Chat format for ranks (Vault) Support mini-messages and legacy colors" })
     @Description({ " ", "# We're recommending to use webui for mini-messages: https://webui.adventure.kyori.net/" })
     @Description({ " ", "# documentation is here: https://docs.adventure.kyori.net/minimessage/format.html" })
+    @Description({ " ", "# You can check LuckyPerms setup and placeholders here: https://luckperms.net/wiki/Placeholders" })
 
     @Description({
+        "# ",
         "# Example usages:",
         "# ",
         "# Hover message:",
@@ -48,11 +50,14 @@ public class PluginConfig implements ChatSettings, PlaceholderStack, TemplateRep
         "# <color:#ff00ee>Example message</color>",
         "# <gradient:#ff00ee:#f79459>Example message</gradient>",
         "# ",
-        "# You can use three more placeholders: <displayname> <name> <message>",
+        "# You can use three more internal placeholders: <displayname> <name> <message>",
         "# "
     })
     public String defaultFormat = "{displayname} » {message}";
-    public Map<String, String> rankFormat = new ImmutableMap.Builder<String, String>()
+    @Description({ " ", "# Here you can set different formats for each rank.",
+            "# Remember! Rank name must be exact same like in you permission plugin configuration.",
+            "# If player have more than one rank remember to correctly setup rank weight configuration" })
+    public Map<String, String> format = new ImmutableMap.Builder<String, String>()
             .put("default", "{member} &7$hoverName({displayname}) &8» <gradient:#d4d4d4:white>{message} ")
             .put("vip", "{vip} &f$hoverName({displayname}) <dark_gray>» <gradient:#ffd270:white>{message}")
             .put("mod", "{mod} &f$hoverName({displayname}) <dark_gray>» <gradient:#a3ff9e:white>{message}")
@@ -60,7 +65,7 @@ public class PluginConfig implements ChatSettings, PlaceholderStack, TemplateRep
             .put("owner", "{owner} &f$hoverName({displayname}) <dark_gray>» <gradient:#ff9195:white><b>{message}")
             .build();
 
-    @Description({ " ", "# Placeholders, it allows you to make a shorter text, you can use some prefixes, characters etc. " })
+    @Description({ " ", "# Placeholders, it allows you to make a shorter text, you can use some prefixes, characters etc. ", "# You can use here PAPI placeholders." })
     public Map<String, String> placeholders = new ImmutableMap.Builder<String, String>()
             .put("{displayname}", "<displayname>")
             .put("{name}", "<name>")
@@ -90,7 +95,7 @@ public boolean isReceiveUpdates() {
 
     @Override
     public String getRawFormat(String rank) {
-        return this.rankFormat.getOrDefault(rank, this.defaultFormat);
+        return this.format.getOrDefault(rank, this.defaultFormat);
     }
 
     @Override

From 1717fdd156fd74ded23f66117a29af212456e186 Mon Sep 17 00:00:00 2001
From: Kamicjusz <kamicjusz.kontakt@gmail.com>
Date: Wed, 29 May 2024 22:16:11 +0200
Subject: [PATCH 3/7] literoofkey fix

---
 .../java/com/eternalcode/formatter/config/PluginConfig.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
index 1873007..797ebfd 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
@@ -31,7 +31,7 @@ public class PluginConfig implements ChatSettings, PlaceholderStack, TemplateRep
     @Description({ " ", "# Chat format for ranks (Vault) Support mini-messages and legacy colors" })
     @Description({ " ", "# We're recommending to use webui for mini-messages: https://webui.adventure.kyori.net/" })
     @Description({ " ", "# documentation is here: https://docs.adventure.kyori.net/minimessage/format.html" })
-    @Description({ " ", "# You can check LuckyPerms setup and placeholders here: https://luckperms.net/wiki/Placeholders" })
+    @Description({ " ", "# You can check LuckPerms setup and placeholders here: https://luckperms.net/wiki/Placeholders" })
 
     @Description({
         "# ",

From 4282137b7914e3987d20471b2f8f287b4853a326 Mon Sep 17 00:00:00 2001
From: Kamicjusz <kamicjusz.kontakt@gmail.com>
Date: Wed, 29 May 2024 22:24:14 +0200
Subject: [PATCH 4/7] second lang fix

---
 .../java/com/eternalcode/formatter/config/PluginConfig.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
index 797ebfd..0711de6 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
@@ -55,7 +55,7 @@ public class PluginConfig implements ChatSettings, PlaceholderStack, TemplateRep
     })
     public String defaultFormat = "{displayname} » {message}";
     @Description({ " ", "# Here you can set different formats for each rank.",
-            "# Remember! Rank name must be exact same like in you permission plugin configuration.",
+            "# Remember! Rank name must be exactly the same as in you permission plugin configuration.",
             "# If player have more than one rank remember to correctly setup rank weight configuration" })
     public Map<String, String> format = new ImmutableMap.Builder<String, String>()
             .put("default", "{member} &7$hoverName({displayname}) &8» <gradient:#d4d4d4:white>{message} ")

From 20d42427f2412597483bd15bb2a25b2ff3da6fa0 Mon Sep 17 00:00:00 2001
From: Rollczi <ndejlich5@gmail.com>
Date: Wed, 29 May 2024 23:09:00 +0200
Subject: [PATCH 5/7] Revert placeholder registry changes.

---
 .../com/eternalcode/formatter/config/PluginConfig.java |  7 +------
 .../formatter/placeholder/PlaceholderRegistry.java     | 10 +++++++---
 .../formatter/placeholder/PlaceholderStack.java        |  4 +---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
index 0711de6..e5e56f7 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
@@ -6,11 +6,8 @@
 import com.google.common.collect.ImmutableMap;
 import com.eternalcode.formatter.ChatSettings;
 import com.eternalcode.formatter.placeholder.PlaceholderStack;
-import me.clip.placeholderapi.PlaceholderAPI;
 import net.dzikoysk.cdn.entity.Description;
-import org.bukkit.entity.Player;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -99,11 +96,9 @@ public String getRawFormat(String rank) {
     }
 
     @Override
-    public String apply(String text, Player target) {
+    public String apply(String text) {
         String value = text;
 
-        value = PlaceholderAPI.setPlaceholders(target, value);
-
         for (Map.Entry<String, String> entry : this.placeholders.entrySet()) {
             value = value.replace(entry.getKey(), entry.getValue());
         }
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderRegistry.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderRegistry.java
index 1f600bd..dde2b69 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderRegistry.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderRegistry.java
@@ -31,15 +31,19 @@ public void playerStack(PlayerPlaceholderStack stack) {
         this.playerStacks.add(stack);
     }
 
-    public String format(String text, Player target) {
+    public String format(String text) {
         for (PlaceholderStack stack : this.stacks) {
-            text = stack.apply(text, target);
+            text = stack.apply(text);
         }
 
         for (Map.Entry<String, Placeholder> entry : this.placeholders.entrySet()) {
             text = text.replace(entry.getKey(), entry.getValue().extract());
         }
 
+        return text;
+    }
+
+    public String format(String text, Player target) {
         for (PlayerPlaceholderStack stack : this.playerStacks) {
             text = stack.apply(text, target);
         }
@@ -48,7 +52,7 @@ public String format(String text, Player target) {
             text = text.replace(entry.getKey(), entry.getValue().extract(target));
         }
 
-        return text;
+        return this.format(text);
     }
 
 }
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderStack.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderStack.java
index f601e1e..6be5a95 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderStack.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/PlaceholderStack.java
@@ -1,9 +1,7 @@
 package com.eternalcode.formatter.placeholder;
 
-import org.bukkit.entity.Player;
-
 public interface PlaceholderStack {
 
-    String apply(String text, Player target);
+    String apply(String text);
 
 }

From d4cff2cfa1b7cc252768a7604cc75ed51715cfd9 Mon Sep 17 00:00:00 2001
From: Rollczi <ndejlich5@gmail.com>
Date: Wed, 29 May 2024 23:13:07 +0200
Subject: [PATCH 6/7] Move papi dependency from config class (see revert) to
 ConfiguredPlaceholderAPIStack class.

---
 .../formatter/ChatFormatterPlugin.java        |  3 +-
 .../formatter/config/PluginConfig.java        | 14 +--------
 .../ConfiguredPlaceholderAPIStack.java        | 29 +++++++++++++++++++
 3 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/ConfiguredPlaceholderAPIStack.java

diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/ChatFormatterPlugin.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/ChatFormatterPlugin.java
index f5a10b2..c2398e1 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/ChatFormatterPlugin.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/ChatFormatterPlugin.java
@@ -4,6 +4,7 @@
 import com.eternalcode.formatter.config.PluginConfig;
 import com.eternalcode.formatter.legacy.LegacyPostProcessor;
 import com.eternalcode.formatter.legacy.LegacyPreProcessor;
+import com.eternalcode.formatter.placeholder.ConfiguredPlaceholderAPIStack;
 import com.eternalcode.formatter.placeholder.PlaceholderAPIStack;
 import com.eternalcode.formatter.placeholder.PlaceholderRegistry;
 import com.eternalcode.formatter.rank.ChatRankProvider;
@@ -39,7 +40,7 @@ public ChatFormatterPlugin(Plugin plugin) {
         PluginConfig pluginConfig = configManager.getPluginConfig();
 
         this.placeholderRegistry = new PlaceholderRegistry();
-        this.placeholderRegistry.stack(pluginConfig);
+        this.placeholderRegistry.playerStack(new ConfiguredPlaceholderAPIStack(pluginConfig));
         this.placeholderRegistry.playerStack(new PlaceholderAPIStack());
         this.templateService = new TemplateService(pluginConfig);
         this.rankProvider = new VaultRankProvider(server);
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
index e5e56f7..90ca698 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/config/PluginConfig.java
@@ -5,13 +5,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.eternalcode.formatter.ChatSettings;
-import com.eternalcode.formatter.placeholder.PlaceholderStack;
 import net.dzikoysk.cdn.entity.Description;
 
 import java.util.List;
 import java.util.Map;
 
-public class PluginConfig implements ChatSettings, PlaceholderStack, TemplateRepository {
+public class PluginConfig implements ChatSettings, TemplateRepository {
 
     @Description(" ")
     @Description("#    ____ _           _   _____      ChatFormatter       _   _            ")
@@ -95,17 +94,6 @@ public String getRawFormat(String rank) {
         return this.format.getOrDefault(rank, this.defaultFormat);
     }
 
-    @Override
-    public String apply(String text) {
-        String value = text;
-
-        for (Map.Entry<String, String> entry : this.placeholders.entrySet()) {
-            value = value.replace(entry.getKey(), entry.getValue());
-        }
-
-        return value;
-    }
-
     @Override
     public List<Template> getTemplates() {
         return this.templates;
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/ConfiguredPlaceholderAPIStack.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/ConfiguredPlaceholderAPIStack.java
new file mode 100644
index 0000000..0603dfc
--- /dev/null
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/ConfiguredPlaceholderAPIStack.java
@@ -0,0 +1,29 @@
+package com.eternalcode.formatter.placeholder;
+
+import com.eternalcode.formatter.config.PluginConfig;
+import java.util.Map;
+import me.clip.placeholderapi.PlaceholderAPI;
+import org.bukkit.entity.Player;
+
+public class ConfiguredPlaceholderAPIStack implements PlayerPlaceholderStack {
+
+    private final PluginConfig pluginConfig;
+
+    public ConfiguredPlaceholderAPIStack(PluginConfig pluginConfig) {
+        this.pluginConfig = pluginConfig;
+    }
+
+    @Override
+    public String apply(String text, Player target) {
+        String value = text;
+
+        value = PlaceholderAPI.setPlaceholders(target, value);
+
+        for (Map.Entry<String, String> entry : this.pluginConfig.placeholders.entrySet()) {
+            value = value.replace(entry.getKey(), entry.getValue());
+        }
+
+        return value;
+    }
+
+}

From 1324f02b855b08cde5d9720dce949ae6d27b5867 Mon Sep 17 00:00:00 2001
From: Rollczi <ndejlich5@gmail.com>
Date: Thu, 30 May 2024 00:24:25 +0200
Subject: [PATCH 7/7] Fix bug, add unit tests.

---
 chatformatter-core/build.gradle.kts           |  5 ++
 .../ConfiguredPlaceholderAPIStack.java        |  4 +-
 .../placeholder/PapiPlaceholdersTest.java     | 85 +++++++++++++++++++
 3 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 chatformatter-core/src/test/java/com/eternalcode/formatter/placeholder/PapiPlaceholdersTest.java

diff --git a/chatformatter-core/build.gradle.kts b/chatformatter-core/build.gradle.kts
index 7ede731..070844f 100644
--- a/chatformatter-core/build.gradle.kts
+++ b/chatformatter-core/build.gradle.kts
@@ -34,7 +34,12 @@ dependencies {
 
     // JUnit 5
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.2")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
+    testImplementation("org.mockito:mockito-core:5.12.0")
+    testImplementation("org.mockito:mockito-junit-jupiter:5.12.0")
+    testImplementation("me.clip:placeholderapi:2.11.5")
+    testImplementation("org.assertj:assertj-core:3.26.0")
 }
 
 tasks {
diff --git a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/ConfiguredPlaceholderAPIStack.java b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/ConfiguredPlaceholderAPIStack.java
index 0603dfc..d2edada 100644
--- a/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/ConfiguredPlaceholderAPIStack.java
+++ b/chatformatter-core/src/main/java/com/eternalcode/formatter/placeholder/ConfiguredPlaceholderAPIStack.java
@@ -17,12 +17,12 @@ public ConfiguredPlaceholderAPIStack(PluginConfig pluginConfig) {
     public String apply(String text, Player target) {
         String value = text;
 
-        value = PlaceholderAPI.setPlaceholders(target, value);
-
         for (Map.Entry<String, String> entry : this.pluginConfig.placeholders.entrySet()) {
             value = value.replace(entry.getKey(), entry.getValue());
         }
 
+        value = PlaceholderAPI.setPlaceholders(target, value);
+
         return value;
     }
 
diff --git a/chatformatter-core/src/test/java/com/eternalcode/formatter/placeholder/PapiPlaceholdersTest.java b/chatformatter-core/src/test/java/com/eternalcode/formatter/placeholder/PapiPlaceholdersTest.java
new file mode 100644
index 0000000..182a82e
--- /dev/null
+++ b/chatformatter-core/src/test/java/com/eternalcode/formatter/placeholder/PapiPlaceholdersTest.java
@@ -0,0 +1,85 @@
+package com.eternalcode.formatter.placeholder;
+
+import com.eternalcode.formatter.config.PluginConfig;
+import com.eternalcode.formatter.template.TemplateService;
+import me.clip.placeholderapi.PlaceholderAPI;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import org.bukkit.entity.Player;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.isNull;
+import org.mockito.MockedStatic;
+import static org.mockito.Mockito.mockStatic;
+
+class PapiPlaceholdersTest {
+
+    private static MockedStatic<PlaceholderAPI> mockStatic;
+
+    private static PlaceholderRegistry registry;
+    private static TemplateService templateService;
+    private static PluginConfig pluginConfig;
+
+    @BeforeAll
+    static void setUpBeforeClass() {
+        pluginConfig = new PluginConfig();
+        registry = new PlaceholderRegistry();
+        templateService = new TemplateService(pluginConfig);
+
+        registry.playerStack(new ConfiguredPlaceholderAPIStack(pluginConfig));
+        registry.playerStack(new PlaceholderAPIStack());
+    }
+
+    @BeforeEach
+    void setUp() {        // mock the PlaceholderAPI plugin (staic methods)
+        mockStatic = mockStatic(PlaceholderAPI.class);
+        mockStatic.when(() -> PlaceholderAPI.setPlaceholders(isNull(Player.class), anyString())).thenAnswer(invocation -> invocation.<String>getArgument(1)
+            .replace("%vault_group%", "--VIP--")
+            .replace("%player_first_join_date%", "2021-01-01")
+            .replace("%player_health%", "19")
+            .replace("%player_level%", "420"));
+    }
+
+    @Test
+    void test() {
+        String text = "Hello %player_name%, you joined on %player_first_join_date% and you are in the %vault_group% group. Your health is %player_health% and your level is %player_level%.";
+        String result = registry.format(text, null);
+
+        assertThat(result)
+            .isEqualTo("Hello %player_name%, you joined on 2021-01-01 and you are in the --VIP-- group. Your health is 19 and your level is 420.");
+    }
+
+
+    @ParameterizedTest
+    @ValueSource(strings = {"default", "vip", "mod", "admin", "owner"})
+    void testFormatFromConfig(String rank) {
+        String rawFormat = pluginConfig.getRawFormat(rank);
+        String formattedString = templateService.applyTemplates(rawFormat);
+        String result = registry.format(formattedString, null);
+
+        assertThat(result)
+            .contains("19", "420", "2021-01-01", "--VIP--")
+            .doesNotContain("%", "{", "}");
+    }
+
+
+    @Test
+    void testFormatFromConfigUnknown() {
+        String rawFormat = pluginConfig.getRawFormat("unknown");
+        String formattedString = templateService.applyTemplates(rawFormat);
+        String result = registry.format(formattedString, null);
+
+        assertThat(result)
+            .doesNotContain("%", "{", "}");
+    }
+
+    @AfterEach
+    void tearDownAfterClass() {
+        mockStatic.close();
+    }
+
+}