feat(claim): 添加自动领取签到奖励的开关与手动领取指令。(#4)

2026-06-05 01:08:10 +08:00 · 2023-02-23 01:41:28 +08:00
parent 77182148c5
commit ab922f0eaa
14 changed files with 376 additions and 171 deletions
@@ -0,0 +1,37 @@
+package cc.carm.plugin.timereward.command;
+
+import cc.carm.lib.easyplugin.command.CommandHandler;
+import cc.carm.plugin.timereward.command.sub.*;
+import cc.carm.plugin.timereward.conf.PluginMessages;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class MainCommand extends CommandHandler {
+
+    public MainCommand(@NotNull JavaPlugin plugin) {
+        super(plugin);
+
+        registerSubCommand(new ClaimCommand(this, "claim"));
+        registerSubCommand(new ListCommand(this, "list"));
+        registerSubCommand(new UserCommand(this, "user"));
+        registerSubCommand(new TestCommand(this, "test"));
+        registerSubCommand(new ReloadCommand(this, "reload"));
+    }
+
+    @Override
+    public Void noArgs(CommandSender sender) {
+        if (sender.hasPermission("TimeReward.admin")) {
+            PluginMessages.USAGE.ADMIN.send(sender);
+        } else {
+            PluginMessages.USAGE.USER.send(sender);
+        }
+        return null;
+    }
+
+    @Override
+    public Void noPermission(CommandSender sender) {
+        PluginMessages.NO_PERMISSION.send(sender);
+        return null;
+    }
+}
@@ -1,142 +0,0 @@
-package cc.carm.plugin.timereward.command;
-
-import cc.carm.plugin.timereward.Main;
-import cc.carm.plugin.timereward.TimeRewardAPI;
-import cc.carm.plugin.timereward.conf.PluginMessages;
-import cc.carm.plugin.timereward.storage.RewardContents;
-import cc.carm.plugin.timereward.storage.UserData;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class TimeRewardCommand implements CommandExecutor, TabCompleter {
-
-    private boolean help(CommandSender sender) {
-        PluginMessages.COMMAND_USAGE.send(sender);
-        return true;
-    }
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
-        if (sender instanceof Player && !sender.hasPermission("TimeReward.admin")) PluginMessages.NO_PERMISSION.send(sender);
-        if (args.length < 1) return help(sender);
-
-        String aim = args[0];
-        if (aim.equalsIgnoreCase("reload")) {
-            long s1 = System.currentTimeMillis();
-            PluginMessages.RELOAD.START.send(sender);
-
-            try {
-                Main.getInstance().getConfigProvider().reload();
-                Main.getInstance().getMessageProvider().reload();
-
-                PluginMessages.RELOAD.COMPLETE.send(sender, System.currentTimeMillis() - s1, TimeRewardAPI.getRewardManager().listRewards().size());
-            } catch (Exception e) {
-                PluginMessages.RELOAD.ERROR.send(sender);
-                e.printStackTrace();
-            }
-
-            return true;
-        } else if (aim.equalsIgnoreCase("list")) {
-            Collection<RewardContents> awards = TimeRewardAPI.getRewardManager().listRewards().values();
-            PluginMessages.LIST.HEADER.send(sender, awards.size());
-
-            for (RewardContents reward : awards) {
-                if (reward.getPermission() != null) {
-                    PluginMessages.LIST.OBJECT_PERM.send(sender,
-                            reward.getRewardID(), reward.getDisplayName(),
-                            reward.getTime(), reward.getPermission()
-                    );
-                } else {
-                    PluginMessages.LIST.OBJECT.send(sender,
-                            reward.getRewardID(), reward.getDisplayName(), reward.getTime()
-                    );
-                }
-            }
-
-            return true;
-        } else if (aim.equalsIgnoreCase("test")) {
-            if (args.length < 2) return help(sender);
-            if (!(sender instanceof Player)) {
-                PluginMessages.NOT_PLAYER.send(sender);
-                return true;
-            }
-
-            RewardContents contents = TimeRewardAPI.getRewardManager().getReward(args[1]);
-            if (contents == null) {
-                PluginMessages.NOT_EXISTS.send(sender, args[1]);
-                return true;
-            }
-
-            PluginMessages.COMMAND_LIST.send(sender, contents.getRewardID());
-
-            TimeRewardAPI.getRewardManager().executeCommand((Player) sender, contents);
-
-            return true;
-        } else if (aim.equalsIgnoreCase("user")) {
-            if (args.length < 2) return help(sender);
-            Player player = Bukkit.getPlayer(args[1]);
-            if (player == null) {
-                PluginMessages.NOT_ONLINE.send(sender, args[1]);
-                return true;
-            }
-
-            UserData user = TimeRewardAPI.getUserManager().getData(player);
-            PluginMessages.USER_INFO.send(sender,
-                    player.getName(), user.getAllSeconds(),
-                    user.getClaimedRewards().size(), String.join("&8, &f", user.getClaimedRewards())
-            );
-
-            return true;
-        }
-
-        return help(sender);
-    }
-
-    @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
-        List<String> allCompletes = new ArrayList<>();
-        // 玩家指令部分
-        if (sender.hasPermission("TimeReward.admin")) {
-            switch (args.length) {
-                case 1: {
-                    allCompletes.add("reload");
-                    allCompletes.add("user");
-                    allCompletes.add("list");
-                    if (sender instanceof Player) allCompletes.add("test");
-
-                    break;
-                }
-                case 2: {
-                    String aim = args[0];
-                    if (aim.equalsIgnoreCase("test") && sender instanceof Player) {
-                        allCompletes = new ArrayList<>(TimeRewardAPI.getRewardManager().listRewards().keySet());
-                    } else if (aim.equalsIgnoreCase("user")) {
-                        allCompletes = Bukkit.getOnlinePlayers().stream().map(HumanEntity::getName).collect(Collectors.toList());
-                    }
-                    break;
-                }
-                default: {
-                    break;
-                }
-            }
-        }
-
-        return allCompletes.stream()
-                .filter(s -> StringUtil.startsWithIgnoreCase(s, args[args.length - 1]))
-                .limit(10).collect(Collectors.toList());
-    }
-
-}
@@ -0,0 +1,64 @@
+package cc.carm.plugin.timereward.command.sub;
+
+import cc.carm.lib.easyplugin.command.SubCommand;
+import cc.carm.plugin.timereward.Main;
+import cc.carm.plugin.timereward.TimeRewardAPI;
+import cc.carm.plugin.timereward.command.MainCommand;
+import cc.carm.plugin.timereward.conf.PluginMessages;
+import cc.carm.plugin.timereward.manager.RewardManager;
+import cc.carm.plugin.timereward.storage.RewardContents;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public class ClaimCommand extends SubCommand<MainCommand> {
+
+    public ClaimCommand(@NotNull MainCommand parent, String identifier, String... aliases) {
+        super(parent, identifier, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        Player player = (Player) sender;
+        RewardManager manager = TimeRewardAPI.getRewardManager();
+
+        @Nullable String rewardID = args.length > 0 ? args[0] : null;
+        if (rewardID == null) {
+
+            List<RewardContents> unclaimedRewards = manager.getUnclaimedRewards(player);
+            if (unclaimedRewards.isEmpty()) {
+                PluginMessages.NO_UNCLAIMED_REWARD.send(sender);
+                return null;
+            }
+
+            Main.getInstance().getScheduler().run(() -> unclaimedRewards.forEach(
+                    // 在同步进程中为玩家发放奖励
+                    unclaimedReward -> manager.claimReward(player, unclaimedReward, false)
+            ));
+
+        } else {
+
+            RewardContents reward = manager.getReward(rewardID);
+            if (reward == null) {
+                PluginMessages.NOT_EXISTS.send(sender, rewardID);
+                return null;
+            }
+
+            if (!manager.isClaimable(player, reward)) {
+                PluginMessages.NOT_CLAIMABLE.send(sender, reward.getDisplayName());
+                return null;
+            }
+            Main.getInstance().getScheduler().run(() -> manager.claimReward(player, reward, false));
+        }
+        return null;
+    }
+}
@@ -0,0 +1,45 @@
+package cc.carm.plugin.timereward.command.sub;
+
+import cc.carm.lib.easyplugin.command.SubCommand;
+import cc.carm.plugin.timereward.TimeRewardAPI;
+import cc.carm.plugin.timereward.command.MainCommand;
+import cc.carm.plugin.timereward.conf.PluginMessages;
+import cc.carm.plugin.timereward.storage.RewardContents;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+
+public class ListCommand extends SubCommand<MainCommand> {
+
+    public ListCommand(@NotNull MainCommand parent, String identifier, String... aliases) {
+        super(parent, identifier, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
+        Collection<RewardContents> awards = TimeRewardAPI.getRewardManager().listRewards().values();
+        PluginMessages.LIST.HEADER.send(sender, awards.size());
+
+        for (RewardContents reward : awards) {
+            if (reward.getPermission() != null) {
+                PluginMessages.LIST.OBJECT_PERM.send(sender,
+                        reward.getRewardID(), reward.getDisplayName(),
+                        reward.getTime(), reward.getPermission()
+                );
+            } else {
+                PluginMessages.LIST.OBJECT.send(sender,
+                        reward.getRewardID(), reward.getDisplayName(), reward.getTime()
+                );
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull CommandSender sender) {
+        return sender.hasPermission("TimeReward.admin");
+    }
+
+}
@@ -0,0 +1,41 @@
+package cc.carm.plugin.timereward.command.sub;
+
+import cc.carm.lib.easyplugin.command.SubCommand;
+import cc.carm.plugin.timereward.Main;
+import cc.carm.plugin.timereward.TimeRewardAPI;
+import cc.carm.plugin.timereward.command.MainCommand;
+import cc.carm.plugin.timereward.conf.PluginMessages;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class ReloadCommand extends SubCommand<MainCommand> {
+
+    public ReloadCommand(@NotNull MainCommand parent, String identifier, String... aliases) {
+        super(parent, identifier, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+
+        long s1 = System.currentTimeMillis();
+        PluginMessages.RELOAD.START.send(sender);
+
+        try {
+            Main.getInstance().getConfigProvider().reload();
+            Main.getInstance().getMessageProvider().reload();
+
+            PluginMessages.RELOAD.COMPLETE.send(sender, System.currentTimeMillis() - s1, TimeRewardAPI.getRewardManager().listRewards().size());
+        } catch (Exception e) {
+            PluginMessages.RELOAD.ERROR.send(sender);
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull CommandSender sender) {
+        return sender.hasPermission("TimeReward.admin");
+    }
+
+}
@@ -0,0 +1,55 @@
+package cc.carm.plugin.timereward.command.sub;
+
+import cc.carm.lib.easyplugin.command.SimpleCompleter;
+import cc.carm.lib.easyplugin.command.SubCommand;
+import cc.carm.plugin.timereward.TimeRewardAPI;
+import cc.carm.plugin.timereward.command.MainCommand;
+import cc.carm.plugin.timereward.conf.PluginMessages;
+import cc.carm.plugin.timereward.storage.RewardContents;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class TestCommand extends SubCommand<MainCommand> {
+
+    public TestCommand(@NotNull MainCommand parent, String identifier, String... aliases) {
+        super(parent, identifier, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+        if (args.length < 1) return getParent().noArgs(sender);
+        if (!(sender instanceof Player)) {
+            PluginMessages.NOT_PLAYER.send(sender);
+            return null;
+        }
+
+        RewardContents contents = TimeRewardAPI.getRewardManager().getReward(args[0]);
+        if (contents == null) {
+            PluginMessages.NOT_EXISTS.send(sender, args[0]);
+            return null;
+        }
+
+        PluginMessages.COMMAND_LIST.send(sender, contents.getRewardID());
+
+        TimeRewardAPI.getRewardManager().executeCommand((Player) sender, contents);
+        return null;
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return SimpleCompleter.text(args[args.length - 1], TimeRewardAPI.getRewardManager().listRewards().keySet());
+        } else return null;
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull CommandSender sender) {
+        return sender.hasPermission("TimeReward.admin");
+    }
+
+
+}
@@ -0,0 +1,52 @@
+package cc.carm.plugin.timereward.command.sub;
+
+import cc.carm.lib.easyplugin.command.SimpleCompleter;
+import cc.carm.lib.easyplugin.command.SubCommand;
+import cc.carm.plugin.timereward.TimeRewardAPI;
+import cc.carm.plugin.timereward.command.MainCommand;
+import cc.carm.plugin.timereward.conf.PluginMessages;
+import cc.carm.plugin.timereward.storage.UserData;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class UserCommand extends SubCommand<MainCommand> {
+
+    public UserCommand(@NotNull MainCommand parent, String identifier, String... aliases) {
+        super(parent, identifier, aliases);
+    }
+
+    @Override
+    public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
+        if (args.length < 1) return getParent().noArgs(sender);
+
+        Player player = Bukkit.getPlayer(args[0]);
+        if (player == null) {
+            PluginMessages.NOT_ONLINE.send(sender, args[0]);
+            return null;
+        }
+
+        UserData user = TimeRewardAPI.getUserManager().getData(player);
+        PluginMessages.USER_INFO.send(sender,
+                player.getName(), user.getAllSeconds(),
+                user.getClaimedRewards().size(), String.join("&8, &f", user.getClaimedRewards())
+        );
+        return null;
+    }
+
+    @Override
+    public List<String> tabComplete(JavaPlugin plugin, CommandSender sender, String[] args) {
+        if (args.length == 1) return SimpleCompleter.onlinePlayers(args[0]);
+        else return null;
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull CommandSender sender) {
+        return sender.hasPermission("TimeReward.admin");
+    }
+
+}