feat(save): 新增定时自动保存功能。

.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

@@ -72,15 +72,21 @@
 变量如下:
 
 ```text
-# %TimeReward_time_<时间类型>%
+# %TimeReward_<单位>_<时间类型>%
-- 得到玩家的在线时长(秒)。
+- 得到玩家的在线时长。
+- 单位可选 seconds, minutes, hours, days.
 - 时间类型可选 TOTAL, DAILY, WEEKLY, MONTHLY 。
 
+
+
 # %TimeReward_reward_<奖励ID>%
 - 得到某个奖励配置的名称。
 
 # %TimeReward_claimed_<奖励ID>%
-- 得到玩家是否已经领取了某个奖励。
+- 得到玩家是否已经领取过某个奖励。
+? 若奖励为循环奖励（即每在线X小时即可领取一次)，
+? 但玩家曾经领取过，该变量仍为 true 。
+? 因此，需使用 %TimeReward_claimable_<奖励ID>% 判断是否可领取。
 
 # %TimeReward_claimable_<奖励ID>%
 - 得到玩家是否可以领取某个奖励 
@@ -104,7 +110,7 @@
 
 若您觉得本插件做的不错，您可以捐赠支持我，感谢您成为开源项目的支持者！
 
-万分感谢 [egg_拿]() 赞助本项目的开发与维护！
+万分感谢 [egg_拿]() 与 [ayoiz](https://github.com/ayoi2) 赞助本项目的开发与维护！
 
 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

@@ -11,14 +11,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
-        <deps.easyplugin.version>1.5.8</deps.easyplugin.version>
+        <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
         <deps.easysql.version>0.4.7</deps.easysql.version>
-        <deps.mineconfig.version>2.8.2</deps.mineconfig.version>
+        <deps.mineconfig.version>3.1.1</deps.mineconfig.version>
     </properties>
 
     <groupId>cc.carm.plugin</groupId>
     <artifactId>timereward</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.4</version>
 
     <name>TimeReward</name>
     <description>在线时长自动领奖插件，通过指令发放奖励，基于EasyPlugin实现。</description>
@@ -145,7 +145,7 @@
         <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>
@@ -160,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>
 
@@ -174,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>
@@ -187,11 +187,11 @@
             <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>
@@ -211,7 +211,7 @@
             <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>
@@ -223,13 +223,13 @@
             <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>
@@ -243,7 +243,7 @@
             <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>
@@ -254,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>
@@ -289,7 +289,7 @@
             <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>

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,10 +1,10 @@
 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.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;
@@ -17,18 +17,23 @@ import cc.carm.plugin.timereward.storage.database.MySQLStorage;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Entity;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.io.File;
 
 public class Main extends EasyPlugin {
     private static Main instance;
 
-    protected ConfigurationProvider<?> configProvider;
+    protected ConfigurationHolder<?> configProvider;
-    protected ConfigurationProvider<?> messageProvider;
+    protected ConfigurationHolder<?> messageProvider;
-    protected ConfigurationProvider<?> rewardProvider;
+    protected ConfigurationHolder<?> rewardProvider;
 
     protected MySQLStorage storage;
     protected UserManager userManager;
     protected RewardManager rewardManager;
 
+    protected BukkitRunnable autoSaveTask;
+
     public Main() {
         instance = this;
     }
@@ -36,13 +41,13 @@ 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 = MineConfiguration.from(this, "rewards.yml");
+        this.rewardProvider = BukkitConfigFactory.from(new File(getDataFolder(), "rewards.yml")).build();
         this.rewardProvider.initialize(RewardsConfig.class);
     }
 
@@ -94,11 +99,32 @@ public class Main extends EasyPlugin {
             info("已禁用检查更新，跳过。");
         }
 
+        if (PluginConfig.AUTO_SAVE.resolve() > 0) {
+            long period = PluginConfig.AUTO_SAVE.resolve() * 20L;
+            this.autoSaveTask = new BukkitRunnable() {
+                int i = 0;
+
+                @Override
+                public void run() {
+                    i = i == Integer.MAX_VALUE ? 0 : i + 1;
+                    debugging("第" + i + "次自动保存用户在线数据...");
+                    userManager.saveAll();
+                }
+            };
+            this.autoSaveTask.runTaskTimerAsynchronously(this, period, period);
+        }
+
         return true;
     }
 
     @Override
     protected void shutdown() {
+
+        if (this.autoSaveTask != null && !this.autoSaveTask.isCancelled()) {
+            this.autoSaveTask.cancel();
+            this.autoSaveTask = null;
+        }
+
         info("终止奖励发放进程...");
         this.rewardManager.shutdown();
 
@@ -137,15 +163,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 ConfigurationProvider<?> getRewardProvider() {
+    public ConfigurationHolder<?> getRewardProvider() {
         return rewardProvider;
     }
 }

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

@@ -22,16 +22,16 @@ public class MainCommand extends CommandHandler {
     @Override
     public Void noArgs(CommandSender sender) {
         if (sender.hasPermission("TimeReward.admin")) {
-            PluginMessages.USAGE.ADMIN.send(sender);
+            PluginMessages.USAGE.ADMIN.sendTo(sender);
         } else {
-            PluginMessages.USAGE.USER.send(sender);
+            PluginMessages.USAGE.USER.sendTo(sender);
         }
         return null;
     }
 
     @Override
     public Void noPermission(CommandSender sender) {
-        PluginMessages.NO_PERMISSION.send(sender);
+        PluginMessages.NO_PERMISSION.sendTo(sender);
         return null;
     }
 }

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

@@ -23,7 +23,7 @@ public class ClaimCommand extends SubCommand<MainCommand> {
     @Override
     public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
         if (!(sender instanceof Player)) {
-            PluginMessages.NOT_PLAYER.send(sender);
+            PluginMessages.NOT_PLAYER.sendTo(sender);
             return null;
         }
 
@@ -35,7 +35,7 @@ public class ClaimCommand extends SubCommand<MainCommand> {
 
             List<RewardContents> unclaimedRewards = manager.getUnclaimedRewards(player);
             if (unclaimedRewards.isEmpty()) {
-                PluginMessages.NO_UNCLAIMED_REWARD.send(sender);
+                PluginMessages.NO_UNCLAIMED_REWARD.sendTo(sender);
                 return null;
             }
 
@@ -45,12 +45,12 @@ public class ClaimCommand extends SubCommand<MainCommand> {
 
             RewardContents reward = manager.getReward(rewardID);
             if (reward == null) {
-                PluginMessages.NOT_EXISTS.send(sender, rewardID);
+                PluginMessages.NOT_EXISTS.sendTo(sender, rewardID);
                 return null;
             }
 
             if (!manager.isClaimable(player, reward)) {
-                PluginMessages.NOT_CLAIMABLE.send(sender, reward.getDisplayName());
+                PluginMessages.NOT_CLAIMABLE.sendTo(sender, reward.getDisplayName());
                 return null;
             }
 

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

@@ -20,7 +20,7 @@ public class ListCommand extends SubCommand<MainCommand> {
     @Override
     public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
         Collection<RewardContents> awards = TimeRewardAPI.getRewardManager().listRewards().values();
-        PluginMessages.LIST.HEADER.send(sender, awards.size());
+        PluginMessages.LIST.HEADER.sendTo(sender, awards.size());
 
         for (RewardContents reward : awards) {
             if (reward.getPermission() != null) {

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

@@ -19,7 +19,7 @@ public class ReloadCommand extends SubCommand<MainCommand> {
     public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
 
         long s1 = System.currentTimeMillis();
-        PluginMessages.RELOAD.START.send(sender);
+        PluginMessages.RELOAD.START.sendTo(sender);
 
         try {
             Main.getInstance().getConfigProvider().reload();
@@ -31,7 +31,7 @@ public class ReloadCommand extends SubCommand<MainCommand> {
                     TimeRewardAPI.getRewardManager().listRewards().size()
             ).to(sender);
         } catch (Exception e) {
-            PluginMessages.RELOAD.ERROR.send(sender);
+            PluginMessages.RELOAD.ERROR.sendTo(sender);
             e.printStackTrace();
         }
         return null;

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

@@ -23,17 +23,17 @@ public class TestCommand extends SubCommand<MainCommand> {
     public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
         if (args.length < 1) return getParent().noArgs(sender);
         if (!(sender instanceof Player)) {
-            PluginMessages.NOT_PLAYER.send(sender);
+            PluginMessages.NOT_PLAYER.sendTo(sender);
             return null;
         }
 
         RewardContents contents = TimeRewardAPI.getRewardManager().getReward(args[0]);
         if (contents == null) {
-            PluginMessages.NOT_EXISTS.send(sender, args[0]);
+            PluginMessages.NOT_EXISTS.sendTo(sender, args[0]);
             return null;
         }
 
-        PluginMessages.COMMAND_LIST.send(sender, contents.getRewardID());
+        PluginMessages.COMMAND_LIST.sendTo(sender, contents.getRewardID());
 
         TimeRewardAPI.getRewardManager().executeCommand((Player) sender, contents);
         return null;

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

@@ -28,11 +28,16 @@ public class UserCommand extends SubCommand<MainCommand> {
 
         Player player = Bukkit.getPlayer(args[0]);
         if (player == null) {
-            PluginMessages.NOT_ONLINE.send(sender, args[0]);
+            PluginMessages.NOT_ONLINE.sendTo(sender, args[0]);
             return null;
         }
 
         UserRewardData user = TimeRewardAPI.getUserManager().get(player);
+        if (user == null) {
+            PluginMessages.LOADING.sendTo(sender, args[0]);
+            return null;
+        }
+
         PluginMessages.USER_INFO.prepare(
                 player.getName(),
                 user.getOnlineDuration(IntervalType.DAILY).getSeconds(),
@@ -44,7 +49,7 @@ public class UserCommand extends SubCommand<MainCommand> {
 
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         user.getClaimedRewards().forEach((id, time) -> {
-            PluginMessages.USER_RECEIVED.send(sender, id, time.format(formatter));
+            PluginMessages.USER_RECEIVED.sendTo(sender, id, time.format(formatter));
         });
 
         return null;

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

@@ -1,35 +1,43 @@
 package cc.carm.plugin.timereward.conf;
 
-import cc.carm.lib.configuration.core.ConfigurationRoot;
+import cc.carm.lib.configuration.Configuration;
-import cc.carm.lib.configuration.core.annotation.HeaderComment;
+import cc.carm.lib.configuration.annotation.ConfigPath;
-import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.configuration.annotation.HeaderComments;
-import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
+import cc.carm.lib.configuration.value.standard.ConfiguredValue;
 
 import java.time.DayOfWeek;
 
-public class PluginConfig extends ConfigurationRoot {
+@ConfigPath(root = true)
+public interface PluginConfig extends Configuration {
 
-    public static final ConfigValue<Boolean> DEBUG = ConfiguredValue.of(Boolean.class, false);
+    ConfiguredValue<Boolean> DEBUG = ConfiguredValue.of(Boolean.class, false);
 
-    @HeaderComment({
+    @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("周起始日，用于判断周度奖励的结算日期。")
+    @HeaderComments({
-    public static final ConfigValue<DayOfWeek> WEEK_FIRST_DAY = ConfiguredValue.builderOf(DayOfWeek.class)
+            "自动保存设定，用于设置自动保存的时间间隔，单位为秒（小于等于0则关闭）。",
-            .from(Integer.class).serializeSource(i -> i).parseSource(i -> (Integer) i)
+            "一般来说，玩家会在退出游戏时进行保存。",
-            .parseValue((v, d) -> DayOfWeek.of(v))
+            "但如果您希望额外的定期保存数据以避免数据丢失，可以选择开启。",
-            .serializeValue(DayOfWeek::getValue)
+    })
+    ConfiguredValue<Long> AUTO_SAVE = ConfiguredValue.of(Long.class, 60L);
+
+    @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,10 +1,11 @@
 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.value.ConfiguredMessage;
-import cc.carm.lib.mineconfiguration.bukkit.value.ConfiguredMessageList;
 import de.themoep.minedown.MineDown;
 import me.clip.placeholderapi.PlaceholderAPI;
 import net.md_5.bungee.api.chat.BaseComponent;
@@ -16,17 +17,18 @@ import org.jetbrains.annotations.NotNull;
 import java.util.function.BiFunction;
 
 
-@HeaderComment({
+@HeaderComments({
         "TimeReward 在线奖励插件的消息配置文件",
         "如特定的消息不需要任何提示，可直接留下单行空内容消息。",
         "支持 &+颜色代码(原版颜色)、&(#XXXXXX)(RGB颜色) 与 &<#XXXXXX>(前后标注RGB颜色渐变)。",
         " "
 })
-public class PluginMessages extends ConfigurationRoot {
+@ConfigPath(root = true)
+public interface PluginMessages extends Configuration {
 
-    public static @NotNull CraftMessageListBuilder<BaseComponent[]> list() {
+    static ConfiguredMessage.@NotNull Builder<BaseComponent[]> list() {
-        return ConfiguredMessageList.create(getParser())
+        return ConfiguredMessage.create(getParser())
-                .whenSend((sender, message) -> {
+                .dispatcher((sender, message) -> {
                     if (sender instanceof ConsoleCommandSender) {
                         message.forEach(m -> sender.sendMessage(BaseComponent.toLegacyText(m)));
                         return;
@@ -36,16 +38,16 @@ public class PluginMessages extends ConfigurationRoot {
                 });
     }
 
-    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 class USAGE extends ConfigurationRoot {
+    interface USAGE extends Configuration {
 
-        public static final ConfiguredMessageList<BaseComponent[]> ADMIN = list().defaults(
+        ConfiguredMessage<BaseComponent[]> ADMIN = list().defaults(
                 "&6&l在线奖励 &f管理员指令帮助",
                 "&8#&f claim &6[奖励ID]",
                 "&8-&7 为自己手动领取对应奖励。",
@@ -60,64 +62,68 @@ public class PluginMessages extends ConfigurationRoot {
                 "&8-&7 测试执行奖励配置的指令。"
         ).build();
 
-        public static final ConfiguredMessageList<BaseComponent[]> USER = list().defaults(
+        ConfiguredMessage<BaseComponent[]> USER = list().defaults(
                 "&6&l在线奖励 &f您可以输入 &e/tr claim &6[奖励ID] &f领取对应奖励。"
         ).build();
     }
 
-    public static final ConfiguredMessageList<BaseComponent[]> NO_PERMISSION = list().defaults(
+    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[]> LOADING = list().defaults(
+            "&e&l请稍候... &f您的在线数据正在加载中。"
+    ).params("player").build();
+
+    ConfiguredMessage<BaseComponent[]> NOT_EXISTS = list().defaults(
             "&f奖励 &e%(award) &f并不存在。"
     ).params("award").build();
 
-    public static final ConfiguredMessageList<BaseComponent[]> NOT_CLAIMABLE = list().defaults(
+    ConfiguredMessage<BaseComponent[]> NOT_CLAIMABLE = list().defaults(
             "&c&l抱歉！&f但您暂时未满足领取奖励 &e%(award) &f的条件。"
     ).params("award").build();
 
-    public static final ConfiguredMessageList<BaseComponent[]> NO_UNCLAIMED_REWARD = list().defaults(
+    ConfiguredMessage<BaseComponent[]> NO_UNCLAIMED_REWARD = list().defaults(
             "&f您暂时没有未领取的奖励。"
     ).build();
 
-    public static final ConfiguredMessageList<BaseComponent[]> USER_INFO = list().defaults(
+    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();
 
-    public static final ConfiguredMessageList<BaseComponent[]> USER_RECEIVED = list().defaults(
+    ConfiguredMessage<BaseComponent[]> USER_RECEIVED = list().defaults(
             "&7- &e%(reward) &7于 &f%(time) &7领取"
     ).params("reward", "time").build();
 
-    public static final ConfiguredMessageList<BaseComponent[]> COMMAND_LIST = list().defaults(
+    ConfiguredMessage<BaseComponent[]> COMMAND_LIST = list().defaults(
             "&f正在执行奖励 %(award) 的指令列表..."
     ).params("award").build();
 
-    public static class LIST extends ConfigurationRoot {
+    interface LIST extends Configuration {
 
-        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", "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)",
@@ -127,17 +133,17 @@ public class PluginMessages extends ConfigurationRoot {
 
     }
 
-    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(
+        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

@@ -1,16 +1,17 @@
 package cc.carm.plugin.timereward.conf;
 
-import cc.carm.lib.configuration.core.ConfigurationRoot;
+import cc.carm.lib.configuration.Configuration;
-import cc.carm.lib.configuration.core.annotation.HeaderComment;
+import cc.carm.lib.configuration.annotation.ConfigPath;
-import cc.carm.lib.configuration.core.source.ConfigurationWrapper;
+import cc.carm.lib.configuration.annotation.HeaderComments;
-import cc.carm.lib.configuration.core.value.ConfigValue;
+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;
 
-@HeaderComment({"奖励相关设定，包含以下设定：",
+@HeaderComments({"奖励相关设定，包含以下设定：",
         " [id] 配置键名即奖励ID，支持英文、数字与下划线。",
         "  | 确定后请不要更改，因为该键值用于存储玩家是否领取的数据",
         "  | 如果更改，原先领取过该奖励的玩家将会自动再领取一次！",
@@ -33,24 +34,21 @@ import java.util.Map;
         " [auto] 该奖励是否自动领取，可以不设置，默认为true。",
         "  | 若关闭自动领取，则需要玩家手动输入/tr claim 领取奖励。",
 })
-public class RewardsConfig extends ConfigurationRoot {
+@ConfigPath(root = true)
+public interface RewardsConfig extends Configuration {
 
-    public static final ConfigValue<RewardsConfig.RewardGroup> REWARDS = create();
+    ConfiguredValue<RewardGroup> REWARDS = ConfiguredValue.builderOf(RewardGroup.class)
+            .fromSection()
+            .parse((v, d) -> RewardGroup.parse(d))
+            .serialize(RewardGroup::serialize)
+            .defaults(RewardGroup.defaults())
+            .build();
 
-    public static Map<String, RewardContents> getContents() {
+    static Map<String, RewardContents> getContents() {
         return REWARDS.getNotNull().getContents();
     }
 
-    private static ConfigValue<RewardGroup> create() {
+    final class RewardGroup {
-        return ConfigValue.builder()
-                .asValue(RewardGroup.class).fromSection()
-                .parseValue((v, d) -> RewardGroup.parse(v))
-                .serializeValue(RewardGroup::serialize)
-                .defaults(RewardGroup.defaults())
-                .build();
-    }
-
-    public static final class RewardGroup {
         final @NotNull Map<String, RewardContents> contents;
 
         public RewardGroup(@NotNull Map<String, RewardContents> contents) {
@@ -69,10 +67,10 @@ public class RewardsConfig extends ConfigurationRoot {
             return map;
         }
 
-        public static RewardGroup parse(@NotNull ConfigurationWrapper<?> section) {
+        public static RewardGroup parse(@NotNull ConfigureSection section) {
             Map<String, RewardContents> rewards = new LinkedHashMap<>();
             for (String rewardID : section.getKeys(false)) {
-                ConfigurationWrapper<?> rewardSection = section.getConfigurationSection(rewardID);
+                ConfigureSection rewardSection = section.getSection(rewardID);
                 if (rewardSection == null) continue;
 
                 RewardContents c = RewardContents.parse(rewardID, rewardSection);

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

@@ -1,6 +1,6 @@
 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;
@@ -88,7 +88,7 @@ public class RewardContents {
         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 + " 的时间配置错误，请检查配置文件。");

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

@@ -10,23 +10,21 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
+import java.time.Duration;
 import java.util.Collections;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.function.ToLongFunction;
 
 public class PAPIExpansion extends EasyPlaceholder {
 
     public PAPIExpansion(@NotNull JavaPlugin plugin, @NotNull String rootIdentifier) {
         super(plugin, rootIdentifier);
 
-        handle("time", userHandler((user, args) -> {
+        handle("seconds", timeHandler(Duration::getSeconds), Collections.singletonList("<时间类型>"), "time");
-            if (args.length < 1) return "请填写时间类型";
+        handle("minutes", timeHandler(Duration::toMinutes), Collections.singletonList("<时间类型>"));
-            IntervalType type = IntervalType.parse(args[0]);
+        handle("hours", timeHandler(Duration::toHours), Collections.singletonList("<时间类型>"));
-
+        handle("days", timeHandler(Duration::toDays), Collections.singletonList("<时间类型>"));
-            if (type == null) return "时间类型不存在";
-
-            return user.getOnlineDuration(type).getSeconds();
-        }), Collections.singletonList("<时间类型>"));
 
         handle("reward",
                 rewardHandler(RewardContents::getDisplayName),
@@ -62,10 +60,21 @@ public class PAPIExpansion extends EasyPlaceholder {
     protected <R> PlaceholderHandler userHandler(BiFunction<UserRewardData, String[], R> userFunction) {
         return (player, args) -> {
             if (player == null || !player.isOnline()) return "加载中...";
-            return userFunction.apply(TimeRewardAPI.getUserManager().get((Player) player), args);
+            UserRewardData data = TimeRewardAPI.getUserManager().get((Player) player);
+            if (data == null) return "加载中...";
+            return userFunction.apply(data, args);
         };
     }
 
+    protected PlaceholderHandler timeHandler(ToLongFunction<Duration> timeFunction) {
+        return userHandler((user, args) -> {
+            if (args.length < 1) return "请填写时间类型";
+            IntervalType type = IntervalType.parse(args[0]);
+            if (type == null) return "时间类型不存在";
+            return timeFunction.applyAsLong(user.getOnlineDuration(type));
+        });
+    }
+
     protected <R> PlaceholderHandler rewardHandler(Function<RewardContents, R> function) {
         return (player, args) -> {
             if (args.length < 1) return "请填写奖励ID";

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

@@ -1,22 +1,33 @@
 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;
 import org.bukkit.event.player.PlayerQuitEvent;
+import org.jetbrains.annotations.Nullable;
 
 public class UserListener implements Listener {
 
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
-        TimeRewardAPI.getUserManager().load(event.getPlayer().getUniqueId(), true).thenAccept(data -> {
+        @Nullable Player player = event.getPlayer();
-            Player player = Bukkit.getPlayer(data.getUserUUID());
+        // Delayed load to avoid async error
-            if (player == null || !player.isOnline()) {
+        Main.getInstance().getScheduler().runLater(20L, () -> {
-                TimeRewardAPI.getUserManager().unload(data.getUserUUID());
+            if (player == null || !player.isOnline()) return;
-            } // 不在线自动卸载
+            TimeRewardAPI.getUserManager()
+                    .load(event.getPlayer().getUniqueId(), true)
+                    .thenAccept(data -> {
+                        if (!player.isOnline()) {  // 不在线自动卸载
+                            TimeRewardAPI.getUserManager().unload(data.getUserUUID(), false);
+                        }
+                    }).exceptionally(ex -> {
+                        Main.severe("加载用户在线时长数据失败: " + event.getPlayer().getName());
+                        ex.printStackTrace();
+                        return null;
+                    });
         });
     }
 

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

@@ -72,6 +72,8 @@ public class RewardManager {
         if (!reward.checkPermission(player)) return false; // 满足权限
 
         UserRewardData user = TimeRewardAPI.getUserManager().get(player);
+        if (user == null) return false; // 玩家数据加载中
+
         IntervalType intervalType = reward.getType();
         LocalDateTime lastClaimed = user.getClaimedDate(reward);
 
@@ -106,6 +108,8 @@ public class RewardManager {
             try {
 
                 UserRewardData user = TimeRewardAPI.getUserManager().get(player);
+                if (user == null) return false; // 玩家数据加载中
+                
                 Main.getStorage().addClaimedData(player.getUniqueId(), map);
                 contents.forEach(user::updateClaimed);
 

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

@@ -23,8 +23,8 @@ public class UserManager extends UserDataManager<UUID, UserRewardData> {
         super(plugin);
     }
 
-    public @NotNull UserRewardData get(Player player) {
+    public @Nullable UserRewardData get(Player player) {
-        return get(player.getUniqueId());
+        return getNullable(player.getUniqueId());
     }
 
     @Override
@@ -38,13 +38,15 @@ public class UserManager extends UserDataManager<UUID, UserRewardData> {
 
         MySQLStorage storage = Main.getStorage();
 
+        @Nullable UserRewardData current = loadData(data.getUserUUID()); // 考虑读取时间差，优先利用数据库的当前数据计算
+        TimeRecord oldRecord = current == null ? data.getTimeRecord() : current.getTimeRecord();
+
         // 只需要保存游玩时间数据，领取数据已经实时保存了
-        LocalDate date = LocalDate.now();
+        Duration daily = IntervalType.DAILY.calculate(oldRecord, data.getJoinTime());
-        Duration daily = data.getOnlineDuration(IntervalType.DAILY);
+        Duration weekly = IntervalType.WEEKLY.calculate(oldRecord, data.getJoinTime());
-        Duration weekly = data.getOnlineDuration(IntervalType.WEEKLY);
+        Duration monthly = IntervalType.MONTHLY.calculate(oldRecord, data.getJoinTime());
-        Duration monthly = data.getOnlineDuration(IntervalType.MONTHLY);
+        Duration total = IntervalType.TOTAL.calculate(oldRecord, data.getJoinTime());
-        Duration total = data.getOnlineDuration(IntervalType.TOTAL);
+        TimeRecord newRecord = new TimeRecord(LocalDate.now(), daily, weekly, monthly, total);
-        TimeRecord newRecord = new TimeRecord(date, daily, weekly, monthly, total);
 
         storage.savePlayTime(data.getUserUUID(), newRecord);
     }

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.Configuration;
-import cc.carm.lib.configuration.core.annotation.ConfigPath;
+import cc.carm.lib.configuration.annotation.ConfigPath;
-import cc.carm.lib.configuration.core.annotation.HeaderComment;
+import cc.carm.lib.configuration.annotation.HeaderComments;
-import cc.carm.lib.configuration.core.value.ConfigValue;
+import cc.carm.lib.configuration.value.standard.ConfiguredValue;
-import cc.carm.lib.configuration.core.value.type.ConfiguredValue;
 
-@HeaderComment("数据库相关设定")
+@HeaderComments("数据库相关设定")
-@ConfigPath("storage.database")
+@ConfigPath(value = "storage.database", root = true)
-public class DatabaseConfig extends ConfigurationRoot {
+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 ConfiguredValue<String> HOST = ConfiguredValue.of(String.class, "127.0.0.1");
-    protected static final ConfigValue<Integer> PORT = ConfiguredValue.of(Integer.class, 3306);
+    protected static final ConfiguredValue<Integer> PORT = ConfiguredValue.of(Integer.class, 3306);
-    protected static final ConfigValue<String> DATABASE = ConfiguredValue.of(String.class, "minecraft");
+    protected static final ConfiguredValue<String> DATABASE = ConfiguredValue.of(String.class, "minecraft");
-    protected static final ConfigValue<String> USERNAME = ConfiguredValue.of(String.class, "root");
+    protected static final ConfiguredValue<String> USERNAME = ConfiguredValue.of(String.class, "root");
-    protected static final ConfigValue<String> PASSWORD = ConfiguredValue.of(String.class, "password");
+    protected static final ConfiguredValue<String> PASSWORD = ConfiguredValue.of(String.class, "password");
-    protected static final ConfigValue<String> EXTRA = ConfiguredValue.of(String.class, "?useSSL=false");
+    protected static final ConfiguredValue<String> EXTRA = ConfiguredValue.of(String.class, "?useSSL=false");
 
-    @HeaderComment("插件相关表的名称")
+    @HeaderComments("插件相关表的名称")
-    public static final class TABLES extends ConfigurationRoot {
+    public static final class TABLES implements Configuration {
-        public static final ConfigValue<String> USER_TIMES = ConfiguredValue.of(String.class, "tr_user_times");
+        public static final ConfiguredValue<String> USER_TIMES = ConfiguredValue.of(String.class, "tr_user_times");
-        public static final ConfigValue<String> USER_CLAIMED = ConfiguredValue.of(String.class, "tr_user_claimed");
+        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,6 +1,6 @@
 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;
@@ -46,10 +46,10 @@ public enum DatabaseTables implements SQLTable {
     });
 
     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;