feat: properly add MiniPlaceholders support everywhere

Author: AlexProgrammerDE

PistonChat/src/main/java/net/pistonmaster/pistonchat/commands/MainCommand.java

@@ -35,7 +35,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
           sender.sendMessage(command.getPermissionMessage());
         }
 
-        String headerText = LegacyComponentSerializer.legacySection().serialize(plugin.getCommonTool().getLanguageMessage("help-header", false));
+        String headerText = LegacyComponentSerializer.legacySection().serialize(plugin.getCommonTool().getLanguageMessage(plugin.getCommonTool().senderAudience(sender), "help-header", false));
         ComponentBuilder builder = new ComponentBuilder(headerText).color(ChatColor.GOLD);
 
         for (Map.Entry<String, Map<String, Object>> entry : plugin.getDescription().getCommands().entrySet()) {

PistonChat/src/main/java/net/pistonmaster/pistonchat/hooks/MiniPlaceholdersHook.java

@@ -23,4 +23,12 @@ public static Pointered getRelationalAudience(PistonChat plugin, Audience source
       return target;
     }
   }
+
+  public static TagResolver audienceGlobalPlaceholders(PistonChat plugin) {
+    if (plugin.getServer().getPluginManager().isPluginEnabled("MiniPlaceholders")) {
+      return MiniPlaceholders.audienceGlobalPlaceholders();
+    } else {
+      return TagResolver.empty();
+    }
+  }
 }

PistonChat/src/main/java/net/pistonmaster/pistonchat/tools/CommonTool.java

@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.pointer.Pointered;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.event.HoverEvent;
@@ -109,33 +110,40 @@ private void sendReceiver(CommandSender sender, String message, CommandSender re
     receiverAudience.sendMessage(MiniMessage.miniMessage().deserialize(senderString, MiniPlaceholdersHook.getRelationalAudience(plugin, senderAudience, receiverAudience), tagResolver));
   }
 
-  public Component getLanguageMessage(String messageKey, boolean prefix, TagResolver... tagResolvers) {
+  public Component getLanguageMessage(Audience audience, String messageKey, boolean prefix, TagResolver... tagResolvers) {
     String messageString = getMessageByKey(messageKey);
-    Component messageComponent = MiniMessage.miniMessage().deserialize(messageString, tagResolvers);
+    TagResolver combinedResolver = TagResolver.resolver(
+        MiniPlaceholdersHook.audienceGlobalPlaceholders(plugin),
+        TagResolver.resolver(tagResolvers)
+    );
+    Component messageComponent = MiniMessage.miniMessage().deserialize(messageString, audience, combinedResolver);
 
     if (!prefix) {
       return messageComponent;
     }
 
     String formatString = plugin.getPluginConfig().messages.format;
 
-    TagResolver tagResolver = TagResolver.resolver(
+    TagResolver formatResolver = TagResolver.resolver(
+        MiniPlaceholdersHook.audienceGlobalPlaceholders(plugin),
         Placeholder.component("message", messageComponent)
     );
 
-    return MiniMessage.miniMessage().deserialize(formatString, tagResolver);
+    return MiniMessage.miniMessage().deserialize(formatString, audience, formatResolver);
   }
 
   private String getMessageByKey(String key) {
     return MessageKeyResolver.getMessageByKey(plugin.getPluginConfig().messages, key);
   }
 
   public void sendLanguageMessage(CommandSender sender, String messageKey, TagResolver... tagResolvers) {
-    senderAudience(sender).sendMessage(getLanguageMessage(messageKey, true, tagResolvers));
+    Audience audience = senderAudience(sender);
+    audience.sendMessage(getLanguageMessage(audience, messageKey, true, tagResolvers));
   }
 
   public void sendLanguageMessageNoPrefix(CommandSender sender, String messageKey, TagResolver... tagResolvers) {
-    senderAudience(sender).sendMessage(getLanguageMessage(messageKey, false, tagResolvers));
+    Audience audience = senderAudience(sender);
+    audience.sendMessage(getLanguageMessage(audience, messageKey, false, tagResolvers));
   }
 
   public Optional<TextColor> getChatColorFor(String message, Player player) {
@@ -163,9 +171,10 @@ public void sendChatMessage(Player chatter, String message, Player receiver, @Nu
     Audience chatterAudience = senderAudience(chatter);
     Audience receiverAudience = senderAudience(receiver);
     TagResolver miniPlaceholderResolver = MiniPlaceholdersHook.relationalGlobalPlaceholders(plugin);
+    Pointered relationalAudience = MiniPlaceholdersHook.getRelationalAudience(plugin, chatterAudience, receiverAudience);
     Component formatComponent = overrideFormat != null
       ? overrideFormat
-      : getFormat(chatter, miniPlaceholderResolver);
+      : getFormat(chatter, relationalAudience, miniPlaceholderResolver);
 
     if (receiver.hasPermission("pistonchat.playernamereply")) {
       String hoverText = plugin.getPluginConfig().hoverText;
@@ -193,7 +202,7 @@ public void sendChatMessage(Player chatter, String message, Player receiver, @Nu
     )));
   }
 
-  public Component getFormat(Player chatter, TagResolver miniPlaceholderResolver) {
+  public Component getFormat(Player chatter, Pointered pointered, TagResolver miniPlaceholderResolver) {
     PistonChatConfig config = plugin.getPluginConfig();
     String formatString = "<player_name>";
     for (Map.Entry<String, String> entry : config.chatFormats.entrySet()) {
@@ -203,7 +212,7 @@ public Component getFormat(Player chatter, TagResolver miniPlaceholderResolver)
       }
     }
 
-    return MiniMessage.miniMessage().deserialize(formatString, TagResolver.resolver(
+    return MiniMessage.miniMessage().deserialize(formatString, pointered, TagResolver.resolver(
         miniPlaceholderResolver,
         getDisplayNameResolver(chatter)
     ));
@@ -225,7 +234,7 @@ public TagResolver getDisplayNameResolver(CommandSender sender) {
     }
   }
 
-  private Audience senderAudience(CommandSender sender) {
+  public Audience senderAudience(CommandSender sender) {
     if (sender instanceof Audience audience) {
       return audience;
     } else {