1
mirror of https://github.com/carm-outsource/TimeReward.git synced 2024-09-19 19:25:49 +00:00

feat(time): 尝试支持按日/周/月/总时长判别奖励。

This commit is contained in:
Carm Jos 2023-09-07 04:26:13 +08:00
parent dd80c5c9f7
commit 9a85f84119
5 changed files with 15 additions and 12 deletions

View File

@ -11,9 +11,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<deps.easyplugin.version>1.5.7</deps.easyplugin.version> <deps.easyplugin.version>1.5.8</deps.easyplugin.version>
<deps.easysql.version>0.4.7</deps.easysql.version> <deps.easysql.version>0.4.7</deps.easysql.version>
<deps.mineconfig.version>2.8.0</deps.mineconfig.version> <deps.mineconfig.version>2.8.2</deps.mineconfig.version>
</properties> </properties>
<groupId>cc.carm.plugin</groupId> <groupId>cc.carm.plugin</groupId>

View File

@ -24,14 +24,15 @@ public class ListCommand extends SubCommand<MainCommand> {
for (RewardContents reward : awards) { for (RewardContents reward : awards) {
if (reward.getPermission() != null) { if (reward.getPermission() != null) {
PluginMessages.LIST.OBJECT_PERM.send(sender, PluginMessages.LIST.OBJECT_PERM.prepare(
reward.getRewardID(), reward.getDisplayName(), reward.getType().name(), reward.getRewardID(), reward.getDisplayName(), reward.getType().name(),
reward.getTime(), reward.getPermission() reward.getTime(), reward.getPermission()
); ).to(sender);
} else { } else {
PluginMessages.LIST.OBJECT.send(sender, PluginMessages.LIST.OBJECT_PERM.prepare(
reward.getRewardID(), reward.getDisplayName(), reward.getType().name(), reward.getTime() reward.getRewardID(), reward.getDisplayName(),
); reward.getType().name(), reward.getTime()
).to(sender);
} }
} }
return null; return null;

View File

@ -26,7 +26,10 @@ public class ReloadCommand extends SubCommand<MainCommand> {
Main.getInstance().getMessageProvider().reload(); Main.getInstance().getMessageProvider().reload();
Main.getInstance().getRewardProvider().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) { } catch (Exception e) {
PluginMessages.RELOAD.ERROR.send(sender); PluginMessages.RELOAD.ERROR.send(sender);
e.printStackTrace(); e.printStackTrace();

View File

@ -33,14 +33,14 @@ public class UserCommand extends SubCommand<MainCommand> {
} }
UserRewardData user = TimeRewardAPI.getUserManager().get(player); UserRewardData user = TimeRewardAPI.getUserManager().get(player);
PluginMessages.USER_INFO.send(sender, PluginMessages.USER_INFO.prepare(
player.getName(), player.getName(),
user.getOnlineDuration(IntervalType.DAILY).getSeconds(), user.getOnlineDuration(IntervalType.DAILY).getSeconds(),
user.getOnlineDuration(IntervalType.WEEKLY).getSeconds(), user.getOnlineDuration(IntervalType.WEEKLY).getSeconds(),
user.getOnlineDuration(IntervalType.MONTHLY).getSeconds(), user.getOnlineDuration(IntervalType.MONTHLY).getSeconds(),
user.getOnlineDuration(IntervalType.TOTAL).getSeconds(), user.getOnlineDuration(IntervalType.TOTAL).getSeconds(),
user.getClaimedRewards().size() user.getClaimedRewards().size()
); ).to(sender);
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) -> {

View File

@ -8,7 +8,6 @@ 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;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -29,7 +28,7 @@ public class PluginMessages extends ConfigurationRoot {
return ConfiguredMessageList.create(getParser()) return ConfiguredMessageList.create(getParser())
.whenSend((sender, message) -> { .whenSend((sender, message) -> {
if (sender instanceof ConsoleCommandSender) { if (sender instanceof ConsoleCommandSender) {
message.forEach(m -> sender.sendMessage(TextComponent.toLegacyText(m))); message.forEach(m -> sender.sendMessage(BaseComponent.toLegacyText(m)));
return; return;
} }
Player player = (Player) sender; Player player = (Player) sender;