Refactor command sub-classes to use shared sendSuccess method

Introduced a protected static sendSuccess method in the base Command class to centralize success message handling. Updated all sub-commands to extend Command and use the new sendSuccess method, reducing code duplication and improving maintainability.

Author: Mqxx

src/main/java/dev/loat/command/Command.java

@@ -1,8 +1,12 @@
 package dev.loat.command;
 
+import java.util.function.Supplier;
+
 import com.mojang.brigadier.context.CommandContext;
 
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Player;
 
 public class Command {
     protected static boolean hasArgument(
@@ -11,4 +15,14 @@ protected static boolean hasArgument(
     ) {
         return context.getNodes().stream().anyMatch(node -> node.getNode().getName().equals(argument));
     }
+
+    @SuppressWarnings("null")
+    protected static void sendSuccess(
+        CommandContext<CommandSourceStack> context,
+        Supplier<Component> supplier
+    ) {
+        if (context.getSource().getEntity() instanceof Player) {
+            context.getSource().sendSuccess(supplier, false);
+        }
+    }
 }

src/main/java/dev/loat/command/sub_command/Abort.java

@@ -2,27 +2,22 @@
 
 import com.mojang.brigadier.context.CommandContext;
 
+import dev.loat.command.Command;
 import dev.loat.logging.Logger;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.entity.player.Player;
 
 
-public final class Abort {
+public final class Abort extends Command {
     public static final String COMMAND = "abort";
 
     public static int execute(CommandContext<CommandSourceStack> context) {
-        String playerName;
-
-        if (context.getSource().getEntity() instanceof Player) {
-            playerName = context.getSource().getPlayer().getName().getString();
-        } else {
-            playerName = "Console";
-        }
+        String playerName = context.getSource().getTextName();
 
         Logger.info("[%s] Aborting current action".formatted(playerName));
 
-        context.getSource().sendSuccess(() -> Component.literal("/backup abort"), false);
+        Abort.sendSuccess(context, () -> Component.literal("/backup abort"));
+
         return 1;
     }
 }

src/main/java/dev/loat/command/sub_command/Cleanup.java

@@ -2,18 +2,20 @@
 
 import com.mojang.brigadier.context.CommandContext;
 
+import dev.loat.command.Command;
 import dev.loat.logging.Logger;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
 
 
-public final class Cleanup {
+public final class Cleanup extends Command {
     public static final String COMMAND = "cleanup";
 
     public static int execute(CommandContext<CommandSourceStack> context) {
         Logger.info("Running cleanup process");
 
-        context.getSource().sendSuccess(() -> Component.literal("/backup cleanup"), false);
+        Cleanup.sendSuccess(context, () -> Component.literal("/backup cleanup"));
+
         return 1;
     }
 }

src/main/java/dev/loat/command/sub_command/Create.java

@@ -26,7 +26,7 @@ public static int execute(CommandContext<CommandSourceStack> context) {
             Logger.info("[%s] Creating new backup".formatted(playerName));
         }
 
-        context.getSource().sendSuccess(() -> Component.literal("/backup create \"%s\"".formatted(comment)), false);
+        Create.sendSuccess(context, () -> Component.literal("/backup create \"%s\"".formatted(comment)));
         return 1;
     }
 }

src/main/java/dev/loat/command/sub_command/Delete.java

@@ -3,12 +3,13 @@
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 
+import dev.loat.command.Command;
 import dev.loat.logging.Logger;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
 
 
-public final class Delete {
+public final class Delete extends Command {
     public static final String COMMAND = "delete";
     public static final String ARGUMENT = "name";
 
@@ -19,7 +20,7 @@ public static int execute(CommandContext<CommandSourceStack> context) {
 
         Logger.info("Deleting existing backup \"%s\"".formatted(name));
 
-        context.getSource().sendSuccess(() -> Component.literal("/backup delete \"%s\"".formatted(name)), false);
+        Delete.sendSuccess(context, () -> Component.literal("/backup delete \"%s\"".formatted(name)));
         return 1;
     }
 }

src/main/java/dev/loat/command/sub_command/Help.java

@@ -2,18 +2,19 @@
 
 import com.mojang.brigadier.context.CommandContext;
 
+import dev.loat.command.Command;
 import dev.loat.logging.Logger;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
 
 
-public final class Help {
+public final class Help extends Command {
     public static final String COMMAND = "help";
 
     public static int execute(CommandContext<CommandSourceStack> context) {
         Logger.info("Getting help");
 
-        context.getSource().sendSuccess(() -> Component.literal("/backup help"), false);
+        Help.sendSuccess(context, () -> Component.literal("/backup help"));
         return 1;
     }
 }

src/main/java/dev/loat/command/sub_command/Info.java

@@ -3,12 +3,13 @@
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 
+import dev.loat.command.Command;
 import dev.loat.logging.Logger;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
 
 
-public final class Info {
+public final class Info extends Command {
     public static final String COMMAND = "info";
     public static final String ARGUMENT = "name";
 
@@ -18,7 +19,7 @@ public static int execute(CommandContext<CommandSourceStack> context) {
 
         Logger.info("Getting info about existing backup \"%s\"".formatted(name));
 
-        context.getSource().sendSuccess(() -> Component.literal("/backup info \"%s\"".formatted(name)), false);
+        Info.sendSuccess(context, () -> Component.literal("/backup info \"%s\"".formatted(name)));
         return 1;
     }
 }

src/main/java/dev/loat/command/sub_command/List.java

@@ -2,18 +2,19 @@
 
 import com.mojang.brigadier.context.CommandContext;
 
+import dev.loat.command.Command;
 import dev.loat.logging.Logger;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
 
 
-public final class List {
+public final class List extends Command {
     public static final String COMMAND = "list";
 
     public static int execute(CommandContext<CommandSourceStack> context) {
         Logger.info("Listing all backups");
 
-        context.getSource().sendSuccess(() -> Component.literal("/backup list"), false);
+        List.sendSuccess(context, () -> Component.literal("/backup list"));
         return 1;
     }
 }

src/main/java/dev/loat/command/sub_command/Reload.java

@@ -2,18 +2,19 @@
 
 import com.mojang.brigadier.context.CommandContext;
 
+import dev.loat.command.Command;
 import dev.loat.logging.Logger;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
 
 
-public final class Reload {
+public final class Reload extends Command {
     public static final String COMMAND = "reload";
 
     public static int execute(CommandContext<CommandSourceStack> context) {
         Logger.info("Reloading config");
 
-        context.getSource().sendSuccess(() -> Component.literal("/backup reload"), false);
+        Reload.sendSuccess(context, () -> Component.literal("/backup reload"));
         return 1;
     }
 }

src/main/java/dev/loat/command/sub_command/Restore.java

@@ -29,7 +29,7 @@ public static int execute(CommandContext<CommandSourceStack> context) {
 
         Logger.info("Restoring existing backup \"%s\"".formatted(name));
 
-        context.getSource().sendSuccess(() -> Component.literal("/backup restore \"%s\"".formatted(name)), false);
+        Restore.sendSuccess(context, () -> Component.literal("/backup restore \"%s\"".formatted(name)));
         return 1;
     }
 }