build: 使用 .asset/ 目录存储构件

feat(command): 添加了指令权限判断与重载时的奖励数量反馈

.github/workflows/maven.yml

@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'adopt'
@@ -35,10 +35,10 @@ jobs:
         run: |
           mkdir artifacts
           cp -vrf target/ artifacts/target/
-          cp -vrf asset/*.jar artifacts
+          cp -vrf .asset/*.jar artifacts
 
       - name: "Upload artifact"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Artifact
           path: artifacts

.github/workflows/release.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'adopt'
@@ -37,5 +37,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: asset/*.jar
+          asset_path: ".asset/*.jar"
           asset_content_type: application/java-archive

README.md

@@ -43,6 +43,11 @@
 - 必须参数 `<参数>`
 
 ```text
+# claim [奖励ID]
+@ 玩家指令 (TimeReward.claim)
+- 为自己手动领取对应奖励。
+- 若不填写奖励ID，则自动领取全部可领取的奖励。
+
 # reload
 @ 管理指令 (TimeReward.admin)
 - 重载插件配置文件。
@@ -51,7 +56,7 @@
 @ 管理指令 (TimeReward.admin)
 - 查看用户的在线时长信息与奖励领取情况。
 
-# list 
+# list
 @ 管理指令 (TimeReward.admin)
 - 列出所有奖励与条件。
 
@@ -67,16 +72,21 @@
 变量如下:
 
 ```text
-# %TimeReward_time%
-- 得到玩家总共的在线时长(秒)。
+# %TimeReward_time_<时间类型>%
+- 得到玩家的在线时长(秒)。
+- 时间类型可选 TOTAL, DAILY, WEEKLY, MONTHLY 。
 
 # %TimeReward_reward_<奖励ID>%
 - 得到某个奖励配置的名称。
 
 # %TimeReward_claimed_<奖励ID>%
-- 得到玩家是否已经领取了某个奖励。
-- * 也可以代表玩家是否可以领取某个奖励 
-- * 因为一旦可以领取就会自动领取，变为已领取状态
+- 得到玩家是否已经领取过某个奖励。
+? 若奖励为循环奖励（即每在线X小时即可领取一次)，
+? 但玩家曾经领取过，该变量仍为 true 。
+? 因此，需使用 %TimeReward_claimable_<奖励ID>% 判断是否可领取。
+
+# %TimeReward_claimable_<奖励ID>%
+- 得到玩家是否可以领取某个奖励 
 ```
 
 ## 配置文件
@@ -97,6 +107,8 @@
 
 若您觉得本插件做的不错，您可以捐赠支持我，感谢您成为开源项目的支持者！
 
+万分感谢 [egg_拿]() 赞助本项目的开发与维护！
+
 Many thanks to Jetbrains for kindly providing a license for me to work on this and other open-source projects.  
 [![](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://www.jetbrains.com/?from=https://github.com/CarmJos/UserPrefix)
 

pom.xml

@@ -10,15 +10,15 @@
         <maven.compiler.target>${project.jdk.version}</maven.compiler.target>
         <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.easysql.version>0.4.6</deps.easysql.version>
-        <deps.mineconfig.version>2.4.0</deps.mineconfig.version>
+
+        <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
+        <deps.easysql.version>0.4.7</deps.easysql.version>
+        <deps.mineconfig.version>3.1.1</deps.mineconfig.version>
     </properties>
 
     <groupId>cc.carm.plugin</groupId>
     <artifactId>timereward</artifactId>
-    <version>2.0.0</version>
+    <version>3.1.2</version>
 
     <name>TimeReward</name>
     <description>在线时长自动领奖插件，通过指令发放奖励，基于EasyPlugin实现。</description>
@@ -49,7 +49,7 @@
             <name>Carm's Repo</name>
             <url>https://repo.carm.cc/repository/maven-public/</url>
         </repository>
-    
+
         <repository>
             <id>github</id>
             <name>GitHub Packages</name>
@@ -66,7 +66,7 @@
             <url>https://mvn.lumine.io/repository/maven-public/</url>
         </repository>
     </repositories>
-    
+
     <distributionManagement>
         <downloadUrl>https://github.com/CarmJos/TimeReward/releases</downloadUrl>
         <repository>
@@ -84,7 +84,7 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-    
+
         <dependency>
             <groupId>cc.carm.lib</groupId>
             <artifactId>easyplugin-main</artifactId>
@@ -92,7 +92,15 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-    
+
+        <dependency>
+            <groupId>cc.carm.lib</groupId>
+            <artifactId>easyplugin-user</artifactId>
+            <version>${deps.easyplugin.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>cc.carm.lib</groupId>
             <artifactId>easyplugin-command</artifactId>
@@ -117,7 +125,7 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-    
+
         <dependency>
             <groupId>cc.carm.lib</groupId>
             <artifactId>easysql-beecp</artifactId>
@@ -125,7 +133,7 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-    
+
         <dependency>
             <groupId>de.themoep</groupId>
             <artifactId>minedown</artifactId>
@@ -137,11 +145,11 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
-        
+
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
@@ -152,7 +160,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.11.2</version>
+            <version>2.11.6</version>
             <scope>provided</scope>
         </dependency>
 
@@ -166,7 +174,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>24.0.0</version>
+            <version>26.0.2</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -174,16 +182,16 @@
 
     <build>
         <defaultGoal>clean package</defaultGoal>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.4.1</version>
                 <configuration>
                     <filesets>
                         <fileset>
-                            <directory>${project.basedir}/asset/</directory>
+                            <directory>${project.basedir}/.asset/</directory>
                             <useDefaultExcludes>true</useDefaultExcludes>
                             <includes>
                                 <include>**/*</include>
@@ -199,11 +207,11 @@
                     </filesets>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.0</version>
+                <version>3.14.0</version>
                 <configuration>
                     <source>${project.jdk.version}</source>
                     <target>${project.jdk.version}</target>
@@ -211,17 +219,17 @@
                     <compilerArgument>-parameters</compilerArgument>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.4.2</version>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -231,11 +239,11 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -246,7 +254,7 @@
                 </executions>
                 <configuration>
                     <finalName>${project.name}-${project.version}</finalName>
-                    <outputDirectory>${project.basedir}/asset/</outputDirectory>
+                    <outputDirectory>${project.basedir}/.asset/</outputDirectory>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>
                         <filter>
@@ -277,17 +285,17 @@
                     </relocations>
                 </configuration>
             </plugin>
-    
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>3.5.3</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
             </plugin>
         </plugins>
-        
+
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -296,4 +304,4 @@
         </resources>
     </build>
 
-</project>
+</project>

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

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

@@ -1,13 +1,14 @@
 package cc.carm.plugin.timereward;
 
-import cc.carm.lib.configuration.core.source.ConfigurationProvider;
+import cc.carm.lib.configuration.source.ConfigurationHolder;
 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.lib.mineconfiguration.bukkit.source.BukkitConfigFactory;
+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.conf.RewardsConfig;
 import cc.carm.plugin.timereward.hooker.PAPIExpansion;
 import cc.carm.plugin.timereward.listener.UserListener;
 import cc.carm.plugin.timereward.manager.RewardManager;
@@ -15,12 +16,16 @@ import cc.carm.plugin.timereward.manager.UserManager;
 import cc.carm.plugin.timereward.storage.database.MySQLStorage;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Entity;
+
+import java.io.File;
 
 public class Main extends EasyPlugin {
     private static Main instance;
 
-    protected ConfigurationProvider<?> configProvider;
-    protected ConfigurationProvider<?> messageProvider;
+    protected ConfigurationHolder<?> configProvider;
+    protected ConfigurationHolder<?> messageProvider;
+    protected ConfigurationHolder<?> rewardProvider;
 
     protected MySQLStorage storage;
     protected UserManager userManager;
@@ -33,11 +38,14 @@ public class Main extends EasyPlugin {
     @Override
     protected void load() {
         log("加载插件配置文件...");
-        this.configProvider = MineConfiguration.from(this, "config.yml");
+        this.configProvider = BukkitConfigFactory.from(new File(getDataFolder(), "config.yml")).build();
         this.configProvider.initialize(PluginConfig.class);
 
-        this.messageProvider = MineConfiguration.from(this, "messages.yml");
+        this.messageProvider = BukkitConfigFactory.from(new File(getDataFolder(), "messages.yml")).build();
         this.messageProvider.initialize(PluginMessages.class);
+
+        this.rewardProvider = BukkitConfigFactory.from(new File(getDataFolder(), "rewards.yml")).build();
+        this.rewardProvider.initialize(RewardsConfig.class);
     }
 
     @Override
@@ -53,21 +61,21 @@ public class Main extends EasyPlugin {
         }
 
         log("加载用户管理器...");
-        this.userManager = new UserManager();
-        if (Bukkit.getOnlinePlayers().size() > 0) {
+        this.userManager = new UserManager(this);
+        if (!Bukkit.getOnlinePlayers().isEmpty()) {
             log("加载现有用户数据...");
-            this.userManager.loadAll();
+            this.userManager.loadOnline(Entity::getUniqueId);
         }
 
         log("加载奖励管理器...");
         this.rewardManager = new RewardManager(this);
-        debug("加载了 " + this.rewardManager.listRewards().size() + " 个奖励配置。");
+        log("成功加载了 " + this.rewardManager.listRewards().size() + " 个奖励配置。");
 
         log("注册监听器...");
         registerListener(new UserListener());
 
         log("注册指令...");
-        registerCommand("TimeReward", new TimeRewardCommand());
+        registerCommand("TimeReward", new MainCommand(this));
 
         if (MessageUtils.hasPlaceholderAPI()) {
             log("注册变量...");
@@ -131,12 +139,15 @@ public class Main extends EasyPlugin {
         return getInstance().storage;
     }
 
-    public ConfigurationProvider<?> getConfigProvider() {
+    public ConfigurationHolder<?> getConfigProvider() {
         return configProvider;
     }
 
-    public ConfigurationProvider<?> getMessageProvider() {
+    public ConfigurationHolder<?> getMessageProvider() {
         return messageProvider;
     }
 
+    public ConfigurationHolder<?> getRewardProvider() {
+        return rewardProvider;
+    }
 }

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

@@ -11,6 +11,9 @@ import java.util.List;
 
 public class TimeRewardAPI {
 
+    private TimeRewardAPI() {
+    }
+
     public static UserManager getUserManager() {
         return Main.getInstance().userManager;
     }
@@ -18,7 +21,7 @@ public class TimeRewardAPI {
     public static RewardManager getRewardManager() {
         return Main.getInstance().rewardManager;
     }
-    
+
     public static void executeCommands(Player player, List<String> commands) {
         if (commands == null || commands.isEmpty()) return;
         for (String command : commands) {

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.sendTo(sender);
+        } else {
+            PluginMessages.USAGE.USER.sendTo(sender);
+        }
+        return null;
+    }
+
+    @Override
+    public Void noPermission(CommandSender sender) {
+        PluginMessages.NO_PERMISSION.sendTo(sender);
+        return null;
+    }
+}

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

@@ -1,141 +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 (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);
-            } 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,68 @@
+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.data.RewardContents;
+import cc.carm.plugin.timereward.manager.RewardManager;
+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.sendTo(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.sendTo(sender);
+                return null;
+            }
+
+            // 为玩家发放奖励
+            manager.claimRewards(player, unclaimedRewards, false);
+        } else {
+
+            RewardContents reward = manager.getReward(rewardID);
+            if (reward == null) {
+                PluginMessages.NOT_EXISTS.sendTo(sender, rewardID);
+                return null;
+            }
+
+            if (!manager.isClaimable(player, reward)) {
+                PluginMessages.NOT_CLAIMABLE.sendTo(sender, reward.getDisplayName());
+                return null;
+            }
+
+            // 为玩家发放奖励
+            manager.claimReward(player, reward, false);
+        }
+        return null;
+    }
+
+    @Override
+    public boolean hasPermission(@NotNull CommandSender sender) {
+        return sender.hasPermission("TimeReward.claim");
+    }
+    
+}

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

@@ -0,0 +1,46 @@
+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.data.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.sendTo(sender, awards.size());
+
+        for (RewardContents reward : awards) {
+            if (reward.getPermission() != null) {
+                PluginMessages.LIST.OBJECT_PERM.prepare(
+                        reward.getRewardID(), reward.getDisplayName(), reward.getType().name(),
+                        reward.getTime(), reward.getPermission()
+                ).to(sender);
+            } else {
+                PluginMessages.LIST.OBJECT_PERM.prepare(
+                        reward.getRewardID(), reward.getDisplayName(),
+                        reward.getType().name(), reward.getTime()
+                ).to(sender);
+            }
+        }
+        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,45 @@
+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.sendTo(sender);
+
+        try {
+            Main.getInstance().getConfigProvider().reload();
+            Main.getInstance().getMessageProvider().reload();
+            Main.getInstance().getRewardProvider().reload();
+
+            PluginMessages.RELOAD.COMPLETE.prepare(
+                    System.currentTimeMillis() - s1,
+                    TimeRewardAPI.getRewardManager().listRewards().size()
+            ).to(sender);
+        } catch (Exception e) {
+            PluginMessages.RELOAD.ERROR.sendTo(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.data.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.sendTo(sender);
+            return null;
+        }
+
+        RewardContents contents = TimeRewardAPI.getRewardManager().getReward(args[0]);
+        if (contents == null) {
+            PluginMessages.NOT_EXISTS.sendTo(sender, args[0]);
+            return null;
+        }
+
+        PluginMessages.COMMAND_LIST.sendTo(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,64 @@
+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.data.IntervalType;
+import cc.carm.plugin.timereward.user.UserRewardData;
+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.time.format.DateTimeFormatter;
+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.sendTo(sender, args[0]);
+            return null;
+        }
+
+        UserRewardData user = TimeRewardAPI.getUserManager().get(player);
+        PluginMessages.USER_INFO.prepare(
+                player.getName(),
+                user.getOnlineDuration(IntervalType.DAILY).getSeconds(),
+                user.getOnlineDuration(IntervalType.WEEKLY).getSeconds(),
+                user.getOnlineDuration(IntervalType.MONTHLY).getSeconds(),
+                user.getOnlineDuration(IntervalType.TOTAL).getSeconds(),
+                user.getClaimedRewards().size()
+        ).to(sender);
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        user.getClaimedRewards().forEach((id, time) -> {
+            PluginMessages.USER_RECEIVED.sendTo(sender, id, time.format(formatter));
+        });
+
+        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

@@ -1,51 +1,37 @@
 package cc.carm.plugin.timereward.conf;
 
-import cc.carm.lib.configuration.core.ConfigurationRoot;
-import cc.carm.lib.configuration.core.annotation.HeaderComment;
-import cc.carm.lib.configuration.core.value.ConfigValue;
-import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
-import cc.carm.plugin.timereward.storage.RewardContents;
+import cc.carm.lib.configuration.Configuration;
+import cc.carm.lib.configuration.annotation.ConfigPath;
+import cc.carm.lib.configuration.annotation.HeaderComments;
+import cc.carm.lib.configuration.value.standard.ConfiguredValue;
 
-public class PluginConfig extends ConfigurationRoot {
+import java.time.DayOfWeek;
 
-    public static final ConfigValue<Boolean> DEBUG = ConfiguredValue.of(Boolean.class, false);
+@ConfigPath(root = true)
+public interface PluginConfig extends Configuration {
 
-    @HeaderComment({
+    ConfiguredValue<Boolean> DEBUG = ConfiguredValue.of(Boolean.class, false);
+
+    @HeaderComments({
             "统计数据设定",
             "该选项用于帮助开发者统计插件版本与使用情况，且绝不会影响性能与使用体验。",
             "当然，您也可以选择在这里关闭，或在plugins/bStats下的配置文件中关闭。"
     })
-    public static final ConfigValue<Boolean> METRICS = ConfiguredValue.of(Boolean.class, true);
+    ConfiguredValue<Boolean> METRICS = ConfiguredValue.of(Boolean.class, true);
 
-    @HeaderComment({
+    @HeaderComments({
             "检查更新设定",
             "该选项用于插件判断是否要检查更新，若您不希望插件检查更新并提示您，可以选择关闭。",
             "检查更新为异步操作，绝不会影响性能与使用体验。"
     })
-    public static final ConfigValue<Boolean> CHECK_UPDATE = ConfiguredValue.of(Boolean.class, true);
+    ConfiguredValue<Boolean> CHECK_UPDATE = ConfiguredValue.of(Boolean.class, true);
 
-    @HeaderComment("数据存储相关设定")
-    public static final class STORAGE extends ConfigurationRoot {
-    }
-
-    @HeaderComment({"奖励相关设定，包含以下设定：",
-            " [id] 配置键名即奖励ID，支持英文、数字与下划线。",
-            "  | 确定后请不要更改，因为该键值用于存储玩家是否领取的数据",
-            "  | 如果更改，原先领取过该奖励的玩家将会自动再领取一次！",
-            " [name] 奖励的显示名称，可以是任意字符串",
-            "  | 可以在 commands 中使用 %(name) 来获取该奖励的名称",
-            "  | 也可以使用变量 %TimeReward_reward_<奖励ID>% 来获取对应奖励的名称",
-            " [permission] 领取奖励时后台执行的指令",
-            "  | 支持PlaceholderAPI变量，指令中可以使用 %(name) 来获取该奖励的名称。",
-            " [commands] 该奖励领取权限，可以不设置。",
-            "  | 若为空则所有人都可以领取；若不为空，则需要拥有该权限的玩家才能领取。"
-    })
-    public static final ConfigValue<RewardContents.Group> REWARDS = ConfigValue.builder()
-            .asValue(RewardContents.Group.class).fromSection()
-            .parseValue((v, d) -> RewardContents.Group.parse(v))
-            .serializeValue(RewardContents.Group::serialize)
-            .defaults(RewardContents.Group.defaults())
-            .build();
+    @HeaderComments("周起始日，用于判断周度奖励的结算日期。")
+    ConfiguredValue<DayOfWeek> WEEK_FIRST_DAY = ConfiguredValue.builderOf(DayOfWeek.class)
+            .from(Integer.class)
+            .parse((v, d) -> DayOfWeek.of(d))
+            .serialize(DayOfWeek::getValue)
+            .defaults(DayOfWeek.MONDAY).build();
 
 }
 

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

@@ -1,125 +1,147 @@
 package cc.carm.plugin.timereward.conf;
 
-import cc.carm.lib.configuration.core.ConfigurationRoot;
-import cc.carm.lib.configuration.core.annotation.HeaderComment;
+
+import cc.carm.lib.configuration.Configuration;
+import cc.carm.lib.configuration.annotation.ConfigPath;
+import cc.carm.lib.configuration.annotation.HeaderComments;
 import cc.carm.lib.easyplugin.utils.ColorParser;
-import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageListBuilder;
-import cc.carm.lib.mineconfiguration.bukkit.builder.message.CraftMessageValueBuilder;
-import cc.carm.lib.mineconfiguration.bukkit.builder.title.TitleConfigBuilder;
 import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessage;
-import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessageList;
-import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredTitle;
 import de.themoep.minedown.MineDown;
 import me.clip.placeholderapi.PlaceholderAPI;
 import net.md_5.bungee.api.chat.BaseComponent;
 import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.BiFunction;
 
 
-@HeaderComment({
+@HeaderComments({
         "TimeReward 在线奖励插件的消息配置文件",
         "如特定的消息不需要任何提示，可直接留下单行空内容消息。",
-        "支持 支持 &+颜色代码(原版颜色)、§(#XXXXXX)(RGB颜色) 与 &<#XXXXXX>(前后标注RGB颜色渐变)。",
+        "支持 &+颜色代码(原版颜色)、&(#XXXXXX)(RGB颜色) 与 &<#XXXXXX>(前后标注RGB颜色渐变)。",
         " "
 })
-public class PluginMessages extends ConfigurationRoot {
+@ConfigPath(root = true)
+public interface PluginMessages extends Configuration {
 
-    public static @NotNull CraftMessageListBuilder<BaseComponent[]> list() {
-        return ConfiguredMessageList.create(getParser())
-                .whenSend((sender, message) -> message.forEach(m -> sender.spigot().sendMessage(m)));
-    }
-
-    public static @NotNull CraftMessageValueBuilder<BaseComponent[]> value() {
+    static ConfiguredMessage.@NotNull Builder<BaseComponent[]> list() {
         return ConfiguredMessage.create(getParser())
-                .whenSend((sender, message) -> sender.spigot().sendMessage(message));
+                .dispatcher((sender, message) -> {
+                    if (sender instanceof ConsoleCommandSender) {
+                        message.forEach(m -> sender.sendMessage(BaseComponent.toLegacyText(m)));
+                        return;
+                    }
+                    Player player = (Player) sender;
+                    message.forEach(m -> player.spigot().sendMessage(m));
+                });
     }
 
-    public static @NotNull TitleConfigBuilder title() {
-        return ConfiguredTitle.create().whenSend((player, in, stay, out, line1, line2) -> player.sendTitle(line1, line2, in, stay, out));
-    }
-
-    public static @NotNull BiFunction<CommandSender, String, BaseComponent[]> getParser() {
+    static @NotNull BiFunction<CommandSender, String, BaseComponent[]> getParser() {
         return (sender, message) -> {
             if (sender instanceof Player) message = PlaceholderAPI.setPlaceholders((Player) sender, message);
             return MineDown.parse(ColorParser.parse(message));
         };
     }
 
-    public static final ConfiguredMessageList<BaseComponent[]> NO_PERMISSION = list().defaults(
+    interface USAGE extends Configuration {
+
+        ConfiguredMessage<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();
+
+        ConfiguredMessage<BaseComponent[]> USER = list().defaults(
+                "&6&l在线奖励 &f您可以输入 &e/tr claim &6[奖励ID] &f领取对应奖励。"
+        ).build();
+    }
+
+    ConfiguredMessage<BaseComponent[]> NO_PERMISSION = list().defaults(
             "&c&l抱歉！&f但您没有足够的权限使用该指令。"
     ).build();
 
-    public static final ConfiguredMessageList<BaseComponent[]> NOT_PLAYER = list().defaults(
+    ConfiguredMessage<BaseComponent[]> NOT_PLAYER = list().defaults(
             "&f该指令请以玩家身份执行。"
     ).build();
 
-    public static final ConfiguredMessageList<BaseComponent[]> NOT_ONLINE = list().defaults(
+    ConfiguredMessage<BaseComponent[]> NOT_ONLINE = list().defaults(
             "&f玩家 &e%(player) &f并不在线。"
     ).params("player").build();
 
-    public static final ConfiguredMessageList<BaseComponent[]> NOT_EXISTS = list().defaults(
+    ConfiguredMessage<BaseComponent[]> NOT_EXISTS = list().defaults(
             "&f奖励 &e%(award) &f并不存在。"
     ).params("award").build();
 
-    public static final ConfiguredMessageList<BaseComponent[]> USER_INFO = list().defaults(
-            "&f玩家 &6%(player) &f已在线&e%(time)&f秒，共领取了 &e%(amount)&f 次奖励。",
-            "&7已领取的奖励列表如下：&r%(rewards) &7。"
-    ).params("player", "time", "amount", "rewards").build();
+    ConfiguredMessage<BaseComponent[]> NOT_CLAIMABLE = list().defaults(
+            "&c&l抱歉！&f但您暂时未满足领取奖励 &e%(award) &f的条件。"
+    ).params("award").build();
 
-    public static final ConfiguredMessageList<BaseComponent[]> COMMAND_LIST = list().defaults(
+    ConfiguredMessage<BaseComponent[]> NO_UNCLAIMED_REWARD = list().defaults(
+            "&f您暂时没有未领取的奖励。"
+    ).build();
+
+    ConfiguredMessage<BaseComponent[]> USER_INFO = list().defaults(
+            "&f玩家 &6%(player) &f的在线时间数据：",
+            "&f  本日在线 &e%(daily)&f秒，本周在线 &e%(weekly)&f秒，",
+            "&f  本月在线 &e%(monthly)&f秒，累积在线 &e%(total)&f秒。",
+            "&7已领取了 &f%(amount) &7种奖励，如下所示："
+    ).params("player", "daily", "weekly", "monthly", "total", "amount").build();
+
+    ConfiguredMessage<BaseComponent[]> USER_RECEIVED = list().defaults(
+            "&7- &e%(reward) &7于 &f%(time) &7领取"
+    ).params("reward", "time").build();
+
+    ConfiguredMessage<BaseComponent[]> COMMAND_LIST = list().defaults(
             "&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 listUserData",
-            "&8-&7 列出所有奖励与条件。",
-            "&8#&f test &6<奖励ID>",
-            "&8-&7 测试执行奖励配置的指令。"
-    ).build();
+    interface LIST extends Configuration {
 
-
-    public static class LIST extends ConfigurationRoot {
-
-        public static final ConfiguredMessageList<BaseComponent[]> HEADER = list().defaults(
+        ConfiguredMessage<BaseComponent[]> HEADER = list().defaults(
                 "&6&l在线奖励 &f奖励列表 &7(共%(amount)个)"
         ).params("amount").build();
 
-        public static final ConfiguredMessageList<BaseComponent[]> OBJECT = list().defaults(
+        ConfiguredMessage<BaseComponent[]> OBJECT = list().defaults(
                 "&8# &f%(id)",
                 "&8- &7奖励名称 &f%(name)",
+                "&8- &7奖励类型 &f%(type)",
                 "&8- &7领取时间 &f&e%(time)&f秒"
-        ).params("id", "name", "time").build();
+        ).params("id", "name", "type", "time").build();
 
-        public static final ConfiguredMessageList<BaseComponent[]> OBJECT_PERM = list().defaults(
+        ConfiguredMessage<BaseComponent[]> OBJECT_PERM = list().defaults(
                 "&8# &f%(id)",
                 "&8- &7奖励名称 &f%(name)",
+                "&8- &7奖励类型 &f%(type)",
                 "&8- &7领取时间 &f&e%(time)&f秒",
                 "&8- &7需要权限 &f%(permission)"
-        ).params("id", "name", "time", "permission").build();
+        ).params("id", "name", "type", "time", "permission").build();
 
     }
 
-    public static class RELOAD extends ConfigurationRoot {
+    interface RELOAD extends Configuration {
 
-        public static final ConfiguredMessageList<BaseComponent[]> START = list().defaults(
+        ConfiguredMessage<BaseComponent[]> START = list().defaults(
                 "&f正在重载配置文件..."
         ).build();
 
-        public static final ConfiguredMessageList<BaseComponent[]> ERROR = list().defaults(
+        ConfiguredMessage<BaseComponent[]> ERROR = list().defaults(
                 "&f配置文件&c重载失败！&f详细原因详见后台输出。"
         ).build();
 
-        public static final ConfiguredMessageList<BaseComponent[]> COMPLETE = list().defaults(
-                "&f配置文件重载完成，共耗时 &d%(time)&fms 。"
-        ).params("time").build();
+        ConfiguredMessage<BaseComponent[]> COMPLETE = list().defaults(
+                "&f配置文件重载完成！耗时 &d%(time)&fms，共加载了 &d%(count) &f个奖励配置。"
+        ).params("time", "count").build();
 
     }
 

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

@@ -0,0 +1,91 @@
+package cc.carm.plugin.timereward.conf;
+
+import cc.carm.lib.configuration.Configuration;
+import cc.carm.lib.configuration.annotation.ConfigPath;
+import cc.carm.lib.configuration.annotation.HeaderComments;
+import cc.carm.lib.configuration.source.section.ConfigureSection;
+import cc.carm.lib.configuration.value.standard.ConfiguredValue;
+import cc.carm.plugin.timereward.data.RewardContents;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@HeaderComments({"奖励相关设定，包含以下设定：",
+        " [id] 配置键名即奖励ID，支持英文、数字与下划线。",
+        "  | 确定后请不要更改，因为该键值用于存储玩家是否领取的数据",
+        "  | 如果更改，原先领取过该奖励的玩家将会自动再领取一次！",
+        " [type] 奖励的类型序号",
+        "  | “0”代表总计时间奖励，“1”代表每日在线奖励，",
+        "  | “2”代表每周在线奖励，“3”代表每月在线奖励。",
+        " [time] 奖励发放要求的时间(秒）",
+        " [loop] 奖励是否按循环时间发放",
+        "  | 可以填入 true 或 false",
+        "  | 若启用，则在规定的周期内，每满足指定时间一次则发放一次奖励",
+        "  | 如 类型为 “每周在线奖励” 时间为 “12小时” ",
+        "  | 则 代表 代表在这周内每12小时发放一次奖励，下一周时间重新开始算",
+        " [name] 奖励的显示名称，可以是任意字符串",
+        "  | 可以在 commands 中使用 %(name) 来获取该奖励的名称",
+        "  | 也可以使用变量 %TimeReward_reward_<奖励ID>% 来获取对应奖励的名称",
+        " [permission] 领取奖励时后台执行的指令",
+        "  | 支持PlaceholderAPI变量，指令中可以使用 %(name) 来获取该奖励的名称。",
+        " [commands] 该奖励领取权限，可以不设置。",
+        "  | 若为空则所有人都可以领取；若不为空，则需要拥有该权限的玩家才能领取。",
+        " [auto] 该奖励是否自动领取，可以不设置，默认为true。",
+        "  | 若关闭自动领取，则需要玩家手动输入/tr claim 领取奖励。",
+})
+@ConfigPath(root = true)
+public interface RewardsConfig extends Configuration {
+
+    ConfiguredValue<RewardGroup> REWARDS = ConfiguredValue.builderOf(RewardGroup.class)
+            .fromSection()
+            .parse((v, d) -> RewardGroup.parse(d))
+            .serialize(RewardGroup::serialize)
+            .defaults(RewardGroup.defaults())
+            .build();
+
+    static Map<String, RewardContents> getContents() {
+        return REWARDS.getNotNull().getContents();
+    }
+
+    final class RewardGroup {
+        final @NotNull Map<String, RewardContents> contents;
+
+        public RewardGroup(@NotNull Map<String, RewardContents> contents) {
+            this.contents = contents;
+        }
+
+        public @NotNull Map<String, RewardContents> getContents() {
+            return contents;
+        }
+
+        public Map<String, Object> serialize() {
+            Map<String, Object> map = new LinkedHashMap<>();
+            for (Map.Entry<String, RewardContents> entry : contents.entrySet()) {
+                map.put(entry.getKey(), entry.getValue().serialize());
+            }
+            return map;
+        }
+
+        public static RewardGroup parse(@NotNull ConfigureSection section) {
+            Map<String, RewardContents> rewards = new LinkedHashMap<>();
+            for (String rewardID : section.getKeys(false)) {
+                ConfigureSection rewardSection = section.getSection(rewardID);
+                if (rewardSection == null) continue;
+
+                RewardContents c = RewardContents.parse(rewardID, rewardSection);
+                if (c == null) continue;
+                rewards.put(rewardID, c);
+            }
+            return new RewardGroup(rewards);
+        }
+
+        public static RewardGroup defaults() {
+            Map<String, RewardContents> rewards = new LinkedHashMap<>();
+            rewards.put("example", RewardContents.defaults("example"));
+            return new RewardGroup(rewards);
+        }
+
+    }
+
+}

src/main/java/cc/carm/plugin/timereward/data/IntervalType.java

@@ -0,0 +1,101 @@
+package cc.carm.plugin.timereward.data;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+
+public enum IntervalType {
+
+    TOTAL(
+            0, time -> false,
+            (timeRecord, join) -> Duration.between(join, LocalDateTime.now()).plus(timeRecord.getTotalTime())
+    ),
+
+    DAILY(
+            1, time -> time.isBefore(TimeRecord.getTodayStart()),
+            (timeRecord, join) -> {
+                LocalDateTime now = LocalDateTime.now();
+                if (now.toLocalDate().isEqual(timeRecord.getDate())) {
+                    // 和记录还在同一天
+                    return Duration.between(join, now).plus(timeRecord.getDailyTime());
+                } else if (now.toLocalDate().isEqual(join.toLocalDate())) {
+                    // 加入的时间和现在的时间在同一天
+                    return Duration.between(join, now);
+                } else {
+                    // 加入的时间和现在的时间不在同一天
+                    return Duration.between(TimeRecord.getTodayStart(), now);
+                }
+            }
+    ),
+    WEEKLY(
+            2, time -> time.isBefore(TimeRecord.getThisWeekStart()),
+            (timeRecord, join) -> {
+                LocalDateTime now = LocalDateTime.now();
+                if (TimeRecord.isSameWeek(timeRecord.getDate(), now)) {
+                    return Duration.between(join, now).plus(timeRecord.getWeeklyTime());
+                } else if (TimeRecord.isSameWeek(join, now)) {
+                    return Duration.between(join, now);
+                } else {
+                    return Duration.between(TimeRecord.getThisWeekStart(), now);
+                }
+            }
+    ),
+
+    MONTHLY(
+            3, time -> time.isBefore(TimeRecord.getThisMonthStart()),
+            (timeRecord, join) -> {
+                LocalDateTime now = LocalDateTime.now();
+                if (TimeRecord.isSameMonth(timeRecord.getDate(), now.toLocalDate())) {
+                    return Duration.between(join, now).plus(timeRecord.getMonthlyTime());
+                } else if (TimeRecord.isSameMonth(join.toLocalDate(), now.toLocalDate())) {
+                    return Duration.between(join, now);
+                } else {
+                    return Duration.between(TimeRecord.getThisMonthStart(), now);
+                }
+            }
+    );
+
+    private final int id;
+    private final @NotNull Predicate<LocalDateTime> periodChangePredicate;
+    private final @NotNull BiFunction<TimeRecord, LocalDateTime, Duration> calculator;
+
+    IntervalType(int id,
+                 @NotNull Predicate<LocalDateTime> periodChangePredicate,
+                 @NotNull BiFunction<TimeRecord, LocalDateTime, Duration> calculator) {
+        this.id = id;
+        this.periodChangePredicate = periodChangePredicate;
+        this.calculator = calculator;
+    }
+
+    public int getID() {
+        return id;
+    }
+
+    public @NotNull BiFunction<TimeRecord, LocalDateTime, Duration> getCalculator() {
+        return calculator;
+    }
+
+    public @NotNull Predicate<LocalDateTime> getPreiodChangePredicate() {
+        return periodChangePredicate;
+    }
+
+    public Duration calculate(@NotNull TimeRecord timeRecord, @NotNull LocalDateTime joinTime) {
+        return calculator.apply(timeRecord, joinTime);
+    }
+
+    public boolean isPeriodChanged(@NotNull LocalDateTime claimedDate) {
+        return periodChangePredicate.test(claimedDate);
+    }
+
+    public static IntervalType parse(String input) {
+        if (input == null) return null;
+        else return Arrays.stream(values())
+                .filter(t -> t.name().equalsIgnoreCase(input) || Integer.toString(t.id).equals(input))
+                .findFirst().orElse(null);
+    }
+
+}

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

@@ -1,6 +1,6 @@
-package cc.carm.plugin.timereward.storage;
+package cc.carm.plugin.timereward.data;
 
-import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
+import cc.carm.lib.configuration.source.section.ConfigureSection;
 import cc.carm.lib.easyplugin.utils.ColorParser;
 import cc.carm.plugin.timereward.Main;
 import org.bukkit.entity.Player;
@@ -13,26 +13,41 @@ public class RewardContents {
 
     public final @NotNull String id;
 
+    public final @NotNull IntervalType type;
     private final long time;
+    private final boolean loop;
+
     private final @Nullable String name;
     private final @Nullable String permission;
     private final @NotNull List<String> commands;
 
+    private final boolean auto;
 
-    public RewardContents(@NotNull String id, long time,
+    public RewardContents(@NotNull String id, @NotNull IntervalType type, long time, boolean loop,
                           @Nullable String name, @Nullable String permission,
-                          @NotNull List<String> commands) {
+                          @NotNull List<String> commands, boolean auto) {
         this.id = id;
+        this.type = type;
         this.time = time;
+        this.loop = loop;
         this.name = name;
         this.permission = permission;
         this.commands = commands;
+        this.auto = auto;
     }
 
-    public String getRewardID() {
+    public @NotNull String getRewardID() {
         return id;
     }
 
+    public @NotNull IntervalType getType() {
+        return type;
+    }
+
+    public boolean isLoop() {
+        return loop;
+    }
+
     public long getTime() {
         return time;
     }
@@ -53,43 +68,52 @@ public class RewardContents {
         return commands;
     }
 
-    public boolean checkPermission(@NotNull Player player) {
-        return permission == null || player.hasPermission(permission);
+    public boolean isAutoClaimed() {
+        return auto;
     }
 
-    public boolean isTimeEnough(long requireSeconds) {
-        return requireSeconds >= getTime();
+    public boolean checkPermission(@NotNull Player player) {
+        return permission == null || player.hasPermission(permission);
     }
 
     public Map<String, Object> serialize() {
         Map<String, Object> map = new LinkedHashMap<>();
         map.put("time", getTime());
+        map.put("type", getType().getID());
+        map.put("loop", isLoop());
         if (getName() != null) map.put("name", getName());
         if (getPermission() != null) map.put("permission", getPermission());
         map.put("commands", getCommands());
+        map.put("auto", auto);
         return map;
     }
 
-    public static RewardContents parse(String id, @NotNull ConfigurationWrapper<?> section) {
+    public static RewardContents parse(String id, @NotNull ConfigureSection section) {
         long time = section.getLong("time", -1L);
         if (time <= 0) {
             Main.severe("奖励 " + id + " 的时间配置错误，请检查配置文件。");
             return null;
         }
 
+        IntervalType intervalType = IntervalType.parse(Objects.toString(section.get("type")));
+        if (intervalType == null) {
+            Main.severe("奖励 " + id + " 的类型配置错误，请检查配置文件。");
+            return null;
+        }
+
         return new RewardContents(
-                id, time,
-                section.getString("name"),
-                section.getString("permission"),
-                section.getStringList("commands")
+                id, intervalType, time, section.getBoolean("loop", false),
+                section.getString("name"), section.getString("permission"),
+                section.getStringList("commands"), section.getBoolean("auto", false)
         );
     }
 
     public static RewardContents defaults(String id) {
         return new RewardContents(
-                id, 7200,
+                id, IntervalType.TOTAL, 7200, false,
                 "&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
         );
     }
 
@@ -106,44 +130,5 @@ public class RewardContents {
         return Objects.hash(id);
     }
 
-    public static final class Group {
-        final @NotNull Map<String, RewardContents> contents;
-
-        public Group(@NotNull Map<String, RewardContents> contents) {
-            this.contents = contents;
-        }
-
-        public @NotNull Map<String, RewardContents> getContents() {
-            return contents;
-        }
-
-        public Map<String, Object> serialize() {
-            Map<String, Object> map = new LinkedHashMap<>();
-            for (Map.Entry<String, RewardContents> entry : contents.entrySet()) {
-                map.put(entry.getKey(), entry.getValue().serialize());
-            }
-            return map;
-        }
-
-        public static Group parse(@NotNull ConfigurationWrapper<?> section) {
-            Map<String, RewardContents> rewards = new LinkedHashMap<>();
-            for (String rewardID : section.getKeys(false)) {
-                ConfigurationWrapper<?> rewardSection = section.getConfigurationSection(rewardID);
-                if (rewardSection == null) continue;
-
-                RewardContents c = RewardContents.parse(rewardID, rewardSection);
-                if (c == null) continue;
-                rewards.put(rewardID, c);
-            }
-            return new Group(rewards);
-        }
-
-        public static Group defaults() {
-            Map<String, RewardContents> rewards = new LinkedHashMap<>();
-            rewards.put("example", RewardContents.defaults("example"));
-            return new Group(rewards);
-        }
-
-    }
 
 }

src/main/java/cc/carm/plugin/timereward/data/TimeRecord.java

@@ -0,0 +1,113 @@
+package cc.carm.plugin.timereward.data;
+
+import cc.carm.plugin.timereward.conf.PluginConfig;
+import org.jetbrains.annotations.NotNull;
+
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalField;
+import java.time.temporal.WeekFields;
+
+public class TimeRecord {
+
+    public static TimeRecord empty() {
+        return new TimeRecord(LocalDate.now(), 0, 0, 0, 0);
+    }
+
+
+    protected final @NotNull LocalDate date;
+
+    protected final @NotNull Duration daily;
+    protected final @NotNull Duration weekly;
+    protected final @NotNull Duration monthly;
+
+    protected final @NotNull Duration total;
+
+    public TimeRecord(@NotNull LocalDate date, long daily, long weekly, long monthly, long total) {
+        this(date,
+                Duration.ofSeconds(daily), Duration.ofSeconds(weekly),
+                Duration.ofSeconds(monthly), Duration.ofSeconds(total)
+        );
+    }
+
+    public TimeRecord(@NotNull LocalDate date,
+                      @NotNull Duration daily, @NotNull Duration weekly,
+                      @NotNull Duration monthly, @NotNull Duration total) {
+        this.date = date;
+        this.daily = daily;
+        this.weekly = weekly;
+        this.monthly = monthly;
+        this.total = total;
+    }
+
+    public @NotNull LocalDate getDate() {
+        return date;
+    }
+
+    public @NotNull Duration getDailyTime() {
+        return daily;
+    }
+
+    public @NotNull Duration getWeeklyTime() {
+        return weekly;
+    }
+
+    public @NotNull Duration getMonthlyTime() {
+        return monthly;
+    }
+
+    public @NotNull Duration getTotalTime() {
+        return total;
+    }
+
+    public boolean isDayUpdated() {
+        return !LocalDate.now().equals(getDate());
+    }
+
+    public boolean isWeekUpdated() {
+        if (!isDayUpdated()) return false; // Same day always same week
+        return !isSameWeek(LocalDate.now(), getDate());
+    }
+
+    public boolean isMonthUpdated() {
+        if (!isDayUpdated()) return false; // Same day always same month
+
+        // Predicate current month is after the month of the date
+        return LocalDate.now().getMonth().compareTo(getDate().getMonth()) > 0;
+    }
+
+    public static boolean isSameWeek(Temporal a, Temporal b) {
+        TemporalField woy = WeekFields.of(PluginConfig.WEEK_FIRST_DAY.getNotNull(), 4).weekOfWeekBasedYear();
+        return a.get(woy) == b.get(woy);
+    }
+
+    public static boolean isSameMonth(LocalDate a, LocalDate b) {
+        return a.getMonth().equals(b.getMonth());
+    }
+
+    public static LocalDateTime getTodayStart() {
+        return LocalDate.now().atTime(0, 0);
+    }
+
+    public static LocalDateTime getThisWeekStart() {
+        TemporalField woy = WeekFields.of(PluginConfig.WEEK_FIRST_DAY.getNotNull(), 4).weekOfWeekBasedYear();
+        return LocalDate.now().with(woy, 1).atTime(0, 0);
+    }
+
+    public static LocalDateTime getThisMonthStart() {
+        return LocalDate.now().withDayOfMonth(1).atTime(0, 0);
+    }
+
+    @Override
+    public String toString() {
+        return "TimeRecord{" +
+                "date=" + date +
+                ", daily=" + daily +
+                ", weekly=" + weekly +
+                ", monthly=" + monthly +
+                ", total=" + total +
+                '}';
+    }
+}

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

@@ -3,8 +3,9 @@ package cc.carm.plugin.timereward.hooker;
 import cc.carm.lib.easyplugin.papi.EasyPlaceholder;
 import cc.carm.lib.easyplugin.papi.handler.PlaceholderHandler;
 import cc.carm.plugin.timereward.TimeRewardAPI;
-import cc.carm.plugin.timereward.storage.RewardContents;
-import cc.carm.plugin.timereward.storage.UserData;
+import cc.carm.plugin.timereward.data.IntervalType;
+import cc.carm.plugin.timereward.data.RewardContents;
+import cc.carm.plugin.timereward.user.UserRewardData;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
@@ -18,26 +19,77 @@ public class PAPIExpansion extends EasyPlaceholder {
     public PAPIExpansion(@NotNull JavaPlugin plugin, @NotNull String rootIdentifier) {
         super(plugin, rootIdentifier);
 
-        handle("time", userHandler(UserData::getAllSeconds));
+        handle("seconds", userHandler((user, args) -> {
+            if (args.length < 1) return "请填写时间类型";
+            IntervalType type = IntervalType.parse(args[0]);
+
+            if (type == null) return "时间类型不存在";
+
+            return user.getOnlineDuration(type).getSeconds();
+        }), Collections.singletonList("<时间类型>"), "time");
+
+        handle("minutes", userHandler((user, args) -> {
+            if (args.length < 1) return "请填写时间类型";
+            IntervalType type = IntervalType.parse(args[0]);
+
+            if (type == null) return "时间类型不存在";
+
+            return user.getOnlineDuration(type).toMinutes();
+        }), Collections.singletonList("<时间类型>"));
+
+        handle("hours", userHandler((user, args) -> {
+            if (args.length < 1) return "请填写时间类型";
+            IntervalType type = IntervalType.parse(args[0]);
+
+            if (type == null) return "时间类型不存在";
+
+            return user.getOnlineDuration(type).toHours();
+        }), Collections.singletonList("<时间类型>"));
+
+        handle("days", userHandler((user, args) -> {
+            if (args.length < 1) return "请填写时间类型";
+            IntervalType type = IntervalType.parse(args[0]);
+
+            if (type == null) return "时间类型不存在";
+
+            return user.getOnlineDuration(type).toDays();
+        }), Collections.singletonList("<时间类型>"));
+
         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]);
+
+            RewardContents reward = TimeRewardAPI.getRewardManager().getReward(args[0]);
+            if (reward == null) return "奖励不存在";
+
+            return user.isClaimed(reward);
         }), 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());
     }
 
-    protected <R> PlaceholderHandler userHandler(Function<UserData, R> userFunction) {
+    protected <R> PlaceholderHandler userHandler(Function<UserRewardData, R> userFunction) {
         return userHandler((user, args) -> userFunction.apply(user));
     }
 
-    protected <R> PlaceholderHandler userHandler(BiFunction<UserData, String[], R> userFunction) {
+    protected <R> PlaceholderHandler userHandler(BiFunction<UserRewardData, String[], R> userFunction) {
         return (player, args) -> {
             if (player == null || !player.isOnline()) return "加载中...";
-            return userFunction.apply(TimeRewardAPI.getUserManager().getData((Player) player), args);
+            return userFunction.apply(TimeRewardAPI.getUserManager().get((Player) player), args);
         };
     }
 

src/main/java/cc/carm/plugin/timereward/listener/UserListener.java

@@ -2,6 +2,8 @@ package cc.carm.plugin.timereward.listener;
 
 import cc.carm.plugin.timereward.Main;
 import cc.carm.plugin.timereward.TimeRewardAPI;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
@@ -11,12 +13,21 @@ public class UserListener implements Listener {
 
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
-        Main.getInstance().getScheduler().runAsync(() -> TimeRewardAPI.getUserManager().loadData(event.getPlayer().getUniqueId()));
+        TimeRewardAPI.getUserManager().load(event.getPlayer().getUniqueId(), true).thenAccept(data -> {
+            Player player = Bukkit.getPlayer(data.getUserUUID());
+            if (player == null || !player.isOnline()) {
+                TimeRewardAPI.getUserManager().unload(data.getUserUUID());
+            } // 不在线自动卸载
+        }).exceptionally(ex -> {
+            Main.severe("加载用户在线时长数据失败: " + event.getPlayer().getName());
+            ex.printStackTrace();
+            return null;
+        });
     }
 
     @EventHandler
     public void onQuit(PlayerQuitEvent event) {
-        Main.getInstance().getScheduler().runAsync(() -> TimeRewardAPI.getUserManager().unloadData(event.getPlayer().getUniqueId()));
+        TimeRewardAPI.getUserManager().unload(event.getPlayer().getUniqueId());
     }
 
 }

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

@@ -3,9 +3,10 @@ package cc.carm.plugin.timereward.manager;
 import cc.carm.lib.easyplugin.utils.MessageUtils;
 import cc.carm.plugin.timereward.Main;
 import cc.carm.plugin.timereward.TimeRewardAPI;
-import cc.carm.plugin.timereward.conf.PluginConfig;
-import cc.carm.plugin.timereward.storage.RewardContents;
-import cc.carm.plugin.timereward.storage.UserData;
+import cc.carm.plugin.timereward.conf.RewardsConfig;
+import cc.carm.plugin.timereward.data.IntervalType;
+import cc.carm.plugin.timereward.data.RewardContents;
+import cc.carm.plugin.timereward.user.UserRewardData;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -13,9 +14,10 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 public class RewardManager {
@@ -29,13 +31,13 @@ public class RewardManager {
                 if (Bukkit.getOnlinePlayers().isEmpty()) return;
 
                 for (Player player : Bukkit.getOnlinePlayers()) {
-                    List<RewardContents> unclaimedRewards = getUnclaimedRewards(player);
-                    if (unclaimedRewards.isEmpty()) continue;
+                    List<RewardContents> rewards = getUnclaimedRewards(player).stream()
+                            .filter(RewardContents::isAutoClaimed)
+                            .collect(Collectors.toList());
+                    if (rewards.isEmpty()) continue;
 
-                    main.getScheduler().run(() -> unclaimedRewards.forEach(
-                            // 在同步进程中为玩家发放奖励
-                            unclaimedReward -> claimReward(player, unclaimedReward, false)
-                    ));
+                    //为玩家发放奖励
+                    claimRewards(player, rewards, true); // 二次检查避免重复发奖
                 }
             }
         };
@@ -48,7 +50,7 @@ public class RewardManager {
     }
 
     protected Map<String, RewardContents> getRewards() {
-        return PluginConfig.REWARDS.getNotNull().getContents();
+        return RewardsConfig.getContents();
     }
 
     public @Nullable RewardContents getReward(String rewardID) {
@@ -56,28 +58,73 @@ public class RewardManager {
     }
 
     public Map<String, RewardContents> listRewards() {
-        return Collections.unmodifiableMap(PluginConfig.REWARDS.getNotNull().getContents());
+        return Collections.unmodifiableMap(RewardsConfig.getContents());
     }
 
     @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 -> !user.isClaimed(reward.getRewardID())) // 未曾领取
-                .filter(reward -> reward.checkPermission(player)) // 满足权限
+                .filter(reward -> isClaimable(player, reward))
                 .collect(Collectors.toList());
     }
 
-    public boolean claimReward(Player player, RewardContents reward, boolean check) {
-        UserData user = TimeRewardAPI.getUserManager().getData(player);
-        if (check && user.isClaimed(reward.getRewardID())) return false;
-        if (check && !reward.isTimeEnough(user.getAllSeconds())) return false;
-        if (check && !reward.checkPermission(player)) return false;
+    public boolean isClaimable(Player player, RewardContents reward) {
+        if (!reward.checkPermission(player)) return false; // 满足权限
 
-        user.addClaimedReward(reward.getRewardID());
-        executeCommand(player, reward);
-        return true;
+        UserRewardData user = TimeRewardAPI.getUserManager().get(player);
+        IntervalType intervalType = reward.getType();
+        LocalDateTime lastClaimed = user.getClaimedDate(reward);
+
+        if (reward.isLoop()) { // 循环奖励
+            if (lastClaimed == null || intervalType.isPeriodChanged(lastClaimed)) {
+                // 无上次领取记录或上次领取的时间不在一个周期内，则直接判断时间是否足够一次循环领取的时间
+                return user.getOnlineDuration(intervalType).getSeconds() > reward.getTime();
+            } else {
+                // 有上次领取记录，且在同一周期内，则直接判断相隔时间是否满足一个周期
+                return Duration.between(lastClaimed, LocalDateTime.now()).getSeconds() > reward.getTime();
+            }
+        } else { // 非循环奖励
+            if (lastClaimed == null || intervalType.isPeriodChanged(lastClaimed)) { // 无上次领取记录，则直接判断时间是否足够领取的时间
+                return user.getOnlineDuration(intervalType).getSeconds() > reward.getTime();
+            } else return false; // 有同一周期内的领取记录，则玩家不得重复领取了
+        }
+    }
+
+    public CompletableFuture<Boolean> claimReward(Player player, RewardContents reward, boolean check) {
+        return claimRewards(player, Collections.singletonList(reward), check);
+    }
+
+    public CompletableFuture<Boolean> claimRewards(Player player, Collection<RewardContents> rewards, boolean check) {
+        Set<RewardContents> contents = rewards.stream()
+                .filter(r -> !check || isClaimable(player, r))
+                .collect(Collectors.toSet());
+
+        Map<String, LocalDateTime> map = new LinkedHashMap<>();
+        contents.forEach(reward -> map.put(reward.getRewardID(), LocalDateTime.now()));
+
+        return Main.getInstance().supplyAsync(() -> {
+            try {
+
+                UserRewardData user = TimeRewardAPI.getUserManager().get(player);
+                Main.getStorage().addClaimedData(player.getUniqueId(), map);
+                contents.forEach(user::updateClaimed);
+
+                return true;
+            } catch (Exception ex) {
+                Main.severe("为玩家 " + player.getName() + " 领取奖励时发生错误。");
+                ex.printStackTrace();
+                return false;
+            }
+        }).thenCompose(result -> {
+            if (result) {
+                return Main.getInstance().supplySync(() -> {
+                    rewards.forEach(reward -> executeCommand(player, reward));
+                    return true;
+                });
+            } else {
+                return CompletableFuture.completedFuture(false);
+            }
+        });
     }
 
     public void executeCommand(Player player, RewardContents reward) {
@@ -88,8 +135,4 @@ public class RewardManager {
         TimeRewardAPI.executeCommands(player, finalCommands); // 执行命令
     }
 
-    public boolean claimReward(Player player, RewardContents reward) {
-        return claimReward(player, reward, true);
-    }
-
 }

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

@@ -1,132 +1,64 @@
 package cc.carm.plugin.timereward.manager;
 
+import cc.carm.lib.easyplugin.EasyPlugin;
+import cc.carm.lib.easyplugin.user.UserDataManager;
 import cc.carm.plugin.timereward.Main;
-import cc.carm.plugin.timereward.util.DataTaskRunner;
-import cc.carm.plugin.timereward.storage.UserData;
+import cc.carm.plugin.timereward.data.IntervalType;
+import cc.carm.plugin.timereward.data.TimeRecord;
 import cc.carm.plugin.timereward.storage.database.MySQLStorage;
-import com.google.common.collect.ImmutableMap;
-import org.bukkit.Bukkit;
+import cc.carm.plugin.timereward.user.LockedRewardData;
+import cc.carm.plugin.timereward.user.UserRewardData;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.Unmodifiable;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.util.LinkedHashMap;
 import java.util.UUID;
 
-public class UserManager {
+public class UserManager extends UserDataManager<UUID, UserRewardData> {
 
-    private final HashMap<UUID, UserData> userDataMap;
-
-    public UserManager() {
-        this.userDataMap = new HashMap<>();
+    public UserManager(@NotNull EasyPlugin plugin) {
+        super(plugin);
     }
 
-    @NotNull
-    public UserData readData(UUID userUUID) {
-        try {
-            long start = System.currentTimeMillis();
-            MySQLStorage storage = Main.getStorage();
-
-            UserData data = storage.loadData(userUUID);
-
-            if (data == null) {
-                Main.debugging("当前还不存在玩家 " + userUUID + " 的数据，视作新档。");
-                return new UserData(userUUID);
-            }
-
-            Main.debugging("读取 " + userUUID + " 的用户数据完成， 耗时 " + (System.currentTimeMillis() - start) + "ms。");
-
-            return data;
-        } catch (Exception e) {
-            Main.severe("无法正常读取玩家数据，玩家操作将不会被保存，请检查数据配置！");
-            Main.severe("Could not loadData user's data, please check the data conf!");
-            e.printStackTrace();
-            return new UserData(userUUID);
-        }
+    public @NotNull UserRewardData get(Player player) {
+        return get(player.getUniqueId());
     }
 
-    public void saveData(UserData data) {
-        try {
-            long start = System.currentTimeMillis();
-            MySQLStorage storage = Main.getStorage();
-
-            Main.debugging("正在保存 " + data.getUserUUID() + " 的用户数据...");
-            storage.saveClaimedData(data.getUserUUID(), data.getClaimedRewards());
-            storage.savePlayTime(data.getUserUUID(), data.getAllSeconds());
-            Main.debugging("保存 " + data.getUserUUID() + " 的用户数据完成，耗时 " + (System.currentTimeMillis() - start) + "ms。");
-
-        } catch (Exception e) {
-            Main.severe("无法正常保存玩家数据，请检查数据配置！");
-            Main.severe("Could not saveData user's data, please check the data conf!");
-            e.printStackTrace();
-        }
+    @Override
+    protected @Nullable UserRewardData loadData(@NotNull UUID key) throws Exception {
+        return Main.getStorage().loadData(key);
     }
 
-    public void loadData(UUID userUUID) {
-        getUserDataMap().put(userUUID, readData(userUUID));
+    @Override
+    public void saveData(@NotNull UserRewardData data) throws Exception {
+        if (data instanceof LockedRewardData) return; // 不保存
+
+        MySQLStorage storage = Main.getStorage();
+
+        @Nullable UserRewardData current = loadData(data.getUserUUID()); // 考虑读取时间差，优先利用数据库的当前数据计算
+        TimeRecord oldRecord = current == null ? data.getTimeRecord() : current.getTimeRecord();
+
+        // 只需要保存游玩时间数据，领取数据已经实时保存了
+        Duration daily = IntervalType.DAILY.calculate(oldRecord, data.getJoinTime());
+        Duration weekly = IntervalType.WEEKLY.calculate(oldRecord, data.getJoinTime());
+        Duration monthly = IntervalType.MONTHLY.calculate(oldRecord, data.getJoinTime());
+        Duration total = IntervalType.TOTAL.calculate(oldRecord, data.getJoinTime());
+        TimeRecord newRecord = new TimeRecord(LocalDate.now(), daily, weekly, monthly, total);
+
+        storage.savePlayTime(data.getUserUUID(), newRecord);
     }
 
-    public void unloadData(UUID userUUID) {
-        unloadData(userUUID, true);
+    @Override
+    public @NotNull UserRewardData emptyUser(@NotNull UUID key) {
+        return new UserRewardData(key, TimeRecord.empty(), new LinkedHashMap<>());
     }
 
-    public void unloadData(UUID userUUID, boolean save) {
-        UserData data = getData(userUUID);
-        if (data == null) return;
-        if (save) saveData(data);
-        getUserDataMap().remove(userUUID);
-    }
-
-    public void loadAll() {
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            if (getUserDataMap().containsKey(player.getUniqueId())) continue;
-            loadData(player.getUniqueId());
-        }
-    }
-
-    public void saveAll() {
-        getUserDataMap().values().forEach(this::saveData);
-    }
-
-    public void unloadAll(boolean save) {
-        if (save) saveAll();
-        getUserDataMap().clear();
-    }
-
-    @Nullable
-    public UserData getData(UUID userUUID) {
-        return getUserDataMap().get(userUUID);
-    }
-
-    @NotNull
-    public UserData getData(Player player) {
-        return getUserDataMap().get(player.getUniqueId());
-    }
-
-    public void editData(@NotNull DataTaskRunner task) {
-        try {
-            task.run(Main.getStorage());
-        } catch (Exception exception) {
-            Main.severe("无法正常更改玩家数据，请检查数据配置！");
-            Main.severe("Could not edit user's data, please check the data conf!");
-            exception.printStackTrace();
-        }
-    }
-
-    public void editDataAsync(@NotNull DataTaskRunner task) {
-        Main.getInstance().getScheduler().runAsync(() -> editData(task));
-    }
-
-    @NotNull
-    @Unmodifiable
-    public Map<UUID, UserData> listUserData() {
-        return ImmutableMap.copyOf(getUserDataMap());
-    }
-
-    protected @NotNull HashMap<UUID, UserData> getUserDataMap() {
-        return userDataMap;
+    @Override
+    public @NotNull UserRewardData errorUser(@NotNull UUID key) {
+        return new LockedRewardData(key); // 避免影响数据存储
     }
 
 }

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

@@ -1,86 +0,0 @@
-package cc.carm.plugin.timereward.storage;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 用户奖励数据，用于存储用户的奖励的领取情况。
- */
-public class UserData {
-
-    protected final @NotNull UUID userUUID;
-    private final Set<@NotNull String> claimedRewards; // 记录已领取的奖励ID
-    private final long storedSeconds; // 记录已经游玩的时间
-    private final long joinMillis; // 记录本次加入的时间
-
-    public UserData(@NotNull UUID userUUID) {
-        this(userUUID, 0, new LinkedHashSet<>());
-    }
-
-    public UserData(@NotNull UUID userUUID, long storedSeconds,
-                    Set<@NotNull String> claimedRewards) {
-        this(userUUID, storedSeconds, claimedRewards, System.currentTimeMillis());
-    }
-
-    public UserData(@NotNull UUID userUUID, long storedSeconds,
-                    Set<@NotNull String> claimedRewards, long joinMillis) {
-        this.userUUID = userUUID;
-        this.storedSeconds = storedSeconds;
-        this.claimedRewards = claimedRewards;
-        this.joinMillis = joinMillis;
-    }
-
-    public @NotNull UUID getUserUUID() {
-        return userUUID;
-    }
-
-    public long getStoredSeconds() {
-        return storedSeconds;
-    }
-
-    /**
-     * 得到本次加入游戏的时间
-     *
-     * @return 本次加入游戏时间
-     */
-    public long getJoinMillis() {
-        return joinMillis;
-    }
-
-    /**
-     * 获取玩家本次加入服务器的时间 ，即为 当前时间-加入时间。
-     *
-     * @return 玩家本次加入服务器的时间
-     */
-    public long getCurrentSeconds() {
-        return TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - getJoinMillis());
-    }
-
-    /**
-     * 获取 玩家在数据库中已经游玩的时间 + (当前时间-加入时间)
-     *
-     * @return 之前游玩的世界与本次游玩时间之和
-     */
-    public long getAllSeconds() {
-        return getStoredSeconds() + getCurrentSeconds();
-    }
-
-    public Set<String> getClaimedRewards() {
-        return claimedRewards;
-    }
-
-    public boolean isClaimed(@NotNull String rewardId) {
-        return this.claimedRewards.contains(rewardId);
-    }
-
-    public boolean addClaimedReward(@NotNull String rewardId) {
-        if (isClaimed(rewardId)) return false; // 已经领取过了
-        this.claimedRewards.add(rewardId);
-        return true;
-    }
-
-}

src/main/java/cc/carm/plugin/timereward/storage/database/DatabaseConfig.java

@@ -1,31 +1,30 @@
 package cc.carm.plugin.timereward.storage.database;
 
-import cc.carm.lib.configuration.core.ConfigurationRoot;
-import cc.carm.lib.configuration.core.annotation.ConfigPath;
-import cc.carm.lib.configuration.core.annotation.HeaderComment;
-import cc.carm.lib.configuration.core.value.ConfigValue;
-import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
+import cc.carm.lib.configuration.Configuration;
+import cc.carm.lib.configuration.annotation.ConfigPath;
+import cc.carm.lib.configuration.annotation.HeaderComments;
+import cc.carm.lib.configuration.value.standard.ConfiguredValue;
 
-@HeaderComment("数据库相关设定")
-@ConfigPath("storage.database")
-public class DatabaseConfig extends ConfigurationRoot {
+@HeaderComments("数据库相关设定")
+@ConfigPath(value = "storage.database", root = true)
+public class DatabaseConfig implements Configuration {
 
     @ConfigPath("driver")
-    protected static final ConfigValue<String> DRIVER_NAME = ConfiguredValue.of(
+    protected static final ConfiguredValue<String> DRIVER_NAME = ConfiguredValue.of(
             String.class, "com.mysql.jdbc.Driver"
     );
 
-    protected static final ConfigValue<String> HOST = ConfiguredValue.of(String.class, "127.0.0.1");
-    protected static final ConfigValue<Integer> PORT = ConfiguredValue.of(Integer.class, 3306);
-    protected static final ConfigValue<String> DATABASE = ConfiguredValue.of(String.class, "minecraft");
-    protected static final ConfigValue<String> USERNAME = ConfiguredValue.of(String.class, "root");
-    protected static final ConfigValue<String> PASSWORD = ConfiguredValue.of(String.class, "password");
-    protected static final ConfigValue<String> EXTRA = ConfiguredValue.of(String.class, "?useSSL=false");
+    protected static final ConfiguredValue<String> HOST = ConfiguredValue.of(String.class, "127.0.0.1");
+    protected static final ConfiguredValue<Integer> PORT = ConfiguredValue.of(Integer.class, 3306);
+    protected static final ConfiguredValue<String> DATABASE = ConfiguredValue.of(String.class, "minecraft");
+    protected static final ConfiguredValue<String> USERNAME = ConfiguredValue.of(String.class, "root");
+    protected static final ConfiguredValue<String> PASSWORD = ConfiguredValue.of(String.class, "password");
+    protected static final ConfiguredValue<String> EXTRA = ConfiguredValue.of(String.class, "?useSSL=false");
 
-    @HeaderComment("插件相关表的名称")
-    public static final class TABLES extends ConfigurationRoot {
-        public static final ConfigValue<String> USER_TIMES = ConfiguredValue.of(String.class, "tr_user_times");
-        public static final ConfigValue<String> USER_CLAIMED = ConfiguredValue.of(String.class, "tr_user_claimed");
+    @HeaderComments("插件相关表的名称")
+    public static final class TABLES implements Configuration {
+        public static final ConfiguredValue<String> USER_TIMES = ConfiguredValue.of(String.class, "tr_user_times");
+        public static final ConfiguredValue<String> USER_CLAIMED = ConfiguredValue.of(String.class, "tr_user_claimed");
     }
 
     protected static String buildJDBC() {

src/main/java/cc/carm/plugin/timereward/storage/database/DatabaseTables.java

@@ -1,9 +1,10 @@
 package cc.carm.plugin.timereward.storage.database;
 
-import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.configuration.value.standard.ConfiguredValue;
 import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.lib.easysql.api.SQLTable;
 import cc.carm.lib.easysql.api.builder.TableCreateBuilder;
+import cc.carm.lib.easysql.api.enums.IndexType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -15,39 +16,40 @@ public enum DatabaseTables implements SQLTable {
     /**
      * 用于记录用户在线时间的表
      */
-    USER_TIMES(DatabaseConfig.TABLES.USER_TIMES, (table) -> {
+    USER_TIMES(DatabaseConfig.TABLES.USER_TIMES, table -> {
         table.addColumn("uuid", "CHAR(36) NOT NULL PRIMARY KEY"); // 用户的UUID
+        table.addColumn("date", "DATE NOT NULL"); // 日期
 
-        table.addColumn("time", "INT UNSIGNED NOT NULL DEFAULT 0"); // 用户在线时间(秒)
+        table.addColumn("daily_time", "MEDIUMINT UNSIGNED NOT NULL DEFAULT 0"); // 用户日在线时间(秒)
+        table.addColumn("weekly_time", "MEDIUMINT UNSIGNED NOT NULL DEFAULT 0"); // 用户周在线时间(秒)
+        table.addColumn("monthly_time", "INT UNSIGNED NOT NULL DEFAULT 0"); // 用户月在线时间(秒)
+        table.addColumn("total_time", "INT UNSIGNED NOT NULL DEFAULT 0"); // 用户总在线时间(秒)
 
         table.addColumn("update",
                 "DATETIME NOT NULL " +
-                "DEFAULT CURRENT_TIMESTAMP " +
-                "ON UPDATE CURRENT_TIMESTAMP"
+                        "DEFAULT CURRENT_TIMESTAMP " +
+                        "ON UPDATE CURRENT_TIMESTAMP"
         );
+
     }),
 
     /**
      * 用于记录用户奖励领取情况的表
      */
     USER_CLAIMED(DatabaseConfig.TABLES.USER_CLAIMED, (table) -> {
-        table.addAutoIncrementColumn("id", false, true); // 排序键
-        table.addColumn("uuid", "CHAR(36) NOT NULL PRIMARY KEY"); // 用户的UUID 主键
+        table.addColumn("uuid", "CHAR(36) NOT NULL"); // 用户的UUID 主键
+        table.addColumn("reward", "VARCHAR(64) NOT NULL"); // 已领取的奖励ID
 
-        table.addColumn("value", "MEDIUMTEXT"); // 已领取的奖励ID
+        table.addColumn("time", "DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP"); // 领取时间
 
-        table.addColumn("update",
-                "DATETIME NOT NULL " +
-                "DEFAULT CURRENT_TIMESTAMP " +
-                "ON UPDATE CURRENT_TIMESTAMP"
-        );
+        table.setIndex(IndexType.PRIMARY_KEY, "pk_timereward_user", "uuid", "reward");
     });
 
     private final Consumer<TableCreateBuilder> builder;
-    private final ConfigValue<String> name;
+    private final ConfiguredValue<String> name;
     private @Nullable SQLManager manager;
 
-    DatabaseTables(ConfigValue<String> name,
+    DatabaseTables(ConfiguredValue<String> name,
                    Consumer<TableCreateBuilder> builder) {
         this.name = name;
         this.builder = builder;

src/main/java/cc/carm/plugin/timereward/storage/database/MySQLStorage.java

@@ -3,18 +3,19 @@ package cc.carm.plugin.timereward.storage.database;
 import cc.carm.lib.easysql.EasySQL;
 import cc.carm.lib.easysql.api.SQLManager;
 import cc.carm.plugin.timereward.Main;
-import cc.carm.plugin.timereward.storage.UserData;
+import cc.carm.plugin.timereward.data.TimeRecord;
+import cc.carm.plugin.timereward.user.UserRewardData;
 import com.google.gson.Gson;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.UUID;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class MySQLStorage {
     protected static final Gson GSON = new Gson();
@@ -56,62 +57,84 @@ public class MySQLStorage {
         return sqlManager;
     }
 
-    public @Nullable UserData loadData(@NotNull UUID uuid) throws Exception {
-        Long playTime = loadPlayTime(uuid);
-        Set<String> claimedData = loadClaimedData(uuid);
-        return new UserData(uuid, playTime, claimedData);
+    public @Nullable UserRewardData loadData(@NotNull UUID uuid) throws Exception {
+        TimeRecord recordDate = loadTimeRecord(uuid);
+        Map<String, LocalDateTime> claimedData = loadClaimedData(uuid);
+        return new UserRewardData(uuid, recordDate, claimedData);
     }
 
-    public long loadPlayTime(@NotNull UUID uuid) throws Exception {
+    public TimeRecord loadTimeRecord(@NotNull UUID uuid) throws Exception {
         return DatabaseTables.USER_TIMES.createQuery()
-                .selectColumns("uuid", "time")
                 .addCondition("uuid", uuid).setLimit(1).build()
-                .executeFunction((query) -> {
-                    ResultSet resultSet = query.getResultSet();
-                    if (resultSet == null || !resultSet.next()) return 0L;
-                    return resultSet.getLong("time");
-                }, 0L);
+                .executeFunction(query -> {
+                    ResultSet rs = query.getResultSet();
+                    if (rs == null || !rs.next()) return TimeRecord.empty();
+
+                    LocalDate date = rs.getDate("date").toLocalDate();
+                    long daily = rs.getLong("daily_time");
+                    long weekly = rs.getLong("weekly_time");
+                    long monthly = rs.getLong("monthly_time");
+                    long total = rs.getLong("total_time");
+
+                    return new TimeRecord(date, daily, weekly, monthly, total);
+                }, TimeRecord.empty());
     }
 
     @NotNull
-    public Set<String> loadClaimedData(@NotNull UUID uuid) throws Exception {
+    public Map<String, LocalDateTime> loadClaimedData(@NotNull UUID uuid) throws Exception {
         return DatabaseTables.USER_CLAIMED.createQuery()
-                .selectColumns("uuid", "value")
-                .addCondition("uuid", uuid).setLimit(1).build()
-                .executeFunction((query) -> {
-                    ResultSet resultSet = query.getResultSet();
-                    if (!resultSet.next()) return new LinkedHashSet<>();
-                    String json = resultSet.getString("value");
-                    if (json == null) return new LinkedHashSet<>();
-                    JsonElement element = PARSER.parse(json);
-                    if (!element.isJsonArray()) return new LinkedHashSet<>();
-                    Set<String> ids = new LinkedHashSet<>();
-                    for (JsonElement e : element.getAsJsonArray()) {
-                        ids.add(e.getAsString());
+                .addCondition("uuid", uuid).build()
+                .executeFunction(query -> {
+                    ResultSet rs = query.getResultSet();
+                    Map<String, LocalDateTime> map = new LinkedHashMap<>();
+
+                    while (rs.next()) {
+                        String rewardID = rs.getString("reward");
+                        LocalDateTime time = rs.getTimestamp("time").toLocalDateTime();
+                        map.put(rewardID, time);
                     }
-                    return ids;
-                }, new LinkedHashSet<>());
+
+                    return map;
+                }, new LinkedHashMap<>());
     }
 
-    public void saveClaimedData(@NotNull UUID uuid, @Nullable Set<String> claimedRewards) throws Exception {
-        if (claimedRewards != null) {
-            DatabaseTables.USER_CLAIMED.createReplace()
-                    .setColumnNames("uuid", "value")
-                    .setParams(uuid.toString(), GSON.toJson(claimedRewards))
-                    .execute();
+    public void addClaimedData(@NotNull UUID uuid, String reward) throws Exception {
+        HashMap<String, LocalDateTime> time = new HashMap<>();
+        time.put(reward, LocalDateTime.now());
+        addClaimedData(uuid, time);
+    }
+
+    public void addClaimedData(@NotNull UUID uuid, @NotNull Map<String, LocalDateTime> data) throws Exception {
+        if (!data.isEmpty()) {
+            List<Object[]> values = data.entrySet().stream()
+                    .map(entry -> new Object[]{uuid.toString(), entry.getKey(), entry.getValue()})
+                    .collect(Collectors.toList());
+            DatabaseTables.USER_CLAIMED.createReplaceBatch()
+                    .setColumnNames("uuid", "reward", "time")
+                    .setAllParams(values).execute();
         } else {
             DatabaseTables.USER_CLAIMED.createDelete()
                     .addCondition("uuid", uuid).setLimit(1)
-                    .build()
-                    .execute();
+                    .build().execute();
         }
     }
 
-    public void savePlayTime(@NotNull UUID uuid, long time) throws Exception {
-        DatabaseTables.USER_TIMES.createReplace()
-                .setColumnNames("uuid", "time")
-                .setParams(uuid.toString(), time)
-                .execute();
+    public void savePlayTime(@NotNull UUID uuid, @Nullable TimeRecord newRecord) throws Exception {
+        if (newRecord != null) {
+            DatabaseTables.USER_TIMES.createReplace()
+                    .setColumnNames("uuid", "date", "daily_time", "weekly_time", "monthly_time", "total_time")
+                    .setParams(
+                            uuid.toString(), newRecord.getDate(),
+                            newRecord.getDailyTime().getSeconds(),
+                            newRecord.getWeeklyTime().getSeconds(),
+                            newRecord.getMonthlyTime().getSeconds(),
+                            newRecord.getTotalTime().getSeconds()
+                    ).execute();
+        } else {
+            DatabaseTables.USER_TIMES.createDelete()
+                    .addCondition("uuid", uuid).setLimit(1)
+                    .build().execute();
+        }
     }
 
 }

src/main/java/cc/carm/plugin/timereward/user/LockedRewardData.java

@@ -0,0 +1,36 @@
+package cc.carm.plugin.timereward.user;
+
+import cc.carm.plugin.timereward.data.IntervalType;
+import cc.carm.plugin.timereward.data.RewardContents;
+import cc.carm.plugin.timereward.data.TimeRecord;
+import org.jetbrains.annotations.NotNull;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.UUID;
+
+public class LockedRewardData extends UserRewardData {
+    public LockedRewardData(@NotNull UUID userUUID) {
+        super(userUUID, TimeRecord.empty(), Collections.emptyMap());
+    }
+
+    @Override
+    public Duration getOnlineDuration(@NotNull IntervalType type) {
+        return Duration.ZERO;
+    }
+
+    @Override
+    public boolean isClaimed(@NotNull RewardContents reward) {
+        return false;
+    }
+
+    @Override
+    public boolean isTimeEnough(RewardContents reward) {
+        return false;
+    }
+
+    @Override
+    public void updateClaimed(@NotNull RewardContents reward) {
+    }
+
+}

src/main/java/cc/carm/plugin/timereward/user/UserRewardData.java

@@ -0,0 +1,84 @@
+package cc.carm.plugin.timereward.user;
+
+import cc.carm.lib.easyplugin.user.UserData;
+import cc.carm.plugin.timereward.data.IntervalType;
+import cc.carm.plugin.timereward.data.RewardContents;
+import cc.carm.plugin.timereward.data.TimeRecord;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 用户奖励数据，用于存储用户的奖励的领取情况。
+ */
+public class UserRewardData extends UserData<UUID> {
+
+    private final @NotNull Map<String, LocalDateTime> claimedRewards; // 记录已领取的奖励ID
+
+    private final @NotNull TimeRecord recordTime;
+    private final @NotNull LocalDateTime joinTime;
+
+    public UserRewardData(@NotNull UUID userUUID, @NotNull TimeRecord timeRecord, @NotNull Map<String, LocalDateTime> claimedRewards) {
+        this(userUUID, claimedRewards, timeRecord, LocalDateTime.now());
+    }
+
+    public UserRewardData(@NotNull UUID userUUID, @NotNull Map<String, LocalDateTime> claimedRewards,
+                          @NotNull TimeRecord recordTime, @NotNull LocalDateTime joinTime) {
+        super(userUUID);
+        this.claimedRewards = claimedRewards;
+        this.recordTime = recordTime;
+        this.joinTime = joinTime;
+    }
+
+    public @NotNull UUID getUserUUID() {
+        return getKey();
+    }
+
+    /**
+     * @return 数据库中的时间记录
+     */
+    public @NotNull TimeRecord getTimeRecord() {
+        return recordTime;
+    }
+
+    /**
+     * 得到本次加入游戏的时间
+     *
+     * @return 本次加入游戏时间
+     */
+    public @NotNull LocalDateTime getJoinTime() {
+        return joinTime;
+    }
+
+    /**
+     * @return 玩家的在线时间周期，需指定周期类型{@link IntervalType}
+     */
+    public Duration getOnlineDuration(@NotNull IntervalType type) {
+        return type.calculate(getTimeRecord(), getJoinTime());
+    }
+
+    public boolean isTimeEnough(RewardContents reward) {
+        return getOnlineDuration(reward.getType()).getSeconds() >= reward.getTime();
+    }
+
+    public @NotNull Map<String, LocalDateTime> getClaimedRewards() {
+        return claimedRewards;
+    }
+
+    public @Nullable LocalDateTime getClaimedDate(@NotNull RewardContents reward) {
+        return claimedRewards.get(reward.getRewardID());
+    }
+
+    public boolean isClaimed(@NotNull RewardContents reward) {
+        return claimedRewards.containsKey(reward.getRewardID());
+    }
+
+    public void updateClaimed(@NotNull RewardContents reward) {
+        this.claimedRewards.put(reward.getRewardID(), LocalDateTime.now());
+    }
+
+}

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}
 
@@ -14,11 +16,13 @@ permissions:
   "TimeReward.admin":
     description: "在线自动领奖的管理员权限。"
     default: op
+  "TimeReward.claim":
+    description: "使用领奖指令的权限，若关闭则玩家不得直接通过指令领取奖励。"
+    default: true
 
 commands:
   "TimeReward":
-    permission: "TimeReward.admin"
     description: "在线自动领奖的基础指令。"
     usage: "/TimeReward help"
     aliases:
-      - tr
+      - tr

src/test/java/TimeTest.java

@@ -0,0 +1,57 @@
+import org.jetbrains.annotations.NotNull;
+import org.junit.Test;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.temporal.TemporalField;
+import java.time.temporal.WeekFields;
+
+public class TimeTest {
+
+    LocalDate date = LocalDate.of(2023, 8, 30);
+
+    @Test
+    public void test() {
+
+        LocalDate date1 = LocalDate.of(2023, 9, 2);
+        LocalDate date2 = LocalDate.of(2023, 8, 28);
+        LocalDate date3 = LocalDate.of(2023, 8, 27);
+
+        System.out.println(isDayUpdated(date1));
+        System.out.println(isWeekUpdated(date1));
+        System.out.println(isMonthUpdated(date1));
+
+        System.out.println(isDayUpdated(date2));
+        System.out.println(isWeekUpdated(date2));
+        System.out.println(isMonthUpdated(date2));
+
+        System.out.println(isDayUpdated(date3));
+        System.out.println(isWeekUpdated(date3));
+        System.out.println(isMonthUpdated(date3));
+
+        System.out.println(isDayUpdated(date));
+
+    }
+
+    public @NotNull LocalDate getDate() {
+        return date;
+    }
+
+    public boolean isDayUpdated(LocalDate d) {
+        return !d.equals(getDate());
+    }
+
+    public boolean isWeekUpdated(LocalDate d) {
+        if (!isDayUpdated(d)) return false; // Same day always same week
+
+        TemporalField woy = WeekFields.of(DayOfWeek.MONDAY, 4).weekOfWeekBasedYear();
+        return getDate().get(woy) != d.get(woy);
+    }
+
+    public boolean isMonthUpdated(LocalDate d) {
+        if (!isDayUpdated(d)) return false; // Same day always same month
+
+        // Predicate current month is after the month of the date
+        return d.getMonth().compareTo(getDate().getMonth()) > 0;
+    }
+}