From 952e0ac7132e54186c0eb654c0f860bb225bf740 Mon Sep 17 00:00:00 2001 From: MrGeneralQ Date: Fri, 22 Apr 2022 22:02:02 +0200 Subject: [PATCH 1/6] class refactored from Message to ConfigMessage & ConfigMessage to MessageKey --- README.md | 4 +- .../me/mrgeneralq/sleepmost/Sleepmost.java | 3 - .../sleepmost/commands/ErrorCommand.java | 5 +- .../sleepmost/commands/SleepCommand.java | 17 ++-- .../sleepmost/commands/SleepmostCommand.java | 7 +- .../commands/subcommands/BedSubCommand.java | 11 ++- .../subcommands/DisableSubCommand.java | 9 +- .../subcommands/EnableSubCommand.java | 9 +- .../subcommands/GetFlagSubCommand.java | 4 +- .../commands/subcommands/InfoSubCommand.java | 7 +- .../subcommands/InsomniaSubCommand.java | 13 ++- .../commands/subcommands/KickSubCommand.java | 17 ++-- .../subcommands/ReloadSubCommand.java | 5 +- .../subcommands/ResetFlagSubCommand.java | 4 +- .../commands/subcommands/ResetSubCommand.java | 7 +- .../commands/subcommands/SetFlagCommand.java | 7 +- .../subcommands/SetOnePlayerSleepCommand.java | 9 +- .../commands/subcommands/SleepSubCommand.java | 10 +-- .../{ConfigMessage.java => MessageKey.java} | 84 +++++++++--------- .../PlayerBedEnterEventListener.java | 9 +- .../PlayerSleepStateChangeEventListener.java | 4 +- .../PlayerWorldChangeEventListener.java | 5 +- .../sleepmost/interfaces/IMessageService.java | 14 +-- .../sleepmost/interfaces/ISleepService.java | 2 - .../mappers/ConfigMessageMapper.java | 26 +++--- .../sleepmost/mappers/MessageMapper.java | 86 +++++++++---------- .../{Message.java => ConfigMessage.java} | 4 +- .../sleepmost/services/MessageService.java | 28 +++--- .../sleepmost/services/SleepService.java | 5 -- 29 files changed, 195 insertions(+), 220 deletions(-) rename src/main/java/me/mrgeneralq/sleepmost/enums/{ConfigMessage.java => MessageKey.java} (93%) rename src/main/java/me/mrgeneralq/sleepmost/models/{Message.java => ConfigMessage.java} (78%) diff --git a/README.md b/README.md index 4d6fe76..f704b0e 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ To fetch the message, you can use the `IMessageService.getMessage(ConfigMessage ```java import me.mrgeneralq.sleepmost.builders.MessageBuilder; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.IMessageService; public class A { @@ -82,7 +82,7 @@ public class A { public void helloWorld(Player player) { //fetching the message builder object (this can be used to modify placeholders) - MessageBuilder helloWorldMsg = this.messageService.getMessage(ConfigMessage.HELLO_WORLD); + MessageBuilder helloWorldMsg = this.messageService.getMessage(MessageKey.HELLO_WORLD); this.messageService.sendMessage(player, helloWorldMsg.build()); } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java b/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java index 62b0063..d267535 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java +++ b/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java @@ -1,12 +1,9 @@ package me.mrgeneralq.sleepmost; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; import me.mrgeneralq.sleepmost.eventlisteners.*; import me.mrgeneralq.sleepmost.interfaces.*; import me.mrgeneralq.sleepmost.mappers.MessageMapper; -import me.mrgeneralq.sleepmost.models.Message; import me.mrgeneralq.sleepmost.runnables.Heartbeat; -import me.mrgeneralq.sleepmost.services.WorldPropertyService; import me.mrgeneralq.sleepmost.statics.ServerVersion; import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/ErrorCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/ErrorCommand.java index 84a5783..f5dac13 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/ErrorCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/ErrorCommand.java @@ -1,7 +1,6 @@ package me.mrgeneralq.sleepmost.commands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.interfaces.ISubCommand; import org.bukkit.command.Command; @@ -17,7 +16,7 @@ public ErrorCommand(IMessageService messageService){ @Override public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.UNKNOWN_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.UNKNOWN_COMMAND).build()); return true; } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java index d439bf2..f2ef051 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java @@ -1,11 +1,10 @@ package me.mrgeneralq.sleepmost.commands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.ICooldownService; import me.mrgeneralq.sleepmost.interfaces.IFlagsRepository; import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.interfaces.ISleepService; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -28,27 +27,27 @@ public SleepCommand(ISleepService sleepService, IMessageService messageService, @Override public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { if (!(sender instanceof Player)) { - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.ONLY_PLAYERS_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ONLY_PLAYERS_COMMAND).build()); return true; } Player player = (Player) sender; if (!player.hasPermission("sleepmost.sleep")) { - this.messageService.sendMessage(player, this.messageService.getMessage(ConfigMessage.NO_PERMISSION_COMMAND).build()); + this.messageService.sendMessage(player, this.messageService.getMessage(MessageKey.NO_PERMISSION_COMMAND).build()); return true; } World world = player.getWorld(); if(!this.flagsRepository.getSleepCmdFlag().getValueAt(world)){ - this.messageService.sendMessage(player, this.messageService.getMessage(ConfigMessage.SLEEP_CMD_DISABLED).build()); + this.messageService.sendMessage(player, this.messageService.getMessage(MessageKey.SLEEP_CMD_DISABLED).build()); return true; } if(this.flagsRepository.getPreventSleepFlag().getValueAt(world)) { - String sleepPreventedConfigMessage = messageService.getMessage(ConfigMessage.SLEEP_PREVENTED).build(); + String sleepPreventedConfigMessage = messageService.getMessage(MessageKey.SLEEP_PREVENTED).build(); this.messageService.sendMessage(player, messageService.getMessage(sleepPreventedConfigMessage) .setPlayer(player) @@ -58,7 +57,7 @@ public boolean onCommand(CommandSender sender, Command command, String s, String } if (!this.sleepService.resetRequired(world)) { - this.messageService.sendMessage(player, messageService.getMessage(ConfigMessage.CANNOT_SLEEP_NOW).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.CANNOT_SLEEP_NOW).build()); return true; } boolean updatedSleepStatus = !this.sleepService.isPlayerAsleep(player); @@ -78,7 +77,7 @@ public boolean onCommand(CommandSender sender, Command command, String s, String this.messageService.sendMessage(player, this.messageService.getMessage(getConfigMessage(updatedSleepStatus)).build()); return true; } - private ConfigMessage getConfigMessage(boolean sleepingStatus){ - return sleepingStatus ? ConfigMessage.SLEEP_SUCCESS : ConfigMessage.NO_LONGER_SLEEPING; + private MessageKey getConfigMessage(boolean sleepingStatus){ + return sleepingStatus ? MessageKey.SLEEP_SUCCESS : MessageKey.NO_LONGER_SLEEPING; } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/SleepmostCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/SleepmostCommand.java index d22bcf7..0e14b98 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/SleepmostCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/SleepmostCommand.java @@ -3,9 +3,8 @@ import java.util.*; import me.mrgeneralq.sleepmost.commands.subcommands.*; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.*; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -68,7 +67,7 @@ public boolean onCommand(CommandSender sender, Command command, String commandLa if(args.length == 0){ if(!sender.hasPermission("sleepmost.help")){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.NO_PERMISSION_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NO_PERMISSION_COMMAND).build()); return true; } sender.sendMessage(colorize("&b*********************************************")); @@ -97,7 +96,7 @@ public boolean onCommand(CommandSender sender, Command command, String commandLa // check if player has permission of command if(!sender.hasPermission("sleepmost." + subCommandStr)) { - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.NO_PERMISSION_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NO_PERMISSION_COMMAND).build()); return true; } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java index f7a54b7..a59dd62 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java @@ -1,10 +1,9 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.interfaces.ISleepService; import me.mrgeneralq.sleepmost.interfaces.ISubCommand; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import me.mrgeneralq.sleepmost.statics.CommandSenderUtils; import org.bukkit.World; import org.bukkit.command.Command; @@ -26,7 +25,7 @@ public BedSubCommand(ISleepService sleepService, IMessageService messageService) public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { if(!CommandSenderUtils.hasWorld(sender)){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.NO_CONSOLE_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build()); return true; } @@ -35,19 +34,19 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL if (!sleepService.isEnabledAt(world)) { - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.ALREADY_DISABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ALREADY_DISABLED_FOR_WORLD).build()); return true; } Player player = (Player) sender; if (player.getBedSpawnLocation() == null) { - this.messageService.sendMessage(player, messageService.getMessage(ConfigMessage.NO_BED_LOCATION_SET).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.NO_BED_LOCATION_SET).build()); return true; } player.teleport(player.getBedSpawnLocation()); - this.messageService.sendMessage(player, messageService.getMessage(ConfigMessage.TELEPORTED_TO_BED).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.TELEPORTED_TO_BED).build()); return true; } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/DisableSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/DisableSubCommand.java index 4b1ffd3..cd5e0e8 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/DisableSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/DisableSubCommand.java @@ -1,7 +1,6 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.interfaces.ISleepService; import me.mrgeneralq.sleepmost.interfaces.ISubCommand; @@ -25,7 +24,7 @@ public DisableSubCommand(ISleepService sleepService, IMessageService messageServ public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { if(!CommandSenderUtils.hasWorld(sender)){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.NO_CONSOLE_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build()); return true; } @@ -34,12 +33,12 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL if (!sleepService.isEnabledAt(world)) { - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.ALREADY_DISABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ALREADY_DISABLED_FOR_WORLD).build()); return true; } sleepService.disableAt(world); - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.DISABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.DISABLED_FOR_WORLD).build()); return true; } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/EnableSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/EnableSubCommand.java index 31d38ba..1977f48 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/EnableSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/EnableSubCommand.java @@ -1,7 +1,6 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.interfaces.ISleepService; import me.mrgeneralq.sleepmost.interfaces.ISubCommand; @@ -24,7 +23,7 @@ public EnableSubCommand(ISleepService sleepService, IMessageService messageServi public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { if(!CommandSenderUtils.hasWorld(sender)){ - String noConsoleCommand = messageService.getMessage(ConfigMessage.NO_CONSOLE_COMMAND).build(); + String noConsoleCommand = messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build(); sender.sendMessage(noConsoleCommand); return true; } @@ -32,12 +31,12 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL World world = CommandSenderUtils.getWorldOf(sender); if(this.sleepService.isEnabledAt(world)){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.ALREADY_ENABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ALREADY_ENABLED_FOR_WORLD).build()); return true; } this.sleepService.enableAt(world); - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.ENABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ENABLED_FOR_WORLD).build()); return true; } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java index 8255f00..29a0f85 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java @@ -1,6 +1,6 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import org.apache.commons.lang.StringUtils; import org.bukkit.World; import org.bukkit.command.Command; @@ -28,7 +28,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL if(!CommandSenderUtils.hasWorld(sender)) { - String noConsoleCmd = this.messageService.getMessagePrefixed(ConfigMessage.NO_CONSOLE_COMMAND).build(); + String noConsoleCmd = this.messageService.getMessagePrefixed(MessageKey.NO_CONSOLE_COMMAND).build(); this.messageService.sendMessage(sender, noConsoleCmd); return true; diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java index 79c9aaa..8f4aa1b 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java @@ -1,7 +1,6 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.flags.ISleepFlag; import me.mrgeneralq.sleepmost.interfaces.*; import me.mrgeneralq.sleepmost.statics.CommandSenderUtils; @@ -32,7 +31,7 @@ public InfoSubCommand(ISleepService sleepService, IMessageService messageService public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { if(!CommandSenderUtils.hasWorld(sender)){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.NO_CONSOLE_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build()); return true; } @@ -40,7 +39,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL if(!sleepService.isEnabledAt(world)) { - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.CURRENTLY_DISABLED).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.CURRENTLY_DISABLED).build()); return true; } sender.sendMessage(colorize("&b*********************************************")); diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InsomniaSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InsomniaSubCommand.java index ca10901..43caf34 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InsomniaSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InsomniaSubCommand.java @@ -1,8 +1,7 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.*; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import me.mrgeneralq.sleepmost.models.WorldProperty; import org.bukkit.World; import org.bukkit.command.Command; @@ -35,18 +34,18 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL World world = player.getWorld(); if(!sleepService.isEnabledAt(world)){ - this.messageService.sendMessage(player, messageService.getMessage(ConfigMessage.NOT_ENABLED_FOR_WORLD).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.NOT_ENABLED_FOR_WORLD).build()); return true; } if (!sleepService.isNight(world)) { - String notNightMessage = this.messageService.getMessage(ConfigMessage.CMD_ONLY_DURING_NIGHT).build(); + String notNightMessage = this.messageService.getMessage(MessageKey.CMD_ONLY_DURING_NIGHT).build(); this.messageService.sendMessage(player, notNightMessage); return true; } if (this.worldPropertyService.getWorldProperties(world).isInsomniaEnabled()) { - String insomniaMessage = this.messageService.getMessage(ConfigMessage.INSOMNIA_ALREADY_ENABLED).build(); + String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_ALREADY_ENABLED).build(); this.messageService.sendMessage(player, insomniaMessage); return true; } @@ -56,13 +55,13 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL this.worldPropertyService.setWorldProperty(world, property); - String insomniaMessage = this.messageService.getMessage(ConfigMessage.INSOMNIA_ENABLED).build(); + String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_ENABLED).build(); List sleepingPlayers = this.sleepService.getSleepers(world); for(Player p: sleepingPlayers){ p.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 60,1)); p.teleport(p.getLocation()); - String targetInsomniaMessage = this.messageService.getMessage(ConfigMessage.INSOMNIA_NOT_SLEEPY).build(); + String targetInsomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_NOT_SLEEPY).build(); this.messageService.sendMessage(p, targetInsomniaMessage); } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/KickSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/KickSubCommand.java index 928ffe1..d8fe88a 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/KickSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/KickSubCommand.java @@ -1,12 +1,11 @@ package me.mrgeneralq.sleepmost.commands.subcommands; import me.mrgeneralq.sleepmost.builders.MessageBuilder; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.IFlagsRepository; import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.interfaces.ISleepService; import me.mrgeneralq.sleepmost.interfaces.ISubCommand; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import me.mrgeneralq.sleepmost.statics.CommandSenderUtils; import org.bukkit.Bukkit; import org.bukkit.World; @@ -30,7 +29,7 @@ public KickSubCommand(ISleepService sleepService, IMessageService messageService public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { if(!CommandSenderUtils.hasWorld(sender)){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.NO_CONSOLE_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build()); return true; } @@ -41,7 +40,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL boolean kickingEnabled = this.flagsRepository.getAllowKickFlag().getValueAt(world); if(!kickingEnabled){ - MessageBuilder kickNotAllowedMsg = this.messageService.getMessagePrefixed(ConfigMessage.KICKING_NOT_ALLOWED) + MessageBuilder kickNotAllowedMsg = this.messageService.getMessagePrefixed(MessageKey.KICKING_NOT_ALLOWED) .setWorld(world); this.messageService.sendMessage(player , kickNotAllowedMsg.build()); @@ -49,31 +48,31 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL } if(args.length < 2){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.SPECIFY_PLAYER).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.SPECIFY_PLAYER).build()); return true; } String targetPlayerName = args[1]; if(Bukkit.getPlayer(targetPlayerName) == null){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.TARGET_NOT_ONLINE).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.TARGET_NOT_ONLINE).build()); return true; } Player targetPlayer = Bukkit.getPlayer(targetPlayerName); if(!this.sleepService.isPlayerAsleep(targetPlayer)){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.TARGET_NOT_SLEEPING).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.TARGET_NOT_SLEEPING).build()); return true; } - MessageBuilder targetKickedFromBedMsg = this.messageService.getMessagePrefixed(ConfigMessage.KICKED_PLAYER_FROM_BED) + MessageBuilder targetKickedFromBedMsg = this.messageService.getMessagePrefixed(MessageKey.KICKED_PLAYER_FROM_BED) .setPlayer(targetPlayer) .setWorld(targetPlayer.getWorld()); - MessageBuilder youAreKickedMsg = this.messageService.getMessage(ConfigMessage.YOU_ARE_KICKED_FROM_BED) + MessageBuilder youAreKickedMsg = this.messageService.getMessage(MessageKey.YOU_ARE_KICKED_FROM_BED) .setPlayer(player); targetPlayer.teleport(targetPlayer.getLocation()); diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ReloadSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ReloadSubCommand.java index 7214e20..3a2ec36 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ReloadSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ReloadSubCommand.java @@ -1,8 +1,7 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.IFlagService; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.interfaces.ISleepService; import me.mrgeneralq.sleepmost.interfaces.ISubCommand; @@ -27,7 +26,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL //reload the config this.sleepService.reloadConfig(); this.messageService.reloadConfig(); - sender.sendMessage(messageService.getMessage(ConfigMessage.CONFIG_RELOADED).build()); + sender.sendMessage(messageService.getMessage(MessageKey.CONFIG_RELOADED).build()); //handle somehow illegal flags values this.flagService.handleProblematicFlags(); diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetFlagSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetFlagSubCommand.java index a84fca2..83ae07b 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetFlagSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetFlagSubCommand.java @@ -1,6 +1,6 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import org.apache.commons.lang.StringUtils; import org.bukkit.World; import org.bukkit.command.Command; @@ -29,7 +29,7 @@ public ResetFlagSubCommand(IMessageService messageService, IFlagsRepository flag public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { if(!CommandSenderUtils.hasWorld(sender)) { - this.messageService.sendMessage(sender, this.messageService.getMessage(ConfigMessage.NO_CONSOLE_COMMAND).build()); + this.messageService.sendMessage(sender, this.messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build()); return true; } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetSubCommand.java index b14fd42..6cf438c 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetSubCommand.java @@ -1,10 +1,9 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.IFlagService; import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.interfaces.ISubCommand; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import me.mrgeneralq.sleepmost.statics.CommandSenderUtils; import org.bukkit.World; import org.bukkit.command.Command; @@ -24,14 +23,14 @@ public ResetSubCommand(IMessageService messageService, IFlagService flagService) public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { if(!CommandSenderUtils.hasWorld(sender)){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.NO_CONSOLE_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build()); return true; } World world = CommandSenderUtils.getWorldOf(sender); this.flagService.resetFlagsAt(world); this.messageService.sendMessage(sender, - this.messageService.getMessagePrefixed(ConfigMessage.FLAGS_RESET_SUCCESS) + this.messageService.getMessagePrefixed(MessageKey.FLAGS_RESET_SUCCESS) .setWorld(world) .build()); return true; diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java index 6f1e4ca..73c9c57 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java @@ -1,9 +1,8 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.flags.types.TabCompletedFlag; import me.mrgeneralq.sleepmost.interfaces.*; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import me.mrgeneralq.sleepmost.flags.ISleepFlag; import me.mrgeneralq.sleepmost.statics.CommandSenderUtils; import org.apache.commons.lang.StringUtils; @@ -33,14 +32,14 @@ public SetFlagCommand(ISleepService sleepService, IMessageService messageService public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { if (!CommandSenderUtils.hasWorld(sender)) { - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.NO_CONSOLE_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build()); return true; } World world = CommandSenderUtils.getWorldOf(sender); if (!sleepService.isEnabledAt(world)) { - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.CURRENTLY_DISABLED).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.CURRENTLY_DISABLED).build()); return true; } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetOnePlayerSleepCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetOnePlayerSleepCommand.java index c836459..d1678bc 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetOnePlayerSleepCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetOnePlayerSleepCommand.java @@ -1,10 +1,9 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.flags.CalculationMethodFlag; import me.mrgeneralq.sleepmost.flags.PlayersRequiredFlag; import me.mrgeneralq.sleepmost.interfaces.*; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import me.mrgeneralq.sleepmost.statics.CommandSenderUtils; import org.bukkit.World; import org.bukkit.command.Command; @@ -30,7 +29,7 @@ public SetOnePlayerSleepCommand(ISleepService sleepService, IMessageService mess public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { if(!CommandSenderUtils.hasWorld(sender)){ - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.NO_CONSOLE_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build()); return true; } @@ -39,7 +38,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL World world = CommandSenderUtils.getWorldOf(sender); if (!sleepService.isEnabledAt(world)) { - this.messageService.sendMessage(sender, messageService.getMessage(ConfigMessage.NOT_ENABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NOT_ENABLED_FOR_WORLD).build()); return true; } @@ -49,7 +48,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL this.flagService.setStringValueAt(calculationMethodFlag, world, "players"); this.flagService.setStringValueAt(playersRequiredFlag, world, "1"); - this.messageService.sendMessage(player, this.messageService.getMessage(ConfigMessage.ONE_PLAYER_SLEEP_SET).build()); + this.messageService.sendMessage(player, this.messageService.getMessage(MessageKey.ONE_PLAYER_SLEEP_SET).build()); return true; } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SleepSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SleepSubCommand.java index 4c539a1..942fa3e 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SleepSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SleepSubCommand.java @@ -1,6 +1,6 @@ package me.mrgeneralq.sleepmost.commands.subcommands; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.*; import me.mrgeneralq.sleepmost.templates.MessageTemplate; import org.bukkit.World; @@ -31,13 +31,13 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL World world = player.getWorld(); if(!this.flagsRepository.getSleepCmdFlag().getValueAt(world)){ - this.messageService.sendMessage(player, this.messageService.getMessage(ConfigMessage.SLEEP_CMD_DISABLED).build()); + this.messageService.sendMessage(player, this.messageService.getMessage(MessageKey.SLEEP_CMD_DISABLED).build()); return true; } //check if sleep is allowed if(this.flagsRepository.getPreventSleepFlag().getValueAt(world)) { - String sleepPreventedConfigMessage = messageService.getMessage(ConfigMessage.SLEEP_PREVENTED).build(); + String sleepPreventedConfigMessage = messageService.getMessage(MessageKey.SLEEP_PREVENTED).build(); this.messageService.sendMessage(player, messageService.getMessage(sleepPreventedConfigMessage) .setPlayer(player) @@ -48,13 +48,13 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL //check if reset is required if (!this.sleepService.resetRequired(world)) { - this.messageService.sendMessage(player, messageService.getMessage(ConfigMessage.CANNOT_SLEEP_NOW).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.CANNOT_SLEEP_NOW).build()); return true; } if(this.worldPropertyService.getWorldProperties(world).isInsomniaEnabled()){ - String insomniaMessage = this.messageService.getMessage(ConfigMessage.INSOMNIA_NOT_SLEEPY).build(); + String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_NOT_SLEEPY).build(); this.messageService.sendMessage(player, insomniaMessage); return true; } diff --git a/src/main/java/me/mrgeneralq/sleepmost/enums/ConfigMessage.java b/src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java similarity index 93% rename from src/main/java/me/mrgeneralq/sleepmost/enums/ConfigMessage.java rename to src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java index 90da262..d30bc30 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/enums/ConfigMessage.java +++ b/src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java @@ -1,42 +1,42 @@ -package me.mrgeneralq.sleepmost.enums; - -public enum ConfigMessage { - PREFIX, - NIGHT_SKIPPED, - STORM_SKIPPED, - PLAYERS_LEFT_TO_SKIP_NIGHT, - PLAYERS_LEFT_TO_SKIP_STORM, - SLEEP_PREVENTED, - NO_SLEEP_THUNDERSTORM, - BOSS_BAR_TITLE, - NO_CONSOLE_COMMAND, - NO_PERMISSION_COMMAND, - UNKNOWN_COMMAND, - CONFIG_RELOADED, - ONLY_PLAYERS_COMMAND, - ALREADY_ENABLED_FOR_WORLD, - ALREADY_DISABLED_FOR_WORLD, - ENABLED_FOR_WORLD, - DISABLED_FOR_WORLD, - NOT_ENABLED_FOR_WORLD, - CURRENTLY_DISABLED, - CANNOT_SLEEP_NOW, - FLAGS_RESET_SUCCESS, - SLEEP_SUCCESS, - NO_LONGER_SLEEPING, - NO_BED_LOCATION_SET, - TELEPORTED_TO_BED, - SLEEP_CMD_DISABLED, - ONE_PLAYER_SLEEP_SET, - SPECIFY_PLAYER, - TARGET_NOT_SLEEPING, - TARGET_NOT_ONLINE, - INSOMNIA_NOT_SLEEPY, - INSOMNIA_ALREADY_ENABLED, - INSOMNIA_ENABLED, - CMD_ONLY_DURING_NIGHT, - KICK_OUT_BED, - KICKED_PLAYER_FROM_BED, - YOU_ARE_KICKED_FROM_BED, - KICKING_NOT_ALLOWED -} +package me.mrgeneralq.sleepmost.enums; + +public enum MessageKey { + PREFIX, + NIGHT_SKIPPED, + STORM_SKIPPED, + PLAYERS_LEFT_TO_SKIP_NIGHT, + PLAYERS_LEFT_TO_SKIP_STORM, + SLEEP_PREVENTED, + NO_SLEEP_THUNDERSTORM, + BOSS_BAR_TITLE, + NO_CONSOLE_COMMAND, + NO_PERMISSION_COMMAND, + UNKNOWN_COMMAND, + CONFIG_RELOADED, + ONLY_PLAYERS_COMMAND, + ALREADY_ENABLED_FOR_WORLD, + ALREADY_DISABLED_FOR_WORLD, + ENABLED_FOR_WORLD, + DISABLED_FOR_WORLD, + NOT_ENABLED_FOR_WORLD, + CURRENTLY_DISABLED, + CANNOT_SLEEP_NOW, + FLAGS_RESET_SUCCESS, + SLEEP_SUCCESS, + NO_LONGER_SLEEPING, + NO_BED_LOCATION_SET, + TELEPORTED_TO_BED, + SLEEP_CMD_DISABLED, + ONE_PLAYER_SLEEP_SET, + SPECIFY_PLAYER, + TARGET_NOT_SLEEPING, + TARGET_NOT_ONLINE, + INSOMNIA_NOT_SLEEPY, + INSOMNIA_ALREADY_ENABLED, + INSOMNIA_ENABLED, + CMD_ONLY_DURING_NIGHT, + KICK_OUT_BED, + KICKED_PLAYER_FROM_BED, + YOU_ARE_KICKED_FROM_BED, + KICKING_NOT_ALLOWED +} diff --git a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerBedEnterEventListener.java b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerBedEnterEventListener.java index e422023..47aa948 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerBedEnterEventListener.java +++ b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerBedEnterEventListener.java @@ -1,8 +1,7 @@ package me.mrgeneralq.sleepmost.eventlisteners; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.*; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import me.mrgeneralq.sleepmost.statics.DataContainer; import org.bukkit.World; import org.bukkit.entity.Player; @@ -49,7 +48,7 @@ public void onPlayerBedEnter(PlayerBedEnterEvent e) { //check if sleeping during storms is allowed if (world.isThundering() && !this.flagsRepository.getStormSleepFlag().getValueAt(world)) { - String preventSleepStormMessage = messageService.getMessage(ConfigMessage.NO_SLEEP_THUNDERSTORM).build(); + String preventSleepStormMessage = messageService.getMessage(MessageKey.NO_SLEEP_THUNDERSTORM).build(); this.messageService.sendMessage(player, messageService.getMessage(preventSleepStormMessage) .setPlayer(player) @@ -62,7 +61,7 @@ public void onPlayerBedEnter(PlayerBedEnterEvent e) { //check if sleep is allowed in world if(this.flagsRepository.getPreventSleepFlag().getValueAt(world)) { - String sleepPreventedConfigMessage = messageService.getMessage(ConfigMessage.SLEEP_PREVENTED).build(); + String sleepPreventedConfigMessage = messageService.getMessage(MessageKey.SLEEP_PREVENTED).build(); this.messageService.sendMessage(player, messageService.getMessage(sleepPreventedConfigMessage) .setPlayer(player) .setWorld(world) @@ -73,7 +72,7 @@ public void onPlayerBedEnter(PlayerBedEnterEvent e) { if(this.worldPropertyService.getWorldProperties(world).isInsomniaEnabled()){ - String insomniaMessage = this.messageService.getMessage(ConfigMessage.INSOMNIA_NOT_SLEEPY).build(); + String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_NOT_SLEEPY).build(); this.messageService.sendMessage(player,insomniaMessage); e.setCancelled(true); return; diff --git a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerSleepStateChangeEventListener.java b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerSleepStateChangeEventListener.java index 01ecb03..9bcf223 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerSleepStateChangeEventListener.java +++ b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerSleepStateChangeEventListener.java @@ -1,7 +1,7 @@ package me.mrgeneralq.sleepmost.eventlisteners; import me.mrgeneralq.sleepmost.Sleepmost; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.enums.SleepSkipCause; import me.mrgeneralq.sleepmost.enums.SleepState; import me.mrgeneralq.sleepmost.events.PlayerSleepStateChangeEvent; @@ -118,7 +118,7 @@ private void updateBossBar(World world){ int playersRequiredAmount = Math.round(sleepService.getRequiredSleepersCount(world)); int sleepingPlayersAmount = sleepService.getSleepersAmount(world); - String configBossBarTitle = this.messageService.getMessage(ConfigMessage.BOSS_BAR_TITLE).build(); + String configBossBarTitle = this.messageService.getMessage(MessageKey.BOSS_BAR_TITLE).build(); String bossBarTitle = new MessageBuilder(configBossBarTitle, "") .usePrefix(false) .setSleepingCount(Math.min(sleepingPlayersAmount, playersRequiredAmount)) diff --git a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerWorldChangeEventListener.java b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerWorldChangeEventListener.java index 3a8df1e..dd87656 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerWorldChangeEventListener.java +++ b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerWorldChangeEventListener.java @@ -1,8 +1,7 @@ package me.mrgeneralq.sleepmost.eventlisteners; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.interfaces.IBossBarService; -import me.mrgeneralq.sleepmost.templates.MessageTemplate; import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.interfaces.ISleepService; import me.mrgeneralq.sleepmost.statics.DataContainer; @@ -45,6 +44,6 @@ public void onPlayerChangeWorld(PlayerChangedWorldEvent e){ if(sleepService.isEnabledAt(world)) return; - this.messageService.sendMessage(player, messageService.getMessage(ConfigMessage.CURRENTLY_DISABLED).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.CURRENTLY_DISABLED).build()); } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/interfaces/IMessageService.java b/src/main/java/me/mrgeneralq/sleepmost/interfaces/IMessageService.java index ac270d0..4419368 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/interfaces/IMessageService.java +++ b/src/main/java/me/mrgeneralq/sleepmost/interfaces/IMessageService.java @@ -1,34 +1,34 @@ package me.mrgeneralq.sleepmost.interfaces; import me.mrgeneralq.sleepmost.builders.MessageBuilder; -import me.mrgeneralq.sleepmost.models.Message; +import me.mrgeneralq.sleepmost.enums.MessageKey; +import me.mrgeneralq.sleepmost.models.ConfigMessage; import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; import me.mrgeneralq.sleepmost.enums.SleepSkipCause; import java.util.List; public interface IMessageService { - ConfigMessage getSleepSkipCauseMessage(SleepSkipCause cause); + MessageKey getSleepSkipCauseMessage(SleepSkipCause cause); String getPlayersLeftMessage(Player player, SleepSkipCause cause, int sleepingPlayersAmount, int requiredPlayersAmount); void sendMessage(CommandSender sender, String message); void sendWorldMessage(World world, String message); void sendOPMessage(String message); void sendPlayerLeftMessage(Player player, SleepSkipCause cause, int sleepingPlayersAmount, int requiredPlayersAmount); void sendNightSkippedMessage(World world, String lastSleeperName, String lastSleeperDisplayName, SleepSkipCause cause); - MessageBuilder getMessage(ConfigMessage configMessage); + MessageBuilder getMessage(MessageKey configMessage); MessageBuilder getMessage(String message); - MessageBuilder getMessagePrefixed(ConfigMessage configMessage); + MessageBuilder getMessagePrefixed(MessageKey configMessage); MessageBuilder getMessagePrefixed(String string); - List getMessages(); + List getMessages(); boolean messagePathExists(String path); - void createMessage(Message message); + void createMessage(ConfigMessage message); void createMissingMessages(); diff --git a/src/main/java/me/mrgeneralq/sleepmost/interfaces/ISleepService.java b/src/main/java/me/mrgeneralq/sleepmost/interfaces/ISleepService.java index 6bfcb01..af02f1b 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/interfaces/ISleepService.java +++ b/src/main/java/me/mrgeneralq/sleepmost/interfaces/ISleepService.java @@ -1,6 +1,4 @@ package me.mrgeneralq.sleepmost.interfaces; -import me.mrgeneralq.sleepmost.builders.MessageBuilder; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; import me.mrgeneralq.sleepmost.enums.SleepSkipCause; import org.bukkit.OfflinePlayer; import org.bukkit.World; diff --git a/src/main/java/me/mrgeneralq/sleepmost/mappers/ConfigMessageMapper.java b/src/main/java/me/mrgeneralq/sleepmost/mappers/ConfigMessageMapper.java index 8fe6937..a5725e4 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/mappers/ConfigMessageMapper.java +++ b/src/main/java/me/mrgeneralq/sleepmost/mappers/ConfigMessageMapper.java @@ -4,26 +4,26 @@ import java.util.Map; import me.mrgeneralq.sleepmost.Sleepmost; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.statics.ChatColorUtils; public class ConfigMessageMapper { private Sleepmost main; - private final Map configMessages = new HashMap<>(); + private final Map configMessages = new HashMap<>(); private static ConfigMessageMapper messageMapper; private ConfigMessageMapper(){ - configMessages.put(ConfigMessage.PREFIX, "messages.prefix"); - configMessages.put(ConfigMessage.NIGHT_SKIPPED, "messages.night-skipped"); - configMessages.put(ConfigMessage.STORM_SKIPPED, "messages.storm-skipped"); - configMessages.put(ConfigMessage.PLAYERS_LEFT_TO_SKIP_NIGHT, "messages.players-left-night"); - configMessages.put(ConfigMessage.PLAYERS_LEFT_TO_SKIP_STORM, "messages.players-left-storm"); - configMessages.put(ConfigMessage.SLEEP_PREVENTED, "messages.sleep-prevented"); - configMessages.put(ConfigMessage.NO_SLEEP_THUNDERSTORM, "messages.no-sleep-storm"); - configMessages.put(ConfigMessage.BOSS_BAR_TITLE, "bossbar.title"); + configMessages.put(MessageKey.PREFIX, "messages.prefix"); + configMessages.put(MessageKey.NIGHT_SKIPPED, "messages.night-skipped"); + configMessages.put(MessageKey.STORM_SKIPPED, "messages.storm-skipped"); + configMessages.put(MessageKey.PLAYERS_LEFT_TO_SKIP_NIGHT, "messages.players-left-night"); + configMessages.put(MessageKey.PLAYERS_LEFT_TO_SKIP_STORM, "messages.players-left-storm"); + configMessages.put(MessageKey.SLEEP_PREVENTED, "messages.sleep-prevented"); + configMessages.put(MessageKey.NO_SLEEP_THUNDERSTORM, "messages.no-sleep-storm"); + configMessages.put(MessageKey.BOSS_BAR_TITLE, "bossbar.title"); } public static ConfigMessageMapper getMapper(){ @@ -36,16 +36,16 @@ public void initialize(Sleepmost main){ this.main = main; } - public String getMessagePath(ConfigMessage message){ + public String getMessagePath(MessageKey message){ return configMessages.get(message); } - public String getMessage(ConfigMessage configMessage, boolean includePrefix) + public String getMessage(MessageKey configMessage, boolean includePrefix) { String message = ""; if(includePrefix) { - message += getMessage(ConfigMessage.PREFIX, false) + " "; + message += getMessage(MessageKey.PREFIX, false) + " "; } message += main.getConfig().getString(configMessages.get(configMessage)); diff --git a/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java b/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java index bed9702..21eea36 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java +++ b/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java @@ -1,7 +1,7 @@ package me.mrgeneralq.sleepmost.mappers; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; -import me.mrgeneralq.sleepmost.models.Message; +import me.mrgeneralq.sleepmost.enums.MessageKey; +import me.mrgeneralq.sleepmost.models.ConfigMessage; import java.util.ArrayList; import java.util.HashMap; @@ -11,7 +11,7 @@ public class MessageMapper { private static MessageMapper mapper; - private final Map messages = new HashMap<>(); + private final Map messages = new HashMap<>(); private MessageMapper() {} @@ -23,51 +23,51 @@ public static MessageMapper getMapper(){ public void loadMessages(){ - this.messages.put(ConfigMessage.PREFIX, new Message("path", "default message")); - this.messages.put(ConfigMessage.NIGHT_SKIPPED, new Message("path", "default message")); - this.messages.put(ConfigMessage.STORM_SKIPPED, new Message("path", "default message")); - this.messages.put(ConfigMessage.PLAYERS_LEFT_TO_SKIP_NIGHT, new Message("path", "default message")); - this.messages.put(ConfigMessage.PLAYERS_LEFT_TO_SKIP_STORM, new Message("path", "default message")); - this.messages.put(ConfigMessage.SLEEP_PREVENTED, new Message("path", "default message")); - this.messages.put(ConfigMessage.NO_SLEEP_THUNDERSTORM, new Message("path", "default message")); - this.messages.put(ConfigMessage.BOSS_BAR_TITLE, new Message("path", "default message")); - this.messages.put(ConfigMessage.NO_CONSOLE_COMMAND, new Message("path", "default message")); - this.messages.put(ConfigMessage.NO_PERMISSION_COMMAND, new Message("path", "default message")); - this.messages.put(ConfigMessage.UNKNOWN_COMMAND, new Message("path", "default message")); - this.messages.put(ConfigMessage.CONFIG_RELOADED, new Message("path", "default message")); - this.messages.put(ConfigMessage.ONLY_PLAYERS_COMMAND, new Message("path", "default message")); - this.messages.put(ConfigMessage.ALREADY_ENABLED_FOR_WORLD, new Message("path", "default message")); - this.messages.put(ConfigMessage.ALREADY_DISABLED_FOR_WORLD, new Message("path", "default message")); - this.messages.put(ConfigMessage.ENABLED_FOR_WORLD, new Message("path", "default message")); - this.messages.put(ConfigMessage.DISABLED_FOR_WORLD, new Message("path", "default message")); - this.messages.put(ConfigMessage.NOT_ENABLED_FOR_WORLD, new Message("path", "default message")); - this.messages.put(ConfigMessage.CURRENTLY_DISABLED, new Message("path", "default message")); - this.messages.put(ConfigMessage.CANNOT_SLEEP_NOW, new Message("path", "default message")); - this.messages.put(ConfigMessage.FLAGS_RESET_SUCCESS, new Message("path", "default message")); - this.messages.put(ConfigMessage.SLEEP_SUCCESS, new Message("path", "default message")); - this.messages.put(ConfigMessage.NO_LONGER_SLEEPING, new Message("path", "default message")); - this.messages.put(ConfigMessage.NO_BED_LOCATION_SET, new Message("path", "default message")); - this.messages.put(ConfigMessage.TELEPORTED_TO_BED, new Message("path", "default message")); - this.messages.put(ConfigMessage.SLEEP_CMD_DISABLED, new Message("path", "default message")); - this.messages.put(ConfigMessage.ONE_PLAYER_SLEEP_SET, new Message("path", "default message")); - this.messages.put(ConfigMessage.SPECIFY_PLAYER, new Message("path", "default message")); - this.messages.put(ConfigMessage.TARGET_NOT_SLEEPING, new Message("path", "default message")); - this.messages.put(ConfigMessage.TARGET_NOT_ONLINE, new Message("path", "default message")); - this.messages.put(ConfigMessage.INSOMNIA_NOT_SLEEPY, new Message("path", "default message")); - this.messages.put(ConfigMessage.INSOMNIA_ALREADY_ENABLED, new Message("path", "default message")); - this.messages.put(ConfigMessage.INSOMNIA_ENABLED, new Message("path", "default message")); - this.messages.put(ConfigMessage.CMD_ONLY_DURING_NIGHT, new Message("path", "default message")); - this.messages.put(ConfigMessage.KICK_OUT_BED, new Message("path", "default message")); - this.messages.put(ConfigMessage.KICKED_PLAYER_FROM_BED, new Message("path", "default message")); - this.messages.put(ConfigMessage.YOU_ARE_KICKED_FROM_BED, new Message("path", "default message")); - this.messages.put(ConfigMessage.KICKING_NOT_ALLOWED, new Message("path", "default message")); + this.messages.put(MessageKey.PREFIX, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.NIGHT_SKIPPED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.STORM_SKIPPED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.PLAYERS_LEFT_TO_SKIP_NIGHT, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.PLAYERS_LEFT_TO_SKIP_STORM, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.SLEEP_PREVENTED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.NO_SLEEP_THUNDERSTORM, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.BOSS_BAR_TITLE, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.NO_CONSOLE_COMMAND, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.NO_PERMISSION_COMMAND, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.UNKNOWN_COMMAND, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.CONFIG_RELOADED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.ONLY_PLAYERS_COMMAND, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.ALREADY_ENABLED_FOR_WORLD, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.ALREADY_DISABLED_FOR_WORLD, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.ENABLED_FOR_WORLD, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.DISABLED_FOR_WORLD, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.NOT_ENABLED_FOR_WORLD, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.CURRENTLY_DISABLED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.CANNOT_SLEEP_NOW, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.FLAGS_RESET_SUCCESS, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.SLEEP_SUCCESS, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.NO_LONGER_SLEEPING, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.NO_BED_LOCATION_SET, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.TELEPORTED_TO_BED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.SLEEP_CMD_DISABLED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.ONE_PLAYER_SLEEP_SET, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.SPECIFY_PLAYER, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.TARGET_NOT_SLEEPING, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.TARGET_NOT_ONLINE, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.INSOMNIA_NOT_SLEEPY, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.INSOMNIA_ALREADY_ENABLED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.INSOMNIA_ENABLED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.CMD_ONLY_DURING_NIGHT, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.KICK_OUT_BED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.KICKED_PLAYER_FROM_BED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.YOU_ARE_KICKED_FROM_BED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.KICKING_NOT_ALLOWED, new ConfigMessage("path", "default message")); } - public Message getMessage(ConfigMessage message){ + public ConfigMessage getMessage(MessageKey message){ return this.messages.get(message); } - public List getAllMessages(){ + public List getAllMessages(){ return new ArrayList<>(this.messages.values()); } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/models/Message.java b/src/main/java/me/mrgeneralq/sleepmost/models/ConfigMessage.java similarity index 78% rename from src/main/java/me/mrgeneralq/sleepmost/models/Message.java rename to src/main/java/me/mrgeneralq/sleepmost/models/ConfigMessage.java index 71dd091..ba56477 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/models/Message.java +++ b/src/main/java/me/mrgeneralq/sleepmost/models/ConfigMessage.java @@ -1,11 +1,11 @@ package me.mrgeneralq.sleepmost.models; -public class Message { +public class ConfigMessage { private final String path; private final String defaultValue; - public Message(String path, String defaultValue) { + public ConfigMessage(String path, String defaultValue) { this.path = path; this.defaultValue = defaultValue; } diff --git a/src/main/java/me/mrgeneralq/sleepmost/services/MessageService.java b/src/main/java/me/mrgeneralq/sleepmost/services/MessageService.java index c21fd58..4a8caf6 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/services/MessageService.java +++ b/src/main/java/me/mrgeneralq/sleepmost/services/MessageService.java @@ -1,13 +1,13 @@ package me.mrgeneralq.sleepmost.services; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.enums.SleepSkipCause; import me.mrgeneralq.sleepmost.interfaces.IConfigRepository; import me.mrgeneralq.sleepmost.interfaces.IFlagsRepository; import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.builders.MessageBuilder; import me.mrgeneralq.sleepmost.mappers.MessageMapper; -import me.mrgeneralq.sleepmost.models.Message; +import me.mrgeneralq.sleepmost.models.ConfigMessage; import me.mrgeneralq.sleepmost.repositories.MessageRepository; import me.mrgeneralq.sleepmost.mappers.ConfigMessageMapper; import me.mrgeneralq.sleepmost.statics.ServerVersion; @@ -38,20 +38,20 @@ public MessageService(IConfigRepository configRepository, MessageRepository mess this.flagsRepository = flagsRepository; this.messageMapper = MessageMapper.getMapper(); - Message prefixMessage = this.messageMapper.getMessage(ConfigMessage.PREFIX); + ConfigMessage prefixMessage = this.messageMapper.getMessage(MessageKey.PREFIX); this.prefix = this.messageRepository.get(prefixMessage.getPath()); } @Override - public ConfigMessage getSleepSkipCauseMessage(SleepSkipCause cause) { - return cause == SleepSkipCause.STORM ? ConfigMessage.PLAYERS_LEFT_TO_SKIP_STORM : ConfigMessage.PLAYERS_LEFT_TO_SKIP_NIGHT; + public MessageKey getSleepSkipCauseMessage(SleepSkipCause cause) { + return cause == SleepSkipCause.STORM ? MessageKey.PLAYERS_LEFT_TO_SKIP_STORM : MessageKey.PLAYERS_LEFT_TO_SKIP_NIGHT; } @Override public String getPlayersLeftMessage(Player player, SleepSkipCause cause, int sleepingPlayersAmount, int requiredPlayersAmount) { - ConfigMessage skipCauseConfigMessage = this.getSleepSkipCauseMessage(cause); + MessageKey skipCauseConfigMessage = this.getSleepSkipCauseMessage(cause); MessageBuilder skipConfigMessageBuilder = this.getMessage(skipCauseConfigMessage) .usePrefix(false) .setPlayer(player) @@ -112,7 +112,7 @@ public void sendPlayerLeftMessage(Player player, SleepSkipCause cause, int sleep if(p.hasPermission("sleepmost.kick")){ - MessageBuilder kickMessage = this.getMessage(ConfigMessage.KICK_OUT_BED); + MessageBuilder kickMessage = this.getMessage(MessageKey.KICK_OUT_BED); TextComponent component = new TextComponent(kickMessage.build()); component.setColor(ChatColor.RED); @@ -132,7 +132,7 @@ public void sendPlayerLeftMessage(Player player, SleepSkipCause cause, int sleep @Override public void sendNightSkippedMessage(World world, String lastSleeperName, String lastSleeperDisplayName, SleepSkipCause cause) { - ConfigMessage message = (cause == SleepSkipCause.STORM ? ConfigMessage.STORM_SKIPPED : ConfigMessage.NIGHT_SKIPPED); + MessageKey message = (cause == SleepSkipCause.STORM ? MessageKey.STORM_SKIPPED : MessageKey.NIGHT_SKIPPED); String skipMessage = ConfigMessageMapper.getMapper().getMessage(message, false) .replace("%player%", lastSleeperName); @@ -141,9 +141,9 @@ public void sendNightSkippedMessage(World world, String lastSleeperName, String } @Override - public MessageBuilder getMessage(ConfigMessage configMessage){ + public MessageBuilder getMessage(MessageKey configMessage){ - Message messageObject = MessageMapper.getMapper().getMessage(configMessage); + ConfigMessage messageObject = MessageMapper.getMapper().getMessage(configMessage); String messageStr = this.messageRepository.get(messageObject.getPath()); return new MessageBuilder(messageStr, this.prefix); @@ -155,7 +155,7 @@ public MessageBuilder getMessage(String message){ } @Override - public MessageBuilder getMessagePrefixed(ConfigMessage configMessage) { + public MessageBuilder getMessagePrefixed(MessageKey configMessage) { return this.getMessage(configMessage).usePrefix(true); } @@ -165,7 +165,7 @@ public MessageBuilder getMessagePrefixed(String message) { } @Override - public List getMessages(){ + public List getMessages(){ return this.messageMapper.getAllMessages(); } @@ -175,13 +175,13 @@ public boolean messagePathExists(String path){ } @Override - public void createMessage(Message message){ + public void createMessage(ConfigMessage message){ this.messageRepository.set(message.getPath(), message.getDefaultValue()); } @Override public void createMissingMessages(){ - for(Message message : this.getMessages()){ + for(ConfigMessage message : this.getMessages()){ if(this.messagePathExists(message.getPath())) continue; this.createMessage(message); diff --git a/src/main/java/me/mrgeneralq/sleepmost/services/SleepService.java b/src/main/java/me/mrgeneralq/sleepmost/services/SleepService.java index 915bf2f..8ae976b 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/services/SleepService.java +++ b/src/main/java/me/mrgeneralq/sleepmost/services/SleepService.java @@ -2,18 +2,13 @@ import me.clip.placeholderapi.PlaceholderAPI; import me.mrgeneralq.sleepmost.Sleepmost; -import me.mrgeneralq.sleepmost.builders.MessageBuilder; -import me.mrgeneralq.sleepmost.enums.ConfigMessage; import me.mrgeneralq.sleepmost.enums.SleepState; import me.mrgeneralq.sleepmost.events.PlayerSleepStateChangeEvent; import me.mrgeneralq.sleepmost.interfaces.*; -import me.mrgeneralq.sleepmost.mappers.MessageMapper; -import me.mrgeneralq.sleepmost.models.Message; import me.mrgeneralq.sleepmost.runnables.NightcycleAnimationTask; import me.mrgeneralq.sleepmost.statics.DataContainer; import me.mrgeneralq.sleepmost.enums.SleepSkipCause; import me.mrgeneralq.sleepmost.events.SleepSkipEvent; -import me.mrgeneralq.sleepmost.utils.PlayerUtils; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.OfflinePlayer; From 9f750a402c33adeafe238f13fec4092aec294529 Mon Sep 17 00:00:00 2001 From: MrGeneralQ Date: Tue, 26 Apr 2022 23:29:10 +0200 Subject: [PATCH 2/6] all message changes + bootstrapper dependency fix --- .../sleepmost/commands/SleepCommand.java | 2 +- .../sleepmost/enums/MessageKey.java | 2 +- .../sleepmost/mappers/MessageMapper.java | 76 +++++++++---------- .../sleepmost/statics/Bootstrapper.java | 3 +- 4 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java index f2ef051..2760027 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java @@ -27,7 +27,7 @@ public SleepCommand(ISleepService sleepService, IMessageService messageService, @Override public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { if (!(sender instanceof Player)) { - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ONLY_PLAYERS_COMMAND).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build()); return true; } Player player = (Player) sender; diff --git a/src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java b/src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java index d30bc30..afc5d52 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java +++ b/src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java @@ -13,7 +13,7 @@ public enum MessageKey { NO_PERMISSION_COMMAND, UNKNOWN_COMMAND, CONFIG_RELOADED, - ONLY_PLAYERS_COMMAND, + //ONLY_PLAYERS_COMMAND, ALREADY_ENABLED_FOR_WORLD, ALREADY_DISABLED_FOR_WORLD, ENABLED_FOR_WORLD, diff --git a/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java b/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java index 21eea36..9480d28 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java +++ b/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java @@ -23,44 +23,44 @@ public static MessageMapper getMapper(){ public void loadMessages(){ - this.messages.put(MessageKey.PREFIX, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.NIGHT_SKIPPED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.STORM_SKIPPED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.PLAYERS_LEFT_TO_SKIP_NIGHT, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.PLAYERS_LEFT_TO_SKIP_STORM, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.SLEEP_PREVENTED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.NO_SLEEP_THUNDERSTORM, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.BOSS_BAR_TITLE, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.NO_CONSOLE_COMMAND, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.NO_PERMISSION_COMMAND, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.UNKNOWN_COMMAND, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.CONFIG_RELOADED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.ONLY_PLAYERS_COMMAND, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.ALREADY_ENABLED_FOR_WORLD, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.ALREADY_DISABLED_FOR_WORLD, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.ENABLED_FOR_WORLD, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.DISABLED_FOR_WORLD, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.NOT_ENABLED_FOR_WORLD, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.CURRENTLY_DISABLED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.CANNOT_SLEEP_NOW, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.FLAGS_RESET_SUCCESS, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.SLEEP_SUCCESS, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.NO_LONGER_SLEEPING, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.NO_BED_LOCATION_SET, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.TELEPORTED_TO_BED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.SLEEP_CMD_DISABLED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.ONE_PLAYER_SLEEP_SET, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.SPECIFY_PLAYER, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.TARGET_NOT_SLEEPING, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.TARGET_NOT_ONLINE, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.INSOMNIA_NOT_SLEEPY, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.INSOMNIA_ALREADY_ENABLED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.INSOMNIA_ENABLED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.CMD_ONLY_DURING_NIGHT, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.KICK_OUT_BED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.KICKED_PLAYER_FROM_BED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.YOU_ARE_KICKED_FROM_BED, new ConfigMessage("path", "default message")); - this.messages.put(MessageKey.KICKING_NOT_ALLOWED, new ConfigMessage("path", "default message")); + this.messages.put(MessageKey.PREFIX, new ConfigMessage("prefix", "&7[&bSleep-Most&7]")); + this.messages.put(MessageKey.NIGHT_SKIPPED, new ConfigMessage("user.night-skipped.title", "&aNight skipped")); + this.messages.put(MessageKey.STORM_SKIPPED, new ConfigMessage("user.storm-skipped.title", "&eStorm skipped")); + this.messages.put(MessageKey.PLAYERS_LEFT_TO_SKIP_NIGHT, new ConfigMessage("user.players-left-night", "&bSleeping to skip night &f[&c%sleeping%/%required%&f]&b!")); + this.messages.put(MessageKey.PLAYERS_LEFT_TO_SKIP_STORM, new ConfigMessage("user.players-left-storm", "&bSleeping to skip the storm &f[&c%sleeping%/%required%&f]&b!")); + this.messages.put(MessageKey.SLEEP_PREVENTED, new ConfigMessage("user.sleep-prevented", "&cYou cannot sleep in this world!")); + this.messages.put(MessageKey.NO_SLEEP_THUNDERSTORM, new ConfigMessage("user.no-sleep-storm", "&cYou cannot sleep during a thunderstorm")); + this.messages.put(MessageKey.BOSS_BAR_TITLE, new ConfigMessage("boss-bar.title", "&bPlayers sleeping to skip the %skip-cause% &f[&c%sleeping-count%&f/&c%sleeping-required-count%&f]")); + this.messages.put(MessageKey.NO_CONSOLE_COMMAND, new ConfigMessage("admin.no-console-command", "&cThis command cannot be executed from the console")); + this.messages.put(MessageKey.NO_PERMISSION_COMMAND, new ConfigMessage("admin.no-permission-command", "&cYou do not have permission to do this")); + this.messages.put(MessageKey.UNKNOWN_COMMAND, new ConfigMessage("admin.unknown-command", "&cUnknown command")); + this.messages.put(MessageKey.CONFIG_RELOADED, new ConfigMessage("admin.config-reloaded", "&aYou successfully reloaded Sleep-Most plugin")); + //this.messages.put(MessageKey.ONLY_PLAYERS_COMMAND, new ConfigMessage("", "default message")); + this.messages.put(MessageKey.ALREADY_ENABLED_FOR_WORLD, new ConfigMessage("admin.already-enabled-for-world", "&cSleep-Most is already enabled in %world%")); + this.messages.put(MessageKey.ALREADY_DISABLED_FOR_WORLD, new ConfigMessage("admin.already-disabled-for-world", "&cSleep-Most is already disabled in %world%")); + this.messages.put(MessageKey.ENABLED_FOR_WORLD, new ConfigMessage("admin.enabled-for-world", "&cSleep-Most is now enabled in %world%")); + this.messages.put(MessageKey.DISABLED_FOR_WORLD, new ConfigMessage("admin.disabled-for-world", "&cSleep-Most is now disabled in %world%")); + this.messages.put(MessageKey.NOT_ENABLED_FOR_WORLD, new ConfigMessage("admin.not-enabled-for-world", "&cSleep-Most is not enabled in %world%. Enable it with &a/sm enable")); + this.messages.put(MessageKey.CURRENTLY_DISABLED, new ConfigMessage("admin.currently-disabled", "&bSleepmost is currently &cdisabled &bfor this world. Type &a/sm enable &bto enable sleepmost for this world")); + this.messages.put(MessageKey.CANNOT_SLEEP_NOW, new ConfigMessage("user.cannot-sleep-now", "&cYou cannot sleep right now")); + this.messages.put(MessageKey.FLAGS_RESET_SUCCESS, new ConfigMessage("flag.flag-reset-success", "&cAll flags were successfully reset")); + this.messages.put(MessageKey.SLEEP_SUCCESS, new ConfigMessage("user.sleep-success", "&aYou are now asleep")); + this.messages.put(MessageKey.NO_LONGER_SLEEPING, new ConfigMessage("user.no-longer-sleeping", "&cYou are no longer sleeping")); + this.messages.put(MessageKey.NO_BED_LOCATION_SET, new ConfigMessage("user.no-bed-location-set", "&cThere is no bed location set")); + this.messages.put(MessageKey.TELEPORTED_TO_BED, new ConfigMessage("user.teleported-to-bed", "&cYou were teleported to your bed")); + this.messages.put(MessageKey.SLEEP_CMD_DISABLED, new ConfigMessage("user.sleep-command-disabled", "&cThe sleep-command is disabled")); + this.messages.put(MessageKey.ONE_PLAYER_SLEEP_SET, new ConfigMessage("admin.one-player-sleep-set", "&cOne player sleep has been configured")); + this.messages.put(MessageKey.SPECIFY_PLAYER, new ConfigMessage("admin.specify-player", "&cPlease specify with the player username")); + this.messages.put(MessageKey.TARGET_NOT_SLEEPING, new ConfigMessage("admin.target-not-sleeping", "&cThe player is not sleeping")); + this.messages.put(MessageKey.TARGET_NOT_ONLINE, new ConfigMessage("admin.target-not-online", "&cThe player is not online")); + this.messages.put(MessageKey.INSOMNIA_NOT_SLEEPY, new ConfigMessage("user.insomnia-not-sleepy", "&cYou don't feel sleepy at the moment")); + this.messages.put(MessageKey.INSOMNIA_ALREADY_ENABLED, new ConfigMessage("admin.insomnia-already-enabled", "&cInsomnia is already enabled in this world")); + this.messages.put(MessageKey.INSOMNIA_ENABLED, new ConfigMessage("admin.insomnia-enabled", "&cInsomnia is enabled")); + this.messages.put(MessageKey.CMD_ONLY_DURING_NIGHT, new ConfigMessage("admin.only-during-night-command", "&cThis command can only be used during the night")); + this.messages.put(MessageKey.KICK_OUT_BED, new ConfigMessage("admin.kick-out-bed", "&c&l[kick out]")); + this.messages.put(MessageKey.KICKED_PLAYER_FROM_BED, new ConfigMessage("user.kicked-player-from-bed", "&cYou kicked %target-player% out from their bed")); + this.messages.put(MessageKey.YOU_ARE_KICKED_FROM_BED, new ConfigMessage("user.kicked-from-bed", "&cYou were kicked out from your bed")); + this.messages.put(MessageKey.KICKING_NOT_ALLOWED, new ConfigMessage("user.kicking-not-allowed", "&cYou do not have permission to kick this player out of their bed")); } public ConfigMessage getMessage(MessageKey message){ diff --git a/src/main/java/me/mrgeneralq/sleepmost/statics/Bootstrapper.java b/src/main/java/me/mrgeneralq/sleepmost/statics/Bootstrapper.java index dc959f8..8f27c2a 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/statics/Bootstrapper.java +++ b/src/main/java/me/mrgeneralq/sleepmost/statics/Bootstrapper.java @@ -41,6 +41,7 @@ public void initialize(Sleepmost main){ this.configRepository = new ConfigRepository(main); this.configService = new ConfigService(main); + this.flagsRepository = new FlagsRepository(configRepository); this.messageRepository = new MessageRepository(); this.messageService = new MessageService(configRepository, messageRepository, flagsRepository); @@ -51,7 +52,7 @@ public void initialize(Sleepmost main){ this.cooldownRepository = new CooldownRepository(); this.cooldownService = new CooldownService(cooldownRepository, configRepository); - this.flagsRepository = new FlagsRepository(configRepository); + this.flagService = new FlagService(flagsRepository, configRepository, configService, messageService); this.playerService = new PlayerService(); From 5a57f648023c2c28d5ad373272fc5c8fc7e697f2 Mon Sep 17 00:00:00 2001 From: MrGeneralQ Date: Wed, 27 Apr 2022 23:17:29 +0200 Subject: [PATCH 3/6] updated ALL messages --- .../sleepmost/builders/MessageBuilder.java | 10 ++++++ .../sleepmost/commands/SleepCommand.java | 15 +++++++-- .../commands/subcommands/BedSubCommand.java | 10 ++++-- .../subcommands/DisableSubCommand.java | 10 ++++-- .../subcommands/EnableSubCommand.java | 11 ++++--- .../subcommands/GetFlagSubCommand.java | 14 ++++---- .../commands/subcommands/InfoSubCommand.java | 6 ++-- .../subcommands/InsomniaSubCommand.java | 20 +++++++++--- .../commands/subcommands/KickSubCommand.java | 12 ++++--- .../subcommands/ResetFlagSubCommand.java | 6 ++-- .../commands/subcommands/ResetSubCommand.java | 2 +- .../commands/subcommands/SetFlagCommand.java | 12 ++++--- .../subcommands/SetOnePlayerSleepCommand.java | 8 +++-- .../commands/subcommands/SleepSubCommand.java | 13 ++++++-- .../sleepmost/enums/MessageKey.java | 11 +++++-- .../PlayerBedEnterEventListener.java | 10 ++++-- .../PlayerSleepStateChangeEventListener.java | 4 ++- .../SleepSkipEventListener.java | 15 +++++++-- .../sleepmost/interfaces/IConfigService.java | 7 +--- .../sleepmost/interfaces/IMessageService.java | 1 + .../sleepmost/mappers/MessageMapper.java | 23 ++++++++----- .../sleepmost/services/ConfigService.java | 30 ----------------- .../sleepmost/services/MessageService.java | 8 +++-- src/main/resources/config.yml | 32 ++----------------- 24 files changed, 162 insertions(+), 128 deletions(-) diff --git a/src/main/java/me/mrgeneralq/sleepmost/builders/MessageBuilder.java b/src/main/java/me/mrgeneralq/sleepmost/builders/MessageBuilder.java index cd47149..d7623da 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/builders/MessageBuilder.java +++ b/src/main/java/me/mrgeneralq/sleepmost/builders/MessageBuilder.java @@ -72,4 +72,14 @@ public MessageBuilder setCause(SleepSkipCause cause){ return this; } + + public MessageBuilder setFlag(String flagName){ + this.message = message.replaceAll("%flag%", flagName); + return this; + } + + public MessageBuilder setPlayer(String playerName){ + this.message = message.replaceAll("%player%", playerName); + return this; + } } \ No newline at end of file diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java index 2760027..2ffa00d 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/SleepCommand.java @@ -47,7 +47,10 @@ public boolean onCommand(CommandSender sender, Command command, String s, String if(this.flagsRepository.getPreventSleepFlag().getValueAt(world)) { - String sleepPreventedConfigMessage = messageService.getMessage(MessageKey.SLEEP_PREVENTED).build(); + String sleepPreventedConfigMessage = messageService.getMessage(MessageKey.SLEEP_PREVENTED) + .setPlayer(player) + .setWorld(world) + .build(); this.messageService.sendMessage(player, messageService.getMessage(sleepPreventedConfigMessage) .setPlayer(player) @@ -57,7 +60,10 @@ public boolean onCommand(CommandSender sender, Command command, String s, String } if (!this.sleepService.resetRequired(world)) { - this.messageService.sendMessage(player, messageService.getMessage(MessageKey.CANNOT_SLEEP_NOW).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.CANNOT_SLEEP_NOW) + .setPlayer(player) + .setWorld(world) + .build()); return true; } boolean updatedSleepStatus = !this.sleepService.isPlayerAsleep(player); @@ -74,7 +80,10 @@ public boolean onCommand(CommandSender sender, Command command, String s, String cooldownService.startCooldown(player); } - this.messageService.sendMessage(player, this.messageService.getMessage(getConfigMessage(updatedSleepStatus)).build()); + this.messageService.sendMessage(player, this.messageService.getMessage(getConfigMessage(updatedSleepStatus)) + .setPlayer(player) + .setWorld(world) + .build()); return true; } private MessageKey getConfigMessage(boolean sleepingStatus){ diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java index a59dd62..901f551 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java @@ -41,12 +41,18 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL Player player = (Player) sender; if (player.getBedSpawnLocation() == null) { - this.messageService.sendMessage(player, messageService.getMessage(MessageKey.NO_BED_LOCATION_SET).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.NO_BED_LOCATION_SET) + .setPlayer(player) + .setWorld(world) + .build()); return true; } player.teleport(player.getBedSpawnLocation()); - this.messageService.sendMessage(player, messageService.getMessage(MessageKey.TELEPORTED_TO_BED).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.TELEPORTED_TO_BED) + .setPlayer(player) + .setWorld(world) + .build()); return true; } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/DisableSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/DisableSubCommand.java index cd5e0e8..bb1f5ba 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/DisableSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/DisableSubCommand.java @@ -8,6 +8,7 @@ import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; public class DisableSubCommand implements ISubCommand { @@ -28,17 +29,20 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL return true; } - World world = CommandSenderUtils.getWorldOf(sender); if (!sleepService.isEnabledAt(world)) { - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ALREADY_DISABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ALREADY_DISABLED_FOR_WORLD) + .setWorld(world) + .build()); return true; } sleepService.disableAt(world); - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.DISABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.DISABLED_FOR_WORLD) + .setWorld(world) + .build()); return true; } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/EnableSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/EnableSubCommand.java index 1977f48..f9fef19 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/EnableSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/EnableSubCommand.java @@ -23,20 +23,23 @@ public EnableSubCommand(ISleepService sleepService, IMessageService messageServi public boolean executeCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) { if(!CommandSenderUtils.hasWorld(sender)){ - String noConsoleCommand = messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build(); - sender.sendMessage(noConsoleCommand); + this.messageService.sendMessage(sender,messageService.getMessage(MessageKey.NO_CONSOLE_COMMAND).build()); return true; } World world = CommandSenderUtils.getWorldOf(sender); if(this.sleepService.isEnabledAt(world)){ - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ALREADY_ENABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ALREADY_ENABLED_FOR_WORLD) + .setWorld(world) + .build()); return true; } this.sleepService.enableAt(world); - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ENABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ENABLED_FOR_WORLD) + .setWorld(world) + .build()); return true; } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java index 29a0f85..d809d6a 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java @@ -27,9 +27,8 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL { if(!CommandSenderUtils.hasWorld(sender)) { - - String noConsoleCmd = this.messageService.getMessagePrefixed(MessageKey.NO_CONSOLE_COMMAND).build(); - + String noConsoleCmd = this.messageService.getMessagePrefixed(MessageKey.NO_CONSOLE_COMMAND) + .build(); this.messageService.sendMessage(sender, noConsoleCmd); return true; } @@ -42,7 +41,9 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL } if (!this.flagsRepository.flagExists(args[1])) { - this.messageService.sendMessage(sender, this.messageService.getMessagePrefixed("&cThis flag does not exist!").build()); + this.messageService.sendMessage(sender, this.messageService.getMessagePrefixed(MessageKey.FLAG_DOES_NOT_EXIST) + .setFlag(args[1]) + .build()); this.messageService.sendMessage(sender, this.messageService.getMessage("&bPossible flags are: &e%flagsNames") .setPlaceHolder("%flagsNames", StringUtils.join(this.flagsRepository.getFlagsNames(), ", ")) @@ -52,8 +53,9 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL ISleepFlag sleepFlag = this.flagsRepository.getFlag(args[1]); - this.messageService.sendMessage(sender, this.messageService.getMessagePrefixed("&bThe &e%flag% &bflag value in your world is &e%value%&b.") - .setPlaceHolder("%flag%", sleepFlag.getName()) + this.messageService.sendMessage(sender, this.messageService.getMessagePrefixed(MessageKey.FLAG_SET_IN_WORLD) + .setFlag(sleepFlag.getName()) + .setWorld(world) .setPlaceHolder("%value%", sleepFlag.getValueAt(world).toString()) .build()); diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java index 8f4aa1b..a608bc9 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java @@ -39,7 +39,9 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL if(!sleepService.isEnabledAt(world)) { - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.CURRENTLY_DISABLED).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.CURRENTLY_DISABLED) + .setWorld(world) + .build()); return true; } sender.sendMessage(colorize("&b*********************************************")); @@ -74,7 +76,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL private String getValueAtMessage(ISleepFlag flag, World world) { return messageService.getMessage("&e%flagName% &b%value%") - .setPlaceHolder("%flagName%", flag.getName()) + .setFlag(flag.getName()) .setPlaceHolder("%value%", this.flagService.getValueDisplayName(flag, flag.getValueAt(world))) .build(); } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InsomniaSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InsomniaSubCommand.java index 43caf34..f620856 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InsomniaSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InsomniaSubCommand.java @@ -34,18 +34,24 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL World world = player.getWorld(); if(!sleepService.isEnabledAt(world)){ - this.messageService.sendMessage(player, messageService.getMessage(MessageKey.NOT_ENABLED_FOR_WORLD).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.NOT_ENABLED_FOR_WORLD) + .setWorld(world) + .build()); return true; } if (!sleepService.isNight(world)) { - String notNightMessage = this.messageService.getMessage(MessageKey.CMD_ONLY_DURING_NIGHT).build(); + String notNightMessage = this.messageService.getMessage(MessageKey.CMD_ONLY_DURING_NIGHT) + .setWorld(world) + .build(); this.messageService.sendMessage(player, notNightMessage); return true; } if (this.worldPropertyService.getWorldProperties(world).isInsomniaEnabled()) { - String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_ALREADY_ENABLED).build(); + String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_ALREADY_ENABLED) + .setWorld(world) + .build(); this.messageService.sendMessage(player, insomniaMessage); return true; } @@ -55,13 +61,17 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL this.worldPropertyService.setWorldProperty(world, property); - String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_ENABLED).build(); + String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_ENABLED) + .setWorld(world) + .build(); List sleepingPlayers = this.sleepService.getSleepers(world); for(Player p: sleepingPlayers){ p.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 60,1)); p.teleport(p.getLocation()); - String targetInsomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_NOT_SLEEPY).build(); + String targetInsomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_NOT_SLEEPY) + .setWorld(world) + .build(); this.messageService.sendMessage(p, targetInsomniaMessage); } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/KickSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/KickSubCommand.java index d8fe88a..2ff580d 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/KickSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/KickSubCommand.java @@ -55,14 +55,18 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL String targetPlayerName = args[1]; if(Bukkit.getPlayer(targetPlayerName) == null){ - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.TARGET_NOT_ONLINE).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.TARGET_NOT_ONLINE) + .setPlayer(player) + .build()); return true; } Player targetPlayer = Bukkit.getPlayer(targetPlayerName); if(!this.sleepService.isPlayerAsleep(targetPlayer)){ - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.TARGET_NOT_SLEEPING).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.TARGET_NOT_SLEEPING) + .setPlayer(targetPlayer) + .build()); return true; } @@ -76,8 +80,8 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL .setPlayer(player); targetPlayer.teleport(targetPlayer.getLocation()); - this.messageService.sendMessage(sender,targetKickedFromBedMsg.build()); - this.messageService.sendMessage(targetPlayer, youAreKickedMsg.build()); + this.messageService.sendMessage(sender,targetKickedFromBedMsg.setPlayer(targetPlayer).build()); + this.messageService.sendMessage(targetPlayer, youAreKickedMsg.setPlayer(player).build()); this.sleepService.setSleeping(targetPlayer, false); return true; } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetFlagSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetFlagSubCommand.java index 83ae07b..c300c0c 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetFlagSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetFlagSubCommand.java @@ -41,7 +41,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL } if (!this.flagsRepository.flagExists(args[1])) { - this.messageService.sendMessage(sender, this.messageService.getMessagePrefixed("&cThis flag does not exist!").build()); + this.messageService.sendMessage(sender, this.messageService.getMessagePrefixed(MessageKey.FLAG_DOES_NOT_EXIST).setFlag(args[1]).build()); this.messageService.sendMessage(sender, this.messageService.getMessage("&bPossible flags are: &e%flagsNames") .setPlaceHolder("%flagsNames", StringUtils.join(this.flagsRepository.getFlagsNames(), ", ")) .build()); @@ -52,8 +52,8 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL this.flagService.resetFlagAt(world, sleepFlag); - this.messageService.sendMessage(sender, this.messageService.getMessagePrefixed("&bThe &e%flag% &bflag was reset to its default value &e%default-value%&b.") - .setPlaceHolder("%flag%", sleepFlag.getName()) + this.messageService.sendMessage(sender, this.messageService.getMessagePrefixed(MessageKey.FLAG_RESET_IN_WORLD) + .setFlag(sleepFlag.getName()) .setPlaceHolder("%default-value%", sleepFlag.getValueAt(world).toString()) .build()); diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetSubCommand.java index 6cf438c..4b07a27 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/ResetSubCommand.java @@ -30,7 +30,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL this.flagService.resetFlagsAt(world); this.messageService.sendMessage(sender, - this.messageService.getMessagePrefixed(MessageKey.FLAGS_RESET_SUCCESS) + this.messageService.getMessagePrefixed(MessageKey.ALL_FLAGS_RESET_SUCCESS) .setWorld(world) .build()); return true; diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java index 73c9c57..7b4899e 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java @@ -39,7 +39,9 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL World world = CommandSenderUtils.getWorldOf(sender); if (!sleepService.isEnabledAt(world)) { - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.CURRENTLY_DISABLED).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.CURRENTLY_DISABLED) + .setWorld(world) + .build()); return true; } @@ -50,7 +52,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL String flagName = args[1]; if (!flagsRepository.flagExists(flagName)) { - this.messageService.sendMessage(sender, messageService.getMessagePrefixed("&cThis flag does not exist!").build()); + this.messageService.sendMessage(sender, messageService.getMessagePrefixed(MessageKey.FLAG_DOES_NOT_EXIST).setFlag(flagName).build()); this.messageService.sendMessage(sender, messageService.getMessage("&bPossible flags are: &e%flagsNames") .setPlaceHolder("%flagsNames", StringUtils.join(flagsRepository.getFlagsNames(), ", ")) .build()); @@ -74,10 +76,10 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL } this.sleepFlagService.setStringValueAt(sleepFlag, world, stringValue); - this.messageService.sendMessage(sender, messageService.getMessagePrefixed("&bFlag &c%flag &bis now set to &e%value &bfor world &e%world") - .setPlaceHolder("%flag", sleepFlag.getName()) + this.messageService.sendMessage(sender, messageService.getMessagePrefixed(MessageKey.FLAG_SET_IN_WORLD) + .setFlag(flagName) + .setWorld(world) .setPlaceHolder("%value", stringValue) - .setPlaceHolder("%world", world.getName()) .build()); return true; } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetOnePlayerSleepCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetOnePlayerSleepCommand.java index d1678bc..ba1c86c 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetOnePlayerSleepCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetOnePlayerSleepCommand.java @@ -38,7 +38,9 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL World world = CommandSenderUtils.getWorldOf(sender); if (!sleepService.isEnabledAt(world)) { - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NOT_ENABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NOT_ENABLED_FOR_WORLD) + .setWorld(world) + .build()); return true; } @@ -48,7 +50,9 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL this.flagService.setStringValueAt(calculationMethodFlag, world, "players"); this.flagService.setStringValueAt(playersRequiredFlag, world, "1"); - this.messageService.sendMessage(player, this.messageService.getMessage(MessageKey.ONE_PLAYER_SLEEP_SET).build()); + this.messageService.sendMessage(player, this.messageService.getMessage(MessageKey.ONE_PLAYER_SLEEP_SET) + .setWorld(world) + .build()); return true; } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SleepSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SleepSubCommand.java index 942fa3e..ae45297 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SleepSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SleepSubCommand.java @@ -37,7 +37,10 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL //check if sleep is allowed if(this.flagsRepository.getPreventSleepFlag().getValueAt(world)) { - String sleepPreventedConfigMessage = messageService.getMessage(MessageKey.SLEEP_PREVENTED).build(); + String sleepPreventedConfigMessage = messageService.getMessage(MessageKey.SLEEP_PREVENTED) + .setWorld(world) + .setPlayer(player) + .build(); this.messageService.sendMessage(player, messageService.getMessage(sleepPreventedConfigMessage) .setPlayer(player) @@ -48,13 +51,17 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL //check if reset is required if (!this.sleepService.resetRequired(world)) { - this.messageService.sendMessage(player, messageService.getMessage(MessageKey.CANNOT_SLEEP_NOW).build()); + this.messageService.sendMessage(player, messageService.getMessage(MessageKey.CANNOT_SLEEP_NOW) + .setWorld(world) + .build()); return true; } if(this.worldPropertyService.getWorldProperties(world).isInsomniaEnabled()){ - String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_NOT_SLEEPY).build(); + String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_NOT_SLEEPY) + .setWorld(world) + .build(); this.messageService.sendMessage(player, insomniaMessage); return true; } diff --git a/src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java b/src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java index afc5d52..d2c3aed 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java +++ b/src/main/java/me/mrgeneralq/sleepmost/enums/MessageKey.java @@ -21,7 +21,7 @@ public enum MessageKey { NOT_ENABLED_FOR_WORLD, CURRENTLY_DISABLED, CANNOT_SLEEP_NOW, - FLAGS_RESET_SUCCESS, + ALL_FLAGS_RESET_SUCCESS, SLEEP_SUCCESS, NO_LONGER_SLEEPING, NO_BED_LOCATION_SET, @@ -38,5 +38,12 @@ public enum MessageKey { KICK_OUT_BED, KICKED_PLAYER_FROM_BED, YOU_ARE_KICKED_FROM_BED, - KICKING_NOT_ALLOWED + KICKING_NOT_ALLOWED, + FLAG_DOES_NOT_EXIST, + FLAG_SET_IN_WORLD, + FLAG_RESET_IN_WORLD, + NIGHT_SKIPPED_TITLE, + STORM_SKIPPED_TITLE, + NIGHT_SKIPPED_SUBTITLE, + STORM_SKIPPED_SUBTITLE } diff --git a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerBedEnterEventListener.java b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerBedEnterEventListener.java index 47aa948..44f9460 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerBedEnterEventListener.java +++ b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerBedEnterEventListener.java @@ -48,7 +48,10 @@ public void onPlayerBedEnter(PlayerBedEnterEvent e) { //check if sleeping during storms is allowed if (world.isThundering() && !this.flagsRepository.getStormSleepFlag().getValueAt(world)) { - String preventSleepStormMessage = messageService.getMessage(MessageKey.NO_SLEEP_THUNDERSTORM).build(); + String preventSleepStormMessage = messageService.getMessage(MessageKey.NO_SLEEP_THUNDERSTORM) + .setPlayer(player) + .setWorld(world) + .build(); this.messageService.sendMessage(player, messageService.getMessage(preventSleepStormMessage) .setPlayer(player) @@ -72,7 +75,10 @@ public void onPlayerBedEnter(PlayerBedEnterEvent e) { if(this.worldPropertyService.getWorldProperties(world).isInsomniaEnabled()){ - String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_NOT_SLEEPY).build(); + String insomniaMessage = this.messageService.getMessage(MessageKey.INSOMNIA_NOT_SLEEPY) + .setWorld(world) + .setPlayer(player) + .build(); this.messageService.sendMessage(player,insomniaMessage); e.setCancelled(true); return; diff --git a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerSleepStateChangeEventListener.java b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerSleepStateChangeEventListener.java index 9bcf223..dfe6d96 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerSleepStateChangeEventListener.java +++ b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/PlayerSleepStateChangeEventListener.java @@ -118,7 +118,9 @@ private void updateBossBar(World world){ int playersRequiredAmount = Math.round(sleepService.getRequiredSleepersCount(world)); int sleepingPlayersAmount = sleepService.getSleepersAmount(world); - String configBossBarTitle = this.messageService.getMessage(MessageKey.BOSS_BAR_TITLE).build(); + String configBossBarTitle = this.messageService.getMessage(MessageKey.BOSS_BAR_TITLE) + .setWorld(world) + .build(); String bossBarTitle = new MessageBuilder(configBossBarTitle, "") .usePrefix(false) .setSleepingCount(Math.min(sleepingPlayersAmount, playersRequiredAmount)) diff --git a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/SleepSkipEventListener.java b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/SleepSkipEventListener.java index f5bc106..adb1acc 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/SleepSkipEventListener.java +++ b/src/main/java/me/mrgeneralq/sleepmost/eventlisteners/SleepSkipEventListener.java @@ -2,6 +2,7 @@ import static me.mrgeneralq.sleepmost.enums.SleepSkipCause.NIGHT_TIME; +import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.enums.SleepersOrAllType; import me.mrgeneralq.sleepmost.exceptions.InvalidSleepSkipCauseOccurredException; import me.mrgeneralq.sleepmost.Sleepmost; @@ -9,6 +10,7 @@ import me.mrgeneralq.sleepmost.flags.UseSkipSoundFlag; import me.mrgeneralq.sleepmost.interfaces.*; import me.mrgeneralq.sleepmost.builders.MessageBuilder; +import me.mrgeneralq.sleepmost.models.ConfigMessage; import me.mrgeneralq.sleepmost.statics.ServerVersion; import org.bukkit.*; import org.bukkit.entity.Player; @@ -128,8 +130,15 @@ private void sendSkipTitle(World world , SleepSkipEvent e) { if (!titleEnabled) { return; } - String skippedTitle = (cause == NIGHT_TIME ? configService.getTitleNightSkippedTitle() : configService.getTitleStormSkippedTitle()); - String skippedSubtitle = (cause == NIGHT_TIME ? configService.getTitleNightSkippedSubTitle() : configService.getTitleStormSkippedSubTitle()); + + String nightSkippedTitle = messageService.getMessage(MessageKey.NIGHT_SKIPPED_TITLE).setWorld(world).build(); + String nightSkippedSubtitle = messageService.getMessage(MessageKey.NIGHT_SKIPPED_SUBTITLE).setWorld(world).build(); + String stormSkippedTitle = messageService.getMessage(MessageKey.STORM_SKIPPED_TITLE).setWorld(world).build(); + String stormSkippedSubtitle = messageService.getMessage(MessageKey.STORM_SKIPPED_SUBTITLE).setWorld(world).build(); + + + String skippedTitle = (cause == NIGHT_TIME ? nightSkippedTitle : stormSkippedTitle); + String skippedSubtitle = (cause == NIGHT_TIME ? nightSkippedSubtitle : stormSkippedSubtitle); List playerList = (flagsRepository.getNonSleepingTitleFlag().getValueAt(world) ? world.getPlayers(): @@ -137,7 +146,7 @@ private void sendSkipTitle(World world , SleepSkipEvent e) { for (Player p : playerList) { - MessageBuilder titleMessageBuilder = new MessageBuilder(skippedTitle, "") + MessageBuilder titleMessageBuilder = this.messageService.getMessage(skippedTitle) .setPlayer(p) .usePrefix(false) .setWorld(world); diff --git a/src/main/java/me/mrgeneralq/sleepmost/interfaces/IConfigService.java b/src/main/java/me/mrgeneralq/sleepmost/interfaces/IConfigService.java index 1a6b8b4..bb28119 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/interfaces/IConfigService.java +++ b/src/main/java/me/mrgeneralq/sleepmost/interfaces/IConfigService.java @@ -8,11 +8,6 @@ public interface IConfigService { int getResetTime(); boolean updateCheckerEnabled(); - boolean getTitleNightSkippedEnabled(); - String getTitleNightSkippedTitle(); - String getTitleNightSkippedSubTitle(); - boolean getTitleStormSkippedEnabled(); - String getTitleStormSkippedTitle(); - String getTitleStormSkippedSubTitle(); Set getEnabledWorlds(); + } diff --git a/src/main/java/me/mrgeneralq/sleepmost/interfaces/IMessageService.java b/src/main/java/me/mrgeneralq/sleepmost/interfaces/IMessageService.java index 4419368..4b43839 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/interfaces/IMessageService.java +++ b/src/main/java/me/mrgeneralq/sleepmost/interfaces/IMessageService.java @@ -10,6 +10,7 @@ import me.mrgeneralq.sleepmost.enums.SleepSkipCause; import java.util.List; +import java.util.TreeSet; public interface IMessageService { diff --git a/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java b/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java index 9480d28..c13d7ad 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java +++ b/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java @@ -3,15 +3,12 @@ import me.mrgeneralq.sleepmost.enums.MessageKey; import me.mrgeneralq.sleepmost.models.ConfigMessage; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class MessageMapper { private static MessageMapper mapper; - private final Map messages = new HashMap<>(); + private final Map messages = new LinkedHashMap<>(); private MessageMapper() {} @@ -24,8 +21,8 @@ public static MessageMapper getMapper(){ public void loadMessages(){ this.messages.put(MessageKey.PREFIX, new ConfigMessage("prefix", "&7[&bSleep-Most&7]")); - this.messages.put(MessageKey.NIGHT_SKIPPED, new ConfigMessage("user.night-skipped.title", "&aNight skipped")); - this.messages.put(MessageKey.STORM_SKIPPED, new ConfigMessage("user.storm-skipped.title", "&eStorm skipped")); + this.messages.put(MessageKey.NIGHT_SKIPPED, new ConfigMessage("user.night-skipped", "&aNight skipped")); + this.messages.put(MessageKey.STORM_SKIPPED, new ConfigMessage("user.storm-skipped", "&eStorm skipped")); this.messages.put(MessageKey.PLAYERS_LEFT_TO_SKIP_NIGHT, new ConfigMessage("user.players-left-night", "&bSleeping to skip night &f[&c%sleeping%/%required%&f]&b!")); this.messages.put(MessageKey.PLAYERS_LEFT_TO_SKIP_STORM, new ConfigMessage("user.players-left-storm", "&bSleeping to skip the storm &f[&c%sleeping%/%required%&f]&b!")); this.messages.put(MessageKey.SLEEP_PREVENTED, new ConfigMessage("user.sleep-prevented", "&cYou cannot sleep in this world!")); @@ -43,7 +40,7 @@ public void loadMessages(){ this.messages.put(MessageKey.NOT_ENABLED_FOR_WORLD, new ConfigMessage("admin.not-enabled-for-world", "&cSleep-Most is not enabled in %world%. Enable it with &a/sm enable")); this.messages.put(MessageKey.CURRENTLY_DISABLED, new ConfigMessage("admin.currently-disabled", "&bSleepmost is currently &cdisabled &bfor this world. Type &a/sm enable &bto enable sleepmost for this world")); this.messages.put(MessageKey.CANNOT_SLEEP_NOW, new ConfigMessage("user.cannot-sleep-now", "&cYou cannot sleep right now")); - this.messages.put(MessageKey.FLAGS_RESET_SUCCESS, new ConfigMessage("flag.flag-reset-success", "&cAll flags were successfully reset")); + this.messages.put(MessageKey.ALL_FLAGS_RESET_SUCCESS, new ConfigMessage("flag.all-reset-success", "&cAll flags were successfully reset")); this.messages.put(MessageKey.SLEEP_SUCCESS, new ConfigMessage("user.sleep-success", "&aYou are now asleep")); this.messages.put(MessageKey.NO_LONGER_SLEEPING, new ConfigMessage("user.no-longer-sleeping", "&cYou are no longer sleeping")); this.messages.put(MessageKey.NO_BED_LOCATION_SET, new ConfigMessage("user.no-bed-location-set", "&cThere is no bed location set")); @@ -61,6 +58,16 @@ public void loadMessages(){ this.messages.put(MessageKey.KICKED_PLAYER_FROM_BED, new ConfigMessage("user.kicked-player-from-bed", "&cYou kicked %target-player% out from their bed")); this.messages.put(MessageKey.YOU_ARE_KICKED_FROM_BED, new ConfigMessage("user.kicked-from-bed", "&cYou were kicked out from your bed")); this.messages.put(MessageKey.KICKING_NOT_ALLOWED, new ConfigMessage("user.kicking-not-allowed", "&cYou do not have permission to kick this player out of their bed")); + this.messages.put(MessageKey.FLAG_SET_IN_WORLD, new ConfigMessage("flag.set-in-world", "&bThe &e%flag% &bflag value in your world is &e%value%&b.")); + this.messages.put(MessageKey.FLAG_RESET_IN_WORLD, new ConfigMessage("flag.reset-in-world", "&bThe &e%flag% &bflag has been reset to &e%default-value%")); + + //TITLES + this.messages.put(MessageKey.NIGHT_SKIPPED_TITLE, new ConfigMessage("user.night-skipped.title", "&aNight skipped")); + this.messages.put(MessageKey.NIGHT_SKIPPED_SUBTITLE, new ConfigMessage("user.night-skipped.subtitle", "&bGood morning sunshine!")); + this.messages.put(MessageKey.STORM_SKIPPED_TITLE, new ConfigMessage("user.storm-skipped.title", "&eStorm skipped")); + this.messages.put(MessageKey.STORM_SKIPPED_SUBTITLE, new ConfigMessage("user.storm-skipped.subtitle", "&bWhat a weather...")); + + } public ConfigMessage getMessage(MessageKey message){ diff --git a/src/main/java/me/mrgeneralq/sleepmost/services/ConfigService.java b/src/main/java/me/mrgeneralq/sleepmost/services/ConfigService.java index 0a8ce2d..4821870 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/services/ConfigService.java +++ b/src/main/java/me/mrgeneralq/sleepmost/services/ConfigService.java @@ -31,36 +31,6 @@ public boolean updateCheckerEnabled() { } - @Override - public boolean getTitleNightSkippedEnabled() { - return main.getConfig().getBoolean("titles.night-skipped.enabled"); - } - - @Override - public String getTitleNightSkippedTitle() { - return colorize(main.getConfig().getString("titles.night-skipped.title")); - } - - @Override - public String getTitleNightSkippedSubTitle() { - return colorize(main.getConfig().getString("titles.night-skipped.subtitle")); - } - - @Override - public boolean getTitleStormSkippedEnabled() { - return main.getConfig().getBoolean("titles.storm-skipped.enabled"); - } - - @Override - public String getTitleStormSkippedTitle() { - return colorize(main.getConfig().getString("titles.storm-skipped.title")); - } - - @Override - public String getTitleStormSkippedSubTitle() { - return colorize(main.getConfig().getString("titles.storm-skipped.subtitle")); - } - @Override public Set getEnabledWorlds() { diff --git a/src/main/java/me/mrgeneralq/sleepmost/services/MessageService.java b/src/main/java/me/mrgeneralq/sleepmost/services/MessageService.java index 4a8caf6..0cbb8e4 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/services/MessageService.java +++ b/src/main/java/me/mrgeneralq/sleepmost/services/MessageService.java @@ -114,7 +114,7 @@ public void sendPlayerLeftMessage(Player player, SleepSkipCause cause, int sleep MessageBuilder kickMessage = this.getMessage(MessageKey.KICK_OUT_BED); - TextComponent component = new TextComponent(kickMessage.build()); + TextComponent component = new TextComponent(kickMessage.build() + " "); component.setColor(ChatColor.RED); component.setBold(true); component.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, String.format("/sm kick %s", player.getName()))); @@ -134,8 +134,10 @@ public void sendPlayerLeftMessage(Player player, SleepSkipCause cause, int sleep public void sendNightSkippedMessage(World world, String lastSleeperName, String lastSleeperDisplayName, SleepSkipCause cause) { MessageKey message = (cause == SleepSkipCause.STORM ? MessageKey.STORM_SKIPPED : MessageKey.NIGHT_SKIPPED); - String skipMessage = ConfigMessageMapper.getMapper().getMessage(message, false) - .replace("%player%", lastSleeperName); + String skipMessage = this.getMessage(message) + .setPlayer(lastSleeperName) + .setWorld(world) + .build(); sendWorldMessage(world, skipMessage); } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 4ba0051..82f5ca3 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,6 +1,6 @@ # WELCOME TO THE OFFICIAL SLEEP-MOST PLUGIN # AUTHORS: MrGeneralQ, HorrendousEntity -# CONTRIBUTORS: Nozemi +# CONTRIBUTORS: Nozemi, Malin # VERSION: ${project.version} # SUPPORT NEEDED? Join our discord at --> https://discord.pseudonova.com/ WE ARE HAPPY TO HELP YOU FURTHER! # YOU CAN FIND THE DOCS FOR THIS PLUGIN HERE --> https://mrgeneralq.gitbook.io/sleepmost/ @@ -61,36 +61,8 @@ sleep: skip-night-sound: ui.toast.challenge_complete skip-storm-sound: entity.wither.spawn -titles: - night-skipped: - title: '&aNight skipped' - subtitle: '&bGood morning sunshine!' - storm-skipped: - title: '&eStorm skipped' - subtitle: '&bWhat a weather...' - - # specify the time which the world will be set after reset time-after-reset: 0 messages: - prefix: '&7[&bSleep-Most&7]' - - #time in seconds for message cooldown when a player goes to sleep - #default 10 seconds - cooldown: 10 - - #message when the night got skipped - night-skipped: '&bThe night was skipped!' - - #message when the storm got skipped - storm-skipped: '&bThe storm was skipped!' - - #message format to show how many players are required to sleep - players-left-night: '&bSleeping to skip night &f[&c%sleeping%/%required%&f]&b!' - players-left-storm: '&bSleeping to skip the storm &f[&c%sleeping%/%required%&f]&b!' - sleep-prevented: '&cYou cannot sleep in this world!' - no-sleep-storm: '&cYou cannot sleep during a thunderstorm' - -bossbar: - title: '&bPlayers sleeping to skip the %skip-cause% &f[&c%sleeping-count%&f/&c%sleeping-required-count%&f]' \ No newline at end of file + cooldown: 10 \ No newline at end of file From 6a8ac3d6fa05f855cf52400fc6ca84432e3e4cd7 Mon Sep 17 00:00:00 2001 From: MrGeneralQ Date: Thu, 28 Apr 2022 00:17:25 +0200 Subject: [PATCH 4/6] finalized messages before beta --- .../commands/subcommands/BedSubCommand.java | 4 +++- .../subcommands/GetFlagSubCommand.java | 18 ++++++++++++++++++ .../commands/subcommands/InfoSubCommand.java | 2 +- .../commands/subcommands/SetFlagCommand.java | 2 +- .../sleepmost/mappers/MessageMapper.java | 2 +- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java index 901f551..4958510 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/BedSubCommand.java @@ -34,7 +34,9 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL if (!sleepService.isEnabledAt(world)) { - this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.ALREADY_DISABLED_FOR_WORLD).build()); + this.messageService.sendMessage(sender, messageService.getMessage(MessageKey.NOT_ENABLED_FOR_WORLD) + .setWorld(world) + .build()); return true; } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java index d809d6a..31b2c31 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/GetFlagSubCommand.java @@ -1,6 +1,7 @@ package me.mrgeneralq.sleepmost.commands.subcommands; import me.mrgeneralq.sleepmost.enums.MessageKey; +import me.mrgeneralq.sleepmost.flags.types.TabCompletedFlag; import org.apache.commons.lang.StringUtils; import org.bukkit.World; import org.bukkit.command.Command; @@ -11,6 +12,11 @@ import me.mrgeneralq.sleepmost.interfaces.IMessageService; import me.mrgeneralq.sleepmost.interfaces.ISubCommand; import me.mrgeneralq.sleepmost.statics.CommandSenderUtils; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; public class GetFlagSubCommand implements ISubCommand { @@ -61,4 +67,16 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL return true; } + + + @Override + public List tabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, List args) { + + if (args.size() == 1) { + return this.flagsRepository.getFlagsNames().stream() + .filter(flag -> flag.contains(args.get(0)) || flag.equalsIgnoreCase(args.get(0))) + .collect(Collectors.toList()); + } + return new ArrayList<>(); + } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java index a608bc9..00a23bc 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/InfoSubCommand.java @@ -75,7 +75,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL private String getValueAtMessage(ISleepFlag flag, World world) { - return messageService.getMessage("&e%flagName% &b%value%") + return messageService.getMessage("&e%flag% &b%value%") .setFlag(flag.getName()) .setPlaceHolder("%value%", this.flagService.getValueDisplayName(flag, flag.getValueAt(world))) .build(); diff --git a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java index 7b4899e..fdc00e7 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java +++ b/src/main/java/me/mrgeneralq/sleepmost/commands/subcommands/SetFlagCommand.java @@ -79,7 +79,7 @@ public boolean executeCommand(CommandSender sender, Command cmd, String commandL this.messageService.sendMessage(sender, messageService.getMessagePrefixed(MessageKey.FLAG_SET_IN_WORLD) .setFlag(flagName) .setWorld(world) - .setPlaceHolder("%value", stringValue) + .setPlaceHolder("%value%", stringValue) .build()); return true; } diff --git a/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java b/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java index c13d7ad..56350d0 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java +++ b/src/main/java/me/mrgeneralq/sleepmost/mappers/MessageMapper.java @@ -60,7 +60,7 @@ public void loadMessages(){ this.messages.put(MessageKey.KICKING_NOT_ALLOWED, new ConfigMessage("user.kicking-not-allowed", "&cYou do not have permission to kick this player out of their bed")); this.messages.put(MessageKey.FLAG_SET_IN_WORLD, new ConfigMessage("flag.set-in-world", "&bThe &e%flag% &bflag value in your world is &e%value%&b.")); this.messages.put(MessageKey.FLAG_RESET_IN_WORLD, new ConfigMessage("flag.reset-in-world", "&bThe &e%flag% &bflag has been reset to &e%default-value%")); - + this.messages.put(MessageKey.FLAG_DOES_NOT_EXIST, new ConfigMessage("flag.not-exist", "&cThis flag does not exist")); //TITLES this.messages.put(MessageKey.NIGHT_SKIPPED_TITLE, new ConfigMessage("user.night-skipped.title", "&aNight skipped")); this.messages.put(MessageKey.NIGHT_SKIPPED_SUBTITLE, new ConfigMessage("user.night-skipped.subtitle", "&bGood morning sunshine!")); From ffda63fc748d27ef283bd2c2a72fb14af7725c27 Mon Sep 17 00:00:00 2001 From: MrGeneralQ Date: Thu, 28 Apr 2022 01:18:38 +0200 Subject: [PATCH 5/6] added early-access-mode --- .../java/me/mrgeneralq/sleepmost/Sleepmost.java | 16 ++++++++++++++++ .../sleepmost/services/UpdateService.java | 7 ++++++- .../me/mrgeneralq/sleepmost/utils/Version.java | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java b/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java index d267535..ae773f3 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java +++ b/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java @@ -7,6 +7,7 @@ import me.mrgeneralq.sleepmost.statics.ServerVersion; import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; +import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; @@ -16,6 +17,9 @@ public class Sleepmost extends JavaPlugin { + private boolean EARLY_ACCESS_MODE = true; + private String EARLY_ACCESS_VERSION = "4.16.0-beta1"; + private static Sleepmost instance; private Bootstrapper bootstrapper; @@ -75,6 +79,9 @@ public void onEnable() { runPreTimerTasks(); runTimers(bootstrapper.getSleepService(), bootstrapper.getWorldPropertyService()); + if(earlyAccessModeEnabled()) + Bukkit.getConsoleSender().sendMessage( "[Sleep-most]" + ChatColor.RED + "WARNING: This is an early access build. This build may contain bugs and untested features. Please update when this is available."); + } public static Sleepmost getInstance() { @@ -106,4 +113,13 @@ void registerBossBars(){ bossBarService.setVisible(world, false); } } + + + public boolean earlyAccessModeEnabled(){ + return this.EARLY_ACCESS_MODE; + } + + public String getEarlyAccessVersion(){ + return this.EARLY_ACCESS_VERSION; + } } diff --git a/src/main/java/me/mrgeneralq/sleepmost/services/UpdateService.java b/src/main/java/me/mrgeneralq/sleepmost/services/UpdateService.java index c447bc7..9be19bf 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/services/UpdateService.java +++ b/src/main/java/me/mrgeneralq/sleepmost/services/UpdateService.java @@ -20,7 +20,7 @@ public UpdateService(IUpdateRepository updateRepository, Sleepmost main, IConfig @Override public boolean hasUpdate() { - return hasUpdate(this.getCurrentVersion()); + return hasUpdate(main.getDescription().getVersion()); } @Override @@ -38,6 +38,11 @@ public boolean hasUpdate(String localVersion) { @Override public String getCurrentVersion() { + + if(this.main.earlyAccessModeEnabled()){ + return this.main.getEarlyAccessVersion(); + } + return main.getDescription().getVersion(); } diff --git a/src/main/java/me/mrgeneralq/sleepmost/utils/Version.java b/src/main/java/me/mrgeneralq/sleepmost/utils/Version.java index c61ab15..4fadbe3 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/utils/Version.java +++ b/src/main/java/me/mrgeneralq/sleepmost/utils/Version.java @@ -19,6 +19,7 @@ public final String get() { } public boolean isBiggerThan(@NotNull Version other) { + String[] thisNodes = this.get().split("\\."); String[] otherNodes = other.get().split("\\."); From 90e2b9debe52743f6ad1d5a5786adac82c9b7daf Mon Sep 17 00:00:00 2001 From: MrGeneralQ Date: Thu, 28 Apr 2022 01:23:28 +0200 Subject: [PATCH 6/6] changed early access version --- src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java b/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java index ae773f3..4c3f8c6 100644 --- a/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java +++ b/src/main/java/me/mrgeneralq/sleepmost/Sleepmost.java @@ -18,7 +18,7 @@ public class Sleepmost extends JavaPlugin { private boolean EARLY_ACCESS_MODE = true; - private String EARLY_ACCESS_VERSION = "4.16.0-beta1"; + private String EARLY_ACCESS_VERSION = "5.0.0-beta1"; private static Sleepmost instance; private Bootstrapper bootstrapper;