Introduce a RootRadarCommand and move ListSubcommand and PlayerSubcommand to common project

Author: BlockyTheDev

versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/command/ListSubcommand.java renamed to common/src/main/java/io/github/communityradargg/forgemod/command/ListSubcommand.java

@@ -20,13 +20,12 @@
 import io.github.communityradargg.forgemod.util.CommonHandler;
 import io.github.communityradargg.forgemod.util.Messages;
 import io.github.communityradargg.forgemod.util.RadarMessage;
-import io.github.communityradargg.forgemod.util.Utils;
+import org.jetbrains.annotations.NotNull;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Holds the logic of the list subcommand.
@@ -131,7 +130,7 @@ private void handleListDeleteSubcommand(final @NotNull String[] args) {
             return;
         }
 
-        oldUuids.forEach(uuid -> Utils.updatePlayerByUuid(commonHandler, uuid, oldPrefixes));
+        oldUuids.forEach(uuid -> commonHandler.updatePlayerByUuid(uuid, oldPrefixes));
         commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.DELETE_SUCCESS)
                 .build().getMessage());
     }
@@ -200,7 +199,7 @@ private void handleListPrefixSubcommand(final @NotNull String[] args) {
         final Set<String> oldPrefixes = listManager.getExistingPrefixes();
         list.setPrefix(args[3]);
         list.saveList();
-        list.getPlayerMap().keySet().forEach(uuid -> Utils.updatePlayerByUuid(commonHandler, uuid, oldPrefixes));
+        list.getPlayerMap().keySet().forEach(uuid -> commonHandler.updatePlayerByUuid(uuid, oldPrefixes));
 
         commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.List.PREFIX_SUCCESS)
                 .replaceWithColorCodes("{prefix}", args[3])

versions/1.8.9/src/main/java/io/github/communityradargg/forgemod/command/PlayerSubcommand.java renamed to common/src/main/java/io/github/communityradargg/forgemod/command/PlayerSubcommand.java

@@ -20,7 +20,6 @@
 import io.github.communityradargg.forgemod.util.CommonHandler;
 import io.github.communityradargg.forgemod.util.Messages;
 import io.github.communityradargg.forgemod.util.RadarMessage;
-import io.github.communityradargg.forgemod.util.Utils;
 import org.jetbrains.annotations.NotNull;
 import java.util.Locale;
 import java.util.Optional;
@@ -120,7 +119,7 @@ private void handlePlayerAddSubcommand(final @NotNull String[] args) {
 
             commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.Player.ADD_SUCCESS)
                     .build().getMessage());
-            Utils.updatePlayerByUuid(commonHandler, uuid, listManager.getExistingPrefixes());
+            commonHandler.updatePlayerByUuid(uuid, listManager.getExistingPrefixes());
         });
     }
 
@@ -166,7 +165,7 @@ private void handlePlayerRemoveSubcommand(final @NotNull String[] args) {
             }
 
             list.getPlayerMap().remove(uuid);
-            Utils.updatePlayerByUuid(commonHandler, uuid, listManager.getExistingPrefixes());
+            commonHandler.updatePlayerByUuid(uuid, listManager.getExistingPrefixes());
             commonHandler.addMessageToChat(new RadarMessage.RadarMessageBuilder(Messages.Player.REMOVE_SUCCESS)
                     .build().getMessage());
         });

common/src/main/java/io/github/communityradargg/forgemod/command/RootRadarCommand.java

@@ -0,0 +1,59 @@
+package io.github.communityradargg.forgemod.command;
+
+import io.github.communityradargg.forgemod.util.CommonHandler;
+import org.jetbrains.annotations.NotNull;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * The root radar command.
+ */
+public class RootRadarCommand {
+    public static final String COMMAND_NAME = "radar";
+    public static final List<String> COMMAND_ALIASES = Arrays.asList("communityradar", "scammer", "trustedmm", "mm");
+    private final CommonHandler commonHandler;
+
+    /**
+     * Constructs as {@link RootRadarCommand}.
+     *
+     * @param commonHandler The common handler.
+     */
+    public RootRadarCommand(final @NotNull CommonHandler commonHandler) {
+        this.commonHandler = commonHandler;
+    }
+
+    /**
+     * Executes the root command with the given arguments.
+     *
+     * @param args The arguments.
+     */
+    public void execute(final String[] args) {
+        Subcommand subcommand = null;
+        if (args.length == 0) {
+            subcommand = new HelpSubcommand(commonHandler);
+        }
+
+        if (subcommand == null) {
+            switch (args[0].toUpperCase(Locale.ENGLISH)) {
+                case "CHECK":
+                    subcommand = new CheckSubcommand(commonHandler, args);
+                    break;
+                case "LIST":
+                    subcommand = new ListSubcommand(commonHandler, args);
+                    break;
+                case "PLAYER":
+                    subcommand = new PlayerSubcommand(commonHandler, args);
+                    break;
+                case "LISTS":
+                    subcommand = new ListsSubcommand(commonHandler);
+                    break;
+                default:
+                    subcommand = new HelpSubcommand(commonHandler);
+                    break;
+            }
+        }
+
+        subcommand.run();
+    }
+}

common/src/main/java/io/github/communityradargg/forgemod/util/CommonHandler.java

@@ -20,6 +20,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.regex.Pattern;
@@ -239,6 +240,16 @@ public void addMessageToChat(final @NotNull String message) {
         return versionBridge.getWorldPlayers();
     }
 
+    /**
+     * Updates a player display name and name tag by its uuid.
+     *
+     * @param uuid The uuid to update the corresponding player.
+     * @param oldPrefixes The old prefixes.
+     */
+    public void updatePlayerByUuid(final @NotNull UUID uuid, final @NotNull Set<String> oldPrefixes) {
+        versionBridge.updatePlayerByUuid(this, uuid, oldPrefixes);
+    }
+
     /**
      * Gets the list manager.
      *

common/src/main/java/io/github/communityradargg/forgemod/util/Messages.java

@@ -21,9 +21,7 @@
 public class Messages {
     public static final String PREFIX = "§8[§cCommunityRadar§8]§r ";
     public static final String MISSING_ARGS = "§cNicht genug Argumente. Gib '/radar' für den korrekten Syntax ein.";
-    public static final String NOT_PLAYER = "§cDieser Befehl kann nur von Spielern ausgeführt werden.";
     public static final String INPUT_PROCESSING = "§7Deine Eingabe wird verarbeitet. Dies kann einige Augenblicke benötigen.";
-
     public static final String HELP =
             "§7§l--------- §eRadar-Hilfe §7§l---------§r\n" +
                     "§e/radar lists §7-> Zeigt die vorhandenen Listen an.\n" +

common/src/main/java/io/github/communityradargg/forgemod/util/VersionBridge.java

@@ -2,6 +2,8 @@
 
 import org.jetbrains.annotations.NotNull;
 import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 
 public interface VersionBridge {
     @NotNull String getVersion();
@@ -11,4 +13,6 @@ public interface VersionBridge {
     boolean isNotInWorld();
 
     @NotNull List<@NotNull PlayerInfo> getWorldPlayers();
+
+    void updatePlayerByUuid(final @NotNull CommonHandler commonHandler, final @NotNull UUID uuid, final @NotNull Set<@NotNull String> oldPrefixes);
 }