From 623b82494f8044a6f7977b8b940cc683d3169337 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Mon, 27 Jan 2020 21:36:27 -0500 Subject: [PATCH 1/6] Create localization branch for upcoming feature. --- MineverseChat/Messages.yml | 18 +++++++++ .../Aust1n46/chat/command/chat/Broadcast.java | 7 +++- .../chat/command/chat/BungeeToggle.java | 10 ++--- .../Aust1n46/chat/command/chat/Channel.java | 10 +++-- .../chat/command/chat/Chatreload.java | 6 +-- .../Aust1n46/chat/command/chat/Chlist.java | 13 +++++-- .../Aust1n46/chat/command/chat/Chwho.java | 16 +++++--- .../Aust1n46/chat/command/chat/Clearchat.java | 10 ++--- .../Aust1n46/chat/command/chat/Leave.java | 10 +++-- .../Aust1n46/chat/command/chat/Listen.java | 12 ++++-- .../chat/command/chat/VentureChatGui.java | 2 +- .../chat/command/message/Message.java | 15 ++++--- .../chat/localization/Localization.java | 29 ++++++++++---- .../chat/localization/LocalizedMessage.java | 39 +++++++++++++++++++ 14 files changed, 151 insertions(+), 46 deletions(-) create mode 100644 MineverseChat/Messages.yml create mode 100644 MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java diff --git a/MineverseChat/Messages.yml b/MineverseChat/Messages.yml new file mode 100644 index 0000000..13dd238 --- /dev/null +++ b/MineverseChat/Messages.yml @@ -0,0 +1,18 @@ +BlockingMessage: '&6{player} is currently blocking messages.' +BungeeToggleOff: '&6You are now blocking BungeeCord chat.' +BungeeToggleOn: '&6You are now receiving BungeeCord chat.' +ClearChatSender: '&aCleared the server chat.' +ClearChatServer: '&aYour chat has been cleared.' +ChannelList: '{channel_color}{channel_name} : {channel_alias}' +ChannelListHeader: '&6Channel List : Alias' +ChannelListWithPermissions: '{channel_color}{channel_name} : {channel_alias} - Permission Required' +ChannelNoPermission: '&cYou do not have permission for this channel.' +ChannelNoPermissionView: '&cYou do not have permission to look at this channel.' +ChannelPlayerListHeader: '&6Players in Channel: {channel_color}{channel_name}' +CommandInvalidArguments: '&cInvalid command: {command} {args}' +CommandMustBeRunByPlayer: '&cThis command must be run by a player.' +CommandNoPermission: '&cYou do not have permission for this command.' +ConfigReloaded: '&6VentureChat config reloaded.' +EmptyString: '' +IgnoringMessage: '&6{player} is currently ignoring your messages.' +InvalidChannel: '&cInvalid channel: {args}' \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Broadcast.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Broadcast.java index 1796088..52ded60 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Broadcast.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Broadcast.java @@ -6,6 +6,7 @@ import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Broadcast extends MineverseCommand { @@ -30,12 +31,14 @@ public class Broadcast extends MineverseCommand { return; } else { - sender.sendMessage(ChatColor.RED + "Invalid command: /broadcast [msg]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/broadcast") + .replace("{args}", "[msg]")); return; } } else { - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java index 5b61241..8eafc04 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/BungeeToggle.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class BungeeToggle extends MineverseCommand { private MineverseChat plugin; @@ -20,23 +20,23 @@ public class BungeeToggle extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.bungeetoggle")) { if(!mcp.getBungeeToggle()) { mcp.setBungeeToggle(true); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now receiving BungeeCord chat."); + mcp.getPlayer().sendMessage(LocalizedMessage.BUNGEE_TOGGLE_ON.toString()); MineverseChat.getInstance().synchronize(mcp, true); return; } mcp.setBungeeToggle(false); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now blocking BungeeCord chat."); + mcp.getPlayer().sendMessage(LocalizedMessage.BUNGEE_TOGGLE_OFF.toString()); MineverseChat.getInstance().synchronize(mcp, true); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java index b918307..a6ad495 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java @@ -14,6 +14,7 @@ import mineverse.Aust1n46.chat.api.events.ChannelJoinEvent; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Channel extends MineverseCommand implements Listener { private MineverseChat plugin; @@ -29,20 +30,23 @@ public class Channel extends MineverseCommand implements Listener { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(args.length > 0) { if(!cc.isChannel(args[0])) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid channel: " + args[0]); + mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[0])); return; } ChatChannel channel = cc.getChannelInfo(args[0]); plugin.getServer().getPluginManager().callEvent(new ChannelJoinEvent(mcp.getPlayer(), channel, "Channel Set: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]")); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /" + command + " [channel]"); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/channel") + .replace("{args}", "[channel]")); return; } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chatreload.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chatreload.java index 5cf1bd4..a2a9652 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chatreload.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chatreload.java @@ -1,12 +1,12 @@ package mineverse.Aust1n46.chat.command.chat; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Chatreload extends MineverseCommand { private MineverseChat plugin; @@ -25,12 +25,12 @@ public class Chatreload extends MineverseCommand { plugin.getServer().getLogger().info("[VentureChat] Config reloaded"); for(MineverseChatPlayer player : MineverseChat.players) { if(player.isOnline() && player.getPlayer().hasPermission("venturechat.reload")) { - player.getPlayer().sendMessage(ChatColor.GOLD + "VentureChat config reloaded."); + player.getPlayer().sendMessage(LocalizedMessage.CONFIG_RELOADED.toString()); } } return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chlist.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chlist.java index f53164a..ff791d8 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chlist.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chlist.java @@ -7,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Chlist extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -17,15 +18,21 @@ public class Chlist extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { - sender.sendMessage(ChatColor.GOLD + "Channel List : Alias"); + sender.sendMessage(LocalizedMessage.CHANNEL_LIST_HEADER.toString()); for(ChatChannel chname : cc.getChannelsInfo()) { if(chname.hasPermission()) { if(sender.hasPermission(chname.getPermission())) { - sender.sendMessage(ChatColor.valueOf(chname.getColor().toUpperCase()) + chname.getName() + " : " + chname.getAlias() + " - Permission Required"); + sender.sendMessage(LocalizedMessage.CHANNEL_LIST_WITH_PERMISSIONS.toString() + .replace("{channel_color}", (ChatColor.valueOf(chname.getColor().toUpperCase())).toString()) + .replace("{channel_name}", chname.getName()) + .replace("{channel_alias}", chname.getAlias())); } } else { - sender.sendMessage(ChatColor.valueOf(chname.getColor().toUpperCase()) + chname.getName() + " : " + chname.getAlias()); + sender.sendMessage(LocalizedMessage.CHANNEL_LIST.toString() + .replace("{channel_color}", (ChatColor.valueOf(chname.getColor().toUpperCase())).toString()) + .replace("{channel_name}", chname.getName()) + .replace("{channel_alias}", chname.getAlias())); } } return; diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java index f081bdc..6e7627a 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java @@ -19,6 +19,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Chwho extends MineverseCommand { private MineverseChat plugin; @@ -40,7 +41,7 @@ public class Chwho extends MineverseCommand { if(!sender.hasPermission(channel.getPermission())) { MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(((Player) sender)); mcp.removeListening(channel.getName()); - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission to look at this channel."); + mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_NO_PERMISSION_VIEW.toString()); return; } } @@ -178,22 +179,27 @@ public class Chwho extends MineverseCommand { if(playerlist.length() > 2) { playerlist = playerlist.substring(0, playerlist.length() - 2); } - sender.sendMessage(ChatColor.GOLD + "Players in Channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); + sender.sendMessage(LocalizedMessage.CHANNEL_PLAYER_LIST_HEADER.toString() + .replace("{channel_color}", (ChatColor.valueOf(channel.getColor().toUpperCase())).toString()) + .replace("{channel_name}", channel.getName())); sender.sendMessage(playerlist); return; } else { - sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[0]); + sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[0])); return; } } else { - sender.sendMessage(ChatColor.RED + "Invalid command: /chwho [channel]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/chwho") + .replace("{args}", "[channel]")); return; } } else { - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Clearchat.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Clearchat.java index 4a85978..e135e0d 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Clearchat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Clearchat.java @@ -1,11 +1,11 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Clearchat extends MineverseCommand { @@ -19,14 +19,14 @@ public class Clearchat extends MineverseCommand { for(MineverseChatPlayer player : MineverseChat.players) { if(player.isOnline() && !player.getPlayer().hasPermission("venturechat.clearchat.bypass")) { for(int a = 1; a <= 20; a++) - player.getPlayer().sendMessage(""); - player.getPlayer().sendMessage(ChatColor.GREEN + "Your chat has been cleared."); + player.getPlayer().sendMessage(LocalizedMessage.EMPTY_STRING.toString()); + player.getPlayer().sendMessage(LocalizedMessage.CLEAR_CHAT_SERVER.toString()); } } - sender.sendMessage(ChatColor.GREEN + "Cleared the server chat."); + sender.sendMessage(LocalizedMessage.CLEAR_CHAT_SENDER.toString()); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java index 7a7827d..a5cffcb 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java @@ -10,6 +10,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Leave extends MineverseCommand { private MineverseChat plugin; @@ -23,14 +24,15 @@ public class Leave extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(args.length > 0) { ChatChannel channel = cc.getChannelInfo(args[0]); if(channel == null) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid channel: " + args[0]); + mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[0])); return; } mcp.removeListening(channel.getName()); @@ -47,6 +49,8 @@ public class Leave extends MineverseCommand { } return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /leave [channelname]"); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/leave") + .replace("{args}", "[channel]")); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java index 55c3bce..9e38d0f 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java @@ -10,6 +10,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Listen extends MineverseCommand { private MineverseChat plugin; @@ -23,20 +24,21 @@ public class Listen extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(args.length > 0) { ChatChannel channel = cc.getChannelInfo(args[0]); if(channel == null) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid channel: " + args[0]); + mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[0])); return; } if(channel.hasPermission()) { if(!mcp.getPlayer().hasPermission(channel.getPermission())) { mcp.removeListening(channel.getName()); - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this channel."); + mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_NO_PERMISSION.toString()); return; } } @@ -45,6 +47,8 @@ public class Listen extends MineverseCommand { mcp.getPlayer().sendMessage("Listening to Channel: " + format); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /listen [channel]"); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/listen") + .replace("{args}", "[channel]")); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java index 98cc852..ce0f698 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java @@ -38,7 +38,7 @@ public class VentureChatGui extends MineverseCommand { return; } if(args.length < 3) { - sender.sendMessage(ChatColor.RED + "Invalid command: " + command+ " [player] [channel] [hash]"); + sender.sendMessage(ChatColor.RED + "Invalid command: " + command + " [player] [channel] [hash]"); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java index af809e8..1fce359 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java @@ -13,6 +13,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -28,17 +29,21 @@ public class Message extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(args.length == 0) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /" + command + " [player] [msg]"); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/" + command) + .replace("{args}", "[player] [message]")); return; } if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) { if(args.length < 2) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /" + command + " [player] [msg]"); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/" + command) + .replace("{args}", "[player] [message]")); return; } ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream(); @@ -111,11 +116,11 @@ public class Message extends MineverseCommand { return; } if(player.getIgnores().contains(mcp.getUUID())) { - mcp.getPlayer().sendMessage(ChatColor.GOLD + player.getName() + " is currently ignoring your messages."); + mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString()); return; } if(!player.getMessageToggle()) { - mcp.getPlayer().sendMessage(ChatColor.GOLD + player.getName() + " is currently blocking messages."); + mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString()); return; } if(args.length >= 2) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java index a801b2d..d3d82a2 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java @@ -1,8 +1,6 @@ package mineverse.Aust1n46.chat.localization; import java.io.File; -import java.io.IOException; -import java.nio.file.Files; import mineverse.Aust1n46.chat.MineverseChat; @@ -10,12 +8,12 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; //This class is used to create objects of localization for different languages. -public class Localization { //unimplemented - private FileConfiguration localization; - private File localizationFile; - private MineverseChat plugin; +public class Localization { + //private FileConfiguration localization; + //private File localizationFile; + //private MineverseChat plugin; - public Localization() { + /*public Localization() { this.plugin = MineverseChat.getInstance(); localizationFile = new File(plugin.getDataFolder().getAbsolutePath(), "en_default.yml"); if(!localizationFile.exists()) { @@ -41,5 +39,22 @@ public class Localization { //unimplemented public FileConfiguration getLocalizedMessages() { return localization; + }*/ + + private static MineverseChat plugin; + private static FileConfiguration localization; + private static File localizationFile; + + public static void initialize() { + plugin = MineverseChat.getInstance(); + localizationFile = new File(plugin.getDataFolder().getAbsolutePath(), "Messages.yml"); + if(!localizationFile.isFile()) { + plugin.saveResource("Messages.yml", true); + } + localization = YamlConfiguration.loadConfiguration(localizationFile); + } + + public static FileConfiguration getLocalization() { + return localization; } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java new file mode 100644 index 0000000..5b6e494 --- /dev/null +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java @@ -0,0 +1,39 @@ +package mineverse.Aust1n46.chat.localization; + +import mineverse.Aust1n46.chat.utilities.Format; + +/** + * Messages configurable in Messages.yml + */ +public enum LocalizedMessage { + BLOCKING_MESSAGE("BlockingMessage"), + BUNGEE_TOGGLE_OFF("BungeeToggleOff"), + BUNGEE_TOGGLE_ON("BungeeToggleOn"), + CLEAR_CHAT_SENDER("ClearChatSender"), + CLEAR_CHAT_SERVER("ClearChatServer"), + CHANNEL_LIST("ChannelList"), + CHANNEL_LIST_HEADER("ChannelListHeader"), + CHANNEL_LIST_WITH_PERMISSIONS("ChannelListWithPermissions"), + CHANNEL_NO_PERMISSION("ChannelNoPermission"), + CHANNEL_NO_PERMISSION_VIEW("ChannelNoPermissionView"), + CHANNEL_PLAYER_LIST_HEADER("ChannelPlayerListHeader"), + COMMAND_INVALID_ARGUMENTS("CommandInvalidArguments"), + COMMAND_MUST_BE_RUN_BY_PLAYER("CommandMustBeRunByPlayer"), + COMMAND_NO_PERMISSION("CommandNoPermission"), + CONFIG_RELOADED("ConfigReloaded"), + EMPTY_STRING("EmptyString"), + IGNORING_MESSAGE("IgnoringMessage"), + INVALID_CHANNEL("InvalidChannel"), + Z_END("End"); + + private final String message; + + LocalizedMessage(String message) { + this.message = message; + } + + @Override + public String toString() { + return Format.FormatStringAll(Localization.getLocalization().getString(this.message)); + } +} \ No newline at end of file From c6faba8c2a4a8b0cf9f119046c79364c313cbbd7 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Tue, 3 Mar 2020 18:05:47 -0500 Subject: [PATCH 2/6] Uncomment localization imports. --- .../Aust1n46/chat/MineverseChat.java | 4 +-- .../chat/localization/Localization.java | 32 ------------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index a88e9d9..8f10ba3 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -36,7 +36,7 @@ import mineverse.Aust1n46.chat.listeners.LoginListener; import mineverse.Aust1n46.chat.listeners.ChatListener; import mineverse.Aust1n46.chat.listeners.PacketListener; import mineverse.Aust1n46.chat.listeners.SignListener; -//import mineverse.Aust1n46.chat.localization.Localization; +import mineverse.Aust1n46.chat.localization.Localization; //import mineverse.Aust1n46.chat.alias.Alias; import mineverse.Aust1n46.chat.alias.AliasInfo; import mineverse.Aust1n46.chat.api.MineverseChatAPI; @@ -210,7 +210,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Enabled Successfully")); // Get config and handle // Configuration - //Localization.initialize(); + Localization.initialize(); PlayerData.initialize(); if(this.firstRun) { for(String uuidString : PlayerData.getPlayerData().getConfigurationSection("players").getKeys(false)) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java index d3d82a2..4a8c70b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java @@ -9,38 +9,6 @@ import org.bukkit.configuration.file.YamlConfiguration; //This class is used to create objects of localization for different languages. public class Localization { - //private FileConfiguration localization; - //private File localizationFile; - //private MineverseChat plugin; - - /*public Localization() { - this.plugin = MineverseChat.getInstance(); - localizationFile = new File(plugin.getDataFolder().getAbsolutePath(), "en_default.yml"); - if(!localizationFile.exists()) { - try { - Files.copy(plugin.getResource("en_default.yml"), localizationFile.toPath()); - } - catch(IOException exception) { - exception.printStackTrace(); - } - } - localization = YamlConfiguration.loadConfiguration(localizationFile); - } - - public Localization(String name) { - this.plugin = MineverseChat.getInstance(); - localizationFile = new File(plugin.getDataFolder().getAbsolutePath(), name + ".yml"); - if(!localizationFile.exists()) { - new Localization(); - return; - } - localization = YamlConfiguration.loadConfiguration(localizationFile); - } - - public FileConfiguration getLocalizedMessages() { - return localization; - }*/ - private static MineverseChat plugin; private static FileConfiguration localization; private static File localizationFile; From 4812e4f26abde4287ed73532ec2d34ad40a83c37 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Thu, 19 Mar 2020 16:39:21 -0400 Subject: [PATCH 3/6] Added custom localization for the next batch of commands. --- MineverseChat/Messages.yml | 35 +++++++- .../Aust1n46/chat/MineverseChat.java | 2 +- .../Aust1n46/chat/command/chat/Channel.java | 13 ++- .../chat/command/chat/Commandblock.java | 27 ++++-- .../chat/command/chat/Commandspy.java | 10 +-- .../Aust1n46/chat/command/chat/Filter.java | 10 +-- .../Aust1n46/chat/command/chat/Force.java | 15 ++-- .../Aust1n46/chat/command/chat/Forceall.java | 11 ++- .../chat/command/chat/Kickchannel.java | 29 +++++-- .../chat/command/chat/Kickchannelall.java | 21 +++-- .../Aust1n46/chat/command/chat/Leave.java | 13 +-- .../Aust1n46/chat/command/chat/Listen.java | 5 +- .../Aust1n46/chat/command/chat/Me.java | 10 ++- .../Aust1n46/chat/command/chat/Nick.java | 3 +- .../Aust1n46/chat/command/chat/RangedSpy.java | 10 +-- .../chat/command/chat/Removemessage.java | 7 +- .../chat/command/chat/Setchannel.java | 85 +++++++++++-------- .../chat/command/chat/Setchannelall.java | 18 ++-- .../chat/command/chat/VentureChatGui.java | 24 ++++-- .../chat/command/chat/Venturechat.java | 6 +- .../chat/localization/Localization.java | 22 +++-- .../chat/localization/LocalizedMessage.java | 31 +++++++ MineverseChat/plugin.yml | 5 +- 23 files changed, 285 insertions(+), 127 deletions(-) diff --git a/MineverseChat/Messages.yml b/MineverseChat/Messages.yml index 13dd238..e1b5a59 100644 --- a/MineverseChat/Messages.yml +++ b/MineverseChat/Messages.yml @@ -1,3 +1,6 @@ +Version: 2.17.3 +BlockCommandPlayer: '&cYou have been blocked from entering command {command}.' +BlockCommandSender: '&cBlocked player &6{player} &cfrom entering command {command}.' BlockingMessage: '&6{player} is currently blocking messages.' BungeeToggleOff: '&6You are now blocking BungeeCord chat.' BungeeToggleOn: '&6You are now receiving BungeeCord chat.' @@ -12,7 +15,37 @@ ChannelPlayerListHeader: '&6Players in Channel: {channel_color}{channel_name}' CommandInvalidArguments: '&cInvalid command: {command} {args}' CommandMustBeRunByPlayer: '&cThis command must be run by a player.' CommandNoPermission: '&cYou do not have permission for this command.' +CommandNotBlockable: '&cCommand is not blockable.' +CommandSpyOff: '&6You are no longer spying on commands.' +CommandSpyOn: '&6You are now spying on commands.' ConfigReloaded: '&6VentureChat config reloaded.' EmptyString: '' +ExitPrivateConversation: 'You are no longer in private conversation with {player_receiver}.' +ExitPrivateConversationSpy: '{player_sender} is no longer in a private conversation with {player_receiver}.' +FilterOff: '&6You are now ignoring the filter.' +FilterOn: '&6You are no longer ignoring the filter.' +ForceAll: '&6Forcing all players to run: &c{message}' +ForcePlayer: '&6Forcing player &c{player} &6to run: &c{message}' IgnoringMessage: '&6{player} is currently ignoring your messages.' -InvalidChannel: '&cInvalid channel: {args}' \ No newline at end of file +InvalidChannel: '&cInvalid channel: {args}' +InvalidHash: '&cInvalid hashcode.' +KickChannel: '&6Kicked player &c{player} &6from channel: {channel_color}{channel_name}' +KickChannelAllPlayer: '&cYou have been kicked from all channels.' +KickChannelAllSender: '&6Kicked player &c{player} &6from all channels.' +LeaveChannel: 'Leaving channel: {channel_color}[{channel_name}]' +ListenChannel: 'Listening to Channel: {channel_color}[{channel_name}]' +MustListenOneChannel: '&cYou need to be listening on at least one channel, setting you into the default channel.' +PlayerOffline: '&cPlayer: &6{args} &cis not online.' +PlayerOfflineNoPermissionsCheck: '&cCan''t run permission check on offline player.' +RangedSpyOff: '&6You are no longer spying on ranged channels.' +RangedSpyOn: '&6You are now spying on ranged channels.' +SetChannel: 'Channel Set: {channel_color}[{channel_name}]' +SetChannelAllPlayer: '&cYou have been set into all channels.' +SetChannelAllSender: '&6Set player &c{player} &6into all channels.' +SetChannelPlayerChannelNoPermission: '&cThis player does not have permission for channel: {channel_color}{channel_name}' +SetChannelSender: '&6Set player &c{player} &6into channel: {channel_color}{channel_name}' +UnblockCommandPlayer: '&cYou have been unblocked from entering command {command}.' +UnblockCommandSender: '&cUnblocked player &6{player} &cfrom entering command {command}.' +#Author added in automatically +VentureChatAuthor: '&6Written by' +VentureChatVersion: '&6VentureChat Version: {version}' \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index 8f10ba3..761c51f 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -159,7 +159,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { private boolean firstRun = true; // Plugin Messaging Channel - public static String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; + public static final String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; // Vault -------------------------------- public static Permission permission = null; diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java index a6ad495..0f1a483 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java @@ -41,7 +41,9 @@ public class Channel extends MineverseCommand implements Listener { return; } ChatChannel channel = cc.getChannelInfo(args[0]); - plugin.getServer().getPluginManager().callEvent(new ChannelJoinEvent(mcp.getPlayer(), channel, "Channel Set: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]")); + plugin.getServer().getPluginManager().callEvent(new ChannelJoinEvent(mcp.getPlayer(), channel, LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName()))); return; } mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() @@ -59,17 +61,20 @@ public class Channel extends MineverseCommand implements Listener { if(channel.hasPermission()) { if(!mcp.getPlayer().hasPermission(channel.getPermission())) { mcp.removeListening(channel.getName()); - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this channel."); + mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_NO_PERMISSION.toString()); return; } } if(mcp.hasConversation()) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { if(p.isSpy()) { - p.getPlayer().sendMessage(mcp.getName() + " is no longer in a private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + "."); + p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString() + .replace("{player_sender}", mcp.getName()) + .replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName())); } } - mcp.getPlayer().sendMessage("You are no longer in private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + "."); + mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString() + .replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName())); mcp.setConversation(null); } mcp.addListening(channel.getName()); diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandblock.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandblock.java index 9286326..9bd7ec8 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandblock.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandblock.java @@ -2,13 +2,13 @@ package mineverse.Aust1n46.chat.command.chat; import java.util.List; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Commandblock extends MineverseCommand { private MineverseChat plugin; @@ -25,7 +25,8 @@ public class Commandblock extends MineverseCommand { if(args.length > 1) { MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } boolean match = false; @@ -35,21 +36,29 @@ public class Commandblock extends MineverseCommand { if(match || player.isBlockedCommand(args[1])) { if(!player.isBlockedCommand(args[1])) { player.addBlockedCommand(args[1]); - player.getPlayer().sendMessage(ChatColor.RED + "You have been blocked from entering command " + args[1] + "."); - sender.sendMessage(ChatColor.RED + "Blocked player " + ChatColor.GOLD + player.getName() + ChatColor.RED + " from entering command " + args[1] + "."); + player.getPlayer().sendMessage(LocalizedMessage.BLOCK_COMMAND_PLAYER.toString() + .replace("{command}", args[1])); + sender.sendMessage(LocalizedMessage.BLOCK_COMMAND_SENDER.toString() + .replace("{player}", player.getName()) + .replace("{command}", args[1])); return; } player.removeBlockedCommand(args[1]); - player.getPlayer().sendMessage(ChatColor.RED + "You have been unblocked from entering command " + args[1] + "."); - sender.sendMessage(ChatColor.RED + "Unblocked player " + ChatColor.GOLD + player.getName() + ChatColor.RED + " from entering command " + args[1] + "."); + player.getPlayer().sendMessage(LocalizedMessage.UNBLOCK_COMMAND_PLAYER.toString() + .replace("{command}", args[1])); + sender.sendMessage(LocalizedMessage.UNBLOCK_COMMAND_SENDER.toString() + .replace("{player}", player.getName()) + .replace("{command}", args[1])); return; } - sender.sendMessage(ChatColor.RED + "Invalid command or the command is not blockable."); + sender.sendMessage(LocalizedMessage.COMMAND_NOT_BLOCKABLE.toString()); return; } - sender.sendMessage(ChatColor.RED + "Invalid command: /commandblock [player] [command]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/commandblock") + .replace("{args}", "[player] [command]")); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandspy.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandspy.java index 8ff245b..9654788 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandspy.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandspy.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Commandspy extends MineverseCommand { private MineverseChat plugin; @@ -20,20 +20,20 @@ public class Commandspy extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.commandspy")) { if(!mcp.hasCommandSpy()) { mcp.setCommandSpy(true); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now spying on commands."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMANDSPY_ON.toString()); return; } mcp.setCommandSpy(false); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer spying on commands."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMANDSPY_OFF.toString()); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Filter.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Filter.java index 1ae6b8c..976713d 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Filter.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Filter.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Filter extends MineverseCommand { private MineverseChat plugin; @@ -20,20 +20,20 @@ public class Filter extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.ignorefilter")) { if(!mcp.hasFilter()) { mcp.setFilter(true); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring the filter."); + mcp.getPlayer().sendMessage(LocalizedMessage.FILTER_ON.toString()); return; } mcp.setFilter(false); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now ignoring the filter."); + mcp.getPlayer().sendMessage(LocalizedMessage.FILTER_OFF.toString()); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Force.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Force.java index e123b54..5f78ac5 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Force.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Force.java @@ -1,11 +1,11 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Force extends MineverseCommand { @@ -17,22 +17,27 @@ public class Force extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.force")) { if(args.length < 2) { - sender.sendMessage(ChatColor.RED + "Invalid command: /force [player] [msg]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/force") + .replace("{args}", "[player] [message]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null || !player.isOnline()) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } String forcemsg = ""; for(int x = 1; x < args.length; x++) if(args[x].length() > 0) forcemsg += args[x] + " "; - sender.sendMessage(ChatColor.GOLD + "Forcing player " + ChatColor.RED + player.getName() + ChatColor.GOLD + " to run: " + ChatColor.RED + forcemsg); + sender.sendMessage(LocalizedMessage.FORCE_PLAYER.toString() + .replace("{player}", player.getName()) + .replace("{message}", forcemsg)); player.getPlayer().chat(forcemsg); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Forceall.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Forceall.java index f08e872..c500cf6 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Forceall.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Forceall.java @@ -1,11 +1,11 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Forceall extends MineverseCommand { @@ -17,19 +17,22 @@ public class Forceall extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.forceall")) { if(args.length < 1) { - sender.sendMessage(ChatColor.RED + "Invalid command: /forceall [msg]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/forceall") + .replace("{args}", "[message]")); return; } String forcemsg = ""; for(int x = 0; x < args.length; x++) if(args[x].length() > 0) forcemsg += args[x] + " "; - sender.sendMessage(ChatColor.GOLD + "Forcing all players to run: " + ChatColor.RED + forcemsg); + sender.sendMessage(LocalizedMessage.FORCE_ALL.toString() + .replace("{message}", forcemsg)); for(MineverseChatPlayer player : MineverseChat.players) if(player.isOnline()) player.getPlayer().chat(forcemsg); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java index 4e5fbb6..248ea7b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java @@ -9,6 +9,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Kickchannel extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -21,38 +22,48 @@ public class Kickchannel extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.kickchannel")) { if(args.length < 2) { - sender.sendMessage(ChatColor.RED + "Invalid command: /kickchannel [player] [channelname]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/kickchannel") + .replace("{args}", "[player] [channel]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } ChatChannel channel = cc.getChannelInfo(args[1]); if(channel == null) { - sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); + sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[1])); return; } - sender.sendMessage(ChatColor.GOLD + "Kicked player " + ChatColor.RED + args[0] + ChatColor.GOLD + " from channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); - String format = ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "] " + ChatColor.valueOf(channel.getColor().toUpperCase()); + sender.sendMessage(LocalizedMessage.KICK_CHANNEL.toString() + .replace("{player}", args[0]) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); player.removeListening(channel.getName()); if(player.isOnline()) { - player.getPlayer().sendMessage("Leaving Channel: " + format); + player.getPlayer().sendMessage(LocalizedMessage.LEAVE_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); } else player.setModified(true); if(player.getListening().size() == 0) { player.setCurrentChannel(cc.getDefaultChannel()); if(player.isOnline()) { - player.getPlayer().sendMessage(ChatColor.RED + "You need to be listening on at least one channel, setting you into the default channel."); - player.getPlayer().sendMessage("Channel Set: " + ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "[" + cc.getDefaultChannel().getName() + "]"); + player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); + player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "") + .replace("{channel_name}", cc.getDefaultChannel().getName())); } else player.setModified(true); } return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java index 3663b91..6b75fa4 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java @@ -8,6 +8,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Kickchannelall extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -20,27 +21,33 @@ public class Kickchannelall extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.kickchannelall")) { if(args.length < 1) { - sender.sendMessage(ChatColor.RED + "Invalid command: /kickchannelall [player]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/kickchannelall") + .replace("{args}", "[player]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } player.clearListening(); - sender.sendMessage(ChatColor.GOLD + "Kicked player " + ChatColor.RED + player.getName() + ChatColor.GOLD + " from all channels."); + sender.sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_SENDER.toString() + .replace("{player}", player.getName())); player.addListening(cc.getDefaultChannel().getName()); player.setCurrentChannel(cc.getDefaultChannel()); if(player.isOnline()) { - player.getPlayer().sendMessage(ChatColor.RED + "You have been kicked from all channels."); - player.getPlayer().sendMessage(ChatColor.RED + "You need to be listening on at least one channel, setting you into the default channel."); - player.getPlayer().sendMessage("Channel Set: " + ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "[" + cc.getDefaultChannel().getName() + "]"); + player.getPlayer().sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_PLAYER.toString()); + player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); + player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "") + .replace("{channel_name}", cc.getDefaultChannel().getName())); } else player.setModified(true); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java index a5cffcb..51a1ebb 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java @@ -35,14 +35,17 @@ public class Leave extends MineverseCommand { .replace("{args}", args[0])); return; } - mcp.removeListening(channel.getName()); - String format = ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]"; - mcp.getPlayer().sendMessage("Leaving channel: " + format); + mcp.removeListening(channel.getName()); + mcp.getPlayer().sendMessage(LocalizedMessage.LEAVE_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); if(mcp.getListening().size() == 0) { mcp.addListening(cc.getDefaultChannel().getName()); mcp.setCurrentChannel(cc.getDefaultChannel()); - mcp.getPlayer().sendMessage(ChatColor.RED + "You need to be listening on at least one channel, setting you into the default channel."); - mcp.getPlayer().sendMessage("Channel Set: " + ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "[" + cc.getDefaultChannel().getName() + "]"); + mcp.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); + mcp.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "") + .replace("{channel_name}", cc.getDefaultChannel().getName())); } if(channel.getBungee()) { MineverseChat.getInstance().synchronize(mcp, true); diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java index 9e38d0f..c8e63dd 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java @@ -42,9 +42,10 @@ public class Listen extends MineverseCommand { return; } } - String format = ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]"; mcp.addListening(channel.getName()); - mcp.getPlayer().sendMessage("Listening to Channel: " + format); + mcp.getPlayer().sendMessage(LocalizedMessage.LISTEN_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); return; } mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java index 7ebcfba..5eccf1a 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Me extends MineverseCommand { @@ -34,7 +34,7 @@ public class Me extends MineverseCommand { String filtered = cc.FilterChat(msg); if(sender instanceof Player && MineverseChatAPI.getMineverseChatPlayer((Player) sender).hasFilter()) { Player p = (Player) sender; - plugin.getServer().broadcastMessage("* " +p.getDisplayName() + filtered); + plugin.getServer().broadcastMessage("* " + p.getDisplayName() + filtered); return; } if(sender instanceof Player) { @@ -45,9 +45,11 @@ public class Me extends MineverseCommand { plugin.getServer().broadcastMessage("* " + sender.getName() + msg); return; } - sender.sendMessage(ChatColor.RED + "Invalid command: /me [msg]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/me") + .replace("{args}", "[message]")); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Nick.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Nick.java index 53cbccc..c491801 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Nick.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Nick.java @@ -8,6 +8,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Nick extends MineverseCommand { @@ -110,6 +111,6 @@ public class Nick extends MineverseCommand { sender.sendMessage(ChatColor.RED + "Invalid command: /nick {player} [nickname]"); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/RangedSpy.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/RangedSpy.java index 4beea26..e36fea5 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/RangedSpy.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/RangedSpy.java @@ -4,8 +4,8 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -20,21 +20,21 @@ public class RangedSpy extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.rangedspy")) { if(!mcp.getRangedSpy()) { mcp.setRangedSpy(true); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now spying on ranged channels."); + mcp.getPlayer().sendMessage(LocalizedMessage.RANGED_SPY_ON.toString()); return; } mcp.setRangedSpy(false); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer spying on ranged channels."); + mcp.getPlayer().sendMessage(LocalizedMessage.RANGED_SPY_OFF.toString()); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java index d5cc3e1..0b9947e 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java @@ -11,6 +11,7 @@ import mineverse.Aust1n46.chat.ChatMessage; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; //import mineverse.Aust1n46.chat.json.JsonButton; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -39,7 +40,9 @@ public class Removemessage extends MineverseCommand { @SuppressWarnings({ "unchecked", "rawtypes" }) public void execute(CommandSender sender, String command, String[] args) { if(args.length == 0) { - sender.sendMessage(ChatColor.RED + "Invalid command: /removemessage [hashcode]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/removemessage") + .replace("{args}", "[hashcode] {channel}")); return; } final int hash; @@ -47,7 +50,7 @@ public class Removemessage extends MineverseCommand { hash = Integer.parseInt(args[0]); } catch(Exception e) { - sender.sendMessage(ChatColor.RED + "Invalid hashcode."); + sender.sendMessage(LocalizedMessage.INVALID_HASH.toString()); return; } if(args.length > 1 && MineverseChat.ccInfo.isChannel(args[1]) && MineverseChat.ccInfo.getChannelInfo(args[1]).getBungee() && sender instanceof Player) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java index 533acd1..4e0e87d 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java @@ -9,6 +9,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Setchannel extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -21,54 +22,66 @@ public class Setchannel extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.setchannel")) { if(args.length < 2) { - sender.sendMessage(ChatColor.RED + "Invalid command: /setchannel [player] [channelname]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/setchannel") + .replace("{args}", "[player] [channel]")); return; } - if(args[0].length() > 1) { - ChatChannel channel = cc.getChannelInfo(args[1]); - MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); - if(player == null) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); + if(player == null) { + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); + return; + } + ChatChannel channel = cc.getChannelInfo(args[1]); + if(channel == null) { + sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[1])); + return; + } + if(channel.hasPermission()) { + if(!player.isOnline()) { + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE_NO_PERMISSIONS_CHECK.toString()); return; } - if(channel == null) { - sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); + if(!player.getPlayer().hasPermission(channel.getPermission())) { + player.removeListening(channel.getName()); + sender.sendMessage(LocalizedMessage.SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); return; } - if(channel.hasPermission()) { - if(!player.isOnline()) { - sender.sendMessage(ChatColor.RED + "Can't run permission check on offline player."); - return; + } + player.addListening(channel.getName()); + player.setCurrentChannel(channel); + sender.sendMessage(LocalizedMessage.SET_CHANNEL_SENDER.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); + if(player.hasConversation()) { + for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { + if(p.isSpy()) { + p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString() + .replace("{player_sender}", player.getName()) + .replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(player.getConversation()).getName())); } - if(!player.getPlayer().hasPermission(channel.getPermission())) { - player.removeListening(channel.getName()); - sender.sendMessage(ChatColor.RED + "This player does not have permission for channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); - return; - } - } - player.addListening(channel.getName()); - player.setCurrentChannel(channel); - sender.sendMessage(ChatColor.GOLD + "Set player " + ChatColor.RED + player.getName() + ChatColor.GOLD + " into channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); - if(player.hasConversation()) { - for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { - if(p.isSpy()) { - p.getPlayer().sendMessage(player.getName() + " is no longer in a private conversation with " + MineverseChatAPI.getMineverseChatPlayer(player.getConversation()).getName() + "."); - } - } - if(player.isOnline()) - player.getPlayer().sendMessage("You are no longer in private conversation with " + MineverseChatAPI.getMineverseChatPlayer(player.getConversation()).getName() + "."); - else - player.setModified(true); - player.setConversation(null); } - String format = ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "] " + ChatColor.valueOf(channel.getColor().toUpperCase()); if(player.isOnline()) - player.getPlayer().sendMessage("Channel Set: " + format); + player.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString() + .replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(player.getConversation()).getName())); else player.setModified(true); - return; + player.setConversation(null); } + if(player.isOnline()) + player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); + else + player.setModified(true); + return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannelall.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannelall.java index 64dfd64..bd1f2e0 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannelall.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannelall.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; @@ -9,6 +8,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Setchannelall extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -21,18 +21,21 @@ public class Setchannelall extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.setchannelall")) { if(args.length < 1) { - sender.sendMessage(ChatColor.RED + "Invalid command: /setchannelall [player]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/setchannelall") + .replace("{args}", "[player]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } for(ChatChannel channel : cc.getChannelsInfo()) { if(channel.hasPermission()) { if(!player.isOnline()) { - sender.sendMessage(ChatColor.RED + "Can't run permission check on offline player."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE_NO_PERMISSIONS_CHECK.toString()); return; } if(!player.getPlayer().hasPermission(channel.getPermission())) { @@ -46,13 +49,14 @@ public class Setchannelall extends MineverseCommand { player.addListening(channel.getName()); } } - sender.sendMessage(ChatColor.GOLD + "Set player " + ChatColor.RED + args[0] + ChatColor.GOLD + " into all channels."); + sender.sendMessage(LocalizedMessage.SET_CHANNEL_ALL_SENDER.toString() + .replace("{player}", player.getName())); if(player.isOnline()) - player.getPlayer().sendMessage(ChatColor.RED + "You have been set into all channels."); + player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL_ALL_PLAYER.toString()); else player.setModified(true); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java index ce0f698..b42b378 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java @@ -20,6 +20,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.gui.GuiSlot; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -34,18 +35,21 @@ public class VentureChatGui extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } if(args.length < 3) { - sender.sendMessage(ChatColor.RED + "Invalid command: " + command + " [player] [channel] [hash]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/venturechatgui") + .replace("{args}", "[player] [channel] [hashcode]")); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.gui")) { MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(target == null) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; /* UUID uuid = null; @@ -70,14 +74,22 @@ public class VentureChatGui extends MineverseCommand { } if(MineverseChat.ccInfo.isChannel(args[1])) { ChatChannel channel = MineverseChat.ccInfo.getChannelInfo(args[1]); - int hash = Integer.parseInt(args[2]); + final int hash; + try { + hash = Integer.parseInt(args[2]); + } + catch(Exception e) { + sender.sendMessage(LocalizedMessage.INVALID_HASH.toString()); + return; + } this.openInventory(mcp, target, channel, hash); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); + mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[1])); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java index c454197..c243af8 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java @@ -2,6 +2,7 @@ package mineverse.Aust1n46.chat.command.chat; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; @@ -21,8 +22,9 @@ public class Venturechat extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { - sender.sendMessage(ChatColor.GOLD + "VentureChat Version: " + plugin.getDescription().getVersion()); - sender.sendMessage(ChatColor.GOLD + "Written by Aust1n46"); + sender.sendMessage(LocalizedMessage.VENTURECHAT_VERSION.toString() + .replace("{version}", plugin.getDescription().getVersion())); + sender.sendMessage(LocalizedMessage.VENTURECHAT_AUTHOR + " " + plugin.getDescription().getAuthors().get(0)); if (sender instanceof Player && plugin.getConfig().getString("loglevel", "info").equals("debug")) { Player player = (Player) sender; String title = ChatColor.GOLD + " | " + ChatColor.BLUE.toString() + ChatColor.BOLD + "Click here to begin..." + ChatColor.RESET + ChatColor.GOLD + " | "; diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java index 4a8c70b..4868eb8 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java @@ -3,23 +3,35 @@ package mineverse.Aust1n46.chat.localization; import java.io.File; import mineverse.Aust1n46.chat.MineverseChat; +import mineverse.Aust1n46.chat.utilities.Format; +import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; //This class is used to create objects of localization for different languages. public class Localization { - private static MineverseChat plugin; + private static MineverseChat plugin = MineverseChat.getInstance(); private static FileConfiguration localization; - private static File localizationFile; public static void initialize() { - plugin = MineverseChat.getInstance(); - localizationFile = new File(plugin.getDataFolder().getAbsolutePath(), "Messages.yml"); + File localizationFile = new File(plugin.getDataFolder().getAbsolutePath(), "Messages.yml"); if(!localizationFile.isFile()) { - plugin.saveResource("Messages.yml", true); + plugin.saveResource("Messages.yml", true); } + localization = YamlConfiguration.loadConfiguration(localizationFile); + + String fileVersion = localization.getString("Version", "null"); + String currentVersion = plugin.getDescription().getVersion(); + + System.out.println(fileVersion + " " + currentVersion); + if(!fileVersion.equals(currentVersion)) { + Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Version Change Detected! Saving Old Messages.yml and Generating Latest File")); + localizationFile.renameTo(new File(plugin.getDataFolder().getAbsolutePath(), "Messages_Old.yml")); + plugin.saveResource("Messages.yml", true); + localization = YamlConfiguration.loadConfiguration(localizationFile); + } } public static FileConfiguration getLocalization() { diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java index 5b6e494..1ec3392 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java @@ -6,6 +6,8 @@ import mineverse.Aust1n46.chat.utilities.Format; * Messages configurable in Messages.yml */ public enum LocalizedMessage { + BLOCK_COMMAND_PLAYER("BlockCommandPlayer"), + BLOCK_COMMAND_SENDER("BlockCommandSender"), BLOCKING_MESSAGE("BlockingMessage"), BUNGEE_TOGGLE_OFF("BungeeToggleOff"), BUNGEE_TOGGLE_ON("BungeeToggleOn"), @@ -20,10 +22,39 @@ public enum LocalizedMessage { COMMAND_INVALID_ARGUMENTS("CommandInvalidArguments"), COMMAND_MUST_BE_RUN_BY_PLAYER("CommandMustBeRunByPlayer"), COMMAND_NO_PERMISSION("CommandNoPermission"), + COMMAND_NOT_BLOCKABLE("CommandNotBlockable"), + COMMANDSPY_OFF("CommandSpyOff"), + COMMANDSPY_ON("CommandSpyOn"), CONFIG_RELOADED("ConfigReloaded"), EMPTY_STRING("EmptyString"), + EXIT_PRIVATE_CONVERSATION("ExitPrivateConversation"), + EXIT_PRIVATE_CONVERSATION_SPY("ExitPrivateConversationSpy"), + FILTER_OFF("FilterOff"), + FILTER_ON("FilterOn"), + FORCE_ALL("ForceAll"), + FORCE_PLAYER("ForcePlayer"), IGNORING_MESSAGE("IgnoringMessage"), INVALID_CHANNEL("InvalidChannel"), + INVALID_HASH("InvalidHash"), + KICK_CHANNEL("KickChannel"), + KICK_CHANNEL_ALL_PLAYER("KickChannelAllPlayer"), + KICK_CHANNEL_ALL_SENDER("KickChannelAllSender"), + LEAVE_CHANNEL("LeaveChannel"), + LISTEN_CHANNEL("ListenChannel"), + MUST_LISTEN_ONE_CHANNEL("MustListenOneChannel"), + PLAYER_OFFLINE("PlayerOffline"), + PLAYER_OFFLINE_NO_PERMISSIONS_CHECK("PlayerOfflineNoPermissionsCheck"), + RANGED_SPY_OFF("RangedSpyOff"), + RANGED_SPY_ON("RangedSpyOn"), + SET_CHANNEL("SetChannel"), + SET_CHANNEL_ALL_PLAYER("SetChannelAllPlayer"), + SET_CHANNEL_ALL_SENDER("SetChannelAllSender"), + SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION("SetChannelPlayerChannelNoPermission"), + SET_CHANNEL_SENDER("SetChannelSender"), + UNBLOCK_COMMAND_PLAYER("UnblockCommandPlayer"), + UNBLOCK_COMMAND_SENDER("UnblockCommandSender"), + VENTURECHAT_AUTHOR("VentureChatAuthor"), + VENTURECHAT_VERSION("VentureChatVersion"), Z_END("End"); private final String message; diff --git a/MineverseChat/plugin.yml b/MineverseChat/plugin.yml index c9076d7..d5532fa 100644 --- a/MineverseChat/plugin.yml +++ b/MineverseChat/plugin.yml @@ -4,8 +4,9 @@ api-version: 1.13 main: mineverse.Aust1n46.chat.MineverseChat depend: [Vault, ProtocolLib, PlaceholderAPI] softdepend: [Towny, Factions, Heroes] -Author: Aust1n46 -description: Chat with channels with many features! +author: Aust1n46 +website: https://bitbucket.org/Aust1n46/venturechat/ +description: #1 Channels Chat plugin! Spigot + Bungee. Supports PlaceholderAPI + JSON formatting. Moderation GUI! commands: mute: usage: /mute [playername] [channel] From 069d757c190cd2cc412b2b0b0762df010473f7e4 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Thu, 19 Mar 2020 20:25:50 -0400 Subject: [PATCH 4/6] Added next batch of custom messages --- MineverseChat/Messages.yml | 33 ++++++++-- .../Aust1n46/chat/MineverseChat.java | 20 ++++-- .../Aust1n46/chat/command/chat/Clearchat.java | 3 +- .../Aust1n46/chat/command/chat/Edit.java | 8 ++- .../chat/command/chat/Venturechat.java | 6 +- .../Aust1n46/chat/command/message/Ignore.java | 24 ++++--- .../chat/command/message/Message.java | 26 +++++--- .../chat/command/message/MessageToggle.java | 10 +-- .../chat/command/message/Notifications.java | 8 +-- .../Aust1n46/chat/command/message/Reply.java | 19 +++--- .../Aust1n46/chat/command/message/Spy.java | 10 +-- .../Aust1n46/chat/command/mute/Mute.java | 62 ++++++++++++++----- .../Aust1n46/chat/command/mute/Muteall.java | 16 +++-- .../Aust1n46/chat/command/mute/Unmute.java | 28 ++++++--- .../Aust1n46/chat/command/mute/Unmuteall.java | 16 +++-- .../chat/localization/InternalMessage.java | 23 +++++++ .../chat/localization/Localization.java | 1 - .../chat/localization/LocalizedMessage.java | 33 ++++++++-- 18 files changed, 252 insertions(+), 94 deletions(-) create mode 100644 MineverseChat/mineverse/Aust1n46/chat/localization/InternalMessage.java diff --git a/MineverseChat/Messages.yml b/MineverseChat/Messages.yml index e1b5a59..490a8e9 100644 --- a/MineverseChat/Messages.yml +++ b/MineverseChat/Messages.yml @@ -6,6 +6,7 @@ BungeeToggleOff: '&6You are now blocking BungeeCord chat.' BungeeToggleOn: '&6You are now receiving BungeeCord chat.' ClearChatSender: '&aCleared the server chat.' ClearChatServer: '&aYour chat has been cleared.' +ChannelCannotMute: '&cYou cannot mute players in this channel: {channel_color}{channel_name}' ChannelList: '{channel_color}{channel_name} : {channel_alias}' ChannelListHeader: '&6Channel List : Alias' ChannelListWithPermissions: '{channel_color}{channel_name} : {channel_alias} - Permission Required' @@ -13,28 +14,49 @@ ChannelNoPermission: '&cYou do not have permission for this channel.' ChannelNoPermissionView: '&cYou do not have permission to look at this channel.' ChannelPlayerListHeader: '&6Players in Channel: {channel_color}{channel_name}' CommandInvalidArguments: '&cInvalid command: {command} {args}' +CommandInvalidArgumentsIgnore: '&cInvalid command: /ignore [player] or /ignore list' CommandMustBeRunByPlayer: '&cThis command must be run by a player.' CommandNoPermission: '&cYou do not have permission for this command.' CommandNotBlockable: '&cCommand is not blockable.' CommandSpyOff: '&6You are no longer spying on commands.' CommandSpyOn: '&6You are now spying on commands.' ConfigReloaded: '&6VentureChat config reloaded.' -EmptyString: '' +EnterPrivateConversation: 'You are now in private conversation with {player_receiver}.' +EnterPrivateConversationSpy: '{player_sender} started a private conversation with {player_receiver}.' ExitPrivateConversation: 'You are no longer in private conversation with {player_receiver}.' ExitPrivateConversationSpy: '{player_sender} is no longer in a private conversation with {player_receiver}.' FilterOff: '&6You are now ignoring the filter.' FilterOn: '&6You are no longer ignoring the filter.' ForceAll: '&6Forcing all players to run: &c{message}' ForcePlayer: '&6Forcing player &c{player} &6to run: &c{message}' +IgnoreListHeader: '&6You are currently ignoring these players:' +IgnorePlayerCant: '&cYou cannot ignore player: &6{player}&c.' +IgnorePlayerOff: '&6You are no longer ignoring player: &c{player}' +IgnorePlayerOn: '&6You are now ignoring player: &c{player}' +IgnoreYourself: '&cYou can not ignore yourself!' IgnoringMessage: '&6{player} is currently ignoring your messages.' InvalidChannel: '&cInvalid channel: {args}' InvalidHash: '&cInvalid hashcode.' +InvalidTime: '&cInvalid time: {args}' KickChannel: '&6Kicked player &c{player} &6from channel: {channel_color}{channel_name}' KickChannelAllPlayer: '&cYou have been kicked from all channels.' KickChannelAllSender: '&6Kicked player &c{player} &6from all channels.' LeaveChannel: 'Leaving channel: {channel_color}[{channel_name}]' ListenChannel: 'Listening to Channel: {channel_color}[{channel_name}]' +MessageToggleOff: '&6You are now blocking messages.' +MessageToggleOn: '&6You are now receiving messages.' MustListenOneChannel: '&cYou need to be listening on at least one channel, setting you into the default channel.' +MutePlayerAllPlayer: '&cYou have just been muted in all channels.' +MutePlayerAllSender: '&cMuted player &6{player} &cin all channels.' +MutePlayerPlayer: '&cYou have just been muted in: {channel_color}{channel_name}' +MutePlayerPlayerTime: '&cYou have just been muted in: {channel_color}{channel_name} &cfor {time} {units}' +MutePlayerSender: '&cMuted player &6{player} &cin: {channel_color}{channel_name}' +MutePlayerSenderTime: '&cMuted player &6{player} &cin: {channel_color}{channel_name} &cfor {time} {units}' +NoPlayerToReplyTo: '&cYou do not have anyone to reply to.' +NotificationsOff: '&aYou are no longer receiving notifications.' +NotificationsOn: '&aYou are now receiving notifications.' +PlayerAlreadyMuted: '&6{player} &cis already muted in channel: {channel_color}{channel_name}' +PlayerNotMuted: '&6{player} &cis not muted in channel: {channel_color}{channel_name}' PlayerOffline: '&cPlayer: &6{args} &cis not online.' PlayerOfflineNoPermissionsCheck: '&cCan''t run permission check on offline player.' RangedSpyOff: '&6You are no longer spying on ranged channels.' @@ -44,8 +66,11 @@ SetChannelAllPlayer: '&cYou have been set into all channels.' SetChannelAllSender: '&6Set player &c{player} &6into all channels.' SetChannelPlayerChannelNoPermission: '&cThis player does not have permission for channel: {channel_color}{channel_name}' SetChannelSender: '&6Set player &c{player} &6into channel: {channel_color}{channel_name}' +SpyOff: '&6You are no longer spying.' +SpyOn: '&6You are now spying.' UnblockCommandPlayer: '&cYou have been unblocked from entering command {command}.' UnblockCommandSender: '&cUnblocked player &6{player} &cfrom entering command {command}.' -#Author added in automatically -VentureChatAuthor: '&6Written by' -VentureChatVersion: '&6VentureChat Version: {version}' \ No newline at end of file +UnmutePlayerAllPlayer: '&cYou have just been unmuted in all channels.' +UnmutePlayerAllSender: '&cUnmuted player &6{player} &cin all channels.' +UnmutePlayerPlayer: '&cYou have just been unmuted in: {channel_color}{channel_name}' +UnmutePlayerSender: '&cUnmuted player &6{player} &cin: {channel_color}{channel_name}' \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index 761c51f..f9b8d54 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -37,6 +37,7 @@ import mineverse.Aust1n46.chat.listeners.ChatListener; import mineverse.Aust1n46.chat.listeners.PacketListener; import mineverse.Aust1n46.chat.listeners.SignListener; import mineverse.Aust1n46.chat.localization.Localization; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; //import mineverse.Aust1n46.chat.alias.Alias; import mineverse.Aust1n46.chat.alias.AliasInfo; import mineverse.Aust1n46.chat.api.MineverseChatAPI; @@ -854,7 +855,9 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { if(playerList.length() > 2) { playerList = playerList.substring(0, playerList.length() - 2); } - mcp.getPlayer().sendMessage(ChatColor.GOLD + "Players in Channel: " + ChatColor.valueOf(chatchannel.getColor().toUpperCase()) + chatchannel.getName()); + mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_PLAYER_LIST_HEADER.toString() + .replace("{channel_color}", (ChatColor.valueOf(chatchannel.getColor().toUpperCase())).toString()) + .replace("{channel_name}", chatchannel.getName())); mcp.getPlayer().sendMessage(Format.FormatStringAll(playerList)); } } @@ -969,7 +972,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { String receiver = msgin.readUTF(); UUID sender = UUID.fromString(msgin.readUTF()); MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender); - p.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + receiver + ChatColor.RED + " is not online."); + p.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", receiver)); } if(identifier.equals("Echo")) { UUID receiver = UUID.fromString(msgin.readUTF()); @@ -981,7 +985,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { rName = Format.FormatStringAll(r.getNickname()); } p.addIgnore(receiver); - p.getPlayer().sendMessage(ChatColor.GOLD + "You are now ignoring player: " + ChatColor.RED + rName); + p.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString() + .replace("{player}", rName)); this.synchronize(p, true); } } @@ -1070,20 +1075,23 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { String receiver = msgin.readUTF(); UUID sender = UUID.fromString(msgin.readUTF()); MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender); - p.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + receiver + ChatColor.RED + " is not online."); + p.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", receiver)); p.setReplyPlayer(null); } if(identifier.equals("Ignore")) { String receiver = msgin.readUTF(); UUID sender = UUID.fromString(msgin.readUTF()); MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender); - p.getPlayer().sendMessage(ChatColor.GOLD + receiver + " is currently ignoring your messages."); + p.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString() + .replace("{player}", receiver)); } if(identifier.equals("Blocked")) { String receiver = msgin.readUTF(); UUID sender = UUID.fromString(msgin.readUTF()); MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender); - p.getPlayer().sendMessage(ChatColor.GOLD + receiver + " is currently blocking messages."); + p.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString() + .replace("{player}", receiver)); } if(identifier.equals("Echo")) { String receiver = msgin.readUTF(); diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Clearchat.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Clearchat.java index e135e0d..68e21e4 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Clearchat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Clearchat.java @@ -5,6 +5,7 @@ import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.InternalMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Clearchat extends MineverseCommand { @@ -19,7 +20,7 @@ public class Clearchat extends MineverseCommand { for(MineverseChatPlayer player : MineverseChat.players) { if(player.isOnline() && !player.getPlayer().hasPermission("venturechat.clearchat.bypass")) { for(int a = 1; a <= 20; a++) - player.getPlayer().sendMessage(LocalizedMessage.EMPTY_STRING.toString()); + player.getPlayer().sendMessage(InternalMessage.EMPTY_STRING.toString()); player.getPlayer().sendMessage(LocalizedMessage.CLEAR_CHAT_SERVER.toString()); } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Edit.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Edit.java index 4836915..a799e5b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Edit.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Edit.java @@ -5,7 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @@ -18,6 +17,7 @@ import mineverse.Aust1n46.chat.ChatMessage; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Edit extends MineverseCommand { @@ -34,7 +34,9 @@ public class Edit extends MineverseCommand { @SuppressWarnings({ "unchecked", "rawtypes" }) public void execute(CommandSender sender, String command, String[] args) { if(args.length == 0) { - sender.sendMessage(ChatColor.RED + "Invalid command: /edit [hashcode]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/edit") + .replace("{args}", "[hashcode]")); return; } final int hash; @@ -42,7 +44,7 @@ public class Edit extends MineverseCommand { hash = Integer.parseInt(args[0]); } catch(Exception e) { - sender.sendMessage(ChatColor.RED + "Invalid hashcode."); + sender.sendMessage(LocalizedMessage.INVALID_HASH.toString()); return; } new BukkitRunnable() { diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java index c243af8..b8fda37 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java @@ -2,7 +2,7 @@ package mineverse.Aust1n46.chat.command.chat; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.command.MineverseCommand; -import mineverse.Aust1n46.chat.localization.LocalizedMessage; +import mineverse.Aust1n46.chat.localization.InternalMessage; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; @@ -22,9 +22,9 @@ public class Venturechat extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { - sender.sendMessage(LocalizedMessage.VENTURECHAT_VERSION.toString() + sender.sendMessage(InternalMessage.VENTURECHAT_VERSION.toString() .replace("{version}", plugin.getDescription().getVersion())); - sender.sendMessage(LocalizedMessage.VENTURECHAT_AUTHOR + " " + plugin.getDescription().getAuthors().get(0)); + sender.sendMessage(InternalMessage.VENTURECHAT_AUTHOR.toString()); if (sender instanceof Player && plugin.getConfig().getString("loglevel", "info").equals("debug")) { Player player = (Player) sender; String title = ChatColor.GOLD + " | " + ChatColor.BLUE.toString() + ChatColor.BOLD + "Click here to begin..." + ChatColor.RESET + ChatColor.GOLD + " | "; diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Ignore.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Ignore.java index a1bfa21..e656b03 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Ignore.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Ignore.java @@ -12,6 +12,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Ignore extends MineverseCommand { private MineverseChat plugin; @@ -24,12 +25,12 @@ public class Ignore extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(args.length == 0) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /ignore [player] or /ignore list"); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS_IGNORE.toString()); return; } if(args[0].equalsIgnoreCase("list")) { @@ -40,7 +41,7 @@ public class Ignore extends MineverseCommand { ignoreList += ChatColor.RED + i.getName() + ChatColor.WHITE + ", "; } } - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are currently ignoring these players:"); + mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_LIST_HEADER.toString()); if(ignoreList.length() > 0) { mcp.getPlayer().sendMessage(ignoreList.substring(0, ignoreList.length() - 2)); } @@ -48,17 +49,19 @@ public class Ignore extends MineverseCommand { } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } if(mcp.getIgnores().contains(player.getUUID())) { - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring player: " + ChatColor.RED + player.getName()); + mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString() + .replace("{player}", player.getName())); mcp.removeIgnore(player.getUUID()); plugin.synchronize(mcp, true); return; } if(mcp.getName().equalsIgnoreCase(player.getName())) { - mcp.getPlayer().sendMessage(ChatColor.RED + "You can not ignore yourself!"); + mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_YOURSELF.toString()); return; } if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) { @@ -78,14 +81,17 @@ public class Ignore extends MineverseCommand { return; } if(!player.isOnline()) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + player.getName() + ChatColor.RED + " is not online."); + mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", player.getName())); return; } if(player.getPlayer().hasPermission("venturechat.ignore.bypass")) { - mcp.getPlayer().sendMessage(ChatColor.RED + "You cannot ignore player: " + ChatColor.GOLD + player.getName() + ChatColor.RED + "."); + mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_CANT.toString() + .replace("{player}", player.getName())); return; } - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now ignoring player: " + ChatColor.RED + player.getName()); + mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_ON.toString() + .replace("{player}", player.getName())); mcp.addIgnore(player.getUUID()); plugin.synchronize(mcp, true); return; diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java index 1fce359..0c67bd8 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java @@ -108,19 +108,23 @@ public class Message extends MineverseCommand { } } if(player == null || !player.isOnline()) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } if(!mcp.getPlayer().canSee(player.getPlayer())) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } if(player.getIgnores().contains(mcp.getUUID())) { - mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString()); + mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString() + .replace("{player}", player.getName())); return; } if(!player.getMessageToggle()) { - mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString()); + mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString() + .replace("{player}", player.getName())); return; } if(args.length >= 2) { @@ -190,22 +194,28 @@ public class Message extends MineverseCommand { if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) { if(sp.isSpy()) { - sp.getPlayer().sendMessage(mcp.getName() + " started a private conversation with " + player.getName() + "."); + sp.getPlayer().sendMessage(LocalizedMessage.ENTER_PRIVATE_CONVERSATION_SPY.toString() + .replace("{player_sender}", mcp.getName()) + .replace("{player_receiver}", player.getName())); } } } - mcp.getPlayer().sendMessage("You are now in private conversation with " + player.getNickname() + "."); + mcp.getPlayer().sendMessage(LocalizedMessage.ENTER_PRIVATE_CONVERSATION.toString() + .replace("{player_receiver}", player.getName())); } else { mcp.setConversation(null); if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) { if(sp.isSpy()) { - sp.getPlayer().sendMessage(mcp.getName() + " is no longer in a private conversation with " + player.getName() + "."); + sp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString() + .replace("{player_sender}", mcp.getName()) + .replace("{player_receiver}", player.getName())); } } } - mcp.getPlayer().sendMessage("You are no longer in private conversation with " + player.getNickname() + "."); + mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString() + .replace("{player_receiver}", player.getName())); } } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/MessageToggle.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/MessageToggle.java index d8dd0f9..62a5580 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/MessageToggle.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/MessageToggle.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.message; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class MessageToggle extends MineverseCommand { private MineverseChat plugin; @@ -20,23 +20,23 @@ public class MessageToggle extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.messagetoggle")) { if(!mcp.getMessageToggle()) { mcp.setMessageToggle(true); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now receiving messages."); + mcp.getPlayer().sendMessage(LocalizedMessage.MESSAGE_TOGGLE_ON.toString()); MineverseChat.getInstance().synchronize(mcp, true); return; } mcp.setMessageToggle(false); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now blocking messages."); + mcp.getPlayer().sendMessage(LocalizedMessage.MESSAGE_TOGGLE_OFF.toString()); MineverseChat.getInstance().synchronize(mcp, true); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Notifications.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Notifications.java index 17deae0..ef35f92 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Notifications.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Notifications.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.message; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Notifications extends MineverseCommand { private MineverseChat plugin; @@ -20,18 +20,18 @@ public class Notifications extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(!mcp.hasNotifications()) { mcp.setNotifications(true); - mcp.getPlayer().sendMessage(ChatColor.GREEN + "You are now receiving notifications."); + mcp.getPlayer().sendMessage(LocalizedMessage.NOTIFICATIONS_ON.toString()); return; } mcp.setNotifications(false); - mcp.getPlayer().sendMessage(ChatColor.GREEN + "You are no longer receiving notifications."); + mcp.getPlayer().sendMessage(LocalizedMessage.NOTIFICATIONS_OFF.toString()); return; } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java index d7f6701..81d3861 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java @@ -13,6 +13,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -28,7 +29,7 @@ public class Reply extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); @@ -82,19 +83,21 @@ public class Reply extends MineverseCommand { return; } if(player == null || !player.isOnline()) { - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have anyone to reply to."); + mcp.getPlayer().sendMessage(LocalizedMessage.NO_PLAYER_TO_REPLY_TO.toString()); return; } if(!mcp.getPlayer().canSee(player.getPlayer())) { - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have anyone to reply to."); + mcp.getPlayer().sendMessage(LocalizedMessage.NO_PLAYER_TO_REPLY_TO.toString()); return; } if(player.getIgnores().contains(mcp.getUUID())) { - mcp.getPlayer().sendMessage(ChatColor.GOLD + player.getNickname() + " is currently ignoring your replies."); + mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString() + .replace("{player}", player.getName())); return; } if(!player.getMessageToggle()) { - mcp.getPlayer().sendMessage(ChatColor.GOLD + player.getNickname() + " is currently blocking messages."); + mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString() + .replace("{player}", player.getName())); return; } String msg = ""; @@ -155,9 +158,11 @@ public class Reply extends MineverseCommand { return; } } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have anyone to reply to."); + mcp.getPlayer().sendMessage(LocalizedMessage.NO_PLAYER_TO_REPLY_TO.toString()); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /reply [msg]"); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/reply") + .replace("{args}", "[message]")); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Spy.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Spy.java index 171a261..72d4a3b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Spy.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Spy.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.message; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Spy extends MineverseCommand { private MineverseChat plugin; @@ -20,23 +20,23 @@ public class Spy extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.spy")) { if(!mcp.isSpy()) { mcp.setSpy(true); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now spying."); + mcp.getPlayer().sendMessage(LocalizedMessage.SPY_ON.toString()); MineverseChat.getInstance().synchronize(mcp, true); return; } mcp.setSpy(false); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer spying."); + mcp.getPlayer().sendMessage(LocalizedMessage.SPY_OFF.toString()); MineverseChat.getInstance().synchronize(mcp, true); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/mute/Mute.java b/MineverseChat/mineverse/Aust1n46/chat/command/mute/Mute.java index bef7261..1b19063 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/mute/Mute.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/mute/Mute.java @@ -9,6 +9,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Mute extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -21,26 +22,37 @@ public class Mute extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.mute")) { if(args.length < 2) { - sender.sendMessage(ChatColor.RED + "Invalid command: /mute [player] [channel] {time}"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/mute") + .replace("{args}", "[player] [channel] {time}")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } if(args.length == 2) { if(cc.isChannel(args[1])) { ChatChannel channel = cc.getChannelInfo(args[1]); if(player.isMuted(channel.getName())) { - sender.sendMessage(ChatColor.GOLD + player.getName() + ChatColor.RED + " is already muted in channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); + sender.sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); return; } if(channel.isMutable()) { player.addMute(channel.getName(), 0); - sender.sendMessage(ChatColor.RED + "Muted player " + ChatColor.GOLD + player.getName() + ChatColor.RED + " in: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); + sender.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); if(player.isOnline()) - player.getPlayer().sendMessage(ChatColor.RED + "You have just been muted in: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); + player.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); else player.setModified(true); if(channel.getBungee()) { @@ -48,16 +60,22 @@ public class Mute extends MineverseCommand { } return; } - sender.sendMessage(ChatColor.RED + "You cannot mute players in this channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); + sender.sendMessage(LocalizedMessage.CHANNEL_CANNOT_MUTE.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); return; } - sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); + sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[1])); return; } if(cc.isChannel(args[1])) { ChatChannel channel = cc.getChannelInfo(args[1]); if(player.isMuted(channel.getName())) { - sender.sendMessage(ChatColor.GOLD + player.getName() + ChatColor.RED + " is already muted in channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); + sender.sendMessage(LocalizedMessage.PLAYER_ALREADY_MUTED.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); return; } if(channel.isMutable()) { @@ -76,9 +94,18 @@ public class Mute extends MineverseCommand { String keyword = "minutes"; if(time == 1) keyword = "minute"; - sender.sendMessage(ChatColor.RED + "Muted player " + ChatColor.GOLD + player.getName() + ChatColor.RED + " in: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName() + ChatColor.RED + " for " + time + " " + keyword); + sender.sendMessage(LocalizedMessage.MUTE_PLAYER_SENDER_TIME.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName()) + .replace("{time}", time + "") + .replace("{units}", keyword)); if(player.isOnline()) - player.getPlayer().sendMessage(ChatColor.RED + "You have just been muted in: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName() + ChatColor.RED + " for " + time + " " + keyword); + player.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName()) + .replace("{time}", time + "") + .replace("{units}", keyword)); else player.setModified(true); if(channel.getBungee()) { @@ -86,19 +113,24 @@ public class Mute extends MineverseCommand { } return; } - sender.sendMessage(ChatColor.RED + "Invalid time: " + args[2]); + sender.sendMessage(LocalizedMessage.INVALID_TIME.toString() + .replace("{args}", args[2])); } catch(Exception e) { - sender.sendMessage(ChatColor.RED + "Invalid time: " + args[2]); + sender.sendMessage(LocalizedMessage.INVALID_TIME.toString() + .replace("{args}", args[2])); } return; } - sender.sendMessage(ChatColor.RED + "You cannot mute players in this channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); + sender.sendMessage(LocalizedMessage.CHANNEL_CANNOT_MUTE.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); return; } - sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); + sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[1])); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/mute/Muteall.java b/MineverseChat/mineverse/Aust1n46/chat/command/mute/Muteall.java index d90ad1a..0e85f8b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/mute/Muteall.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/mute/Muteall.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.mute; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; @@ -9,6 +8,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Muteall extends MineverseCommand { @SuppressWarnings("unused") @@ -24,12 +24,15 @@ public class Muteall extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.mute")) { if(args.length < 1) { - sender.sendMessage(ChatColor.RED + "Invalid command: /muteall [player]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/muteall") + .replace("{args}", "[player]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } boolean bungee = false; @@ -44,16 +47,17 @@ public class Muteall extends MineverseCommand { if(bungee) { MineverseChat.getInstance().synchronize(player, true); } - sender.sendMessage(ChatColor.RED + "Muted player " + ChatColor.GOLD + player.getName() + ChatColor.RED + " in all channels."); + sender.sendMessage(LocalizedMessage.MUTE_PLAYER_ALL_SENDER.toString() + .replace("{player}", player.getName())); if(player.isOnline()) { - player.getPlayer().sendMessage(ChatColor.RED + "You have just been muted in all channels."); + player.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_ALL_PLAYER.toString()); } else player.setModified(true); return; } else { - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/mute/Unmute.java b/MineverseChat/mineverse/Aust1n46/chat/command/mute/Unmute.java index ba65d5d..45b5573 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/mute/Unmute.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/mute/Unmute.java @@ -9,6 +9,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Unmute extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -21,24 +22,36 @@ public class Unmute extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.mute")) { if(args.length < 2) { - sender.sendMessage(ChatColor.RED + "Invalid command: /unmute [player] [channel]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/unmute") + .replace("{args}", "[player] [channel]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } for(ChatChannel channel : cc.getChannelsInfo()) { if(channel.getName().equalsIgnoreCase(args[1]) || channel.getAlias().equalsIgnoreCase(args[1])) { if(!player.isMuted(channel.getName())) { - sender.sendMessage(ChatColor.GOLD + player.getName() + ChatColor.RED + " is not muted in channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); + sender.sendMessage(LocalizedMessage.PLAYER_NOT_MUTED.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); return; } player.removeMute(channel.getName()); - sender.sendMessage(ChatColor.RED + "Unmuted player " + ChatColor.GOLD + player.getName() + ChatColor.RED + " in: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); + sender.sendMessage(LocalizedMessage.UNMUTE_PLAYER_SENDER.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); if(player.isOnline()) { - player.getPlayer().sendMessage(ChatColor.RED + "You have just been unmuted in: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); + player.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_PLAYER.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); } else { player.setModified(true); @@ -49,11 +62,12 @@ public class Unmute extends MineverseCommand { return; } } - sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); + sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[1])); return; } else { - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/mute/Unmuteall.java b/MineverseChat/mineverse/Aust1n46/chat/command/mute/Unmuteall.java index a487f58..ca940f7 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/mute/Unmuteall.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/mute/Unmuteall.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.mute; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; @@ -9,6 +8,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Unmuteall extends MineverseCommand { @SuppressWarnings("unused") @@ -24,12 +24,15 @@ public class Unmuteall extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.mute")) { if(args.length < 1) { - sender.sendMessage(ChatColor.RED + "Invalid command: /unmuteall [player]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/unmuteall") + .replace("{args}", "[player]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } boolean bungee = false; @@ -42,16 +45,17 @@ public class Unmuteall extends MineverseCommand { if(bungee) { MineverseChat.getInstance().synchronize(player, true); } - sender.sendMessage(ChatColor.RED + "Unmuted player " + ChatColor.GOLD + player.getName() + ChatColor.RED + " in all channels."); + sender.sendMessage(LocalizedMessage.UNMUTE_PLAYER_ALL_SENDER.toString() + .replace("{player}", player.getName())); if(player.isOnline()) { - player.getPlayer().sendMessage(ChatColor.RED + "You have just been unmuted in all channels."); + player.getPlayer().sendMessage(LocalizedMessage.UNMUTE_PLAYER_ALL_PLAYER.toString()); } else player.setModified(true); return; } else { - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/InternalMessage.java b/MineverseChat/mineverse/Aust1n46/chat/localization/InternalMessage.java new file mode 100644 index 0000000..7c96a08 --- /dev/null +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/InternalMessage.java @@ -0,0 +1,23 @@ +package mineverse.Aust1n46.chat.localization; + +import mineverse.Aust1n46.chat.utilities.Format; + +/** + * Messages internal to the plugin + */ +public enum InternalMessage { + EMPTY_STRING(""), + VENTURECHAT_AUTHOR("&6Written by Aust1n46"), + VENTURECHAT_VERSION("&6VentureChat Version: {version}"); + + private final String message; + + InternalMessage(String message) { + this.message = message; + } + + @Override + public String toString() { + return Format.FormatStringAll(this.message); + } +} \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java index 4868eb8..5099684 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java @@ -25,7 +25,6 @@ public class Localization { String fileVersion = localization.getString("Version", "null"); String currentVersion = plugin.getDescription().getVersion(); - System.out.println(fileVersion + " " + currentVersion); if(!fileVersion.equals(currentVersion)) { Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Version Change Detected! Saving Old Messages.yml and Generating Latest File")); localizationFile.renameTo(new File(plugin.getDataFolder().getAbsolutePath(), "Messages_Old.yml")); diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java index 1ec3392..5b4107a 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java @@ -13,6 +13,7 @@ public enum LocalizedMessage { BUNGEE_TOGGLE_ON("BungeeToggleOn"), CLEAR_CHAT_SENDER("ClearChatSender"), CLEAR_CHAT_SERVER("ClearChatServer"), + CHANNEL_CANNOT_MUTE("ChannelCannotMute"), CHANNEL_LIST("ChannelList"), CHANNEL_LIST_HEADER("ChannelListHeader"), CHANNEL_LIST_WITH_PERMISSIONS("ChannelListWithPermissions"), @@ -20,28 +21,49 @@ public enum LocalizedMessage { CHANNEL_NO_PERMISSION_VIEW("ChannelNoPermissionView"), CHANNEL_PLAYER_LIST_HEADER("ChannelPlayerListHeader"), COMMAND_INVALID_ARGUMENTS("CommandInvalidArguments"), + COMMAND_INVALID_ARGUMENTS_IGNORE("CommandInvalidArgumentsIgnore"), COMMAND_MUST_BE_RUN_BY_PLAYER("CommandMustBeRunByPlayer"), COMMAND_NO_PERMISSION("CommandNoPermission"), COMMAND_NOT_BLOCKABLE("CommandNotBlockable"), COMMANDSPY_OFF("CommandSpyOff"), COMMANDSPY_ON("CommandSpyOn"), CONFIG_RELOADED("ConfigReloaded"), - EMPTY_STRING("EmptyString"), + ENTER_PRIVATE_CONVERSATION("EnterPrivateConversation"), + ENTER_PRIVATE_CONVERSATION_SPY("EnterPrivateConversationSpy"), EXIT_PRIVATE_CONVERSATION("ExitPrivateConversation"), EXIT_PRIVATE_CONVERSATION_SPY("ExitPrivateConversationSpy"), FILTER_OFF("FilterOff"), FILTER_ON("FilterOn"), FORCE_ALL("ForceAll"), FORCE_PLAYER("ForcePlayer"), + IGNORE_LIST_HEADER("IgnoreListHeader"), + IGNORE_PLAYER_CANT("IgnorePlayerCant"), + IGNORE_PLAYER_OFF("IgnorePlayerOff"), + IGNORE_PLAYER_ON("IgnorePlayerOn"), + IGNORE_YOURSELF("IgnoreYourself"), IGNORING_MESSAGE("IgnoringMessage"), INVALID_CHANNEL("InvalidChannel"), INVALID_HASH("InvalidHash"), + INVALID_TIME("InvalidTime"), KICK_CHANNEL("KickChannel"), KICK_CHANNEL_ALL_PLAYER("KickChannelAllPlayer"), KICK_CHANNEL_ALL_SENDER("KickChannelAllSender"), LEAVE_CHANNEL("LeaveChannel"), LISTEN_CHANNEL("ListenChannel"), + MESSAGE_TOGGLE_OFF("MessageToggleOff"), + MESSAGE_TOGGLE_ON("MessageToggleOn"), MUST_LISTEN_ONE_CHANNEL("MustListenOneChannel"), + MUTE_PLAYER_ALL_PLAYER("MutePlayerAllPlayer"), + MUTE_PLAYER_ALL_SENDER("MutePlayerAllSender"), + MUTE_PLAYER_PLAYER("MutePlayerPlayer"), + MUTE_PLAYER_PLAYER_TIME("MutePlayerPlayerTime"), + MUTE_PLAYER_SENDER("MutePlayerSender"), + MUTE_PLAYER_SENDER_TIME("MutePlayerSenderTime"), + NO_PLAYER_TO_REPLY_TO("NoPlayerToReplyTo"), + NOTIFICATIONS_OFF("NotificationsOff"), + NOTIFICATIONS_ON("NotificationsOn"), + PLAYER_ALREADY_MUTED("PlayerAlreadyMuted"), + PLAYER_NOT_MUTED("PlayerNotMuted"), PLAYER_OFFLINE("PlayerOffline"), PLAYER_OFFLINE_NO_PERMISSIONS_CHECK("PlayerOfflineNoPermissionsCheck"), RANGED_SPY_OFF("RangedSpyOff"), @@ -51,11 +73,14 @@ public enum LocalizedMessage { SET_CHANNEL_ALL_SENDER("SetChannelAllSender"), SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION("SetChannelPlayerChannelNoPermission"), SET_CHANNEL_SENDER("SetChannelSender"), + SPY_OFF("SpyOff"), + SPY_ON("SpyOn"), UNBLOCK_COMMAND_PLAYER("UnblockCommandPlayer"), UNBLOCK_COMMAND_SENDER("UnblockCommandSender"), - VENTURECHAT_AUTHOR("VentureChatAuthor"), - VENTURECHAT_VERSION("VentureChatVersion"), - Z_END("End"); + UNMUTE_PLAYER_ALL_PLAYER("UnmutePlayerAllPlayer"), + UNMUTE_PLAYER_ALL_SENDER("UnmutePlayerAllSender"), + UNMUTE_PLAYER_PLAYER("UnmutePlayerPlayer"), + UNMUTE_PLAYER_SENDER("UnmutePlayerSender"); private final String message; From 0ed5b39a9b67e2380a10274d3cc5600d1b48880f Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Thu, 19 Mar 2020 20:56:41 -0400 Subject: [PATCH 5/6] Added configurable command spy format. --- MineverseChat/config.yml | 3 +++ MineverseChat/defaultconfig.yml | 1 + .../mineverse/Aust1n46/chat/listeners/CommandListener.java | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/MineverseChat/config.yml b/MineverseChat/config.yml index 68e1355..65d7476 100644 --- a/MineverseChat/config.yml +++ b/MineverseChat/config.yml @@ -46,7 +46,10 @@ nicknames: nickname-in-tablist: true +# {player} : player sending command +# {command} : command typed commandspy: + format: '&6{player}: {command}' worldeditcommands: true antispam: diff --git a/MineverseChat/defaultconfig.yml b/MineverseChat/defaultconfig.yml index 68e1355..96fc53e 100644 --- a/MineverseChat/defaultconfig.yml +++ b/MineverseChat/defaultconfig.yml @@ -47,6 +47,7 @@ nicknames: nickname-in-tablist: true commandspy: + format: '&6{player}: {command}' worldeditcommands: true antispam: diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java index a95cfab..b40a226 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java @@ -56,11 +56,11 @@ public class CommandListener implements CommandExecutor, Listener { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { if(p.hasCommandSpy()) { if(wec) { - p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + ": " + event.getMessage()); + p.getPlayer().sendMessage(Format.FormatStringAll(cs.getString("format").replace("{player}", mcp.getName()).replace("{command}", event.getMessage()))); } else { if(!(event.getMessage().toLowerCase().startsWith("//"))) { - p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + ": " + event.getMessage()); + p.getPlayer().sendMessage(Format.FormatStringAll(cs.getString("format").replace("{player}", mcp.getName()).replace("{command}", event.getMessage()))); } } } From 2b36ac643b16c1d4ad986ed5e50f22c884929ab8 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Thu, 19 Mar 2020 22:50:39 -0400 Subject: [PATCH 6/6] Added final batch of custom messages. --- MineverseChat/Messages.yml | 5 +++ .../Aust1n46/chat/listeners/ChatListener.java | 33 +++++++++++++------ .../chat/listeners/CommandListener.java | 15 ++++++--- .../chat/localization/LocalizedMessage.java | 5 +++ 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/MineverseChat/Messages.yml b/MineverseChat/Messages.yml index 490a8e9..bfa4d6d 100644 --- a/MineverseChat/Messages.yml +++ b/MineverseChat/Messages.yml @@ -1,18 +1,21 @@ Version: 2.17.3 BlockCommandPlayer: '&cYou have been blocked from entering command {command}.' BlockCommandSender: '&cBlocked player &6{player} &cfrom entering command {command}.' +BlockedCommand: '&cYou are blocked from entering this command: {command}' BlockingMessage: '&6{player} is currently blocking messages.' BungeeToggleOff: '&6You are now blocking BungeeCord chat.' BungeeToggleOn: '&6You are now receiving BungeeCord chat.' ClearChatSender: '&aCleared the server chat.' ClearChatServer: '&aYour chat has been cleared.' ChannelCannotMute: '&cYou cannot mute players in this channel: {channel_color}{channel_name}' +ChannelCooldown: '&c{cooldown} {units} of cooldown remaining.' ChannelList: '{channel_color}{channel_name} : {channel_alias}' ChannelListHeader: '&6Channel List : Alias' ChannelListWithPermissions: '{channel_color}{channel_name} : {channel_alias} - Permission Required' ChannelNoPermission: '&cYou do not have permission for this channel.' ChannelNoPermissionView: '&cYou do not have permission to look at this channel.' ChannelPlayerListHeader: '&6Players in Channel: {channel_color}{channel_name}' +ChannelMuted: '&cYou are muted in this channel: {channel_color}{channel_name}&c{time}' CommandInvalidArguments: '&cInvalid command: {command} {args}' CommandInvalidArgumentsIgnore: '&cInvalid command: /ignore [player] or /ignore list' CommandMustBeRunByPlayer: '&cThis command must be run by a player.' @@ -50,6 +53,7 @@ MutePlayerAllPlayer: '&cYou have just been muted in all channels.' MutePlayerAllSender: '&cMuted player &6{player} &cin all channels.' MutePlayerPlayer: '&cYou have just been muted in: {channel_color}{channel_name}' MutePlayerPlayerTime: '&cYou have just been muted in: {channel_color}{channel_name} &cfor {time} {units}' +MutePlayerSpam: '&cYou have been muted for spamming in: {channel_color}{channel_name}&c{time}' MutePlayerSender: '&cMuted player &6{player} &cin: {channel_color}{channel_name}' MutePlayerSenderTime: '&cMuted player &6{player} &cin: {channel_color}{channel_name} &cfor {time} {units}' NoPlayerToReplyTo: '&cYou do not have anyone to reply to.' @@ -66,6 +70,7 @@ SetChannelAllPlayer: '&cYou have been set into all channels.' SetChannelAllSender: '&6Set player &c{player} &6into all channels.' SetChannelPlayerChannelNoPermission: '&cThis player does not have permission for channel: {channel_color}{channel_name}' SetChannelSender: '&6Set player &c{player} &6into channel: {channel_color}{channel_name}' +SpamWarning: '&cSlow down your chat! You''re halfway to being muted for spam!' SpyOff: '&6You are no longer spying.' SpyOn: '&6You are now spying.' UnblockCommandPlayer: '&cYou have been unblocked from entering command {command}.' diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java index 4407ff2..bff6a1e 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -41,6 +41,7 @@ import mineverse.Aust1n46.chat.api.events.ChatMessageEvent; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.database.DatabaseSender; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.utilities.FormatTags; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -115,7 +116,9 @@ public class ChatListener implements Listener { if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { if(p.isSpy()) { - p.getPlayer().sendMessage(mcp.getName() + " is no longer in a private conversation with " + tp.getName() + "."); + p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString() + .replace("{player_sender}", mcp.getName()) + .replace("{player_receiver}", tp.getName())); } } } @@ -123,12 +126,14 @@ public class ChatListener implements Listener { } else { if(tp.getIgnores().contains(mcp.getUUID())) { - mcp.getPlayer().sendMessage(ChatColor.GOLD + tp.getName() + " is currently ignoring your messages."); + mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString() + .replace("{player}", tp.getName())); event.setCancelled(true); return; } if(!tp.getMessageToggle()) { - mcp.getPlayer().sendMessage(ChatColor.GOLD + tp.getName() + " is currently blocking messages."); + mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString() + .replace("{player}", tp.getName())); event.setCancelled(true); return; } @@ -420,9 +425,12 @@ public class ChatListener implements Listener { int remaining = timemark - time; if(remaining <= 0) remaining = 1; if(remaining == 1) keyword = "minute"; - timedMute = ChatColor.RED + " for " + remaining + " more " + keyword; + timedMute = " for " + remaining + " more " + keyword; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You are muted in this channel: " + ChatColor.valueOf(eventChannel.getColor().toUpperCase()) + eventChannel.getName() + timedMute); + mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_MUTED.toString() + .replace("{channel_color}", ChatColor.valueOf(eventChannel.getColor().toUpperCase()) + "") + .replace("{channel_name}", eventChannel.getName()) + .replace("{time}", timedMute)); mcp.setQuickChat(false); event.setCancelled(true); return; @@ -433,7 +441,7 @@ public class ChatListener implements Listener { String Channelformat; boolean irc = false; if(eventChannel.hasPermission() && !mcp.getPlayer().hasPermission(eventChannel.getPermission())) { - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this channel."); + mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_NO_PERMISSION.toString()); mcp.setQuickChat(false); mcp.removeListening(eventChannel.getName()); mcp.setCurrentChannel(cc.getDefaultChannel()); @@ -462,7 +470,9 @@ public class ChatListener implements Listener { int remaining = timemark - time; String keyword = "seconds"; if(remaining == 1) keyword = "second"; - mcp.getPlayer().sendMessage(ChatColor.RED + "" + remaining + " " + keyword + " of cooldown remaining."); + mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_COOLDOWN.toString() + .replace("{cooldown}", remaining + "") + .replace("{units}", keyword)); mcp.setQuickChat(false); event.setCancelled(true); bungee = false; @@ -493,17 +503,20 @@ public class ChatListener implements Listener { if(mutedfor > 0) { String keyword = "minutes"; if(mutedfor == 1) keyword = "minute"; - timedmute = ChatColor.RED + " for " + mutedfor + " " + keyword; + timedmute = " for " + mutedfor + " " + keyword; } mcp.getSpam().get(eventChannel).set(0, 0); - mcp.getPlayer().sendMessage(ChatColor.RED + "You have been muted for spamming in: " + ChatColor.valueOf(eventChannel.getColor().toUpperCase()) + eventChannel.getName() + timedmute); + mcp.getPlayer().sendMessage(LocalizedMessage.MUTE_PLAYER_SPAM.toString() + .replace("{channel_color}", ChatColor.valueOf(eventChannel.getColor().toUpperCase()) + "") + .replace("{channel_name}", eventChannel.getName()) + .replace("{time}", timedmute)); mcp.setQuickChat(false); event.setCancelled(true); } else { if(spamtimeconfig % 2 != 0) spamtimeconfig++; if(spamcount + 1 == spamtimeconfig / 2) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Slow down your chat! You're halfway to being muted for spam!"); + mcp.getPlayer().sendMessage(LocalizedMessage.SPAM_WARNING.toString()); } mcp.getSpam().get(eventChannel).set(0, spamcount + 1); } diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java index b40a226..cf04d48 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java @@ -14,6 +14,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.gui.GuiSlot; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -82,7 +83,8 @@ public class CommandListener implements CommandExecutor, Listener { String[] blocked = event.getMessage().split(" "); if(mcp.getBlockedCommands().contains(blocked[0])) { - mcp.getPlayer().sendMessage(ChatColor.RED + "You are blocked from entering this command: " + event.getMessage()); + mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKED_COMMAND.toString() + .replace("{command}", event.getMessage())); event.setCancelled(true); return; } @@ -169,14 +171,19 @@ public class CommandListener implements CommandExecutor, Listener { for(ChatChannel channel : cc.getChannelsInfo()) { if(!channel.hasPermission() || mcp.getPlayer().hasPermission(channel.getPermission())) { if(message.equals("/" + channel.getAlias())) { - mcp.getPlayer().sendMessage("Channel Set: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]"); + mcp.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); if(mcp.hasConversation()) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { if(p.isSpy()) { - p.getPlayer().sendMessage(mcp.getName() + " is no longer in a private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + "."); + p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString() + .replace("{player_sender}", mcp.getName()) + .replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName())); } } - mcp.getPlayer().sendMessage("You are no longer in private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + "."); + mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString() + .replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName())); mcp.setConversation(null); } mcp.addListening(channel.getName()); diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java index 5b4107a..7a53428 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java @@ -8,18 +8,21 @@ import mineverse.Aust1n46.chat.utilities.Format; public enum LocalizedMessage { BLOCK_COMMAND_PLAYER("BlockCommandPlayer"), BLOCK_COMMAND_SENDER("BlockCommandSender"), + BLOCKED_COMMAND("BlockedCommand"), BLOCKING_MESSAGE("BlockingMessage"), BUNGEE_TOGGLE_OFF("BungeeToggleOff"), BUNGEE_TOGGLE_ON("BungeeToggleOn"), CLEAR_CHAT_SENDER("ClearChatSender"), CLEAR_CHAT_SERVER("ClearChatServer"), CHANNEL_CANNOT_MUTE("ChannelCannotMute"), + CHANNEL_COOLDOWN("ChannelCooldown"), CHANNEL_LIST("ChannelList"), CHANNEL_LIST_HEADER("ChannelListHeader"), CHANNEL_LIST_WITH_PERMISSIONS("ChannelListWithPermissions"), CHANNEL_NO_PERMISSION("ChannelNoPermission"), CHANNEL_NO_PERMISSION_VIEW("ChannelNoPermissionView"), CHANNEL_PLAYER_LIST_HEADER("ChannelPlayerListHeader"), + CHANNEL_MUTED("ChannelMuted"), COMMAND_INVALID_ARGUMENTS("CommandInvalidArguments"), COMMAND_INVALID_ARGUMENTS_IGNORE("CommandInvalidArgumentsIgnore"), COMMAND_MUST_BE_RUN_BY_PLAYER("CommandMustBeRunByPlayer"), @@ -57,6 +60,7 @@ public enum LocalizedMessage { MUTE_PLAYER_ALL_SENDER("MutePlayerAllSender"), MUTE_PLAYER_PLAYER("MutePlayerPlayer"), MUTE_PLAYER_PLAYER_TIME("MutePlayerPlayerTime"), + MUTE_PLAYER_SPAM("MutePlayerSpam"), MUTE_PLAYER_SENDER("MutePlayerSender"), MUTE_PLAYER_SENDER_TIME("MutePlayerSenderTime"), NO_PLAYER_TO_REPLY_TO("NoPlayerToReplyTo"), @@ -73,6 +77,7 @@ public enum LocalizedMessage { SET_CHANNEL_ALL_SENDER("SetChannelAllSender"), SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION("SetChannelPlayerChannelNoPermission"), SET_CHANNEL_SENDER("SetChannelSender"), + SPAM_WARNING("SpamWarning"), SPY_OFF("SpyOff"), SPY_ON("SpyOn"), UNBLOCK_COMMAND_PLAYER("UnblockCommandPlayer"),