Hex color support and papi placeholders support

StarchierOrb · Jul 24, 2021 · a7b5d93 · a7b5d93
1 parent 86e327e
commit a7b5d93
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 8 deletions.
diff --git a/src/main/java/me/starchier/inventorykeeper/command/CommandExec.java b/src/main/java/me/starchier/inventorykeeper/command/CommandExec.java
@@ -2,6 +2,7 @@
 
 import me.starchier.inventorykeeper.InventoryKeeper;
 import me.starchier.inventorykeeper.util.PluginHandler;
+import me.starchier.inventorykeeper.util.StringUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -57,7 +58,7 @@ public void runCommands(Player player, boolean isDeathCommand, String path, bool
                 continue;
             }
             if (isDeathCommand) {
-                Bukkit.dispatchCommand(Bukkit.getConsoleSender(), s.replace("%player%", player.getName()));
+                Bukkit.dispatchCommand(Bukkit.getConsoleSender(), StringUtil.replacePlaceholder(s.replace("%player%", player.getName()), player));
             } else {
                 runCmds.add(s.replace("%player%", player.getName()));
             }
@@ -74,13 +75,13 @@ public void run() {
                             boolean isOP = player.isOp();
                             try {
                                 player.setOp(true);
-                                Bukkit.dispatchCommand(player, s.replace("[op]", ""));
+                                Bukkit.dispatchCommand(player, StringUtil.replacePlaceholder(s.replace("[op]", ""), player));
                             } catch (Exception e) {
                             } finally {
                                 player.setOp(isOP);
                             }
                         } else {
-                            Bukkit.dispatchCommand(Bukkit.getConsoleSender(), s);
+                            Bukkit.dispatchCommand(Bukkit.getConsoleSender(), StringUtil.replacePlaceholder(s, player));
                         }
                     }
                 }
@@ -95,7 +96,7 @@ private boolean runOpCommand(Player player, boolean isDeath, String s) {
                 boolean isOP = player.isOp();
                 try {
                     player.setOp(true);
-                    Bukkit.dispatchCommand(player, fixCmd.replace("%player%", player.getName()));
+                    Bukkit.dispatchCommand(player, StringUtil.replacePlaceholder(fixCmd.replace("%player%", player.getName()), player));
                 } catch (Exception e) {
                 } finally {
                     player.setOp(isOP);
@@ -131,7 +132,7 @@ public void runRandomCommands(Player player, boolean isDeath, String path, boole
                 runCmds.add(s.replace("%player%", player.getName()));
                 continue;
             }
-            Bukkit.dispatchCommand(Bukkit.getConsoleSender(), s.replace("%player%", player.getName()));
+            Bukkit.dispatchCommand(Bukkit.getConsoleSender(), StringUtil.replacePlaceholder(s.replace("%player%", player.getName()), player));
         }
         runCommandsOnRespawn(player, isDeath, runCmds);
     }

diff --git a/src/main/java/me/starchier/inventorykeeper/util/PluginHandler.java b/src/main/java/me/starchier/inventorykeeper/util/PluginHandler.java
@@ -43,9 +43,9 @@ public static boolean isLegacy() {
 
     public String getConfigValue(String path, boolean isGeneralConfig) {
         if (isGeneralConfig) {
-            return ChatColor.translateAlternateColorCodes('&', generalConfig.getString("settings." + path, null));
+            return StringUtil.transform(ChatColor.translateAlternateColorCodes('&', generalConfig.getString("settings." + path, null)));
         } else {
-            return ChatColor.translateAlternateColorCodes('&', itemsConfig.getString("items." + path, null));
+            return StringUtil.transform(ChatColor.translateAlternateColorCodes('&', itemsConfig.getString("items." + path, null)));
         }
     }
 
@@ -93,7 +93,7 @@ public Boolean isBlackList(boolean isEntityList, String itemGroup) {
     }
 
     public String getMessage(String path) {
-        return ChatColor.translateAlternateColorCodes('&', generalConfig.getString("messages." + path, null));
+        return StringUtil.transform(ChatColor.translateAlternateColorCodes('&', generalConfig.getString("messages." + path, null)));
     }
 
     public List<String> getList(String path, boolean isGeneralConfig) {
@@ -106,6 +106,7 @@ public List<String> getList(String path, boolean isGeneralConfig) {
         List<String> fixList = new ArrayList<>();
         for (String s : originList) {
             s = ChatColor.translateAlternateColorCodes('&', s);
+            s = StringUtil.transform(s);
             fixList.add(s);
         }
         return fixList;

diff --git a/src/main/java/me/starchier/inventorykeeper/util/StringUtil.java b/src/main/java/me/starchier/inventorykeeper/util/StringUtil.java
@@ -0,0 +1,31 @@
+package me.starchier.inventorykeeper.util;
+
+import me.clip.placeholderapi.PlaceholderAPI;
+import net.md_5.bungee.api.ChatColor;
+import org.bukkit.entity.Player;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class StringUtil {
+    private static final Pattern hexPattern = Pattern.compile("(#[a-fA-F0-9]{6})");
+
+    public static String transform(String str) {
+        try {
+            Matcher matcher = hexPattern.matcher(str);
+            while (matcher.find()) {
+                String hexCode = str.substring(matcher.start(), matcher.end());
+                str = str.replace(hexCode, ChatColor.of(hexCode).toString());
+            }
+        } catch (Exception ignored) {
+        }
+        return str;
+    }
+
+    public static String replacePlaceholder(String str, Player player) {
+        if (PlaceholderAPI.containsPlaceholders(str)) {
+            return PlaceholderAPI.setPlaceholders(player, str);
+        }
+        return str;
+    }
+}