[1.8.6-dev3]craft list命令权限细化,添加工作台配方创建的非空判定

YufiriaMazenta · Jan 5, 2024 · 3deaec2 · 3deaec2
1 parent fe228dc
commit 3deaec2
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 35 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 import java.text.SimpleDateFormat
-version = "1.8.6-dev2"
+version = "1.8.6-dev3"
 
 plugins {
     `java-library`

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/AbstractSubCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/AbstractSubCommand.java
@@ -21,6 +21,10 @@ protected AbstractSubCommand(String command) {
 
     @Override
     public boolean onCommand(CommandSender sender, List<String> args) {
+        if (args.isEmpty()) {
+            sendNotEnoughCmdParamMsg(sender, 1);
+            return true;
+        }
         SubcmdExecutor subCommand = subcommands().get(args.get(0));
         if (subCommand == null) {
             LangUtil.sendLang(sender, Languages.COMMAND_UNDEFINED_SUBCMD);

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/RecipeListCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/recipe/RecipeListCommand.java
@@ -10,10 +10,9 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
+
+import static crypticlib.command.CommandManager.subcommand;
 
 public final class RecipeListCommand extends AbstractSubCommand {
 
@@ -22,42 +21,29 @@ public final class RecipeListCommand extends AbstractSubCommand {
 
     private RecipeListCommand() {
         super("list", "craftorithm.command.list");
+        regSub(subcommand(SERVER)
+            .setPermission("craftorithm.command.list.server")
+            .setExecutor((sender, args) -> {
+                new RecipeListMenu((Player) sender, RecipeManager.INSTANCE.serverRecipesCache().keySet()).openMenu();
+                return true;
+            }));
+        regSub(subcommand(CRAFTORITHM)
+            .setPermission("craftorithm.command.list.craftorithm")
+            .setExecutor((sender, arg) -> {
+                new RecipeGroupListMenu((Player) sender).openMenu();
+                return true;
+            }));
     }
 
     @Override
     public boolean onCommand(CommandSender sender, List<String> args) {
-        if (CrypticLib.minecraftVersion() < 11600) {
-            LangUtil.sendLang(sender, Languages.COMMAND_LIST_UNSUPPORTED_VERSION);
-            return true;
-        }
         if (!checkSenderIsPlayer(sender)) {
             return true;
         }
-        String listType;
-        if (args.isEmpty())
-            listType = CRAFTORITHM;
-        else
-            listType = args.get(0).toLowerCase(Locale.ENGLISH);
-        Player player = (Player) sender;
-        switch (listType) {
-            case SERVER:
-                new RecipeListMenu(player, RecipeManager.INSTANCE.serverRecipesCache().keySet()).openMenu();
-                break;
-            case CRAFTORITHM:
-            default:
-                new RecipeGroupListMenu(player).openMenu();
-                break;
+        if (args.isEmpty()) {
+            args = new ArrayList<>(Collections.singletonList(CRAFTORITHM));
         }
-        return true;
+        return super.onCommand(sender, args);
     }
 
-    @Override
-    public List<String> onTabComplete(CommandSender sender, List<String> args) {
-        if (args.size() <= 1) {
-            List<String> list = new ArrayList<>(Arrays.asList(CRAFTORITHM, SERVER));
-            filterTabList(list, args.get(0));
-            return list;
-        }
-        return super.onTabComplete(sender, args);
-    }
 }
diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/CraftingRecipeCreator.java b/src/main/java/com/github/yufiriamazenta/craftorithm/menu/creator/CraftingRecipeCreator.java
@@ -62,6 +62,17 @@ public CraftingRecipeCreator(@NotNull Player player, RecipeType recipeType, @Not
                             String sourceName = ItemUtils.matchItemNameOrCreate(source, true);
                             sourceList.add(sourceName);
                         }
+                        boolean allEmpty = true;
+                        for (String choice : sourceList) {
+                            if (!choice.isEmpty()) {
+                                allEmpty = false;
+                                break;
+                            }
+                        }
+                        if (allEmpty) {
+                            LangUtil.sendLang(event.getWhoClicked(), Languages.COMMAND_CREATE_NULL_SOURCE);
+                            return;
+                        }
                         ConfigWrapper recipeConfig = createRecipeConfig(recipeName);
                         switch (recipeType()) {
                             case SHAPED:

diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java b/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java
@@ -115,7 +115,7 @@ public void reloadRecipeManager() {
         loadRecipeGroups();
         loadRecipes();
         reloadRemovedRecipes();
-        reloadServerRecipeCache();
+        loadServerRecipeCache();
     }
 
     private void loadRecipes() {
@@ -444,7 +444,7 @@ public void resetRecipes() {
         recipeUnlockMap.clear();
     }
 
-    public void reloadServerRecipeCache() {
+    public void loadServerRecipeCache() {
         Iterator<Recipe> recipeIterator = Bukkit.recipeIterator();
         serverRecipesCache.clear();
         while (recipeIterator.hasNext()) {