merge: branch 'TureBentzin-develop' into develop

Author: zetastormy

src/main/java/me/zetastormy/akropolis/hook/HooksManager.java

@@ -29,6 +29,7 @@
 import me.zetastormy.akropolis.hook.hooks.head.BaseHead;
 import me.zetastormy.akropolis.hook.hooks.head.DatabaseHead;
 import me.zetastormy.akropolis.util.text.PlaceholderUtil;
+import me.zetastormy.akropolis.util.text.TextUtil;
 
 public class HooksManager {
     private final Map<String, PluginHook> hooks;
@@ -54,6 +55,7 @@ public HooksManager(AkropolisPlugin plugin) {
         if (Bukkit.getPluginManager().isPluginEnabled("MiniPlaceholders")) {
             hooks.put("MINIPLACEHOLDERS", null);
             PlaceholderUtil.setMPState(true);
+            TextUtil.setMPState(true);
             plugin.getLogger().info("Hooked into MiniPlaceholders");
         }
 

src/main/java/me/zetastormy/akropolis/util/text/PlaceholderUtil.java

@@ -19,6 +19,8 @@
 
 package me.zetastormy.akropolis.util.text;
 
+import java.util.Stack;
+
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -28,6 +30,7 @@
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.zetastormy.akropolis.AkropolisPlugin;
 import me.zetastormy.akropolis.module.modules.world.SongPlayerManager;
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -41,30 +44,6 @@ private PlaceholderUtil() {
         throw new UnsupportedOperationException();
     }
 
-    public static Component setPlaceholders(String rawText, Player player) {
-        String text = rawText;
-
-        text = text.replace("<online>", String.valueOf(Bukkit.getOnlinePlayers().size()))
-                 .replace("<online_max>", String.valueOf(Bukkit.getMaxPlayers()))
-                 .replace("<current_song>", getCurrentSong());
-
-        if (player != null) {
-            text = text.replace("<player>", player.getName())
-                     .replace("<ping>", String.valueOf(player.getPing()))
-                     .replace("<world>", player.getWorld().getName())
-                     .replace("<location>", formatLocation(player.getLocation()));
-
-            return TextUtil.parse(
-                text,
-                player,
-                (papi) ? papiTag(player) : TagResolver.empty(),
-                (miniplaceholders) ? MiniPlaceholders.audienceGlobalPlaceholders() : TagResolver.empty()
-            );
-        }
-
-        return TextUtil.parse(text);
-    }
-
     private static String formatLocation(Location loc) {
         return loc.getBlockX() + ", " + loc.getBlockY() + ", " + loc.getBlockZ();
     }
@@ -74,6 +53,44 @@ private static String getCurrentSong() {
         return songPlayerManager != null ? songPlayerManager.getCurrentSong() : "None";
     }
 
+    /**
+     * Pushes a tag resolver onto the stack that inserts (self-closing) the given component for the given name.
+     * @param tagResolvers the mutable stack of tag resolvers
+     * @param name the name of the tag to resolve (e.g. "player", "ping", etc.)
+     * @param component the component to insert when the tag is resolved
+     */
+    private static void pushTagResolver(final Stack<TagResolver> tagResolvers, final String name, final Component component) {
+        tagResolvers.push(TagResolver.resolver(name, (argumentQueue, context)
+                -> Tag.selfClosingInserting(component)));
+    }
+
+    public static Component setPlaceholders(String rawText, Audience audience) {
+        final Stack<TagResolver> tagResolvers = new Stack<>();
+
+        pushTagResolver(tagResolvers, "online", Component.text(Bukkit.getOnlinePlayers().size()));
+        pushTagResolver(tagResolvers, "online_max", Component.text(Bukkit.getMaxPlayers()));
+        pushTagResolver(tagResolvers, "current_song", Component.text(getCurrentSong()));
+
+        if ((audience instanceof Player player)) {
+            pushTagResolver(tagResolvers, "player", Component.text(player.getName()));
+            pushTagResolver(tagResolvers, "ping", Component.text(player.getPing()));
+            pushTagResolver(tagResolvers, "world", Component.text(player.getWorld().getName()));
+            pushTagResolver(tagResolvers, "location", Component.text(formatLocation(player.getLocation())));
+
+            if (papi) {
+                tagResolvers.push(papiTag(player));
+            }
+
+            if (miniplaceholders) {
+                tagResolvers.push(MiniPlaceholders.audienceGlobalPlaceholders());
+
+                return TextUtil.parse(rawText, audience, TagResolver.resolver(tagResolvers));
+            }
+        }
+
+        return TextUtil.parse(rawText, TagResolver.resolver(tagResolvers));
+    }
+
     @SuppressWarnings("deprecation")
     public static TagResolver papiTag(Player player) {
         return TagResolver.resolver("papi", (argumentQueue, context) -> {

src/main/java/me/zetastormy/akropolis/util/text/TextUtil.java

@@ -19,9 +19,10 @@
 
 package me.zetastormy.akropolis.util.text;
 
-import net.kyori.adventure.pointer.Pointered;
 import org.bukkit.Color;
 
+import io.github.miniplaceholders.api.MiniPlaceholders;
+import net.kyori.adventure.pointer.Pointered;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
@@ -30,16 +31,24 @@
 public class TextUtil {
     private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
 
+    private static boolean miniplaceholders = false;
+
     private TextUtil() {
         throw new UnsupportedOperationException();
     }
 
     public static Component parse(String message) {
-        return MINI_MESSAGE.deserialize(message);
+        if (miniplaceholders)
+            return MINI_MESSAGE.deserialize(message, MiniPlaceholders.globalPlaceholders());
+        else
+            return MINI_MESSAGE.deserialize(message);
     }
 
     public static Component parse(String message, TagResolver resolver) {
-        return MINI_MESSAGE.deserialize(message, resolver);
+        if (miniplaceholders)
+            return MINI_MESSAGE.deserialize(message, resolver, MiniPlaceholders.globalPlaceholders());
+        else
+            return MINI_MESSAGE.deserialize(message, resolver);
     }
 
     public static Component parse(String message, Pointered target, TagResolver... resolver) {
@@ -51,11 +60,11 @@ public static String raw(Component message) {
     }
 
     public static Component parseAndReplace(String message, String pattern, Component replacement) {
-        return MINI_MESSAGE.deserialize(message, Placeholder.component(pattern, replacement));
+        return parse(message, Placeholder.component(pattern, replacement));
     }
 
     public static Component replace(Component message, String pattern, Component replacement) {
-        return MINI_MESSAGE.deserialize(raw(message), Placeholder.component(pattern, replacement));
+        return parse(raw(message), Placeholder.component(pattern, replacement));
     }
 
     public static String joinString(int index, String[] args) {
@@ -90,4 +99,8 @@ public static Color getColor(String s) {
             default -> null;
         };
     }
+
+    public static void setMPState(boolean miniplaceholders) {
+        TextUtil.miniplaceholders = miniplaceholders;
+    }
 }