Upgrade f show, migrate to minimessage, improve resolvers for factions and players

Author: mbax

bukkit/src/main/java/dev/kitteh/factions/command/defaults/CmdShow.java

@@ -8,36 +8,24 @@
 import dev.kitteh.factions.command.Cmd;
 import dev.kitteh.factions.command.FactionParser;
 import dev.kitteh.factions.command.Sender;
-import dev.kitteh.factions.permissible.Relation;
-import dev.kitteh.factions.plugin.AbstractFactionsPlugin;
 import dev.kitteh.factions.tag.FactionTag;
 import dev.kitteh.factions.tag.FancyTag;
 import dev.kitteh.factions.tag.Tag;
+import dev.kitteh.factions.tagresolver.FactionResolver;
 import dev.kitteh.factions.util.ComponentDispatcher;
-import dev.kitteh.factions.util.MiscUtil;
+import dev.kitteh.factions.util.Mini;
 import dev.kitteh.factions.util.Permission;
 import dev.kitteh.factions.util.TL;
 import dev.kitteh.factions.util.TextUtil;
+import dev.kitteh.factions.util.TriConsumer;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 import org.incendo.cloud.Command;
 import org.incendo.cloud.CommandManager;
 import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.minecraft.extras.MinecraftHelp;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import dev.kitteh.factions.util.TriConsumer;
-import org.incendo.cloud.minecraft.extras.MinecraftHelp;
-import java.util.stream.Collectors;
 
 public class CmdShow implements Cmd {
     @Override
@@ -56,19 +44,17 @@ public TriConsumer<CommandManager<Sender>, Command.Builder<Sender>, MinecraftHel
 
     public CmdShow() {
         // add defaults to /f show in case config doesn't have it
-        defaults.add("{header}");
-        defaults.add("&6Description: &e{description}");
-        defaults.add("&6Joining: &e{joining}    {peaceful}");
-        defaults.add("&6Land / Power / Maxpower: &e {chunks} / {power} / {maxPower}");
-        defaults.add("&6Raidable: {raidable}");
-        defaults.add("&6Founded: &e{create-date}");
-        defaults.add("&6This faction is permanent, remaining even with no members.");
-        defaults.add("&6Land value: &e{land-value} {land-refund}");
-        defaults.add("&6Balance: &e{faction-balance}");
-        defaults.add("&6Bans: &e{faction-bancount}");
-        defaults.add("&6Allies(&e{allies}&6/&e{max-allies}&6): {allies-list}");
-        defaults.add("&6Online: (&e{online}&6/&e{members}&6): {online-list}");
-        defaults.add("&6Offline: (&e{offline}&6/&e{members}&6): {offline-list}");
+        defaults.add("<fuuid:title><faction:relation_color><faction:name>");
+        defaults.add("<gold>Description: <yellow><faction:description>");
+        defaults.add("<gold><faction:if_open>No invitation required</faction:if_open><faction:if_open:else>Invitation required</faction:if_open:else><faction:if_peaceful>.    <fuuid:color:peaceful>Peaceful");
+        defaults.add("<gold>Land / Power / Max Power: <yellow><faction:claims_count></yellow> / <yellow><faction:power></yellow> / <yellow><faction:power_max>");
+        defaults.add("<gold>Raidable: <faction:if_raidable><green>Yes</faction:if_raidable><faction:if_raidable:else><red>No");
+        defaults.add("<gold>Founded: <yellow><faction:creation_date>");
+        defaults.add("<faction:if_permanent><gold>This faction is permanent, remaining even with no members.");
+        defaults.add("<fuuid:if_economy><fuuid:if_banks><gold>Balance: <yellow><faction:bank_balance></fuuid:if_banks>     <gold>Land value: <yellow><faction:claims_value>");
+        defaults.add("<faction:if_allies><gold>Allies (<yellow><faction:allies_count></yellow>/<yellow><faction:allies_max></yellow>): {allies-list}");
+        defaults.add("<faction:if_online><gold>Online: (<yellow><faction:members_online_count></yellow>/<yellow><faction:members_total_count></yellow>)<faction:if_online>: {online-list}");
+        defaults.add("<faction:if_offline><gold>Offline: (<yellow><faction:members_offline_count></yellow>/<yellow><faction:members_total_count></yellow>)<faction:if_offline>: {offline-list}");
     }
 
     private void handle(CommandContext<Sender> context) {
@@ -91,168 +77,37 @@ private void handle(CommandContext<Sender> context) {
             return;
         }
 
-        List<String> show = FactionsPlugin.instance().conf().commands().show().getFormat();
+        var tl = FactionsPlugin.instance().tl().commands().show();
+        List<String> show = tl.getNormalFormat();
         if (show == null || show.isEmpty()) {
             show = defaults;
         }
 
-        if (!faction.isNormal()) {
-            String tag = faction.tagLegacy(fPlayer);
-            // send header and that's all
-            String header = show.getFirst();
-            if (FactionTag.HEADER.foundInString(header)) {
-                context.sender().sender().sendMessage(TextUtil.titleizeLegacy(tag));
-            } else {
-                String message = header.replace(FactionTag.FACTION.getTag(), tag);
-                message = Tag.parsePlain(faction, fPlayer, message);
-                context.sender().sender().sendMessage(TextUtil.parse(message));
-            }
-            return; // we only show header for non-normal factions
+        if (faction.isSafeZone()) {
+            show = tl.getSafezoneFormat();
+        }
+        if (faction.isWarZone()) {
+            show = tl.getWarzoneFormat();
         }
 
-        List<String> messageList = new ArrayList<>();
         for (String raw : show) {
-            String parsed = Tag.parsePlain(faction, fPlayer, raw); // use relations
-            if (parsed == null) {
-                continue; // Due to minimal f show.
-            }
+            String msg = raw;
 
-            if (fPlayer != null) {
-                parsed = Tag.parsePlaceholders(fPlayer.asPlayer(), parsed);
+            FancyTag tag = FancyTag.getMatch(raw);
+            if (tag != null) {
+                msg = msg.replace(tag.getTag(), "");
             }
-
-            if (!parsed.contains("{notFrozen}") && !parsed.contains("{notPermanent}")) {
-                if (parsed.contains("{ig}")) {
-                    // replaces all variables with no home TL
-                    parsed = parsed.substring(0, parsed.indexOf("{ig}")) + TL.COMMAND_SHOW_NOHOME;
-                }
-                parsed = parsed.replace("%", ""); // Just in case it got in there before we disallowed it.
-                messageList.add(parsed);
+            Component component = Mini.parse(msg, FactionResolver.of(fPlayer, faction));
+            if (component == Component.empty()) {
+                continue; // Due to minimal f show.
             }
-        }
-        if (fPlayer != null && this.groupPresent()) {
-            new GroupGetter(messageList, fPlayer, faction).runTaskAsynchronously(AbstractFactionsPlugin.instance());
-        } else {
-            this.sendMessages(messageList, context.sender().sender(), faction, fPlayer);
-        }
-    }
-
-    private void sendMessages(List<String> messageList, CommandSender recipient, Faction faction, FPlayer player) {
-        this.sendMessages(messageList, recipient, faction, player, null);
-    }
 
-    private void sendMessages(List<String> messageList, CommandSender recipient, Faction faction, FPlayer player, Map<UUID, String> groupMap) {
-        FancyTag tag;
-        for (String parsed : messageList) {
-            if ((tag = FancyTag.getMatch(parsed)) != null) {
-                if (player != null) {
-                    List<Component> fancy = FancyTag.parse(parsed, faction, player, groupMap);
-                    if (fancy != null) {
-                        for (Component component : fancy) {
-                            ComponentDispatcher.send(recipient, component);
-                        }
-                    }
-                } else {
-                    StringBuilder builder = new StringBuilder();
-                    builder.append(parsed.replace(tag.getTag(), ""));
-                    switch (tag) {
-                        case ONLINE_LIST:
-                            this.onOffLineMessage(builder, recipient, faction, true);
-                            break;
-                        case OFFLINE_LIST:
-                            this.onOffLineMessage(builder, recipient, faction, false);
-                            break;
-                        case ALLIES_LIST:
-                            this.relationMessage(builder, recipient, faction, Relation.ALLY);
-                            break;
-                        case ENEMIES_LIST:
-                            this.relationMessage(builder, recipient, faction, Relation.ENEMY);
-                            break;
-                        case TRUCES_LIST:
-                            this.relationMessage(builder, recipient, faction, Relation.TRUCE);
-                            break;
-                        default:
-                            // NO
-                    }
-                }
+            if (tag == null) {
+                ComponentDispatcher.send(context.sender().sender(), component);
             } else {
-                ComponentDispatcher.send(recipient, LegacyComponentSerializer.legacySection().deserialize(TextUtil.parse(parsed)));
-            }
-        }
-    }
-
-    private void onOffLineMessage(StringBuilder builder, CommandSender recipient, Faction faction, boolean online) {
-        boolean first = true;
-        for (FPlayer p : MiscUtil.rankOrder(faction.membersOnline(online))) {
-            String name = p.nameWithTitleLegacy();
-            builder.append(first ? name : ", " + name);
-            first = false;
-        }
-        recipient.sendMessage(TextUtil.parse(builder.toString()));
-    }
-
-    private void relationMessage(StringBuilder builder, CommandSender recipient, Faction faction, Relation relation) {
-        boolean first = true;
-        for (Faction otherFaction : Factions.factions().all()) {
-            if (otherFaction != faction && otherFaction.relationTo(faction) == relation) {
-                String s = otherFaction.tag();
-                builder.append(first ? s : ", " + s);
-                first = false;
-            }
-        }
-        recipient.sendMessage(TextUtil.parse(builder.toString()));
-    }
-
-    private boolean groupPresent() {
-        for (String line : FactionsPlugin.instance().conf().commands().toolTips().getPlayer()) {
-            if (line.contains("{group}")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private class GroupGetter extends BukkitRunnable {
-        private final List<String> messageList;
-        private final FPlayer sender;
-        private final Faction faction;
-        private final Set<OfflinePlayer> players;
-
-        private GroupGetter(List<String> messageList, FPlayer sender, Faction faction) {
-            this.messageList = messageList;
-            this.sender = sender;
-            this.faction = faction;
-            this.players = faction.members().stream().map(fp -> AbstractFactionsPlugin.instance().getOfflinePlayer(fp.name(), fp.uniqueId())).collect(Collectors.toSet());
-        }
-
-        @Override
-        public void run() {
-            Map<UUID, String> map = new HashMap<>();
-            for (OfflinePlayer player : this.players) {
-                map.put(player.getUniqueId(), AbstractFactionsPlugin.instance().getPrimaryGroup(player));
-            }
-            new SenderRunner(this.messageList, this.sender, this.faction, map).runTask(AbstractFactionsPlugin.instance());
-        }
-    }
-
-    private class SenderRunner extends BukkitRunnable {
-        private final List<String> messageList;
-        private final FPlayer sender;
-        private final Faction faction;
-        private final Map<UUID, String> map;
-
-        private SenderRunner(List<String> messageList, FPlayer sender, Faction faction, Map<UUID, String> map) {
-            this.messageList = messageList;
-            this.sender = sender;
-            this.faction = faction;
-            this.map = map;
-        }
-
-        @Override
-        public void run() {
-            Player player = Bukkit.getPlayerExact(sender.name());
-            if (player != null) {
-                CmdShow.this.sendMessages(messageList, player, faction, sender, map);
+                for (Component comp : tag.getMessage(component, faction, fPlayer)) {
+                    ComponentDispatcher.send(context.sender().sender(), comp);
+                }
             }
         }
     }

bukkit/src/main/java/dev/kitteh/factions/config/file/MainConfig.java

@@ -39,7 +39,7 @@ public boolean isDebug() {
         }
     }
 
-    private static TextColor getColor(String name, TextColor current, TextColor defaultColor) {
+    static TextColor getColor(String name, TextColor current, TextColor defaultColor) {
         if (current != null) {
             return current;
         }
@@ -52,7 +52,7 @@ private static TextColor getColor(String name, TextColor current, TextColor defa
             ret = NamedTextColor.NAMES.value(name.toLowerCase());
         }
 
-        return ret == null ? NamedTextColor.WHITE : ret;
+        return ret == null ? defaultColor : ret;
     }
 
     public class Colors {
@@ -362,7 +362,7 @@ public class Show {
             private List<String> format = new ArrayList<>() {
                 {
                     this.add("{header}");
-                    this.add("&6Description: &e{description}");
+                    this.add("&6Description: &e<faction:description>");
                     this.add("&6Joining: &e{joining}    {peaceful}");
                     this.add("&6Land / Power / Maxpower: &e {chunks}/{power}/{maxPower}");
                     this.add("&6Raidable: {raidable}");
@@ -466,7 +466,7 @@ public int getMaxWarps() {
         }
 
         public class ToolTips {
-            @Comment("Faction on-hover tooltip information")
+            @Comment("Outdated tooltips - left as reference - removing in a future version")
             private List<String> faction = new ArrayList<>() {
                 {
                     this.add("&6Leader: &f{leader}");
@@ -477,7 +477,7 @@ public class ToolTips {
                     this.add("&6Members: &f{online}/{members}");
                 }
             };
-            @Comment("Player on-hover tooltip information")
+            @Comment("Outdated tooltips - left as reference - removing in a future version")
             private List<String> player = new ArrayList<>() {
                 {
                     this.add("&6Last Seen: &f{lastSeen}");