From cceaa69601e09d9f2668c41d5923242e86c08881 Mon Sep 17 00:00:00 2001
From: xaver106 <xaver10610@gmail.com>
Date: Sun, 24 Apr 2022 00:26:23 +0200
Subject: [PATCH] refactor: list command shows owner better added check for: -
 unknown owners (UUID not cached/invalid) - server plots - plots owner by
 everyone

---
 .../com/plotsquared/core/command/ListCmd.java | 23 +++++++++++++++++++
 Core/src/main/resources/lang/messages_en.json |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
index e6a2ae91d..8e177888d 100644
--- a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
+++ b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java
@@ -32,6 +32,7 @@ import com.plotsquared.core.configuration.caption.Caption;
 import com.plotsquared.core.configuration.caption.CaptionHolder;
 import com.plotsquared.core.configuration.caption.Templates;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.database.DBFunc;
 import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
@@ -39,6 +40,7 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.PriceFlag;
+import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EconHandler;
 import com.plotsquared.core.util.MathMan;
@@ -456,6 +458,9 @@ public class ListCmd extends SubCommand {
                 String prefix = "";
                 String online = TranslatableCaption.of("info.plot_list_player_online").getComponent(player);
                 String offline = TranslatableCaption.of("info.plot_list_player_offline").getComponent(player);
+                String unknown = TranslatableCaption.of("info.plot_list_player_unknown").getComponent(player);
+                String server = TranslatableCaption.of("info.plot_list_player_server").getComponent(player);
+                String everyone = TranslatableCaption.of("info.plot_list_player_everyone").getComponent(player);
                 TextComponent.Builder builder = Component.text();
                 try {
                     final List<UUIDMapping> names = PlotSquared.get().getImpromptuUUIDPipeline().getNames(plot.getOwners())
@@ -466,6 +471,24 @@ public class ListCmd extends SubCommand {
                         Template playerTemplate = Template.of("player", uuidMapping.getUsername());
                         if (pp != null) {
                             builder.append(MINI_MESSAGE.parse(online, prefixTemplate, playerTemplate));
+                        } else if (plot.getFlag(ServerPlotFlag.class)) {
+                            Template serverTemplate = Template.of(
+                                    "player",
+                                    TranslatableCaption.of("info.server").getComponent(player)
+                            );
+                            builder.append(MINI_MESSAGE.parse(server, serverTemplate));
+                        } else if (uuidMapping.getUsername().equalsIgnoreCase("unknown")) {
+                            Template unknownTemplate = Template.of(
+                                    "player",
+                                    TranslatableCaption.of("info.unknown").getComponent(player)
+                            );
+                            builder.append(MINI_MESSAGE.parse(unknown, unknownTemplate));
+                        } else if (uuidMapping.getUuid().equals(DBFunc.EVERYONE)) {
+                            Template everyoneTemplate = Template.of(
+                                    "player",
+                                    TranslatableCaption.of("info.everyone").getComponent(player)
+                            );
+                            builder.append(MINI_MESSAGE.parse(everyone, everyoneTemplate));
                         } else {
                             builder.append(MINI_MESSAGE.parse(offline, prefixTemplate, playerTemplate));
                         }
diff --git a/Core/src/main/resources/lang/messages_en.json b/Core/src/main/resources/lang/messages_en.json
index 50b3639df..f16f1f34c 100644
--- a/Core/src/main/resources/lang/messages_en.json
+++ b/Core/src/main/resources/lang/messages_en.json
@@ -381,6 +381,9 @@
   "info.plot_list_default": "<gold><plot></gold>",
   "info.plot_list_player_online": "<dark_aqua><prefix></dark_aqua><hover:show_text:\"<dark_aqua>Online</dark_aqua>\"><gold><player></gold></hover>",
   "info.plot_list_player_offline": "<dark_aqua><prefix></dark_aqua><hover:show_text:\"<dark_gray>Offline</dark_gray>\"><gold><player></gold></hover>",
+  "info.plot_list_player_unknown": "<hover:show_text:\"<red>The owner of this plot is unknown</red>\"><white><player></white></hover>",
+  "info.plot_list_player_server": "<hover:show_text:\"<red>The plot is owned by the server</red>\"><white><player></white></hover>",
+  "info.plot_list_player_everyone": "<hover:show_text:\"<blue>The plot is owned by everyone</blue>\"><white><player></white></hover>",
   "info.area_info_format": "<header>\n<reset><gold>Name: </gold><gray><name></gray>\n<gold>Type: </gold><gray><type></gray>\n<gold>Terrain: </gold><gray><terrain></gray>\n<gold>Usage: </gold><gray><usage>%</gray>\n<gold>Claimed: </gold><gray><claimed></gray>\n<gold>Clusters: </gold><gray><clusters></gray>\n<gold>Region: </gold><gray><region></gray>\n<gold>Generator: </gold><gray><generator></gray>\n<footer>",
   "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
   "info.area_list_item": "<click:run_command:<command_tp>><hover:show_text:\"<command_tp>\"><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:<command_info>><hover:show_text:\"<hover_info>\"><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",