release: v1.4.0-beta.2

Author: leemwood

.github/workflows/maven-publish.yml

@@ -76,7 +76,7 @@ jobs:
           "name": "BellCommand ${{ github.ref_name }}",
           "version_number": "${{ github.ref_name }}",
           "changelog": $(echo "${{ steps.commit.outputs.message }}" | jq -Rsa .),
-          "game_versions": ["1.13", "1.14", "1.15", "1.16", "1.17", "1.18", "1.19", "1.20", "1.21"],
+          "game_versions": ["1.13", "1.13.1", "1.13.2", "1.14", "1.14.1", "1.14.2", "1.14.3", "1.14.4", "1.15", "1.15.1", "1.15.2", "1.16", "1.16.1", "1.16.2", "1.16.3", "1.16.4", "1.16.5", "1.17", "1.17.1", "1.18", "1.18.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1"],
           "version_type": "$VERSION_TYPE",
           "loaders": ["spigot", "paper", "purpur"],
           "project_id": "n18snJd9",

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>cn.ningmo</groupId>
     <artifactId>bellcommand</artifactId>
-    <version>1.4.0-beta.1</version>
+    <version>1.4.0-beta.2</version>
     <packaging>jar</packaging>
 
   <name>BellCommand</name>

src/main/java/cn/ningmo/bellcommand/BellCommand.java

@@ -53,6 +53,7 @@ public void onEnable() {
 
             // 5. 注册命令和监听器
             getCommand("bc").setExecutor(this);
+            getCommand("bc").setTabCompleter(this);
             getServer().getPluginManager().registerEvents(new ItemClickListener(this), this);
             getServer().getPluginManager().registerEvents(new AutoGiveListener(this), this);
 
@@ -146,10 +147,56 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
     }
 
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        List<String> completions = new ArrayList<>();
+        
+        if (args.length == 1) {
+            List<String> subCommands = new ArrayList<>();
+            if (sender.hasPermission("bellcommand.give")) subCommands.add("give");
+            if (sender.hasPermission("bellcommand.reload")) subCommands.add("reload");
+            if (sender.hasPermission("bellcommand.list")) subCommands.add("list");
+            subCommands.add("help");
+            
+            for (String sub : subCommands) {
+                if (sub.startsWith(args[0].toLowerCase())) {
+                    completions.add(sub);
+                }
+            }
+        } else if (args.length == 2 && args[0].equalsIgnoreCase("give")) {
+            if (sender.hasPermission("bellcommand.give")) {
+                for (Player player : getServer().getOnlinePlayers()) {
+                    if (player.getName().toLowerCase().startsWith(args[1].toLowerCase())) {
+                        completions.add(player.getName());
+                    }
+                }
+            }
+        } else if (args.length == 3 && args[0].equalsIgnoreCase("give")) {
+            if (sender.hasPermission("bellcommand.give")) {
+                for (CommandItem item : itemManager.getAllItems()) {
+                    if (item.getId().toLowerCase().startsWith(args[2].toLowerCase())) {
+                        completions.add(item.getId());
+                    }
+                }
+            }
+        }
+        
+        return completions;
+    }
+
     private void handleGiveCommand(CommandSender sender, String[] args) {
         String playerName = args[1];
         String itemId = args[2];
-        int amount = args.length > 3 ? Math.max(1, Integer.parseInt(args[3])) : 1;
+        int amount = 1;
+        
+        if (args.length > 3) {
+            try {
+                amount = Math.max(1, Integer.parseInt(args[3]));
+            } catch (NumberFormatException e) {
+                sender.sendMessage(languageManager.getMessage("messages.command.give-usage"));
+                return;
+            }
+        }
 
         Player target = getServer().getPlayer(playerName);
         if (target == null) {

src/main/java/cn/ningmo/bellcommand/ItemClickListener.java

@@ -99,11 +99,13 @@ public AutoCleanupConfig(ConfigurationSection config) {
     public static class CommandEntry {
         private final String command;
         private final boolean asConsole;
+        private final boolean asOp;
         private final double delay; // 延迟执行时间（秒）
 
-        public CommandEntry(String command, boolean asConsole, double delay) {
+        public CommandEntry(String command, boolean asConsole, boolean asOp, double delay) {
             this.command = command;
             this.asConsole = asConsole;
+            this.asOp = asOp;
             this.delay = delay;
         }
 
@@ -115,6 +117,10 @@ public boolean isAsConsole() {
             return asConsole;
         }
 
+        public boolean isAsOp() {
+            return asOp;
+        }
+        
         public double getDelay() {
             return delay;
         }
@@ -153,9 +159,10 @@ public CommandItem(String id, ConfigurationSection config) {
                         if (cmdSection != null) {
                             String cmd = cmdSection.getString("command");
                             boolean asConsole = cmdSection.getBoolean("as-console", false);
+                            boolean asOp = cmdSection.getBoolean("as-op", false);
                             double delay = cmdSection.getDouble("delay", 0.0); // 获取延迟时间，默认为0秒
                             if (cmd != null && !cmd.isEmpty()) {
-                                typeCommands.add(new CommandEntry(cmd, asConsole, delay));
+                                typeCommands.add(new CommandEntry(cmd, asConsole, asOp, delay));
                             }
                         }
                     }
@@ -185,7 +192,15 @@ public double getCooldown() {
     }
 
     public List<CommandEntry> getCommands(String type) {
-        return commands.getOrDefault(type, new ArrayList<>());
+        List<CommandEntry> result = commands.getOrDefault(type, new ArrayList<>());
+        
+        // 如果是基岩版特定的点击类型且没有配置，则回退到普通点击类型
+        if (result.isEmpty() && type.startsWith("bedrock-")) {
+            String fallbackType = type.replace("bedrock-", "");
+            result = commands.getOrDefault(fallbackType, new ArrayList<>());
+        }
+        
+        return result;
     }
 
     public AutoGiveConfig getAutoGive() {