From 9a85f8411917e8c9faff6211a5a8f839cbcb2182 Mon Sep 17 00:00:00 2001 From: carm Date: Thu, 7 Sep 2023 04:26:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(time):=20=E5=B0=9D=E8=AF=95=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8C=89=E6=97=A5/=E5=91=A8/=E6=9C=88/=E6=80=BB?= =?UTF-8?q?=E6=97=B6=E9=95=BF=E5=88=A4=E5=88=AB=E5=A5=96=E5=8A=B1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../plugin/timereward/command/sub/ListCommand.java | 11 ++++++----- .../plugin/timereward/command/sub/ReloadCommand.java | 5 ++++- .../plugin/timereward/command/sub/UserCommand.java | 4 ++-- .../carm/plugin/timereward/conf/PluginMessages.java | 3 +-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 9067d1c..7c94e8c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,9 +11,9 @@ UTF-8 UTF-8 - 1.5.7 + 1.5.8 0.4.7 - 2.8.0 + 2.8.2 cc.carm.plugin diff --git a/src/main/java/cc/carm/plugin/timereward/command/sub/ListCommand.java b/src/main/java/cc/carm/plugin/timereward/command/sub/ListCommand.java index 3efeb11..874b2df 100644 --- a/src/main/java/cc/carm/plugin/timereward/command/sub/ListCommand.java +++ b/src/main/java/cc/carm/plugin/timereward/command/sub/ListCommand.java @@ -24,14 +24,15 @@ public class ListCommand extends SubCommand { for (RewardContents reward : awards) { if (reward.getPermission() != null) { - PluginMessages.LIST.OBJECT_PERM.send(sender, + PluginMessages.LIST.OBJECT_PERM.prepare( reward.getRewardID(), reward.getDisplayName(), reward.getType().name(), reward.getTime(), reward.getPermission() - ); + ).to(sender); } else { - PluginMessages.LIST.OBJECT.send(sender, - reward.getRewardID(), reward.getDisplayName(), reward.getType().name(), reward.getTime() - ); + PluginMessages.LIST.OBJECT_PERM.prepare( + reward.getRewardID(), reward.getDisplayName(), + reward.getType().name(), reward.getTime() + ).to(sender); } } return null; diff --git a/src/main/java/cc/carm/plugin/timereward/command/sub/ReloadCommand.java b/src/main/java/cc/carm/plugin/timereward/command/sub/ReloadCommand.java index cf0d088..86cd5be 100644 --- a/src/main/java/cc/carm/plugin/timereward/command/sub/ReloadCommand.java +++ b/src/main/java/cc/carm/plugin/timereward/command/sub/ReloadCommand.java @@ -26,7 +26,10 @@ public class ReloadCommand extends SubCommand { Main.getInstance().getMessageProvider().reload(); Main.getInstance().getRewardProvider().reload(); - PluginMessages.RELOAD.COMPLETE.send(sender, System.currentTimeMillis() - s1, TimeRewardAPI.getRewardManager().listRewards().size()); + PluginMessages.RELOAD.COMPLETE.prepare( + System.currentTimeMillis() - s1, + TimeRewardAPI.getRewardManager().listRewards().size() + ).to(sender); } catch (Exception e) { PluginMessages.RELOAD.ERROR.send(sender); e.printStackTrace(); diff --git a/src/main/java/cc/carm/plugin/timereward/command/sub/UserCommand.java b/src/main/java/cc/carm/plugin/timereward/command/sub/UserCommand.java index 6b73db5..80ecb9f 100644 --- a/src/main/java/cc/carm/plugin/timereward/command/sub/UserCommand.java +++ b/src/main/java/cc/carm/plugin/timereward/command/sub/UserCommand.java @@ -33,14 +33,14 @@ public class UserCommand extends SubCommand { } UserRewardData user = TimeRewardAPI.getUserManager().get(player); - PluginMessages.USER_INFO.send(sender, + 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) -> { diff --git a/src/main/java/cc/carm/plugin/timereward/conf/PluginMessages.java b/src/main/java/cc/carm/plugin/timereward/conf/PluginMessages.java index 750e4c3..c11448c 100644 --- a/src/main/java/cc/carm/plugin/timereward/conf/PluginMessages.java +++ b/src/main/java/cc/carm/plugin/timereward/conf/PluginMessages.java @@ -8,7 +8,6 @@ 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; -import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.Player; @@ -29,7 +28,7 @@ public class PluginMessages extends ConfigurationRoot { return ConfiguredMessageList.create(getParser()) .whenSend((sender, message) -> { if (sender instanceof ConsoleCommandSender) { - message.forEach(m -> sender.sendMessage(TextComponent.toLegacyText(m))); + message.forEach(m -> sender.sendMessage(BaseComponent.toLegacyText(m))); return; } Player player = (Player) sender;