fix(permission): 移除基础权限判断。

README.md

@@ -43,6 +43,11 @@
 - 必须参数 `<参数>`
 
 ```text
+# claim [奖励ID]
+@ 玩家指令
+- 为自己手动领取对应奖励。
+- 若不填写奖励ID，则自动领取全部可领取的奖励。
+
 # reload
 @ 管理指令 (TimeReward.admin)
 - 重载插件配置文件。
@@ -75,8 +80,9 @@
 
 # %TimeReward_claimed_<奖励ID>%
 - 得到玩家是否已经领取了某个奖励。
-- * 也可以代表玩家是否可以领取某个奖励 
+
-- * 因为一旦可以领取就会自动领取，变为已领取状态
+# %TimeReward_claimable_<奖励ID>%
+- 得到玩家是否可以领取某个奖励 
 ```
 
 ## 配置文件

pom.xml

@@ -11,14 +11,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         
-        <deps.easyplugin.version>1.5.2</deps.easyplugin.version>
+        <deps.easyplugin.version>1.5.5</deps.easyplugin.version>
-        <deps.easysql.version>0.4.6</deps.easysql.version>
+        <deps.easysql.version>0.4.7</deps.easysql.version>
-        <deps.mineconfig.version>2.4.0</deps.mineconfig.version>
+        <deps.mineconfig.version>2.5.1</deps.mineconfig.version>
     </properties>
 
     <groupId>cc.carm.plugin</groupId>
     <artifactId>timereward</artifactId>
-    <version>2.0.1</version>
+    <version>2.2.1</version>
 
     <name>TimeReward</name>
     <description>在线时长自动领奖插件，通过指令发放奖励，基于EasyPlugin实现。</description>

src/main/java/cc/carm/plugin/timereward/Main.java

@@ -5,7 +5,7 @@ import cc.carm.lib.easyplugin.EasyPlugin;
 import cc.carm.lib.easyplugin.updatechecker.GHUpdateChecker;
 import cc.carm.lib.easyplugin.utils.MessageUtils;
 import cc.carm.lib.mineconfiguration.bukkit.MineConfiguration;
-import cc.carm.plugin.timereward.command.TimeRewardCommand;
+import cc.carm.plugin.timereward.command.MainCommand;
 import cc.carm.plugin.timereward.conf.PluginConfig;
 import cc.carm.plugin.timereward.conf.PluginMessages;
 import cc.carm.plugin.timereward.hooker.PAPIExpansion;
@@ -67,7 +67,7 @@ public class Main extends EasyPlugin {
         registerListener(new UserListener());
 
         log("注册指令...");
-        registerCommand("TimeReward", new TimeRewardCommand());
+        registerCommand("TimeReward", new MainCommand(this));
 
         if (MessageUtils.hasPlaceholderAPI()) {
             log("注册变量...");

src/main/java/cc/carm/plugin/timereward/command/MainCommand.java

@@ -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;
+    }
+}

src/main/java/cc/carm/plugin/timereward/command/TimeRewardCommand.java

@@ -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());
-    }
-
-}

src/main/java/cc/carm/plugin/timereward/command/sub/ClaimCommand.java

@@ -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;
+    }
+}

src/main/java/cc/carm/plugin/timereward/command/sub/ListCommand.java

@@ -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");
+    }
+
+}

src/main/java/cc/carm/plugin/timereward/command/sub/ReloadCommand.java

@@ -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");
+    }
+
+}

src/main/java/cc/carm/plugin/timereward/command/sub/TestCommand.java

@@ -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");
+    }
+
+
+}

src/main/java/cc/carm/plugin/timereward/command/sub/UserCommand.java

@@ -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");
+    }
+
+}

src/main/java/cc/carm/plugin/timereward/conf/PluginConfig.java

@@ -24,10 +24,6 @@ public class PluginConfig extends ConfigurationRoot {
     })
     public static final ConfigValue<Boolean> CHECK_UPDATE = ConfiguredValue.of(Boolean.class, true);
     
-    @HeaderComment("数据存储相关设定")
-    public static final class STORAGE extends ConfigurationRoot {
-    }
-
     @HeaderComment({"奖励相关设定，包含以下设定：",
             " [id] 配置键名即奖励ID，支持英文、数字与下划线。",
             "  | 确定后请不要更改，因为该键值用于存储玩家是否领取的数据",
@@ -38,7 +34,9 @@ public class PluginConfig extends ConfigurationRoot {
             " [permission] 领取奖励时后台执行的指令",
             "  | 支持PlaceholderAPI变量，指令中可以使用 %(name) 来获取该奖励的名称。",
             " [commands] 该奖励领取权限，可以不设置。",
-            "  | 若为空则所有人都可以领取；若不为空，则需要拥有该权限的玩家才能领取。"
+            "  | 若为空则所有人都可以领取；若不为空，则需要拥有该权限的玩家才能领取。",
+            " [auto] 该奖励是否自动领取，可以不设置，默认为true。",
+            "  | 若关闭自动领取，则需要玩家手动输入/tr claim 领取奖励。",
     })
     public static final ConfigValue<RewardContents.Group> REWARDS = ConfigValue.builder()
             .asValue(RewardContents.Group.class).fromSection()

src/main/java/cc/carm/plugin/timereward/conf/PluginMessages.java

@@ -44,6 +44,28 @@ public class PluginMessages extends ConfigurationRoot {
         };
     }
 
+    public static final class USAGE extends ConfigurationRoot {
+
+        public static final ConfiguredMessageList<BaseComponent[]> ADMIN = list().defaults(
+                "&6&l在线奖励 &f管理员指令帮助",
+                "&8#&f claim &6[奖励ID]",
+                "&8-&7 为自己手动领取对应奖励。",
+                "&8-&7 若不填写奖励ID，则自动领取全部可领取的奖励。",
+                "&8#&f reload",
+                "&8-&7 重载插件配置文件。",
+                "&8#&f user &6<玩家>",
+                "&8-&7 查看用户的在线时长信息与奖励领取情况。",
+                "&8#&f list",
+                "&8-&7 列出所有奖励与条件。",
+                "&8#&f test &6<奖励ID>",
+                "&8-&7 测试执行奖励配置的指令。"
+        ).build();
+
+        public static final ConfiguredMessageList<BaseComponent[]> USER = list().defaults(
+                "&6&l在线奖励 &f您可以输入 &e/tr claim &6[奖励ID] &f领取对应奖励。"
+        ).build();
+    }
+
     public static final ConfiguredMessageList<BaseComponent[]> NO_PERMISSION = list().defaults(
             "&c&l抱歉！&f但您没有足够的权限使用该指令。"
     ).build();
@@ -60,6 +82,14 @@ public class PluginMessages extends ConfigurationRoot {
             "&f奖励 &e%(award) &f并不存在。"
     ).params("award").build();
 
+    public static final ConfiguredMessageList<BaseComponent[]> NOT_CLAIMABLE = list().defaults(
+            "&c&l抱歉！&f但您暂时未满足领取奖励 &e%(award) &f的条件。"
+    ).params("award").build();
+
+    public static final ConfiguredMessageList<BaseComponent[]> NO_UNCLAIMED_REWARD = list().defaults(
+            "&f您暂时没有未领取的奖励。"
+    ).build();
+
     public static final ConfiguredMessageList<BaseComponent[]> USER_INFO = list().defaults(
             "&f玩家 &6%(player) &f已在线&e%(time)&f秒，共领取了 &e%(amount)&f 次奖励。",
             "&7已领取的奖励列表如下：&r%(rewards) &7。"
@@ -69,18 +99,6 @@ public class PluginMessages extends ConfigurationRoot {
             "&f正在执行奖励 %(award) 的指令列表..."
     ).params("award").build();
 
-    public static final ConfiguredMessageList<BaseComponent[]> COMMAND_USAGE = list().defaults(
-            "&6&l在线奖励 &f指令帮助",
-            "&8#&f reload",
-            "&8-&7 重载插件配置文件。",
-            "&8#&f user &6<玩家>",
-            "&8-&7 查看用户的在线时长信息与奖励领取情况。",
-            "&8#&f list",
-            "&8-&7 列出所有奖励与条件。",
-            "&8#&f test &6<奖励ID>",
-            "&8-&7 测试执行奖励配置的指令。"
-    ).build();
-
 
     public static class LIST extends ConfigurationRoot {
 
@@ -114,7 +132,7 @@ public class PluginMessages extends ConfigurationRoot {
         ).build();
 
         public static final ConfiguredMessageList<BaseComponent[]> COMPLETE = list().defaults(
-                "&f配置文件重载完成！耗时 &d%(time)&fms，共加载了 &d(count) &f个奖励配置。"
+                "&f配置文件重载完成！耗时 &d%(time)&fms，共加载了 &d%(count) &f个奖励配置。"
         ).params("time", "count").build();
 
     }

src/main/java/cc/carm/plugin/timereward/hooker/PAPIExpansion.java

@@ -19,14 +19,27 @@ public class PAPIExpansion extends EasyPlaceholder {
         super(plugin, rootIdentifier);
 
         handle("time", userHandler(UserData::getAllSeconds));
+
         handle("reward",
                 rewardHandler(RewardContents::getDisplayName),
                 Collections.singletonList("<奖励ID>")
         );
+
         handle("claimed", userHandler((user, args) -> {
             if (args.length < 1) return "请填写奖励ID";
             else return user.isClaimed(args[0]);
         }), Collections.singletonList("<奖励ID>"));
+
+        handle("claimable", (offlinePlayer, args) -> {
+            if (offlinePlayer == null || !offlinePlayer.isOnline()) return "加载中...";
+            if (args.length < 1) return "请填写奖励ID";
+
+            RewardContents reward = TimeRewardAPI.getRewardManager().getReward(args[0]);
+            if (reward == null) return "奖励不存在";
+
+            return TimeRewardAPI.getRewardManager().isClaimable((Player) offlinePlayer, reward);
+        }, Collections.singletonList("<奖励ID>"));
+
         handle("version", (player, args) -> getVersion());
     }
 

src/main/java/cc/carm/plugin/timereward/manager/RewardManager.java

@@ -29,13 +29,15 @@ public class RewardManager {
                 if (Bukkit.getOnlinePlayers().isEmpty()) return;
 
                 for (Player player : Bukkit.getOnlinePlayers()) {
-                    List<RewardContents> unclaimedRewards = getUnclaimedRewards(player);
+                    List<RewardContents> rewards = getUnclaimedRewards(player).stream()
-                    if (unclaimedRewards.isEmpty()) continue;
+                            .filter(RewardContents::isAutoClaimed)
+                            .collect(Collectors.toList());
+                    if (rewards.isEmpty()) continue;
 
-                    main.getScheduler().run(() -> unclaimedRewards.forEach(
+                    main.getScheduler().run(() -> rewards.forEach(r -> {
-                            // 在同步进程中为玩家发放奖励
+                        // 在同步进程中为玩家发放奖励
-                            unclaimedReward -> claimReward(player, unclaimedReward, false)
+                        claimReward(player, r, true); // 二次检查避免重复发奖
-                    ));
+                    }));
                 }
             }
         };
@@ -61,21 +63,22 @@ public class RewardManager {
 
     @Unmodifiable
     public @NotNull List<RewardContents> getUnclaimedRewards(@NotNull Player player) {
-        UserData user = TimeRewardAPI.getUserManager().getData(player);
         return listRewards().values().stream()
-                .filter(reward -> reward.isTimeEnough(user.getAllSeconds())) // 时间足够
+                .filter(reward -> isClaimable(player, reward))
-                .filter(reward -> !user.isClaimed(reward.getRewardID())) // 未曾领取
-                .filter(reward -> reward.checkPermission(player)) // 满足权限
                 .collect(Collectors.toList());
     }
 
-    public boolean claimReward(Player player, RewardContents reward, boolean check) {
+    public boolean isClaimable(Player player, RewardContents reward) {
         UserData user = TimeRewardAPI.getUserManager().getData(player);
-        if (check && user.isClaimed(reward.getRewardID())) return false;
+        return !user.isClaimed(reward.getRewardID()) // 未曾领取
-        if (check && !reward.isTimeEnough(user.getAllSeconds())) return false;
+                && reward.isTimeEnough(user.getAllSeconds()) // 时间足够
-        if (check && !reward.checkPermission(player)) return false;
+                && reward.checkPermission(player); // 满足权限
+    }
 
-        user.addClaimedReward(reward.getRewardID());
+    public boolean claimReward(Player player, RewardContents reward, boolean check) {
+        if (check && !isClaimable(player, reward)) return false;
+
+        TimeRewardAPI.getUserManager().getData(player).addClaimedReward(reward.getRewardID());
         executeCommand(player, reward);
         return true;
     }

src/main/java/cc/carm/plugin/timereward/storage/RewardContents.java

@@ -18,15 +18,18 @@ public class RewardContents {
     private final @Nullable String permission;
     private final @NotNull List<String> commands;
 
+    private final boolean auto;
+
 
     public RewardContents(@NotNull String id, long time,
                           @Nullable String name, @Nullable String permission,
-                          @NotNull List<String> commands) {
+                          @NotNull List<String> commands, boolean auto) {
         this.id = id;
         this.time = time;
         this.name = name;
         this.permission = permission;
         this.commands = commands;
+        this.auto = auto;
     }
 
     public String getRewardID() {
@@ -53,6 +56,10 @@ public class RewardContents {
         return commands;
     }
 
+    public boolean isAutoClaimed() {
+        return auto;
+    }
+
     public boolean checkPermission(@NotNull Player player) {
         return permission == null || player.hasPermission(permission);
     }
@@ -67,6 +74,7 @@ public class RewardContents {
         if (getName() != null) map.put("name", getName());
         if (getPermission() != null) map.put("permission", getPermission());
         map.put("commands", getCommands());
+        map.put("auto", auto);
         return map;
     }
 
@@ -81,7 +89,8 @@ public class RewardContents {
                 id, time,
                 section.getString("name"),
                 section.getString("permission"),
-                section.getStringList("commands")
+                section.getStringList("commands"),
+                section.getBoolean("auto", false)
         );
     }
 
@@ -89,7 +98,8 @@ public class RewardContents {
         return new RewardContents(
                 id, 7200,
                 "&f[初级奖励] &e总在线时长 2小时", "TimeReward.vip",
-                Collections.singletonList("say &f恭喜 &b%player_name% &f领取了奖励 &r%(name) &f！")
+                Collections.singletonList("say &f恭喜 &b%player_name% &f领取了奖励 &r%(name) &f！"),
+                true
         );
     }
 

src/main/resources/plugin.yml

@@ -1,7 +1,9 @@
 main: cc.carm.plugin.timereward.Main
 name: TimeReward
 version: ${project.version}
-author: CarmJos
+authors:
+  - CarmJos
+  - Yurinann
 website: ${project.url}
 description: ${project.description}
 
@@ -17,7 +19,6 @@ permissions:
 
 commands:
   "TimeReward":
-    permission: "TimeReward.admin"
     description: "在线自动领奖的基础指令。"
     usage: "/TimeReward help"
     aliases: