diff --git a/.gitignore b/.gitignore index 6789d6e..c426d9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .DS_Store -#.idea/ +.idea/ .settings/ .classpath .project diff --git a/src/main/java/com/hackclub/hccore/HCCorePlugin.java b/src/main/java/com/hackclub/hccore/HCCorePlugin.java index b86d731..abe65e4 100644 --- a/src/main/java/com/hackclub/hccore/HCCorePlugin.java +++ b/src/main/java/com/hackclub/hccore/HCCorePlugin.java @@ -34,6 +34,8 @@ import com.hackclub.hccore.commands.SpawnCommand; import com.hackclub.hccore.commands.StatsCommand; import com.hackclub.hccore.commands.WelcomeCommand; +import com.hackclub.hccore.commands.messaging.MessageCommand; +import com.hackclub.hccore.commands.messaging.ReplyCommand; import com.hackclub.hccore.listeners.AFKListener; import com.hackclub.hccore.listeners.BeehiveInteractionListener; import com.hackclub.hccore.listeners.NameChangeListener; @@ -94,6 +96,8 @@ public void onEnable() { registerCommand("stats", new StatsCommand(this)); registerCommand("rules", new RulesCommand()); registerCommand("welcome", new WelcomeCommand()); + registerCommand("msg", new MessageCommand(this)); + registerCommand("reply", new ReplyCommand(this)); // prepare for new emotes commands: // downvote "↓" diff --git a/src/main/java/com/hackclub/hccore/PlayerData.java b/src/main/java/com/hackclub/hccore/PlayerData.java index c72a271..fb69989 100644 --- a/src/main/java/com/hackclub/hccore/PlayerData.java +++ b/src/main/java/com/hackclub/hccore/PlayerData.java @@ -9,6 +9,7 @@ import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; +import java.util.UUID; import java.util.logging.Level; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; @@ -44,6 +45,8 @@ public class PlayerData { private TextColor messageColor = NamedTextColor.GRAY; @Expose private Map savedLocations = new LinkedHashMap<>(); + @Expose + private UUID lastPlayerChattingWith = null; public PlayerData(HCCorePlugin plugin, Player player) { this.plugin = plugin; @@ -182,6 +185,7 @@ public void load() { this.setSlackId(data.slackId); this.setNameColor(data.nameColor); this.setMessageColor(data.messageColor); + this.setLastPlayerChattingWith(data.lastPlayerChattingWith); this.savedLocations = data.savedLocations; } catch (IOException e) { e.printStackTrace(); @@ -241,4 +245,12 @@ private void refreshNameTag() { } } } + + public void setLastPlayerChattingWith(UUID lastPlayerChattingWith) { + this.lastPlayerChattingWith = lastPlayerChattingWith; + } + + public UUID getLastPlayerChattingWith() { + return this.lastPlayerChattingWith; + } } diff --git a/src/main/java/com/hackclub/hccore/commands/AFKCommand.java b/src/main/java/com/hackclub/hccore/commands/AFKCommand.java index 2021aa1..4f126e7 100644 --- a/src/main/java/com/hackclub/hccore/commands/AFKCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/AFKCommand.java @@ -3,7 +3,7 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; import com.hackclub.hccore.commands.general.ArgumentlessCommand; -import com.hackclub.hccore.playerMessages.MustBePlayerMessage; +import com.hackclub.hccore.playermessages.MustBePlayerMessage; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/hackclub/hccore/commands/ColorCommand.java b/src/main/java/com/hackclub/hccore/commands/ColorCommand.java index 3e48349..10046a4 100644 --- a/src/main/java/com/hackclub/hccore/commands/ColorCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/ColorCommand.java @@ -2,10 +2,10 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; -import com.hackclub.hccore.playerMessages.MustBePlayerMessage; -import com.hackclub.hccore.playerMessages.color.ColorResetMessage; -import com.hackclub.hccore.playerMessages.color.ColorSetMessage; -import com.hackclub.hccore.playerMessages.color.InvalidColorMessage; +import com.hackclub.hccore.playermessages.MustBePlayerMessage; +import com.hackclub.hccore.playermessages.color.ColorResetMessage; +import com.hackclub.hccore.playermessages.color.ColorSetMessage; +import com.hackclub.hccore.playermessages.color.InvalidColorMessage; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 6b350c6..36a9a8a 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -2,22 +2,22 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; -import com.hackclub.hccore.playerMessages.MustBePlayerMessage; -import com.hackclub.hccore.playerMessages.NoOnlinePlayerMessage; -import com.hackclub.hccore.playerMessages.loc.HasLocationMessage; -import com.hackclub.hccore.playerMessages.loc.LocationAddMessage; -import com.hackclub.hccore.playerMessages.loc.LocationExistsMessage; -import com.hackclub.hccore.playerMessages.loc.LocationGetMessage; -import com.hackclub.hccore.playerMessages.loc.LocationListMessage; -import com.hackclub.hccore.playerMessages.loc.LocationNotFoundMessage; -import com.hackclub.hccore.playerMessages.loc.LocationRemovedMessage; -import com.hackclub.hccore.playerMessages.loc.LocationRenamedMessage; -import com.hackclub.hccore.playerMessages.loc.NoLocationsMessage; -import com.hackclub.hccore.playerMessages.loc.RecipSharedMessage; -import com.hackclub.hccore.playerMessages.loc.SelfShareMessage; -import com.hackclub.hccore.playerMessages.loc.SendSharedMessage; -import com.hackclub.hccore.playerMessages.loc.SpecifyLocationMessage; -import com.hackclub.hccore.playerMessages.loc.SpecifyShareMessage; +import com.hackclub.hccore.playermessages.MustBePlayerMessage; +import com.hackclub.hccore.playermessages.NoOnlinePlayerMessage; +import com.hackclub.hccore.playermessages.loc.HasLocationMessage; +import com.hackclub.hccore.playermessages.loc.LocationAddMessage; +import com.hackclub.hccore.playermessages.loc.LocationExistsMessage; +import com.hackclub.hccore.playermessages.loc.LocationGetMessage; +import com.hackclub.hccore.playermessages.loc.LocationListMessage; +import com.hackclub.hccore.playermessages.loc.LocationNotFoundMessage; +import com.hackclub.hccore.playermessages.loc.LocationRemovedMessage; +import com.hackclub.hccore.playermessages.loc.LocationRenamedMessage; +import com.hackclub.hccore.playermessages.loc.NoLocationsMessage; +import com.hackclub.hccore.playermessages.loc.RecipSharedMessage; +import com.hackclub.hccore.playermessages.loc.SelfShareMessage; +import com.hackclub.hccore.playermessages.loc.SendSharedMessage; +import com.hackclub.hccore.playermessages.loc.SpecifyLocationMessage; +import com.hackclub.hccore.playermessages.loc.SpecifyShareMessage; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/com/hackclub/hccore/commands/NickCommand.java b/src/main/java/com/hackclub/hccore/commands/NickCommand.java index ef10e69..bccf57d 100644 --- a/src/main/java/com/hackclub/hccore/commands/NickCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/NickCommand.java @@ -2,11 +2,11 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; -import com.hackclub.hccore.playerMessages.MustBePlayerMessage; -import com.hackclub.hccore.playerMessages.nickname.NicknameLengthMessage; -import com.hackclub.hccore.playerMessages.nickname.NicknameResetMessage; -import com.hackclub.hccore.playerMessages.nickname.NicknameSetMessage; -import com.hackclub.hccore.playerMessages.nickname.SaharshMessage; +import com.hackclub.hccore.playermessages.MustBePlayerMessage; +import com.hackclub.hccore.playermessages.nickname.NicknameLengthMessage; +import com.hackclub.hccore.playermessages.nickname.NicknameResetMessage; +import com.hackclub.hccore.playermessages.nickname.NicknameSetMessage; +import com.hackclub.hccore.playermessages.nickname.SaharshMessage; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/hackclub/hccore/commands/PingCommand.java b/src/main/java/com/hackclub/hccore/commands/PingCommand.java index fddedd1..99542d3 100644 --- a/src/main/java/com/hackclub/hccore/commands/PingCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/PingCommand.java @@ -2,10 +2,10 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; -import com.hackclub.hccore.playerMessages.MustBePlayerMessage; -import com.hackclub.hccore.playerMessages.NoOnlinePlayerMessage; -import com.hackclub.hccore.playerMessages.ping.PingFailMessage; -import com.hackclub.hccore.playerMessages.ping.PingMessage; +import com.hackclub.hccore.playermessages.MustBePlayerMessage; +import com.hackclub.hccore.playermessages.NoOnlinePlayerMessage; +import com.hackclub.hccore.playermessages.ping.PingFailMessage; +import com.hackclub.hccore.playermessages.ping.PingMessage; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/hackclub/hccore/commands/RulesCommand.java b/src/main/java/com/hackclub/hccore/commands/RulesCommand.java index e214744..c488b1a 100644 --- a/src/main/java/com/hackclub/hccore/commands/RulesCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/RulesCommand.java @@ -1,7 +1,7 @@ package com.hackclub.hccore.commands; import com.hackclub.hccore.commands.general.ArgumentlessCommand; -import com.hackclub.hccore.playerMessages.RulesMessage; +import com.hackclub.hccore.playermessages.RulesMessage; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/hackclub/hccore/commands/SlackCommand.java b/src/main/java/com/hackclub/hccore/commands/SlackCommand.java index 69fc379..83eed2f 100644 --- a/src/main/java/com/hackclub/hccore/commands/SlackCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/SlackCommand.java @@ -2,18 +2,18 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; -import com.hackclub.hccore.playerMessages.MustBePlayerMessage; -import com.hackclub.hccore.playerMessages.PlayerHasntPlayedMessage; -import com.hackclub.hccore.playerMessages.slack.InvalidSlackMessage; -import com.hackclub.hccore.playerMessages.slack.LinkErrorMessage; -import com.hackclub.hccore.playerMessages.slack.LinkedSlackMessage; -import com.hackclub.hccore.playerMessages.slack.LookupErrorMessage; -import com.hackclub.hccore.playerMessages.slack.PlayerNotLinkedMessage; -import com.hackclub.hccore.playerMessages.slack.SlackDisabledMessage; -import com.hackclub.hccore.playerMessages.slack.SlackUsernameMessage; -import com.hackclub.hccore.playerMessages.slack.UnlinkedSlackMessage; -import com.hackclub.hccore.playerMessages.slack.VerificationErrorMessage; -import com.hackclub.hccore.playerMessages.slack.VerificationSentMessage; +import com.hackclub.hccore.playermessages.MustBePlayerMessage; +import com.hackclub.hccore.playermessages.PlayerHasntPlayedMessage; +import com.hackclub.hccore.playermessages.slack.InvalidSlackMessage; +import com.hackclub.hccore.playermessages.slack.LinkErrorMessage; +import com.hackclub.hccore.playermessages.slack.LinkedSlackMessage; +import com.hackclub.hccore.playermessages.slack.LookupErrorMessage; +import com.hackclub.hccore.playermessages.slack.PlayerNotLinkedMessage; +import com.hackclub.hccore.playermessages.slack.SlackDisabledMessage; +import com.hackclub.hccore.playermessages.slack.SlackUsernameMessage; +import com.hackclub.hccore.playermessages.slack.UnlinkedSlackMessage; +import com.hackclub.hccore.playermessages.slack.VerificationErrorMessage; +import com.hackclub.hccore.playermessages.slack.VerificationSentMessage; import com.slack.api.model.User; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java b/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java index 3ca4d63..2414e96 100644 --- a/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java @@ -3,13 +3,13 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; import com.hackclub.hccore.commands.general.ArgumentlessCommand; -import com.hackclub.hccore.playerMessages.MustBePlayerMessage; -import com.hackclub.hccore.playerMessages.spawn.OverworldCommandMessage; -import com.hackclub.hccore.playerMessages.spawn.SpawnGroundMessage; -import com.hackclub.hccore.playerMessages.spawn.SpawnHurtMessage; -import com.hackclub.hccore.playerMessages.spawn.SpawnRadiusMessage; -import com.hackclub.hccore.playerMessages.spawn.SpawnSkyMessage; -import com.hackclub.hccore.playerMessages.spawn.SpawnTeleportMessage; +import com.hackclub.hccore.playermessages.MustBePlayerMessage; +import com.hackclub.hccore.playermessages.spawn.OverworldCommandMessage; +import com.hackclub.hccore.playermessages.spawn.SpawnGroundMessage; +import com.hackclub.hccore.playermessages.spawn.SpawnHurtMessage; +import com.hackclub.hccore.playermessages.spawn.SpawnRadiusMessage; +import com.hackclub.hccore.playermessages.spawn.SpawnSkyMessage; +import com.hackclub.hccore.playermessages.spawn.SpawnTeleportMessage; import org.bukkit.GameMode; import org.bukkit.World.Environment; import org.bukkit.block.Block; diff --git a/src/main/java/com/hackclub/hccore/commands/StatsCommand.java b/src/main/java/com/hackclub/hccore/commands/StatsCommand.java index 11f173c..a37a01a 100644 --- a/src/main/java/com/hackclub/hccore/commands/StatsCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/StatsCommand.java @@ -2,14 +2,14 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; -import com.hackclub.hccore.playerMessages.MustBePlayerMessage; -import com.hackclub.hccore.playerMessages.NoOnlinePlayerMessage; -import com.hackclub.hccore.playerMessages.stats.IncludePlayerStatMessage; -import com.hackclub.hccore.playerMessages.stats.InvalidStatMessage; -import com.hackclub.hccore.playerMessages.stats.SpecificStatMessage; -import com.hackclub.hccore.playerMessages.stats.StatMessage; -import com.hackclub.hccore.playerMessages.stats.UnsupportedStatMessage; -import com.hackclub.hccore.playerMessages.stats.YourStatsMessage; +import com.hackclub.hccore.playermessages.MustBePlayerMessage; +import com.hackclub.hccore.playermessages.NoOnlinePlayerMessage; +import com.hackclub.hccore.playermessages.stats.IncludePlayerStatMessage; +import com.hackclub.hccore.playermessages.stats.InvalidStatMessage; +import com.hackclub.hccore.playermessages.stats.SpecificStatMessage; +import com.hackclub.hccore.playermessages.stats.StatMessage; +import com.hackclub.hccore.playermessages.stats.UnsupportedStatMessage; +import com.hackclub.hccore.playermessages.stats.YourStatsMessage; import com.hackclub.hccore.utils.TimeUtil; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/src/main/java/com/hackclub/hccore/commands/WelcomeCommand.java b/src/main/java/com/hackclub/hccore/commands/WelcomeCommand.java index 0005117..0ff5749 100644 --- a/src/main/java/com/hackclub/hccore/commands/WelcomeCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/WelcomeCommand.java @@ -1,7 +1,7 @@ package com.hackclub.hccore.commands; import com.hackclub.hccore.commands.general.ArgumentlessCommand; -import com.hackclub.hccore.playerMessages.WelcomeMessage; +import com.hackclub.hccore.playermessages.WelcomeMessage; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/hackclub/hccore/commands/messaging/MessageCommand.java b/src/main/java/com/hackclub/hccore/commands/messaging/MessageCommand.java new file mode 100644 index 0000000..d54de55 --- /dev/null +++ b/src/main/java/com/hackclub/hccore/commands/messaging/MessageCommand.java @@ -0,0 +1,51 @@ +package com.hackclub.hccore.commands.messaging; + +import com.hackclub.hccore.HCCorePlugin; +import com.hackclub.hccore.playermessages.MustBePlayerMessage; +import com.hackclub.hccore.playermessages.NoOnlinePlayerMessage; +import com.hackclub.hccore.playermessages.messages.PrivateMessage; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.TextColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +public class MessageCommand implements CommandExecutor { + + private HCCorePlugin plugin; + + public MessageCommand(HCCorePlugin plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { + if (args.length < 2) return false; + + //TODO: Allow console to send messages as "Console" in red. + if (!(sender instanceof Player sendingPlayer)) { + sender.sendMessage(MustBePlayerMessage.get()); + return true; + } + + final Player recipientPlayer = sender.getServer().getPlayerExact(args[0]); + + if (recipientPlayer == null) { + sender.sendMessage(NoOnlinePlayerMessage.get()); + return true; + } + + final Component senderMessage = PrivateMessage.get("You", recipientPlayer.getName(), String.join(" ", args).substring(args[0].length() + 1), null, this.plugin.getDataManager().getData(recipientPlayer).getNameColor()); + final Component receiverMessage = PrivateMessage.get(sendingPlayer.getName(), "You", String.join(" ", args).substring(args[0].length() + 1), this.plugin.getDataManager().getData(sendingPlayer).getNameColor(), null); + + this.plugin.getDataManager().getData(recipientPlayer).setLastPlayerChattingWith(sendingPlayer.getUniqueId()); + this.plugin.getDataManager().getData(sendingPlayer).setLastPlayerChattingWith(recipientPlayer.getUniqueId()); + + recipientPlayer.sendMessage(receiverMessage); + sendingPlayer.sendMessage(senderMessage); + + return true; + } +} diff --git a/src/main/java/com/hackclub/hccore/commands/messaging/ReplyCommand.java b/src/main/java/com/hackclub/hccore/commands/messaging/ReplyCommand.java new file mode 100644 index 0000000..88e723e --- /dev/null +++ b/src/main/java/com/hackclub/hccore/commands/messaging/ReplyCommand.java @@ -0,0 +1,57 @@ +package com.hackclub.hccore.commands.messaging; + +import com.comphenix.protocol.PacketType.Play; +import com.hackclub.hccore.HCCorePlugin; +import com.hackclub.hccore.playermessages.MustBePlayerMessage; +import com.hackclub.hccore.playermessages.NoOnlinePlayerMessage; +import com.hackclub.hccore.playermessages.messages.PrivateMessage; +import java.util.Arrays; +import net.kyori.adventure.text.Component; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +public class ReplyCommand implements CommandExecutor { + + private HCCorePlugin plugin; + + public ReplyCommand(HCCorePlugin plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { + if (args.length < 1) return false; + + if (!(sender instanceof Player sendingPlayer)) { + sender.sendMessage(MustBePlayerMessage.get()); + return true; + } + + Player recipientPlayer; + try { + recipientPlayer = sender.getServer().getPlayer(this.plugin.getDataManager().getData(sendingPlayer).getLastPlayerChattingWith()); + } catch (Exception e) { + sender.sendMessage(NoOnlinePlayerMessage.get()); + return true; + } + + if (recipientPlayer == null) { + sender.sendMessage(NoOnlinePlayerMessage.get()); + return true; + } + + final Component senderMessage = PrivateMessage.get("You", recipientPlayer.getName(), String.join(" ", args), null, this.plugin.getDataManager().getData(recipientPlayer).getNameColor()); + final Component receiverMessage = PrivateMessage.get(sendingPlayer.getName(), "You", String.join(" ", args), this.plugin.getDataManager().getData(sendingPlayer).getNameColor(), null); + + this.plugin.getDataManager().getData(recipientPlayer).setLastPlayerChattingWith(sendingPlayer.getUniqueId()); + this.plugin.getDataManager().getData(sendingPlayer).setLastPlayerChattingWith(recipientPlayer.getUniqueId()); + + recipientPlayer.sendMessage(receiverMessage); + sendingPlayer.sendMessage(senderMessage); + + return true; + } +} diff --git a/src/main/java/com/hackclub/hccore/listeners/AFKListener.java b/src/main/java/com/hackclub/hccore/listeners/AFKListener.java index 9a9f3bd..1e94bf9 100644 --- a/src/main/java/com/hackclub/hccore/listeners/AFKListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/AFKListener.java @@ -3,10 +3,10 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; import com.hackclub.hccore.events.player.PlayerAFKStatusChangeEvent; -import com.hackclub.hccore.playerMessages.afk.IsAFKMessage; -import com.hackclub.hccore.playerMessages.afk.NotAFKMessage; -import com.hackclub.hccore.playerMessages.afk.RunAFKMessage; -import com.hackclub.hccore.playerMessages.afk.YouAFKMessage; +import com.hackclub.hccore.playermessages.afk.IsAFKMessage; +import com.hackclub.hccore.playermessages.afk.NotAFKMessage; +import com.hackclub.hccore.playermessages.afk.RunAFKMessage; +import com.hackclub.hccore.playermessages.afk.YouAFKMessage; import io.papermc.paper.event.player.AsyncChatEvent; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java index a00f9d5..a586f92 100644 --- a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java @@ -4,13 +4,13 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; -import com.hackclub.hccore.playerMessages.WelcomeMessage; -import com.hackclub.hccore.playerMessages.player.BanMessage; -import com.hackclub.hccore.playerMessages.player.ChatMessage; -import com.hackclub.hccore.playerMessages.player.JoinMessage; -import com.hackclub.hccore.playerMessages.player.LeaveMessage; -import com.hackclub.hccore.playerMessages.player.MustLinkMessage; -import com.hackclub.hccore.playerMessages.player.ServerFullMessage; +import com.hackclub.hccore.playermessages.WelcomeMessage; +import com.hackclub.hccore.playermessages.player.BanMessage; +import com.hackclub.hccore.playermessages.player.ChatMessage; +import com.hackclub.hccore.playermessages.player.JoinMessage; +import com.hackclub.hccore.playermessages.player.LeaveMessage; +import com.hackclub.hccore.playermessages.player.MustLinkMessage; +import com.hackclub.hccore.playermessages.player.ServerFullMessage; import java.util.UUID; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.TextColor; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/MustBePlayerMessage.java b/src/main/java/com/hackclub/hccore/playermessages/MustBePlayerMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/MustBePlayerMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/MustBePlayerMessage.java index 1310b5b..0b0356d 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/MustBePlayerMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/MustBePlayerMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages; +package com.hackclub.hccore.playermessages; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/NoOnlinePlayerMessage.java b/src/main/java/com/hackclub/hccore/playermessages/NoOnlinePlayerMessage.java similarity index 89% rename from src/main/java/com/hackclub/hccore/playerMessages/NoOnlinePlayerMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/NoOnlinePlayerMessage.java index 95cc199..5053c9b 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/NoOnlinePlayerMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/NoOnlinePlayerMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages; +package com.hackclub.hccore.playermessages; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/PlayerHasntPlayedMessage.java b/src/main/java/com/hackclub/hccore/playermessages/PlayerHasntPlayedMessage.java similarity index 89% rename from src/main/java/com/hackclub/hccore/playerMessages/PlayerHasntPlayedMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/PlayerHasntPlayedMessage.java index 5e89666..dafded9 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/PlayerHasntPlayedMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/PlayerHasntPlayedMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages; +package com.hackclub.hccore.playermessages; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/RulesMessage.java b/src/main/java/com/hackclub/hccore/playermessages/RulesMessage.java similarity index 97% rename from src/main/java/com/hackclub/hccore/playerMessages/RulesMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/RulesMessage.java index 8307a12..944f5e9 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/RulesMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/RulesMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages; +package com.hackclub.hccore.playermessages; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/WelcomeMessage.java b/src/main/java/com/hackclub/hccore/playermessages/WelcomeMessage.java similarity index 94% rename from src/main/java/com/hackclub/hccore/playerMessages/WelcomeMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/WelcomeMessage.java index 5c14ecf..e03c2e4 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/WelcomeMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/WelcomeMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages; +package com.hackclub.hccore.playermessages; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/afk/AutoAFKMessage.java b/src/main/java/com/hackclub/hccore/playermessages/afk/AutoAFKMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/afk/AutoAFKMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/afk/AutoAFKMessage.java index 1dc9687..2870d9d 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/afk/AutoAFKMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/afk/AutoAFKMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.afk; +package com.hackclub.hccore.playermessages.afk; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/afk/IsAFKMessage.java b/src/main/java/com/hackclub/hccore/playermessages/afk/IsAFKMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/afk/IsAFKMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/afk/IsAFKMessage.java index 79bbc89..121c8f9 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/afk/IsAFKMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/afk/IsAFKMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.afk; +package com.hackclub.hccore.playermessages.afk; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/afk/NotAFKMessage.java b/src/main/java/com/hackclub/hccore/playermessages/afk/NotAFKMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/afk/NotAFKMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/afk/NotAFKMessage.java index 8fca8dc..01735d1 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/afk/NotAFKMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/afk/NotAFKMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.afk; +package com.hackclub.hccore.playermessages.afk; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/afk/RunAFKMessage.java b/src/main/java/com/hackclub/hccore/playermessages/afk/RunAFKMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/afk/RunAFKMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/afk/RunAFKMessage.java index 49d0815..2d1172b 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/afk/RunAFKMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/afk/RunAFKMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.afk; +package com.hackclub.hccore.playermessages.afk; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/afk/YouAFKMessage.java b/src/main/java/com/hackclub/hccore/playermessages/afk/YouAFKMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/afk/YouAFKMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/afk/YouAFKMessage.java index 578f025..5f9dd2f 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/afk/YouAFKMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/afk/YouAFKMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.afk; +package com.hackclub.hccore.playermessages.afk; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/color/ColorResetMessage.java b/src/main/java/com/hackclub/hccore/playermessages/color/ColorResetMessage.java similarity index 92% rename from src/main/java/com/hackclub/hccore/playerMessages/color/ColorResetMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/color/ColorResetMessage.java index 6a85bf3..d80c0a5 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/color/ColorResetMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/color/ColorResetMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.color; +package com.hackclub.hccore.playermessages.color; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/color/ColorSetMessage.java b/src/main/java/com/hackclub/hccore/playermessages/color/ColorSetMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/color/ColorSetMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/color/ColorSetMessage.java index d7e7856..e82bc52 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/color/ColorSetMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/color/ColorSetMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.color; +package com.hackclub.hccore.playermessages.color; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/color/InvalidColorMessage.java b/src/main/java/com/hackclub/hccore/playermessages/color/InvalidColorMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/color/InvalidColorMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/color/InvalidColorMessage.java index 46a9592..3b8054e 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/color/InvalidColorMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/color/InvalidColorMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.color; +package com.hackclub.hccore.playermessages.color; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/HasLocationMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/HasLocationMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/HasLocationMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/HasLocationMessage.java index 985264e..aa2c3e8 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/HasLocationMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/HasLocationMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationAddMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationAddMessage.java similarity index 95% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/LocationAddMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/LocationAddMessage.java index 195a336..524b584 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationAddMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationAddMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationExistsMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationExistsMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/LocationExistsMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/LocationExistsMessage.java index 9015751..c544b3f 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationExistsMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationExistsMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationGetMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationGetMessage.java similarity index 94% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/LocationGetMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/LocationGetMessage.java index 75ec366..6638d8d 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationGetMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationGetMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationListMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationListMessage.java similarity index 96% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/LocationListMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/LocationListMessage.java index 735dca5..3c0e4fb 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationListMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationListMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationNotFoundMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationNotFoundMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/LocationNotFoundMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/LocationNotFoundMessage.java index 662c576..26c05a4 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationNotFoundMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationNotFoundMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationRemovedMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationRemovedMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/LocationRemovedMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/LocationRemovedMessage.java index 0fb1064..065de0c 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationRemovedMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationRemovedMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationRenamedMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationRenamedMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/LocationRenamedMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/LocationRenamedMessage.java index f81d545..25d7714 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/LocationRenamedMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/LocationRenamedMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/NoLocationsMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/NoLocationsMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/NoLocationsMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/NoLocationsMessage.java index afbc3df..ba6dac2 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/NoLocationsMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/NoLocationsMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/RecipSharedMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/RecipSharedMessage.java similarity index 95% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/RecipSharedMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/RecipSharedMessage.java index 2b6946d..e618f75 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/RecipSharedMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/RecipSharedMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/SelfShareMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/SelfShareMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/SelfShareMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/SelfShareMessage.java index 2484388..5e166d7 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/SelfShareMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/SelfShareMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/SendSharedMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/SendSharedMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/SendSharedMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/SendSharedMessage.java index 7e56d72..58c2a1b 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/SendSharedMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/SendSharedMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/SpecifyLocationMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/SpecifyLocationMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/SpecifyLocationMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/SpecifyLocationMessage.java index 42eca6e..626decb 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/SpecifyLocationMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/SpecifyLocationMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/loc/SpecifyShareMessage.java b/src/main/java/com/hackclub/hccore/playermessages/loc/SpecifyShareMessage.java similarity index 89% rename from src/main/java/com/hackclub/hccore/playerMessages/loc/SpecifyShareMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/loc/SpecifyShareMessage.java index 0899f71..dd76706 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/loc/SpecifyShareMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/loc/SpecifyShareMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.loc; +package com.hackclub.hccore.playermessages.loc; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playermessages/messages/PrivateMessage.java b/src/main/java/com/hackclub/hccore/playermessages/messages/PrivateMessage.java new file mode 100644 index 0000000..127c843 --- /dev/null +++ b/src/main/java/com/hackclub/hccore/playermessages/messages/PrivateMessage.java @@ -0,0 +1,25 @@ +package com.hackclub.hccore.playermessages.messages; + +import static net.kyori.adventure.text.Component.empty; +import static net.kyori.adventure.text.Component.text; +import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; + +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.TextColor; + +public class PrivateMessage { + public static Component get(String sender, String recipient, String message, TextColor senderColor, TextColor recipientColor) { + if (senderColor == null) senderColor = TextColor.color(0xAAAAAA); + if (recipientColor == null) recipientColor = TextColor.color(0xAAAAAA); + final Component senderNameComponent = text(sender).color(senderColor); + final Component recipientNameComponent = text(recipient).color(recipientColor); + final Component messageComponent = text(message); + + return empty().color(TextColor.color(0xAAAAAA)) + .append(senderNameComponent) + .append(text(" -> ").color(TextColor.color(0xAAAAAA))) + .append(recipientNameComponent) + .append(text(": ").color(TextColor.color(0xAAAAAA))) + .append(messageComponent); + } +} \ No newline at end of file diff --git a/src/main/java/com/hackclub/hccore/playerMessages/nickname/NicknameLengthMessage.java b/src/main/java/com/hackclub/hccore/playermessages/nickname/NicknameLengthMessage.java similarity index 92% rename from src/main/java/com/hackclub/hccore/playerMessages/nickname/NicknameLengthMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/nickname/NicknameLengthMessage.java index 41e2eac..74fad80 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/nickname/NicknameLengthMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/nickname/NicknameLengthMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.nickname; +package com.hackclub.hccore.playermessages.nickname; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/nickname/NicknameResetMessage.java b/src/main/java/com/hackclub/hccore/playermessages/nickname/NicknameResetMessage.java similarity index 86% rename from src/main/java/com/hackclub/hccore/playerMessages/nickname/NicknameResetMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/nickname/NicknameResetMessage.java index 06c160e..61b4e1d 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/nickname/NicknameResetMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/nickname/NicknameResetMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.nickname; +package com.hackclub.hccore.playermessages.nickname; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/nickname/NicknameSetMessage.java b/src/main/java/com/hackclub/hccore/playermessages/nickname/NicknameSetMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/nickname/NicknameSetMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/nickname/NicknameSetMessage.java index 818760a..05383c1 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/nickname/NicknameSetMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/nickname/NicknameSetMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.nickname; +package com.hackclub.hccore.playermessages.nickname; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/nickname/SaharshMessage.java b/src/main/java/com/hackclub/hccore/playermessages/nickname/SaharshMessage.java similarity index 86% rename from src/main/java/com/hackclub/hccore/playerMessages/nickname/SaharshMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/nickname/SaharshMessage.java index 294841d..06eb716 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/nickname/SaharshMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/nickname/SaharshMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.nickname; +package com.hackclub.hccore.playermessages.nickname; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/ping/PingFailMessage.java b/src/main/java/com/hackclub/hccore/playermessages/ping/PingFailMessage.java similarity index 92% rename from src/main/java/com/hackclub/hccore/playerMessages/ping/PingFailMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/ping/PingFailMessage.java index 1fb764a..3962bc0 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/ping/PingFailMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/ping/PingFailMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.ping; +package com.hackclub.hccore.playermessages.ping; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/ping/PingMessage.java b/src/main/java/com/hackclub/hccore/playermessages/ping/PingMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/ping/PingMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/ping/PingMessage.java index df16d9e..76260e1 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/ping/PingMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/ping/PingMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.ping; +package com.hackclub.hccore.playermessages.ping; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/player/BanMessage.java b/src/main/java/com/hackclub/hccore/playermessages/player/BanMessage.java similarity index 96% rename from src/main/java/com/hackclub/hccore/playerMessages/player/BanMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/player/BanMessage.java index 79d645a..d863499 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/player/BanMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/player/BanMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.player; +package com.hackclub.hccore.playermessages.player; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/player/ChatMessage.java b/src/main/java/com/hackclub/hccore/playermessages/player/ChatMessage.java similarity index 94% rename from src/main/java/com/hackclub/hccore/playerMessages/player/ChatMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/player/ChatMessage.java index 6aa69ce..e7927bc 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/player/ChatMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/player/ChatMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.player; +package com.hackclub.hccore.playermessages.player; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; import static net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacyAmpersand; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/player/JoinMessage.java b/src/main/java/com/hackclub/hccore/playermessages/player/JoinMessage.java similarity index 91% rename from src/main/java/com/hackclub/hccore/playerMessages/player/JoinMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/player/JoinMessage.java index 9634453..19264ae 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/player/JoinMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/player/JoinMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.player; +package com.hackclub.hccore.playermessages.player; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/player/LeaveMessage.java b/src/main/java/com/hackclub/hccore/playermessages/player/LeaveMessage.java similarity index 91% rename from src/main/java/com/hackclub/hccore/playerMessages/player/LeaveMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/player/LeaveMessage.java index e096934..9763872 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/player/LeaveMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/player/LeaveMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.player; +package com.hackclub.hccore.playermessages.player; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/player/MustLinkMessage.java b/src/main/java/com/hackclub/hccore/playermessages/player/MustLinkMessage.java similarity index 95% rename from src/main/java/com/hackclub/hccore/playerMessages/player/MustLinkMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/player/MustLinkMessage.java index 949303d..b36226f 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/player/MustLinkMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/player/MustLinkMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.player; +package com.hackclub.hccore.playermessages.player; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/player/ServerFullMessage.java b/src/main/java/com/hackclub/hccore/playermessages/player/ServerFullMessage.java similarity index 89% rename from src/main/java/com/hackclub/hccore/playerMessages/player/ServerFullMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/player/ServerFullMessage.java index 9cd1156..94e0b82 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/player/ServerFullMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/player/ServerFullMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.player; +package com.hackclub.hccore.playermessages.player; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/AccountLinkedMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/AccountLinkedMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/AccountLinkedMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/AccountLinkedMessage.java index 9b9301d..a8ad412 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/AccountLinkedMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/AccountLinkedMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/InvalidSlackMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/InvalidSlackMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/InvalidSlackMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/InvalidSlackMessage.java index 9c694f6..1f857c5 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/InvalidSlackMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/InvalidSlackMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/LinkDeniedMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/LinkDeniedMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/LinkDeniedMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/LinkDeniedMessage.java index 51ff077..15c794c 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/LinkDeniedMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/LinkDeniedMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/LinkErrorMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/LinkErrorMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/LinkErrorMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/LinkErrorMessage.java index 5ba297b..b285f67 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/LinkErrorMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/LinkErrorMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/LinkedSlackMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/LinkedSlackMessage.java similarity index 98% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/LinkedSlackMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/LinkedSlackMessage.java index 85f2438..ac33be0 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/LinkedSlackMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/LinkedSlackMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.format.NamedTextColor.RED; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/LookupErrorMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/LookupErrorMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/LookupErrorMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/LookupErrorMessage.java index 924db0a..80baab2 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/LookupErrorMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/LookupErrorMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/PlayerNotLinkedMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/PlayerNotLinkedMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/PlayerNotLinkedMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/PlayerNotLinkedMessage.java index 46d9959..25d21f9 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/PlayerNotLinkedMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/PlayerNotLinkedMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/SlackChatMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/SlackChatMessage.java similarity index 94% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/SlackChatMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/SlackChatMessage.java index ff12610..b284fcd 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/SlackChatMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/SlackChatMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; import static net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacyAmpersand; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/SlackDisabledMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/SlackDisabledMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/SlackDisabledMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/SlackDisabledMessage.java index a446370..ae8aa79 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/SlackDisabledMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/SlackDisabledMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/SlackUsernameMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/SlackUsernameMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/SlackUsernameMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/SlackUsernameMessage.java index 4a6c3f4..cabc29f 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/SlackUsernameMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/SlackUsernameMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/UnlinkedSlackMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/UnlinkedSlackMessage.java similarity index 95% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/UnlinkedSlackMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/UnlinkedSlackMessage.java index f1c85c1..3ace0e4 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/UnlinkedSlackMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/UnlinkedSlackMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/VerificationErrorMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/VerificationErrorMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/VerificationErrorMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/VerificationErrorMessage.java index 1c1540f..077fa91 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/VerificationErrorMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/VerificationErrorMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/slack/VerificationSentMessage.java b/src/main/java/com/hackclub/hccore/playermessages/slack/VerificationSentMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/slack/VerificationSentMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/slack/VerificationSentMessage.java index 8408244..e0499ad 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/slack/VerificationSentMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/slack/VerificationSentMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.slack; +package com.hackclub.hccore.playermessages.slack; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/spawn/OverworldCommandMessage.java b/src/main/java/com/hackclub/hccore/playermessages/spawn/OverworldCommandMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/spawn/OverworldCommandMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/spawn/OverworldCommandMessage.java index 9f18414..b23dd3a 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/spawn/OverworldCommandMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/spawn/OverworldCommandMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.spawn; +package com.hackclub.hccore.playermessages.spawn; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnGroundMessage.java b/src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnGroundMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnGroundMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnGroundMessage.java index 0d9eac2..76c1a24 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnGroundMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnGroundMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.spawn; +package com.hackclub.hccore.playermessages.spawn; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnHurtMessage.java b/src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnHurtMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnHurtMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnHurtMessage.java index 3187de5..f160dcf 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnHurtMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnHurtMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.spawn; +package com.hackclub.hccore.playermessages.spawn; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnRadiusMessage.java b/src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnRadiusMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnRadiusMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnRadiusMessage.java index ec4f38f..62e6738 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnRadiusMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnRadiusMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.spawn; +package com.hackclub.hccore.playermessages.spawn; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnSkyMessage.java b/src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnSkyMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnSkyMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnSkyMessage.java index 69530d2..6e4d066 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnSkyMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnSkyMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.spawn; +package com.hackclub.hccore.playermessages.spawn; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnTeleportMessage.java b/src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnTeleportMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnTeleportMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnTeleportMessage.java index 4f6bd12..7b5de2f 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/spawn/SpawnTeleportMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/spawn/SpawnTeleportMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.spawn; +package com.hackclub.hccore.playermessages.spawn; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/stats/IncludePlayerStatMessage.java b/src/main/java/com/hackclub/hccore/playermessages/stats/IncludePlayerStatMessage.java similarity index 88% rename from src/main/java/com/hackclub/hccore/playerMessages/stats/IncludePlayerStatMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/stats/IncludePlayerStatMessage.java index 0bab2db..74c0b2a 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/stats/IncludePlayerStatMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/stats/IncludePlayerStatMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.stats; +package com.hackclub.hccore.playermessages.stats; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/stats/InvalidStatMessage.java b/src/main/java/com/hackclub/hccore/playermessages/stats/InvalidStatMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/stats/InvalidStatMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/stats/InvalidStatMessage.java index 6921e13..fd9faee 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/stats/InvalidStatMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/stats/InvalidStatMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.stats; +package com.hackclub.hccore.playermessages.stats; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/stats/SpecificStatMessage.java b/src/main/java/com/hackclub/hccore/playermessages/stats/SpecificStatMessage.java similarity index 94% rename from src/main/java/com/hackclub/hccore/playerMessages/stats/SpecificStatMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/stats/SpecificStatMessage.java index ba1b2e3..04791d6 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/stats/SpecificStatMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/stats/SpecificStatMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.stats; +package com.hackclub.hccore.playermessages.stats; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/stats/StatMessage.java b/src/main/java/com/hackclub/hccore/playermessages/stats/StatMessage.java similarity index 93% rename from src/main/java/com/hackclub/hccore/playerMessages/stats/StatMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/stats/StatMessage.java index 4adef5b..80d4887 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/stats/StatMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/stats/StatMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.stats; +package com.hackclub.hccore.playermessages.stats; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/stats/UnsupportedStatMessage.java b/src/main/java/com/hackclub/hccore/playermessages/stats/UnsupportedStatMessage.java similarity index 87% rename from src/main/java/com/hackclub/hccore/playerMessages/stats/UnsupportedStatMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/stats/UnsupportedStatMessage.java index 2e5d6bf..40c60c4 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/stats/UnsupportedStatMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/stats/UnsupportedStatMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.stats; +package com.hackclub.hccore.playermessages.stats; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/stats/YourStatsMessage.java b/src/main/java/com/hackclub/hccore/playermessages/stats/YourStatsMessage.java similarity index 92% rename from src/main/java/com/hackclub/hccore/playerMessages/stats/YourStatsMessage.java rename to src/main/java/com/hackclub/hccore/playermessages/stats/YourStatsMessage.java index 24c11a0..e606f7c 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/stats/YourStatsMessage.java +++ b/src/main/java/com/hackclub/hccore/playermessages/stats/YourStatsMessage.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.stats; +package com.hackclub.hccore.playermessages.stats; import static net.kyori.adventure.text.Component.text; import static net.kyori.adventure.text.minimessage.MiniMessage.miniMessage; diff --git a/src/main/java/com/hackclub/hccore/playerMessages/tags/ConditionalResolver.java b/src/main/java/com/hackclub/hccore/playermessages/tags/ConditionalResolver.java similarity index 94% rename from src/main/java/com/hackclub/hccore/playerMessages/tags/ConditionalResolver.java rename to src/main/java/com/hackclub/hccore/playermessages/tags/ConditionalResolver.java index d4efb26..4404857 100644 --- a/src/main/java/com/hackclub/hccore/playerMessages/tags/ConditionalResolver.java +++ b/src/main/java/com/hackclub/hccore/playermessages/tags/ConditionalResolver.java @@ -1,4 +1,4 @@ -package com.hackclub.hccore.playerMessages.tags; +package com.hackclub.hccore.playermessages.tags; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.tag.Modifying; diff --git a/src/main/java/com/hackclub/hccore/slack/SlackBot.java b/src/main/java/com/hackclub/hccore/slack/SlackBot.java index 2cd6741..b624910 100644 --- a/src/main/java/com/hackclub/hccore/slack/SlackBot.java +++ b/src/main/java/com/hackclub/hccore/slack/SlackBot.java @@ -13,9 +13,9 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; import com.hackclub.hccore.events.player.PlayerAFKStatusChangeEvent; -import com.hackclub.hccore.playerMessages.slack.AccountLinkedMessage; -import com.hackclub.hccore.playerMessages.slack.LinkDeniedMessage; -import com.hackclub.hccore.playerMessages.slack.SlackChatMessage; +import com.hackclub.hccore.playermessages.slack.AccountLinkedMessage; +import com.hackclub.hccore.playermessages.slack.LinkDeniedMessage; +import com.hackclub.hccore.playermessages.slack.SlackChatMessage; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.LiteralArgumentBuilder; diff --git a/src/main/java/com/hackclub/hccore/tasks/AutoAFKTask.java b/src/main/java/com/hackclub/hccore/tasks/AutoAFKTask.java index b7edd43..9f0640c 100644 --- a/src/main/java/com/hackclub/hccore/tasks/AutoAFKTask.java +++ b/src/main/java/com/hackclub/hccore/tasks/AutoAFKTask.java @@ -2,7 +2,7 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; -import com.hackclub.hccore.playerMessages.afk.AutoAFKMessage; +import com.hackclub.hccore.playermessages.afk.AutoAFKMessage; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 437965e..e0c6d3c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -43,3 +43,13 @@ commands: rules: description: gets the rules usage: / + msg: + description: message a player + usage: / + aliases: + - whisper + reply: + description: reply to a player + usage: / + aliases: + - r \ No newline at end of file