diff --git a/MineverseChat/Messages.yml b/MineverseChat/Messages.yml new file mode 100644 index 0000000..bfa4d6d --- /dev/null +++ b/MineverseChat/Messages.yml @@ -0,0 +1,81 @@ +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.' +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.' +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}' +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.' +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.' +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}' +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}.' +UnblockCommandSender: '&cUnblocked player &6{player} &cfrom entering command {command}.' +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/config.yml b/MineverseChat/config.yml index d9d5e2b..b9aaac6 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 b174225..e04eb2f 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/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index ce17d56..a64a946 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -36,7 +36,8 @@ 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.localization.LocalizedMessage; //import mineverse.Aust1n46.chat.alias.Alias; import mineverse.Aust1n46.chat.alias.AliasInfo; import mineverse.Aust1n46.chat.api.MineverseChatAPI; @@ -155,11 +156,11 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { private boolean firstRun = true; // Plugin Messaging Channel - public static final String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; + public static final String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; // Event constants public static final boolean ASYNC = true; - public static final boolean SYNC = false; + public static final boolean SYNC = false; // Vault -------------------------------- public static Permission permission = null; @@ -217,14 +218,15 @@ 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(); Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Registering Listeners")); // Channel information reference aaInfo = new AliasInfo(this); jfInfo = new JsonFormatInfo(this); gsInfo = new GuiSlotInfo(); - + PlayerData.initialize(); if(this.firstRun) { for(String uuidString : PlayerData.getPlayerData().getConfigurationSection("players").getKeys(false)) { @@ -811,7 +813,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)); } } @@ -925,7 +929,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()); @@ -945,7 +950,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { } 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); } } @@ -1033,20 +1039,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/Broadcast.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Broadcast.java index 01efa5d..5574860 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.configuration.ConfigurationSection; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Broadcast extends MineverseCommand { @@ -32,12 +33,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 c41a714..4c5cee7 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java @@ -13,6 +13,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.events.ChannelJoinEvent; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Channel extends MineverseCommand implements Listener { private MineverseChat plugin = MineverseChat.getInstance(); @@ -26,20 +27,25 @@ 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(args.length > 0) { if(!ChatChannel.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 = ChatChannel.getChannel(args[0]); - plugin.getServer().getPluginManager().callEvent(new ChannelJoinEvent(mcp.getPlayer(), channel, "Channel Set: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]")); + } + ChatChannel channel = ChatChannel.getChannel(args[0]); + 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(ChatColor.RED + "Invalid command: /" + command + " [channel]"); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/channel") + .replace("{args}", "[channel]")); return; } @@ -52,17 +58,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/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 48a2168..ab7eb3b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chlist.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chlist.java @@ -5,6 +5,7 @@ import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Chlist extends MineverseCommand { @@ -13,16 +14,22 @@ public class Chlist extends MineverseCommand { } @Override - public void execute(CommandSender sender, String command, String[] args) { - sender.sendMessage(ChatColor.GOLD + "Channel List : Alias"); - for(ChatChannel chname : ChatChannel.getChannels()) { + public void execute(CommandSender sender, String command, String[] args) { + sender.sendMessage(LocalizedMessage.CHANNEL_LIST_HEADER.toString()); + for(ChatChannel chname : ChatChannel.getChannels()) { 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 5288f47..21cf35f 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java @@ -18,6 +18,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Chwho extends MineverseCommand { private MineverseChat plugin = MineverseChat.getInstance(); @@ -37,7 +38,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; } } @@ -175,22 +176,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..68e21e4 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Clearchat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Clearchat.java @@ -1,11 +1,12 @@ 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.InternalMessage; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Clearchat extends MineverseCommand { @@ -19,14 +20,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(InternalMessage.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/Commandblock.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandblock.java index 6cbd844..a5768cc 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; @@ -24,7 +24,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; @@ -34,21 +35,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/Edit.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Edit.java index c9cbdd2..028f2d5 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; @@ -17,6 +16,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 { @@ -32,7 +32,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; @@ -40,7 +42,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/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 bad486e..2f32f0b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java @@ -7,6 +7,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Kickchannel extends MineverseCommand { @@ -18,38 +19,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 = ChatChannel.getChannel(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(ChatChannel.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(ChatChannel.getDefaultColor().toUpperCase()) + "[" + ChatChannel.getDefaultChannel().getName() + "]"); + if(player.isOnline()) { + player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); + player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(ChatChannel.getDefaultColor().toUpperCase()) + "") + .replace("{channel_name}", ChatChannel.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 d5791b7..da600b9 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java @@ -7,6 +7,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Kickchannelall extends MineverseCommand { @@ -18,27 +19,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."); + player.clearListening(); + sender.sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_SENDER.toString() + .replace("{player}", player.getName())); player.addListening(ChatChannel.getDefaultChannel().getName()); - player.setCurrentChannel(ChatChannel.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(ChatChannel.getDefaultColor().toUpperCase()) + "[" + ChatChannel.getDefaultChannel().getName() + "]"); + player.setCurrentChannel(ChatChannel.getDefaultChannel()); + if(player.isOnline()) { + 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(ChatChannel.getDefaultColor().toUpperCase()) + "") + .replace("{channel_name}", ChatChannel.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 02a63c9..559cd5e 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java @@ -9,6 +9,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Leave extends MineverseCommand { private MineverseChat plugin = MineverseChat.getInstance();; @@ -20,30 +21,36 @@ 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 = ChatChannel.getChannel(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()); - String format = ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]"; - mcp.getPlayer().sendMessage("Leaving channel: " + format); - if(mcp.getListening().size() == 0) { + 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(ChatChannel.getDefaultChannel().getName()); mcp.setCurrentChannel(ChatChannel.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(ChatChannel.getDefaultColor().toUpperCase()) + "[" + ChatChannel.getDefaultChannel().getName() + "]"); + mcp.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); + mcp.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(ChatChannel.getDefaultColor().toUpperCase()) + "") + .replace("{channel_name}", ChatChannel.getDefaultChannel().getName())); } if(channel.getBungee()) { MineverseChat.getInstance().synchronize(mcp, true); } 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 07e3d27..b70df93 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java @@ -9,6 +9,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Listen extends MineverseCommand { private MineverseChat plugin = MineverseChat.getInstance();; @@ -20,28 +21,32 @@ 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 = ChatChannel.getChannel(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; } } - 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(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/Me.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java index f11497a..c17800f 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java @@ -1,12 +1,12 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Me extends MineverseCommand { @@ -31,7 +31,7 @@ public class Me extends MineverseCommand { String filtered = Format.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) { @@ -42,9 +42,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 74f68e6..d697835 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java @@ -11,7 +11,8 @@ import mineverse.Aust1n46.chat.ChatMessage; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; -import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; import org.bukkit.ChatColor; @@ -35,7 +36,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; @@ -43,7 +46,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 && ChatChannel.isChannel(args[1]) && ChatChannel.getChannel(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 7c93c50..1233a8b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java @@ -8,6 +8,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Setchannel extends MineverseCommand { @@ -19,54 +20,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; + } + MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); + if(player == null) { + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } - if(args[0].length() > 1) { - ChatChannel channel = ChatChannel.getChannel(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."); + ChatChannel channel = ChatChannel.getChannel(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 390d602..c85eb05 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannelall.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannelall.java @@ -1,12 +1,12 @@ 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.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Setchannelall extends MineverseCommand { @@ -18,18 +18,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 : ChatChannel.getChannels()) { 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())) { @@ -43,13 +46,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 d95ab3b..cb3850b 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; @@ -33,18 +34,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; @@ -66,17 +70,25 @@ public class VentureChatGui extends MineverseCommand { target = new MineverseChatPlayer(uuid, name, current, ignores, listening, mutes, blockedCommands, mail, false, null, true, true, name, jsonFormat, false, false, false, true, true, true); MineverseChat.players.add(target); */ - } + } if(ChatChannel.isChannel(args[1])) { ChatChannel channel = ChatChannel.getChannel(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..b8fda37 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.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; @@ -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(InternalMessage.VENTURECHAT_VERSION.toString() + .replace("{version}", plugin.getDescription().getVersion())); + 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 3894b24..cfdec64 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")) { @@ -42,15 +43,28 @@ public class Ignore extends MineverseCommand { } ignoreList += ChatColor.RED + iName + 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)); } return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); - if(mcp.getName().equalsIgnoreCase(args[0])) { - mcp.getPlayer().sendMessage(ChatColor.RED + "You can not ignore yourself!"); + + if(player == null) { + mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); + return; + } + if(mcp.getIgnores().contains(player.getUUID())) { + 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(LocalizedMessage.IGNORE_YOURSELF.toString()); return; } if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) { @@ -67,10 +81,11 @@ public class Ignore extends MineverseCommand { catch(Exception e) { e.printStackTrace(); } - return; - } - if(player == null || !player.isOnline()) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + return; + } + if(!player.isOnline()) { + mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", player.getName())); return; } if(mcp.getIgnores().contains(player.getUUID())) { @@ -80,10 +95,12 @@ public class Ignore extends MineverseCommand { 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 f96747a..bfcb49c 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Message.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; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -25,17 +26,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(); @@ -101,19 +106,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(ChatColor.GOLD + player.getName() + " is currently ignoring your messages."); + mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString() + .replace("{player}", player.getName())); return; } if(!player.getMessageToggle()) { - mcp.getPlayer().sendMessage(ChatColor.GOLD + player.getName() + " is currently blocking messages."); + mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString() + .replace("{player}", player.getName())); return; } if(args.length >= 2) { @@ -181,22 +190,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 3120b7c..c9d1c7f 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Reply.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; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -25,7 +26,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); @@ -80,19 +81,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 = ""; @@ -151,9 +154,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 1dc1202..f8d6322 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/mute/Mute.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/mute/Mute.java @@ -8,6 +8,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Mute extends MineverseCommand { @@ -19,26 +20,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(ChatChannel.isChannel(args[1])) { ChatChannel channel = ChatChannel.getChannel(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()) { @@ -46,16 +58,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(ChatChannel.isChannel(args[1])) { ChatChannel channel = ChatChannel.getChannel(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()) { @@ -74,9 +92,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()) { @@ -84,19 +111,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 9d212d8..4d8d5b3 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; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Muteall extends MineverseCommand { @@ -19,12 +19,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; @@ -39,16 +42,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 cb5ddc4..c8b4dbb 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/mute/Unmute.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/mute/Unmute.java @@ -8,6 +8,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Unmute extends MineverseCommand { @@ -19,24 +20,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 : ChatChannel.getChannels()) { 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); @@ -47,11 +60,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 10f47e7..841d4c6 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; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Unmuteall extends MineverseCommand { @@ -19,12 +19,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; @@ -37,16 +40,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/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java index 986f26e..14f1935 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java @@ -33,6 +33,7 @@ import mineverse.Aust1n46.chat.api.events.ChannelJoinEvent; import mineverse.Aust1n46.chat.api.events.VentureChatEvent; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.database.DatabaseSender; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -83,19 +84,25 @@ 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())); } } } mcp.setConversation(null); } else { - if(tp.getIgnores().contains(mcp.getUUID())) { - mcp.getPlayer().sendMessage(ChatColor.GOLD + tp.getName() + " is currently ignoring your messages."); + if(tp.getIgnores().contains(mcp.getUUID())) { + 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."); + if(!tp.getMessageToggle()) { + mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString() + .replace("{player}", tp.getName())); + event.setCancelled(true); return; } String filtered = chat; @@ -227,9 +234,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); return; } @@ -237,7 +247,7 @@ public class ChatListener implements Listener { int chCooldown = 0; String curColor = ""; 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(ChatChannel.getDefaultChannel()); @@ -258,7 +268,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); bungee = false; return; @@ -288,17 +300,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); return; } 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 0cbd0f9..be039f6 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java +++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/CommandListener.java @@ -13,6 +13,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.gui.GuiSlot; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -48,12 +49,15 @@ public class CommandListener implements CommandExecutor, Listener { public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) throws FileNotFoundException { ConfigurationSection cs = plugin.getConfig().getConfigurationSection("commandspy"); Boolean wec = cs.getBoolean("worldeditcommands", true); - MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(event.getPlayer()); - if(!mcp.getPlayer().hasPermission("venturechat.commandspy.hide")) { - for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { - if(p.hasCommandSpy()) { - if(wec) { - p.getPlayer().sendMessage(ChatColor.GOLD + mcp.getName() + ": " + event.getMessage()); + MineverseChatPlayer mcp = MineverseChatAPI.getOnlineMineverseChatPlayer(event.getPlayer()); + for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { + if(p.hasCommandSpy()) { + if(wec) { + 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(Format.FormatStringAll(cs.getString("format").replace("{player}", mcp.getName()).replace("{command}", event.getMessage()))); } else { if(!(event.getMessage().toLowerCase().startsWith("//"))) { @@ -66,7 +70,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; } @@ -153,14 +158,19 @@ public class CommandListener implements CommandExecutor, Listener { for(ChatChannel channel : ChatChannel.getChannels()) { 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/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 a801b2d..5099684 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java @@ -1,45 +1,39 @@ package mineverse.Aust1n46.chat.localization; import java.io.File; -import java.io.IOException; -import java.nio.file.Files; 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 { //unimplemented - private FileConfiguration localization; - private File localizationFile; - private MineverseChat plugin; +public class Localization { + private static MineverseChat plugin = MineverseChat.getInstance(); + private static FileConfiguration localization; - 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(); - } + public static void initialize() { + File localizationFile = new File(plugin.getDataFolder().getAbsolutePath(), "Messages.yml"); + if(!localizationFile.isFile()) { + plugin.saveResource("Messages.yml", true); } + localization = YamlConfiguration.loadConfiguration(localizationFile); + + String fileVersion = localization.getString("Version", "null"); + String currentVersion = plugin.getDescription().getVersion(); + + 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 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() { + 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..7a53428 --- /dev/null +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java @@ -0,0 +1,100 @@ +package mineverse.Aust1n46.chat.localization; + +import mineverse.Aust1n46.chat.utilities.Format; + +/** + * Messages configurable in Messages.yml + */ +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"), + COMMAND_NO_PERMISSION("CommandNoPermission"), + COMMAND_NOT_BLOCKABLE("CommandNotBlockable"), + COMMANDSPY_OFF("CommandSpyOff"), + COMMANDSPY_ON("CommandSpyOn"), + CONFIG_RELOADED("ConfigReloaded"), + 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_SPAM("MutePlayerSpam"), + 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"), + 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"), + SPAM_WARNING("SpamWarning"), + SPY_OFF("SpyOff"), + SPY_ON("SpyOn"), + UNBLOCK_COMMAND_PLAYER("UnblockCommandPlayer"), + UNBLOCK_COMMAND_SENDER("UnblockCommandSender"), + UNMUTE_PLAYER_ALL_PLAYER("UnmutePlayerAllPlayer"), + UNMUTE_PLAYER_ALL_SENDER("UnmutePlayerAllSender"), + UNMUTE_PLAYER_PLAYER("UnmutePlayerPlayer"), + UNMUTE_PLAYER_SENDER("UnmutePlayerSender"); + + 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 diff --git a/MineverseChat/plugin.yml b/MineverseChat/plugin.yml index 6bf3e24..16c2e81 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]