refactor(punishment): extract shared command helpers, reduce duplication

Add CONSOLE_UUID, resolvePlayerUuid(), and senderUuid() helpers to
HypixelCommand base class. Refactor BanCommand and MuteCommand to use
them, eliminating duplicated UUID resolution and sender extraction.
Remove direct PunishmentRedis dependency from BanCommand.

Author: Swofty-Developments

type.generic/src/main/java/net/swofty/type/generic/command/HypixelCommand.java

@@ -4,16 +4,21 @@
 import net.minestom.server.command.CommandSender;
 import net.minestom.server.command.ConsoleSender;
 import net.minestom.server.command.builder.Command;
+import net.minestom.server.entity.Player;
+import net.minestom.server.utils.mojang.MojangUtils;
 import net.swofty.type.generic.data.HypixelDataHandler;
 import net.swofty.type.generic.data.datapoints.DatapointRank;
 import net.swofty.type.generic.user.HypixelPlayer;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 public abstract class HypixelCommand {
     public static final String COMMAND_SUFFIX = "Command";
+    public static final UUID CONSOLE_UUID = new UUID(0, 0);
 
     @Getter
     private final CommandParameters params;
@@ -40,6 +45,16 @@ protected HypixelCommand() {
 
     public abstract void registerUsage(MinestomCommand command);
 
+    protected static UUID resolvePlayerUuid(CommandSender sender, String playerName, String action) throws IOException {
+        UUID uuid = MojangUtils.getUUID(playerName);
+        sender.sendMessage("§8Processing " + action + " for player §e" + playerName + "§7... (" + uuid + ")");
+        return uuid;
+    }
+
+    protected static UUID senderUuid(CommandSender sender) {
+        return sender instanceof Player p ? p.getUuid() : CONSOLE_UUID;
+    }
+
     public boolean permissionCheck(CommandSender sender) {
         HypixelPlayer player = (HypixelPlayer) sender;
         HypixelDataHandler dataHandler = player.getDataHandler();

type.generic/src/main/java/net/swofty/type/generic/command/commands/BanCommand.java

@@ -4,13 +4,10 @@
 import net.minestom.server.command.CommandSender;
 import net.minestom.server.command.builder.arguments.*;
 import net.minestom.server.command.builder.suggestion.SuggestionEntry;
-import net.minestom.server.entity.Player;
-import net.minestom.server.utils.mojang.MojangUtils;
 import net.swofty.commons.ServiceType;
 import net.swofty.commons.StringUtility;
 import net.swofty.commons.protocol.objects.punishment.PunishPlayerProtocolObject;
 import net.swofty.commons.punishment.PunishmentReason;
-import net.swofty.commons.punishment.PunishmentRedis;
 import net.swofty.commons.punishment.PunishmentTag;
 import net.swofty.commons.punishment.PunishmentType;
 import net.swofty.commons.punishment.template.BanType;
@@ -24,11 +21,9 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 @CommandParameters(
         aliases = "ban tempban banip tempbanip",
@@ -52,55 +47,35 @@ public void registerUsage(MinestomCommand command) {
             for (PunishmentTag tag : PunishmentTag.values()) {
                 suggestion.addEntry(new SuggestionEntry("-" + tag.getShortCode(), Component.text("§e" + tag.getShortCode() + " §7| " + (tag.getDescription() != null ? tag.getDescription() : "No description"))));
             }
-        }); // can be -O -U etc.
+        });
 
         command.addSyntax((sender, context) -> {
             String playerName = context.get(playerArg);
             String duration = context.get(durationArg);
             BanType type = BanType.valueOf(context.get(reasonArg));
 
-
-            UUID targetUuid;
-            try {
-                targetUuid = MojangUtils.getUUID(playerName);
-                sender.sendMessage("§8Processing ban for player §e" + playerName + "§7... (" + targetUuid + ")");
-            } catch (IOException e) {
-                sender.sendMessage("§cCould not find player: " + playerName);
-                return;
-            }
-
-            UUID senderUuid;
-            if (sender instanceof Player player) {
-                senderUuid = player.getUuid();
-            } else {
-                senderUuid = UUID.fromString("00000000-0000-0000-0000-000000000000");
-            }
-
-            long actualTime = StringUtility.parseDuration(duration);
-            long expiryTime = System.currentTimeMillis() + actualTime;
-
             CompletableFuture.runAsync(() -> {
-                banPlayer(sender, targetUuid, type, senderUuid, actualTime, expiryTime, playerName, null);
+                try {
+                    UUID targetUuid = resolvePlayerUuid(sender, playerName, "ban");
+                    long actualTime = StringUtility.parseDuration(duration);
+                    long expiryTime = System.currentTimeMillis() + actualTime;
+                    banPlayer(sender, targetUuid, type, senderUuid(sender), actualTime, expiryTime, playerName, null);
+                } catch (IOException e) {
+                    sender.sendMessage("§cCould not find player: " + playerName);
+                }
             });
         }, playerArg, durationArg, reasonArg);
 
-        // permanent ban
         command.addSyntax((sender, context) -> {
             String playerName = context.get(playerArg);
             BanType reason = BanType.valueOf(context.get(reasonArg));
 
             CompletableFuture.runAsync(() -> {
                 try {
-                    banPlayer(sender,
-                            MojangUtils.getUUID(playerName),
-                            reason,
-                            sender instanceof Player player ? player.getUuid() : UUID.fromString("00000000-0000-0000-0000-000000000000"),
-                            0,
-                            -1,
-                            playerName, null);
+                    banPlayer(sender, resolvePlayerUuid(sender, playerName, "ban"), reason,
+                            senderUuid(sender), 0, -1, playerName, null);
                 } catch (IOException e) {
                     sender.sendMessage("§cCould not find player: " + playerName);
-                    return;
                 }
             });
         }, playerArg, reasonArg);
@@ -112,13 +87,8 @@ public void registerUsage(MinestomCommand command) {
 
             CompletableFuture.runAsync(() -> {
                 try {
-                    banPlayer(sender,
-                            MojangUtils.getUUID(playerName),
-                            reason,
-                            sender instanceof Player player ? player.getUuid() : UUID.fromString("00000000-0000-0000-0000-000000000000"),
-                            0,
-                            -1,
-                            playerName, tags);
+                    banPlayer(sender, resolvePlayerUuid(sender, playerName, "ban"), reason,
+                            senderUuid(sender), 0, -1, playerName, tags);
                 } catch (IOException e) {
                     sender.sendMessage("§cCould not find player: " + playerName);
                 }
@@ -128,7 +98,6 @@ public void registerUsage(MinestomCommand command) {
 
     private List<PunishmentTag> parseTags(List<String> rawTags) {
         List<PunishmentTag> tags = new ArrayList<>();
-
         for (String rawTag : rawTags) {
             if (rawTag.startsWith("-")) {
                 String tagCode = rawTag.substring(1).toUpperCase();
@@ -140,26 +109,11 @@ private List<PunishmentTag> parseTags(List<String> rawTags) {
                 }
             }
         }
-
         return tags;
     }
 
-    private void banPlayer(CommandSender sender, UUID targetUuid, BanType type, UUID senderUuid, long actualTime, long expiryTime, String playerName, @Nullable List<PunishmentTag> tags) {
-        if (tags != null && !tags.contains(PunishmentTag.OVERWRITE)) {
-            Optional<PunishmentRedis.ActivePunishment> activePunishment = PunishmentRedis.getActive(targetUuid);
-            AtomicBoolean alreadyBanned = new AtomicBoolean(false);
-            activePunishment.ifPresent(punishment -> {
-                PunishmentType t = PunishmentType.valueOf(punishment.type());
-                if (t == PunishmentType.BAN) {
-                    sender.sendMessage("§cThis player is already banned. If you want to replace this ban use the tag -O, Punishment ID: §7" + punishment.banId());
-                    alreadyBanned.set(true);
-                }
-            });
-            if (alreadyBanned.get()) {
-                return;
-            }
-        }
-
+    private void banPlayer(CommandSender sender, UUID targetUuid, BanType type, UUID senderUuid,
+                           long actualTime, long expiryTime, String playerName, @Nullable List<PunishmentTag> tags) {
         ProxyService punishmentService = new ProxyService(ServiceType.PUNISHMENT);
         PunishmentReason reason = new PunishmentReason(type);
         ArrayList<PunishmentTag> tagList = (tags != null) ? new ArrayList<>(tags) : new ArrayList<>();
@@ -178,6 +132,8 @@ private void banPlayer(CommandSender sender, UUID targetUuid, BanType type, UUID
             if (result instanceof PunishPlayerProtocolObject.PunishPlayerResponse response) {
                 if (response.success()) {
                     sender.sendMessage("§aSuccessfully banned player §e" + playerName + "§a. §8Punishment ID: §7" + response.punishmentId());
+                } else if (response.errorCode() == PunishPlayerProtocolObject.ErrorCode.ALREADY_PUNISHED) {
+                    sender.sendMessage("§cThis player is already banned. Use the tag -O to overwrite. Punishment ID: §7" + response.errorMessage());
                 } else {
                     sender.sendMessage("§cFailed to ban player: " + response.errorMessage());
                 }

type.generic/src/main/java/net/swofty/type/generic/command/commands/MuteCommand.java

@@ -6,8 +6,6 @@
 import net.minestom.server.command.builder.arguments.ArgumentString;
 import net.minestom.server.command.builder.arguments.ArgumentType;
 import net.minestom.server.command.builder.suggestion.SuggestionEntry;
-import net.minestom.server.entity.Player;
-import net.minestom.server.utils.mojang.MojangUtils;
 import net.swofty.commons.ServiceType;
 import net.swofty.commons.StringUtility;
 import net.swofty.commons.protocol.objects.punishment.PunishPlayerProtocolObject;
@@ -49,55 +47,35 @@ public void registerUsage(MinestomCommand command) {
             String duration = context.get(durationArg);
             MuteType type = MuteType.valueOf(context.get(reasonArg));
 
-
-            UUID targetUuid;
-            try {
-                targetUuid = MojangUtils.getUUID(playerName);
-                sender.sendMessage("§8Processing mute for player §e" + playerName + "§7... (" + targetUuid + ")");
-            } catch (IOException e) {
-                sender.sendMessage("§cCould not find player: " + playerName);
-                return;
-            }
-
-            UUID senderUuid;
-            if (sender instanceof Player player) {
-                senderUuid = player.getUuid();
-            } else {
-                senderUuid = UUID.fromString("00000000-0000-0000-0000-000000000000");
-            }
-
-            long actualTime = StringUtility.parseDuration(duration);
-            long expiryTime = System.currentTimeMillis() + actualTime;
-
             CompletableFuture.runAsync(() -> {
-                mutePlayer(sender, targetUuid, type, senderUuid, actualTime, expiryTime, playerName);
+                try {
+                    UUID targetUuid = resolvePlayerUuid(sender, playerName, "mute");
+                    long actualTime = StringUtility.parseDuration(duration);
+                    long expiryTime = System.currentTimeMillis() + actualTime;
+                    mutePlayer(sender, targetUuid, type, senderUuid(sender), actualTime, expiryTime, playerName);
+                } catch (IOException e) {
+                    sender.sendMessage("§cCould not find player: " + playerName);
+                }
             });
         }, playerArg, durationArg, reasonArg);
 
-        // permanent mute
         command.addSyntax((sender, context) -> {
             String playerName = context.get(playerArg);
             MuteType reason = MuteType.valueOf(context.get(reasonArg));
 
             CompletableFuture.runAsync(() -> {
                 try {
-                    mutePlayer(sender,
-                            MojangUtils.getUUID(playerName),
-                            reason,
-                            sender instanceof Player player ? player.getUuid() : UUID.fromString("00000000-0000-0000-0000-000000000000"),
-                            0,
-                            -1,
-                            playerName);
+                    mutePlayer(sender, resolvePlayerUuid(sender, playerName, "mute"), reason,
+                            senderUuid(sender), 0, -1, playerName);
                 } catch (IOException e) {
                     sender.sendMessage("§cCould not find player: " + playerName);
                 }
             });
-
-
         }, playerArg, reasonArg);
     }
 
-    private void mutePlayer(CommandSender sender, UUID targetUuid, MuteType type, UUID senderUuid, long actualTime, long expiryTime, String playerName) {
+    private void mutePlayer(CommandSender sender, UUID targetUuid, MuteType type, UUID senderUuid,
+                            long actualTime, long expiryTime, String playerName) {
         ProxyService punishmentService = new ProxyService(ServiceType.PUNISHMENT);
         PunishmentReason reason = new PunishmentReason(type);
         PunishPlayerProtocolObject.PunishPlayerMessage message = new PunishPlayerProtocolObject.PunishPlayerMessage(
@@ -113,6 +91,8 @@ private void mutePlayer(CommandSender sender, UUID targetUuid, MuteType type, UU
             if (result instanceof PunishPlayerProtocolObject.PunishPlayerResponse response) {
                 if (response.success()) {
                     sender.sendMessage("§aSuccessfully muted player §e" + playerName + "§a. §8Punishment ID: §7" + response.punishmentId());
+                } else if (response.errorCode() == PunishPlayerProtocolObject.ErrorCode.ALREADY_PUNISHED) {
+                    sender.sendMessage("§cThis player already has an active punishment. Punishment ID: §7" + response.errorMessage());
                 } else {
                     sender.sendMessage("§cFailed to mute player: " + response.errorMessage());
                 }