outsource/TimeReward
1
Fork 0
mirror of https://github.com/carm-outsource/TimeReward.git synced 2026-06-04 15:28:16 +08:00
Code Releases Activity

feat: 适配上游更新。

Browse Source
This commit is contained in:
Carm Jos
2025-04-20 01:13:11 +08:00
parent fbc8921bda
commit bd192b9843
13 changed files with 117 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/cc/carm/plugin/timereward/Main.java
+13 -11
View File
@@ -1,10 +1,10 @@
package cc.carm.plugin.timereward; 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.EasyPlugin;
import cc.carm.lib.easyplugin.updatechecker.GHUpdateChecker; import cc.carm.lib.easyplugin.updatechecker.GHUpdateChecker;
import cc.carm.lib.easyplugin.utils.MessageUtils; 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.command.MainCommand;
import cc.carm.plugin.timereward.conf.PluginConfig; import cc.carm.plugin.timereward.conf.PluginConfig;
import cc.carm.plugin.timereward.conf.PluginMessages; import cc.carm.plugin.timereward.conf.PluginMessages;
@@ -18,12 +18,14 @@ import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import java.io.File;
public class Main extends EasyPlugin { public class Main extends EasyPlugin {
private static Main instance; 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 MySQLStorage storage;
protected UserManager userManager; protected UserManager userManager;
@@ -36,13 +38,13 @@ public class Main extends EasyPlugin {
@Override @Override
protected void load() { protected void load() {
log("加载插件配置文件..."); log("加载插件配置文件...");
this.configProvider = MineConfiguration.from(this, "config.yml"); this.configProvider = BukkitConfigFactory.from(new File(getDataFolder(), "config.yml")).build();
this.configProvider.initialize(PluginConfig.class); 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.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); this.rewardProvider.initialize(RewardsConfig.class);
} }
@@ -137,15 +139,15 @@ public class Main extends EasyPlugin {
return getInstance().storage; return getInstance().storage;
} }
public ConfigurationProvider<?> getConfigProvider() { public ConfigurationHolder<?> getConfigProvider() {
return configProvider; return configProvider;
} }
public ConfigurationProvider<?> getMessageProvider() { public ConfigurationHolder<?> getMessageProvider() {
return messageProvider; return messageProvider;
} }
public ConfigurationProvider<?> getRewardProvider() { public ConfigurationHolder<?> getRewardProvider() {
return rewardProvider; return rewardProvider;
} }
} }
src/main/java/cc/carm/plugin/timereward/command/MainCommand.java
+3 -3
View File
@@ -22,16 +22,16 @@ public class MainCommand extends CommandHandler {
@Override @Override
public Void noArgs(CommandSender sender) { public Void noArgs(CommandSender sender) {
if (sender.hasPermission("TimeReward.admin")) { if (sender.hasPermission("TimeReward.admin")) {
PluginMessages.USAGE.ADMIN.send(sender); PluginMessages.USAGE.ADMIN.sendTo(sender);
} else { } else {
PluginMessages.USAGE.USER.send(sender); PluginMessages.USAGE.USER.sendTo(sender);
} }
return null; return null;
} }
@Override @Override
public Void noPermission(CommandSender sender) { public Void noPermission(CommandSender sender) {
PluginMessages.NO_PERMISSION.send(sender); PluginMessages.NO_PERMISSION.sendTo(sender);
return null; return null;
} }
} }
src/main/java/cc/carm/plugin/timereward/command/sub/ClaimCommand.java
+4 -4
View File
@@ -23,7 +23,7 @@ public class ClaimCommand extends SubCommand<MainCommand> {
@Override @Override
public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) { public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
PluginMessages.NOT_PLAYER.send(sender); PluginMessages.NOT_PLAYER.sendTo(sender);
return null; return null;
} }
@@ -35,7 +35,7 @@ public class ClaimCommand extends SubCommand<MainCommand> {
List<RewardContents> unclaimedRewards = manager.getUnclaimedRewards(player); List<RewardContents> unclaimedRewards = manager.getUnclaimedRewards(player);
if (unclaimedRewards.isEmpty()) { if (unclaimedRewards.isEmpty()) {
PluginMessages.NO_UNCLAIMED_REWARD.send(sender); PluginMessages.NO_UNCLAIMED_REWARD.sendTo(sender);
return null; return null;
} }
@@ -45,12 +45,12 @@ public class ClaimCommand extends SubCommand<MainCommand> {
RewardContents reward = manager.getReward(rewardID); RewardContents reward = manager.getReward(rewardID);
if (reward == null) { if (reward == null) {
PluginMessages.NOT_EXISTS.send(sender, rewardID); PluginMessages.NOT_EXISTS.sendTo(sender, rewardID);
return null; return null;
} }
if (!manager.isClaimable(player, reward)) { if (!manager.isClaimable(player, reward)) {
PluginMessages.NOT_CLAIMABLE.send(sender, reward.getDisplayName()); PluginMessages.NOT_CLAIMABLE.sendTo(sender, reward.getDisplayName());
return null; return null;
} }
src/main/java/cc/carm/plugin/timereward/command/sub/ListCommand.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class ListCommand extends SubCommand<MainCommand> {
@Override @Override
public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) { public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) {
Collection<RewardContents> awards = TimeRewardAPI.getRewardManager().listRewards().values(); 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) { for (RewardContents reward : awards) {
if (reward.getPermission() != null) { if (reward.getPermission() != null) {
src/main/java/cc/carm/plugin/timereward/command/sub/ReloadCommand.java
+2 -2
View File
@@ -19,7 +19,7 @@ public class ReloadCommand extends SubCommand<MainCommand> {
public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception { public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
long s1 = System.currentTimeMillis(); long s1 = System.currentTimeMillis();
PluginMessages.RELOAD.START.send(sender); PluginMessages.RELOAD.START.sendTo(sender);
try { try {
Main.getInstance().getConfigProvider().reload(); Main.getInstance().getConfigProvider().reload();
@@ -31,7 +31,7 @@ public class ReloadCommand extends SubCommand<MainCommand> {
TimeRewardAPI.getRewardManager().listRewards().size() TimeRewardAPI.getRewardManager().listRewards().size()
).to(sender); ).to(sender);
} catch (Exception e) { } catch (Exception e) {
PluginMessages.RELOAD.ERROR.send(sender); PluginMessages.RELOAD.ERROR.sendTo(sender);
e.printStackTrace(); e.printStackTrace();
} }
return null; return null;
src/main/java/cc/carm/plugin/timereward/command/sub/TestCommand.java
+3 -3
View File
@@ -23,17 +23,17 @@ public class TestCommand extends SubCommand<MainCommand> {
public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception { public Void execute(JavaPlugin plugin, CommandSender sender, String[] args) throws Exception {
if (args.length < 1) return getParent().noArgs(sender); if (args.length < 1) return getParent().noArgs(sender);
if (!(sender instanceof Player)) { if (!(sender instanceof Player)) {
PluginMessages.NOT_PLAYER.send(sender); PluginMessages.NOT_PLAYER.sendTo(sender);
return null; return null;
} }
RewardContents contents = TimeRewardAPI.getRewardManager().getReward(args[0]); RewardContents contents = TimeRewardAPI.getRewardManager().getReward(args[0]);
if (contents == null) { if (contents == null) {
PluginMessages.NOT_EXISTS.send(sender, args[0]); PluginMessages.NOT_EXISTS.sendTo(sender, args[0]);
return null; return null;
} }
PluginMessages.COMMAND_LIST.send(sender, contents.getRewardID()); PluginMessages.COMMAND_LIST.sendTo(sender, contents.getRewardID());
TimeRewardAPI.getRewardManager().executeCommand((Player) sender, contents); TimeRewardAPI.getRewardManager().executeCommand((Player) sender, contents);
return null; return null;
src/main/java/cc/carm/plugin/timereward/command/sub/UserCommand.java
+2 -2
View File
@@ -28,7 +28,7 @@ public class UserCommand extends SubCommand<MainCommand> {
Player player = Bukkit.getPlayer(args[0]); Player player = Bukkit.getPlayer(args[0]);
if (player == null) { if (player == null) {
PluginMessages.NOT_ONLINE.send(sender, args[0]); PluginMessages.NOT_ONLINE.sendTo(sender, args[0]);
return null; return null;
} }
@@ -44,7 +44,7 @@ public class UserCommand extends SubCommand<MainCommand> {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
user.getClaimedRewards().forEach((id, time) -> { 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; return null;
src/main/java/cc/carm/plugin/timereward/conf/PluginConfig.java
+16 -15
View File
@@ -1,35 +1,36 @@
package cc.carm.plugin.timereward.conf; 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; 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下的配置文件中关闭。" "当然，您也可以选择在这里关闭，或在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) ConfiguredValue<DayOfWeek> WEEK_FIRST_DAY = ConfiguredValue.builderOf(DayOfWeek.class)
.from(Integer.class).serializeSource(i -> i).parseSource(i -> (Integer) i) .from(Integer.class)
.parseValue((v, d) -> DayOfWeek.of(v)) .parse((v, d) -> DayOfWeek.of(d))
.serializeValue(DayOfWeek::getValue) .serialize(DayOfWeek::getValue)
.defaults(DayOfWeek.MONDAY).build(); .defaults(DayOfWeek.MONDAY).build();
} }
src/main/java/cc/carm/plugin/timereward/conf/PluginMessages.java
+32 -30
View File
@@ -1,10 +1,11 @@
package cc.carm.plugin.timereward.conf; 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.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 de.themoep.minedown.MineDown;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
@@ -16,17 +17,18 @@ import org.jetbrains.annotations.NotNull;
import java.util.function.BiFunction; import java.util.function.BiFunction;
@HeaderComment({ @HeaderComments({
"TimeReward 在线奖励插件的消息配置文件", "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() { static ConfiguredMessage.@NotNull Builder<BaseComponent[]> list() {
return ConfiguredMessageList.create(getParser()) return ConfiguredMessage.create(getParser())
.whenSend((sender, message) -> { .dispatcher((sender, message) -> {
if (sender instanceof ConsoleCommandSender) { if (sender instanceof ConsoleCommandSender) {
message.forEach(m -> sender.sendMessage(BaseComponent.toLegacyText(m))); message.forEach(m -> sender.sendMessage(BaseComponent.toLegacyText(m)));
return; 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) -> { return (sender, message) -> {
if (sender instanceof Player) message = PlaceholderAPI.setPlaceholders((Player) sender, message); if (sender instanceof Player) message = PlaceholderAPI.setPlaceholders((Player) sender, message);
return MineDown.parse(ColorParser.parse(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管理员指令帮助", "&6&l在线奖励 &f管理员指令帮助",
"&8#&f claim &6[奖励ID]", "&8#&f claim &6[奖励ID]",
"&8-&7 为自己手动领取对应奖励。", "&8-&7 为自己手动领取对应奖励。",
@@ -60,64 +62,64 @@ public class PluginMessages extends ConfigurationRoot {
"&8-&7 测试执行奖励配置的指令。" "&8-&7 测试执行奖励配置的指令。"
).build(); ).build();
public static final ConfiguredMessageList<BaseComponent[]> USER = list().defaults( ConfiguredMessage<BaseComponent[]> USER = list().defaults(
"&6&l在线奖励 &f您可以输入 &e/tr claim &6[奖励ID] &f领取对应奖励。" "&6&l在线奖励 &f您可以输入 &e/tr claim &6[奖励ID] &f领取对应奖励。"
).build(); ).build();
} }
public static final ConfiguredMessageList<BaseComponent[]> NO_PERMISSION = list().defaults( ConfiguredMessage<BaseComponent[]> NO_PERMISSION = list().defaults(
"&c&l抱歉！&f但您没有足够的权限使用该指令。" "&c&l抱歉！&f但您没有足够的权限使用该指令。"
).build(); ).build();
public static final ConfiguredMessageList<BaseComponent[]> NOT_PLAYER = list().defaults( ConfiguredMessage<BaseComponent[]> NOT_PLAYER = list().defaults(
"&f该指令请以玩家身份执行。" "&f该指令请以玩家身份执行。"
).build(); ).build();
public static final ConfiguredMessageList<BaseComponent[]> NOT_ONLINE = list().defaults( ConfiguredMessage<BaseComponent[]> NOT_ONLINE = list().defaults(
"&f玩家 &e%(player) &f并不在线。" "&f玩家 &e%(player) &f并不在线。"
).params("player").build(); ).params("player").build();
public static final ConfiguredMessageList<BaseComponent[]> NOT_EXISTS = list().defaults( ConfiguredMessage<BaseComponent[]> NOT_EXISTS = list().defaults(
"&f奖励 &e%(award) &f并不存在。" "&f奖励 &e%(award) &f并不存在。"
).params("award").build(); ).params("award").build();
public static final ConfiguredMessageList<BaseComponent[]> NOT_CLAIMABLE = list().defaults( ConfiguredMessage<BaseComponent[]> NOT_CLAIMABLE = list().defaults(
"&c&l抱歉！&f但您暂时未满足领取奖励 &e%(award) &f的条件。" "&c&l抱歉！&f但您暂时未满足领取奖励 &e%(award) &f的条件。"
).params("award").build(); ).params("award").build();
public static final ConfiguredMessageList<BaseComponent[]> NO_UNCLAIMED_REWARD = list().defaults( ConfiguredMessage<BaseComponent[]> NO_UNCLAIMED_REWARD = list().defaults(
"&f您暂时没有未领取的奖励。" "&f您暂时没有未领取的奖励。"
).build(); ).build();
public static final ConfiguredMessageList<BaseComponent[]> USER_INFO = list().defaults( ConfiguredMessage<BaseComponent[]> USER_INFO = list().defaults(
"&f玩家 &6%(player) &f的在线时间数据：", "&f玩家 &6%(player) &f的在线时间数据：",
"&f 本日在线 &e%(daily)&f秒，本周在线 &e%(weekly)&f秒，", "&f 本日在线 &e%(daily)&f秒，本周在线 &e%(weekly)&f秒，",
"&f 本月在线 &e%(monthly)&f秒，累积在线 &e%(total)&f秒。", "&f 本月在线 &e%(monthly)&f秒，累积在线 &e%(total)&f秒。",
"&7已领取了 &f%(amount) &7种奖励，如下所示：" "&7已领取了 &f%(amount) &7种奖励，如下所示："
).params("player", "daily", "weekly", "monthly", "total", "amount").build(); ).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领取" "&7- &e%(reward) &7于 &f%(time) &7领取"
).params("reward", "time").build(); ).params("reward", "time").build();
public static final ConfiguredMessageList<BaseComponent[]> COMMAND_LIST = list().defaults( ConfiguredMessage<BaseComponent[]> COMMAND_LIST = list().defaults(
"&f正在执行奖励 %(award) 的指令列表..." "&f正在执行奖励 %(award) 的指令列表..."
).params("award").build(); ).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)个)" "&6&l在线奖励 &f奖励列表 &7(共%(amount)个)"
).params("amount").build(); ).params("amount").build();
public static final ConfiguredMessageList<BaseComponent[]> OBJECT = list().defaults( ConfiguredMessage<BaseComponent[]> OBJECT = list().defaults(
"&8# &f%(id)", "&8# &f%(id)",
"&8- &7奖励名称 &f%(name)", "&8- &7奖励名称 &f%(name)",
"&8- &7奖励类型 &f%(type)", "&8- &7奖励类型 &f%(type)",
"&8- &7领取时间 &f&e%(time)&f秒" "&8- &7领取时间 &f&e%(time)&f秒"
).params("id", "name", "type", "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# &f%(id)",
"&8- &7奖励名称 &f%(name)", "&8- &7奖励名称 &f%(name)",
"&8- &7奖励类型 &f%(type)", "&8- &7奖励类型 &f%(type)",
@@ -127,17 +129,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正在重载配置文件..." "&f正在重载配置文件..."
).build(); ).build();
public static final ConfiguredMessageList<BaseComponent[]> ERROR = list().defaults( ConfiguredMessage<BaseComponent[]> ERROR = list().defaults(
"&f配置文件&c重载失败！&f详细原因详见后台输出。" "&f配置文件&c重载失败！&f详细原因详见后台输出。"
).build(); ).build();
public static final ConfiguredMessageList<BaseComponent[]> COMPLETE = list().defaults( ConfiguredMessage<BaseComponent[]> COMPLETE = list().defaults(
"&f配置文件重载完成！耗时 &d%(time)&fms，共加载了 &d%(count) &f个奖励配置。" "&f配置文件重载完成！耗时 &d%(time)&fms，共加载了 &d%(count) &f个奖励配置。"
).params("time", "count").build(); ).params("time", "count").build();
src/main/java/cc/carm/plugin/timereward/conf/RewardsConfig.java
+18 -20
View File
@@ -1,16 +1,17 @@
package cc.carm.plugin.timereward.conf; 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 cc.carm.plugin.timereward.data.RewardContents;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
@HeaderComment({"奖励相关设定，包含以下设定：", @HeaderComments({"奖励相关设定，包含以下设定：",
" [id] 配置键名即奖励ID，支持英文、数字与下划线。", " [id] 配置键名即奖励ID，支持英文、数字与下划线。",
" | 确定后请不要更改，因为该键值用于存储玩家是否领取的数据", " | 确定后请不要更改，因为该键值用于存储玩家是否领取的数据",
" | 如果更改，原先领取过该奖励的玩家将会自动再领取一次！", " | 如果更改，原先领取过该奖励的玩家将会自动再领取一次！",
@@ -33,24 +34,21 @@ import java.util.Map;
" [auto] 该奖励是否自动领取，可以不设置，默认为true。", " [auto] 该奖励是否自动领取，可以不设置，默认为true。",
" | 若关闭自动领取，则需要玩家手动输入/tr claim 领取奖励。", " | 若关闭自动领取，则需要玩家手动输入/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(); 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; final @NotNull Map<String, RewardContents> contents;
public RewardGroup(@NotNull Map<String, RewardContents> contents) { public RewardGroup(@NotNull Map<String, RewardContents> contents) {
@@ -69,10 +67,10 @@ public class RewardsConfig extends ConfigurationRoot {
return map; return map;
} }
public static RewardGroup parse(@NotNull ConfigurationWrapper<?> section) { public static RewardGroup parse(@NotNull ConfigureSection section) {
Map<String, RewardContents> rewards = new LinkedHashMap<>(); Map<String, RewardContents> rewards = new LinkedHashMap<>();
for (String rewardID : section.getKeys(false)) { for (String rewardID : section.getKeys(false)) {
ConfigurationWrapper<?> rewardSection = section.getConfigurationSection(rewardID); ConfigureSection rewardSection = section.getSection(rewardID);
if (rewardSection == null) continue; if (rewardSection == null) continue;
RewardContents c = RewardContents.parse(rewardID, rewardSection); RewardContents c = RewardContents.parse(rewardID, rewardSection);
src/main/java/cc/carm/plugin/timereward/data/RewardContents.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cc.carm.plugin.timereward.data; 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.lib.easyplugin.utils.ColorParser;
import cc.carm.plugin.timereward.Main; import cc.carm.plugin.timereward.Main;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -88,7 +88,7 @@ public class RewardContents {
return map; 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); long time = section.getLong("time", -1L);
if (time <= 0) { if (time <= 0) {
Main.severe("奖励 " + id + " 的时间配置错误，请检查配置文件。"); Main.severe("奖励 " + id + " 的时间配置错误，请检查配置文件。");
src/main/java/cc/carm/plugin/timereward/storage/database/DatabaseConfig.java
+18 -19
View File
@@ -1,31 +1,30 @@
package cc.carm.plugin.timereward.storage.database; 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") @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" 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() { protected static String buildJDBC() {
src/main/java/cc/carm/plugin/timereward/storage/database/DatabaseTables.java
+3 -3
View File
@@ -1,6 +1,6 @@
package cc.carm.plugin.timereward.storage.database; 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.SQLManager;
import cc.carm.lib.easysql.api.SQLTable; import cc.carm.lib.easysql.api.SQLTable;
import cc.carm.lib.easysql.api.builder.TableCreateBuilder; import cc.carm.lib.easysql.api.builder.TableCreateBuilder;
@@ -46,10 +46,10 @@ public enum DatabaseTables implements SQLTable {
}); });
private final Consumer<TableCreateBuilder> builder; private final Consumer<TableCreateBuilder> builder;
private final ConfigValue<String> name; private final ConfiguredValue<String> name;
private @Nullable SQLManager manager; private @Nullable SQLManager manager;
DatabaseTables(ConfigValue<String> name, DatabaseTables(ConfiguredValue<String> name,
Consumer<TableCreateBuilder> builder) { Consumer<TableCreateBuilder> builder) {
this.name = name; this.name = name;
this.builder = builder; this.builder = builder;