feat: finish work system command, all work a generic(remove duplicate code), easy to integrate api,

Author: Referix

src/main/java/dev/lotus/studio/command/MainCommand.java

@@ -22,23 +22,20 @@ public MainCommand(String command, CustomItemManager itemManager, SafeZoneManage
         // тут реєструєш усі "верхньорівневі" команди тобто усі реалізації SubCommand
         register(new GenericCommand<>(
                 "item",
-                "Управление предметами",
                 "/main item <armor|view|eat>",
                 ItemSubCommandFactory.createAll(itemManager)
         ));
 
         register(new GenericCommand<>(
                 "safezone",
-                "Управление SafeZone зонами",
                 "/main safezone <pos1|pos2|save|list|remove>",
                 SafeZoneSubCommandFactory.createAll(safeZoneManager)
         ));
 
         register(new  GenericCommand<>(
                 "reload",
-                "Reload commands",
                 "main",
-                ReloadSubCommandFactory.createAll(safeZoneManager, itemManager)));
+                ReloadSubCommandFactory.createAll(itemManager)));
 
         register(new HelpCommand());
 

src/main/java/dev/lotus/studio/command/subcommand/GenericCommand.java

@@ -11,25 +11,36 @@
 public class GenericCommand<T extends SubCommand> implements SubCommand {
 
     private final String name;
-    private final String description;
     private final String usage;
     private final Collection<T> subCommands;
 
-    public GenericCommand(String name, String description, String usage, Collection<T> subCommands) {
+    public GenericCommand(String name, String usage, Collection<T> subCommands) {
         this.name = name;
-        this.description = description;
         this.usage = usage;
         this.subCommands = subCommands;
     }
 
     @Override
     public String getName() { return name; }
 
-    @Override
-    public String getDescription() { return description; }
 
     @Override
-    public String getUsage() { return usage; }
+    public String getUsage() {
+        String children = subCommands.stream()
+                .map(SubCommand::getName)
+                .reduce((a, b) -> a + "|" + b)
+                .orElse("");
+        return "/" + name + " <" + children + ">";
+    }
+
+    public String getFullUsage(String parentChain) {
+        String full = (parentChain == null || parentChain.isEmpty())
+                ? name
+                : parentChain + " " + name;
+
+        return "/" + full + " ..."; // для опису групи
+    }
+
 
     @Override
     public boolean execute(Player player, String[] args) {

src/main/java/dev/lotus/studio/command/subcommand/HelpCommand.java

@@ -8,8 +8,6 @@ public class HelpCommand implements SubCommand {
     @Override
     public String getName() { return "help"; }
 
-    @Override
-    public String getDescription() { return "Показує список доступних команд"; }
 
     @Override
     public String getUsage() { return "/main help"; }

src/main/java/dev/lotus/studio/command/subcommand/SubCommand.java

@@ -7,9 +7,16 @@
 
 public interface SubCommand {
     String getName();
-    String getDescription();
     String getUsage();
     boolean execute(Player player, String[] args);
     List<String> tabComplete(Player player, String[] args);
+
+    default String getFullUsage(String parentChain) {
+        if (parentChain == null || parentChain.isEmpty()) {
+            return "/" + getName() + " " + getUsage();
+        }
+        return "/" + parentChain + " " + getName() +
+                (getUsage().isEmpty() ? "" : " " + getUsage());
+    }
 }
 

src/main/java/dev/lotus/studio/command/subcommand/SubCommandFactory.java

@@ -0,0 +1,18 @@
+package dev.lotus.studio.command.subcommand;
+
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.function.Function;
+
+public class SubCommandFactory {
+    public static <E extends Enum<E>, C> Collection<C> createAll(
+            Class<E> enumClass,
+            Function<E, C> creator
+    ) {
+        return Arrays.stream(enumClass.getEnumConstants())
+                .map(creator)
+                .toList();
+    }
+}
+

src/main/java/dev/lotus/studio/command/subcommand/item/factory/ItemSubCommandFactory.java

@@ -1,15 +1,15 @@
 package dev.lotus.studio.command.subcommand.item.factory;
 
+import dev.lotus.studio.command.subcommand.SubCommandFactory;
 import dev.lotus.studio.item.CustomItemManager;
 
-import java.util.Arrays;
 import java.util.Collection;
 
 public class ItemSubCommandFactory {
     public static Collection<AbstractItemSubCommand> createAll(CustomItemManager itemManager) {
-        return Arrays.stream(ItemSubCommandType.values())
-                .map(type -> type.create(itemManager))
-                .toList();
+        return SubCommandFactory.createAll(ItemSubCommandType.class,
+                type -> type.create(itemManager));
     }
 }
 
+

src/main/java/dev/lotus/studio/command/subcommand/item/subcommand/ArmorCommand.java

@@ -19,27 +19,23 @@ public String getName() {
         return "armor";
     }
 
-    @Override
-    public String getDescription() {
-        return "Управление предметами брони";
-    }
 
     @Override
     public String getUsage() {
-        return "/main item armor <give|list|help>";
+        return "<give|list|help>";
     }
 
     @Override
     public boolean execute(Player player, String[] args) {
         if (args.length == 0) {
-            player.sendMessage("§7Использование: " + getUsage());
+            player.sendMessage("§7Использование: " + getFullUsage("lotus item"));
             return true;
         }
 
         switch (args[0].toLowerCase()) {
             case "give" -> {
-                if (args.length < 2) {
-                    player.sendMessage("§7Использование: /main item armor give <itemKey>");
+                if (args.length != 2) {
+                    player.sendMessage("§7Использование: /lotus item armor give <itemKey>");
                     return true;
                 }
                 var customItem = itemManager.getItem(args[1]);
@@ -60,7 +56,7 @@ public boolean execute(Player player, String[] args) {
                 player.sendMessage("/main item armor list");
                 player.sendMessage("/main item armor help");
             }
-            default -> player.sendMessage("§cНеизвестная команда. " + getUsage());
+            default -> player.sendMessage("§cНеизвестная команда. " + getFullUsage("lotus item"));
         }
 
         return true;

src/main/java/dev/lotus/studio/command/subcommand/item/subcommand/EatCommand.java

@@ -19,27 +19,23 @@ public String getName() {
         return "eat";
     }
 
-    @Override
-    public String getDescription() {
-        return "Управление съедобными предметами";
-    }
 
     @Override
     public String getUsage() {
-        return "/main item eat <give|list|help>";
+        return "<give|list|help>";
     }
 
     @Override
     public boolean execute(Player player, String[] args) {
         if (args.length == 0) {
-            player.sendMessage("§7Использование: " + getUsage());
+            player.sendMessage("§7Использование: " + getFullUsage("lotus item"));
             return true;
         }
 
         switch (args[0].toLowerCase()) {
             case "give" -> {
-                if (args.length < 2) {
-                    player.sendMessage("§7Использование: /main item eat give <itemKey>");
+                if (args.length != 2) {
+                    player.sendMessage("§7Использование: /lotus item eat give <itemKey>");
                     return true;
                 }
                 var eatItem = itemManager.getEatItem(args[1]);
@@ -64,7 +60,7 @@ public boolean execute(Player player, String[] args) {
                 player.sendMessage("/main item eat list");
                 player.sendMessage("/main item eat help");
             }
-            default -> player.sendMessage("§cНеизвестная команда. " + getUsage());
+            default -> player.sendMessage("§cНеизвестная команда. " + getFullUsage("lotus item"));
         }
 
         return true;

src/main/java/dev/lotus/studio/command/subcommand/item/subcommand/ViewCommand.java

@@ -19,27 +19,23 @@ public String getName() {
         return "view";
     }
 
-    @Override
-    public String getDescription() {
-        return "Управление view предметами";
-    }
 
     @Override
     public String getUsage() {
-        return "/main item view <give|list|help>";
+        return "<give|list|help>";
     }
 
     @Override
     public boolean execute(Player player, String[] args) {
         if (args.length == 0) {
-            player.sendMessage("§7Использование: " + getUsage());
+            player.sendMessage("§7Использование: " + getFullUsage("lotus item"));
             return true;
         }
 
         switch (args[0].toLowerCase()) {
             case "give" -> {
-                if (args.length < 2) {
-                    player.sendMessage("§7Использование: /main item view give <itemKey>");
+                if (args.length != 2) {
+                    player.sendMessage("§7Использование: /lotus item view give <itemKey>");
                     return true;
                 }
                 var viewItem = itemManager.getViewItem(args[1]);
@@ -64,7 +60,7 @@ public boolean execute(Player player, String[] args) {
                 player.sendMessage("/main item view list");
                 player.sendMessage("/main item view help");
             }
-            default -> player.sendMessage("§cНеизвестная команда. " + getUsage());
+            default -> player.sendMessage("§cНеизвестная команда. " + getFullUsage("lotus item"));
         }
 
         return true;

src/main/java/dev/lotus/studio/command/subcommand/reload/factory/AbstractReloadCommand.java

@@ -2,14 +2,11 @@
 
 import dev.lotus.studio.command.subcommand.SubCommand;
 import dev.lotus.studio.item.CustomItemManager;
-import dev.lotus.studio.safezone.SafeZoneManager;
 
 public abstract class AbstractReloadCommand implements SubCommand {
     protected final CustomItemManager itemManager;
-    protected final SafeZoneManager safeZoneManager;
 
-    protected AbstractReloadCommand(CustomItemManager itemManager , SafeZoneManager safeZoneManager) {
+    protected AbstractReloadCommand(CustomItemManager itemManager) {
         this.itemManager = itemManager;
-        this.safeZoneManager = safeZoneManager;
     }
 }