diff --git a/MineverseChat/Messages.yml b/MineverseChat/Messages.yml index 13dd238..e1b5a59 100644 --- a/MineverseChat/Messages.yml +++ b/MineverseChat/Messages.yml @@ -1,3 +1,6 @@ +Version: 2.17.3 +BlockCommandPlayer: '&cYou have been blocked from entering command {command}.' +BlockCommandSender: '&cBlocked player &6{player} &cfrom entering command {command}.' BlockingMessage: '&6{player} is currently blocking messages.' BungeeToggleOff: '&6You are now blocking BungeeCord chat.' BungeeToggleOn: '&6You are now receiving BungeeCord chat.' @@ -12,7 +15,37 @@ ChannelPlayerListHeader: '&6Players in Channel: {channel_color}{channel_name}' CommandInvalidArguments: '&cInvalid command: {command} {args}' CommandMustBeRunByPlayer: '&cThis command must be run by a player.' CommandNoPermission: '&cYou do not have permission for this command.' +CommandNotBlockable: '&cCommand is not blockable.' +CommandSpyOff: '&6You are no longer spying on commands.' +CommandSpyOn: '&6You are now spying on commands.' ConfigReloaded: '&6VentureChat config reloaded.' EmptyString: '' +ExitPrivateConversation: 'You are no longer in private conversation with {player_receiver}.' +ExitPrivateConversationSpy: '{player_sender} is no longer in a private conversation with {player_receiver}.' +FilterOff: '&6You are now ignoring the filter.' +FilterOn: '&6You are no longer ignoring the filter.' +ForceAll: '&6Forcing all players to run: &c{message}' +ForcePlayer: '&6Forcing player &c{player} &6to run: &c{message}' IgnoringMessage: '&6{player} is currently ignoring your messages.' -InvalidChannel: '&cInvalid channel: {args}' \ No newline at end of file +InvalidChannel: '&cInvalid channel: {args}' +InvalidHash: '&cInvalid hashcode.' +KickChannel: '&6Kicked player &c{player} &6from channel: {channel_color}{channel_name}' +KickChannelAllPlayer: '&cYou have been kicked from all channels.' +KickChannelAllSender: '&6Kicked player &c{player} &6from all channels.' +LeaveChannel: 'Leaving channel: {channel_color}[{channel_name}]' +ListenChannel: 'Listening to Channel: {channel_color}[{channel_name}]' +MustListenOneChannel: '&cYou need to be listening on at least one channel, setting you into the default channel.' +PlayerOffline: '&cPlayer: &6{args} &cis not online.' +PlayerOfflineNoPermissionsCheck: '&cCan''t run permission check on offline player.' +RangedSpyOff: '&6You are no longer spying on ranged channels.' +RangedSpyOn: '&6You are now spying on ranged channels.' +SetChannel: 'Channel Set: {channel_color}[{channel_name}]' +SetChannelAllPlayer: '&cYou have been set into all channels.' +SetChannelAllSender: '&6Set player &c{player} &6into all channels.' +SetChannelPlayerChannelNoPermission: '&cThis player does not have permission for channel: {channel_color}{channel_name}' +SetChannelSender: '&6Set player &c{player} &6into channel: {channel_color}{channel_name}' +UnblockCommandPlayer: '&cYou have been unblocked from entering command {command}.' +UnblockCommandSender: '&cUnblocked player &6{player} &cfrom entering command {command}.' +#Author added in automatically +VentureChatAuthor: '&6Written by' +VentureChatVersion: '&6VentureChat Version: {version}' \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index 8f10ba3..761c51f 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -159,7 +159,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { private boolean firstRun = true; // Plugin Messaging Channel - public static String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; + public static final String PLUGIN_MESSAGING_CHANNEL = "venturechat:data"; // Vault -------------------------------- public static Permission permission = null; diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java index a6ad495..0f1a483 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Channel.java @@ -41,7 +41,9 @@ public class Channel extends MineverseCommand implements Listener { return; } ChatChannel channel = cc.getChannelInfo(args[0]); - plugin.getServer().getPluginManager().callEvent(new ChannelJoinEvent(mcp.getPlayer(), channel, "Channel Set: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]")); + plugin.getServer().getPluginManager().callEvent(new ChannelJoinEvent(mcp.getPlayer(), channel, LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName()))); return; } mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() @@ -59,17 +61,20 @@ public class Channel extends MineverseCommand implements Listener { if(channel.hasPermission()) { if(!mcp.getPlayer().hasPermission(channel.getPermission())) { mcp.removeListening(channel.getName()); - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this channel."); + mcp.getPlayer().sendMessage(LocalizedMessage.CHANNEL_NO_PERMISSION.toString()); return; } } if(mcp.hasConversation()) { for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { if(p.isSpy()) { - p.getPlayer().sendMessage(mcp.getName() + " is no longer in a private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + "."); + p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString() + .replace("{player_sender}", mcp.getName()) + .replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName())); } } - mcp.getPlayer().sendMessage("You are no longer in private conversation with " + MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName() + "."); + mcp.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString() + .replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(mcp.getConversation()).getName())); mcp.setConversation(null); } mcp.addListening(channel.getName()); diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandblock.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandblock.java index 9286326..9bd7ec8 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandblock.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandblock.java @@ -2,13 +2,13 @@ package mineverse.Aust1n46.chat.command.chat; import java.util.List; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Commandblock extends MineverseCommand { private MineverseChat plugin; @@ -25,7 +25,8 @@ public class Commandblock extends MineverseCommand { if(args.length > 1) { MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } boolean match = false; @@ -35,21 +36,29 @@ public class Commandblock extends MineverseCommand { if(match || player.isBlockedCommand(args[1])) { if(!player.isBlockedCommand(args[1])) { player.addBlockedCommand(args[1]); - player.getPlayer().sendMessage(ChatColor.RED + "You have been blocked from entering command " + args[1] + "."); - sender.sendMessage(ChatColor.RED + "Blocked player " + ChatColor.GOLD + player.getName() + ChatColor.RED + " from entering command " + args[1] + "."); + player.getPlayer().sendMessage(LocalizedMessage.BLOCK_COMMAND_PLAYER.toString() + .replace("{command}", args[1])); + sender.sendMessage(LocalizedMessage.BLOCK_COMMAND_SENDER.toString() + .replace("{player}", player.getName()) + .replace("{command}", args[1])); return; } player.removeBlockedCommand(args[1]); - player.getPlayer().sendMessage(ChatColor.RED + "You have been unblocked from entering command " + args[1] + "."); - sender.sendMessage(ChatColor.RED + "Unblocked player " + ChatColor.GOLD + player.getName() + ChatColor.RED + " from entering command " + args[1] + "."); + player.getPlayer().sendMessage(LocalizedMessage.UNBLOCK_COMMAND_PLAYER.toString() + .replace("{command}", args[1])); + sender.sendMessage(LocalizedMessage.UNBLOCK_COMMAND_SENDER.toString() + .replace("{player}", player.getName()) + .replace("{command}", args[1])); return; } - sender.sendMessage(ChatColor.RED + "Invalid command or the command is not blockable."); + sender.sendMessage(LocalizedMessage.COMMAND_NOT_BLOCKABLE.toString()); return; } - sender.sendMessage(ChatColor.RED + "Invalid command: /commandblock [player] [command]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/commandblock") + .replace("{args}", "[player] [command]")); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandspy.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandspy.java index 8ff245b..9654788 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandspy.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Commandspy.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Commandspy extends MineverseCommand { private MineverseChat plugin; @@ -20,20 +20,20 @@ public class Commandspy extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.commandspy")) { if(!mcp.hasCommandSpy()) { mcp.setCommandSpy(true); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now spying on commands."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMANDSPY_ON.toString()); return; } mcp.setCommandSpy(false); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer spying on commands."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMANDSPY_OFF.toString()); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Filter.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Filter.java index 1ae6b8c..976713d 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Filter.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Filter.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Filter extends MineverseCommand { private MineverseChat plugin; @@ -20,20 +20,20 @@ public class Filter extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.ignorefilter")) { if(!mcp.hasFilter()) { mcp.setFilter(true); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring the filter."); + mcp.getPlayer().sendMessage(LocalizedMessage.FILTER_ON.toString()); return; } mcp.setFilter(false); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now ignoring the filter."); + mcp.getPlayer().sendMessage(LocalizedMessage.FILTER_OFF.toString()); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Force.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Force.java index e123b54..5f78ac5 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Force.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Force.java @@ -1,11 +1,11 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Force extends MineverseCommand { @@ -17,22 +17,27 @@ public class Force extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.force")) { if(args.length < 2) { - sender.sendMessage(ChatColor.RED + "Invalid command: /force [player] [msg]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/force") + .replace("{args}", "[player] [message]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null || !player.isOnline()) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } String forcemsg = ""; for(int x = 1; x < args.length; x++) if(args[x].length() > 0) forcemsg += args[x] + " "; - sender.sendMessage(ChatColor.GOLD + "Forcing player " + ChatColor.RED + player.getName() + ChatColor.GOLD + " to run: " + ChatColor.RED + forcemsg); + sender.sendMessage(LocalizedMessage.FORCE_PLAYER.toString() + .replace("{player}", player.getName()) + .replace("{message}", forcemsg)); player.getPlayer().chat(forcemsg); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Forceall.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Forceall.java index f08e872..c500cf6 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Forceall.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Forceall.java @@ -1,11 +1,11 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Forceall extends MineverseCommand { @@ -17,19 +17,22 @@ public class Forceall extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.forceall")) { if(args.length < 1) { - sender.sendMessage(ChatColor.RED + "Invalid command: /forceall [msg]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/forceall") + .replace("{args}", "[message]")); return; } String forcemsg = ""; for(int x = 0; x < args.length; x++) if(args[x].length() > 0) forcemsg += args[x] + " "; - sender.sendMessage(ChatColor.GOLD + "Forcing all players to run: " + ChatColor.RED + forcemsg); + sender.sendMessage(LocalizedMessage.FORCE_ALL.toString() + .replace("{message}", forcemsg)); for(MineverseChatPlayer player : MineverseChat.players) if(player.isOnline()) player.getPlayer().chat(forcemsg); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java index 4e5fbb6..248ea7b 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannel.java @@ -9,6 +9,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Kickchannel extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -21,38 +22,48 @@ public class Kickchannel extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.kickchannel")) { if(args.length < 2) { - sender.sendMessage(ChatColor.RED + "Invalid command: /kickchannel [player] [channelname]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/kickchannel") + .replace("{args}", "[player] [channel]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } ChatChannel channel = cc.getChannelInfo(args[1]); if(channel == null) { - sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); + sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[1])); return; } - sender.sendMessage(ChatColor.GOLD + "Kicked player " + ChatColor.RED + args[0] + ChatColor.GOLD + " from channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); - String format = ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "] " + ChatColor.valueOf(channel.getColor().toUpperCase()); + sender.sendMessage(LocalizedMessage.KICK_CHANNEL.toString() + .replace("{player}", args[0]) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); player.removeListening(channel.getName()); if(player.isOnline()) { - player.getPlayer().sendMessage("Leaving Channel: " + format); + player.getPlayer().sendMessage(LocalizedMessage.LEAVE_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); } else player.setModified(true); if(player.getListening().size() == 0) { player.setCurrentChannel(cc.getDefaultChannel()); if(player.isOnline()) { - player.getPlayer().sendMessage(ChatColor.RED + "You need to be listening on at least one channel, setting you into the default channel."); - player.getPlayer().sendMessage("Channel Set: " + ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "[" + cc.getDefaultChannel().getName() + "]"); + player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); + player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "") + .replace("{channel_name}", cc.getDefaultChannel().getName())); } else player.setModified(true); } return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java index 3663b91..6b75fa4 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Kickchannelall.java @@ -8,6 +8,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Kickchannelall extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -20,27 +21,33 @@ public class Kickchannelall extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.kickchannelall")) { if(args.length < 1) { - sender.sendMessage(ChatColor.RED + "Invalid command: /kickchannelall [player]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/kickchannelall") + .replace("{args}", "[player]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } player.clearListening(); - sender.sendMessage(ChatColor.GOLD + "Kicked player " + ChatColor.RED + player.getName() + ChatColor.GOLD + " from all channels."); + sender.sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_SENDER.toString() + .replace("{player}", player.getName())); player.addListening(cc.getDefaultChannel().getName()); player.setCurrentChannel(cc.getDefaultChannel()); if(player.isOnline()) { - player.getPlayer().sendMessage(ChatColor.RED + "You have been kicked from all channels."); - player.getPlayer().sendMessage(ChatColor.RED + "You need to be listening on at least one channel, setting you into the default channel."); - player.getPlayer().sendMessage("Channel Set: " + ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "[" + cc.getDefaultChannel().getName() + "]"); + player.getPlayer().sendMessage(LocalizedMessage.KICK_CHANNEL_ALL_PLAYER.toString()); + player.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); + player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "") + .replace("{channel_name}", cc.getDefaultChannel().getName())); } else player.setModified(true); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java index a5cffcb..51a1ebb 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Leave.java @@ -35,14 +35,17 @@ public class Leave extends MineverseCommand { .replace("{args}", args[0])); return; } - mcp.removeListening(channel.getName()); - String format = ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]"; - mcp.getPlayer().sendMessage("Leaving channel: " + format); + mcp.removeListening(channel.getName()); + mcp.getPlayer().sendMessage(LocalizedMessage.LEAVE_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); if(mcp.getListening().size() == 0) { mcp.addListening(cc.getDefaultChannel().getName()); mcp.setCurrentChannel(cc.getDefaultChannel()); - mcp.getPlayer().sendMessage(ChatColor.RED + "You need to be listening on at least one channel, setting you into the default channel."); - mcp.getPlayer().sendMessage("Channel Set: " + ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "[" + cc.getDefaultChannel().getName() + "]"); + mcp.getPlayer().sendMessage(LocalizedMessage.MUST_LISTEN_ONE_CHANNEL.toString()); + mcp.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(cc.defaultColor.toUpperCase()) + "") + .replace("{channel_name}", cc.getDefaultChannel().getName())); } if(channel.getBungee()) { MineverseChat.getInstance().synchronize(mcp, true); diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java index 9e38d0f..c8e63dd 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Listen.java @@ -42,9 +42,10 @@ public class Listen extends MineverseCommand { return; } } - String format = ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "]"; mcp.addListening(channel.getName()); - mcp.getPlayer().sendMessage("Listening to Channel: " + format); + mcp.getPlayer().sendMessage(LocalizedMessage.LISTEN_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); return; } mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java index 7ebcfba..5eccf1a 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Me.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -8,6 +7,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Me extends MineverseCommand { @@ -34,7 +34,7 @@ public class Me extends MineverseCommand { String filtered = cc.FilterChat(msg); if(sender instanceof Player && MineverseChatAPI.getMineverseChatPlayer((Player) sender).hasFilter()) { Player p = (Player) sender; - plugin.getServer().broadcastMessage("* " +p.getDisplayName() + filtered); + plugin.getServer().broadcastMessage("* " + p.getDisplayName() + filtered); return; } if(sender instanceof Player) { @@ -45,9 +45,11 @@ public class Me extends MineverseCommand { plugin.getServer().broadcastMessage("* " + sender.getName() + msg); return; } - sender.sendMessage(ChatColor.RED + "Invalid command: /me [msg]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/me") + .replace("{args}", "[message]")); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Nick.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Nick.java index 53cbccc..c491801 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Nick.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Nick.java @@ -8,6 +8,7 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; public class Nick extends MineverseCommand { @@ -110,6 +111,6 @@ public class Nick extends MineverseCommand { sender.sendMessage(ChatColor.RED + "Invalid command: /nick {player} [nickname]"); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/RangedSpy.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/RangedSpy.java index 4beea26..e36fea5 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/RangedSpy.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/RangedSpy.java @@ -4,8 +4,8 @@ import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -20,21 +20,21 @@ public class RangedSpy extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.rangedspy")) { if(!mcp.getRangedSpy()) { mcp.setRangedSpy(true); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now spying on ranged channels."); + mcp.getPlayer().sendMessage(LocalizedMessage.RANGED_SPY_ON.toString()); return; } mcp.setRangedSpy(false); - mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer spying on ranged channels."); + mcp.getPlayer().sendMessage(LocalizedMessage.RANGED_SPY_OFF.toString()); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java index d5cc3e1..0b9947e 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Removemessage.java @@ -11,6 +11,7 @@ import mineverse.Aust1n46.chat.ChatMessage; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; //import mineverse.Aust1n46.chat.json.JsonButton; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -39,7 +40,9 @@ public class Removemessage extends MineverseCommand { @SuppressWarnings({ "unchecked", "rawtypes" }) public void execute(CommandSender sender, String command, String[] args) { if(args.length == 0) { - sender.sendMessage(ChatColor.RED + "Invalid command: /removemessage [hashcode]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/removemessage") + .replace("{args}", "[hashcode] {channel}")); return; } final int hash; @@ -47,7 +50,7 @@ public class Removemessage extends MineverseCommand { hash = Integer.parseInt(args[0]); } catch(Exception e) { - sender.sendMessage(ChatColor.RED + "Invalid hashcode."); + sender.sendMessage(LocalizedMessage.INVALID_HASH.toString()); return; } if(args.length > 1 && MineverseChat.ccInfo.isChannel(args[1]) && MineverseChat.ccInfo.getChannelInfo(args[1]).getBungee() && sender instanceof Player) { diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java index 533acd1..4e0e87d 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannel.java @@ -9,6 +9,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Setchannel extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -21,54 +22,66 @@ public class Setchannel extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.setchannel")) { if(args.length < 2) { - sender.sendMessage(ChatColor.RED + "Invalid command: /setchannel [player] [channelname]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/setchannel") + .replace("{args}", "[player] [channel]")); return; } - if(args[0].length() > 1) { - ChatChannel channel = cc.getChannelInfo(args[1]); - MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); - if(player == null) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); + if(player == null) { + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); + return; + } + ChatChannel channel = cc.getChannelInfo(args[1]); + if(channel == null) { + sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[1])); + return; + } + if(channel.hasPermission()) { + if(!player.isOnline()) { + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE_NO_PERMISSIONS_CHECK.toString()); return; } - if(channel == null) { - sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); + if(!player.getPlayer().hasPermission(channel.getPermission())) { + player.removeListening(channel.getName()); + sender.sendMessage(LocalizedMessage.SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); return; } - if(channel.hasPermission()) { - if(!player.isOnline()) { - sender.sendMessage(ChatColor.RED + "Can't run permission check on offline player."); - return; + } + player.addListening(channel.getName()); + player.setCurrentChannel(channel); + sender.sendMessage(LocalizedMessage.SET_CHANNEL_SENDER.toString() + .replace("{player}", player.getName()) + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); + if(player.hasConversation()) { + for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { + if(p.isSpy()) { + p.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION_SPY.toString() + .replace("{player_sender}", player.getName()) + .replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(player.getConversation()).getName())); } - if(!player.getPlayer().hasPermission(channel.getPermission())) { - player.removeListening(channel.getName()); - sender.sendMessage(ChatColor.RED + "This player does not have permission for channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); - return; - } - } - player.addListening(channel.getName()); - player.setCurrentChannel(channel); - sender.sendMessage(ChatColor.GOLD + "Set player " + ChatColor.RED + player.getName() + ChatColor.GOLD + " into channel: " + ChatColor.valueOf(channel.getColor().toUpperCase()) + channel.getName()); - if(player.hasConversation()) { - for(MineverseChatPlayer p : MineverseChat.onlinePlayers) { - if(p.isSpy()) { - p.getPlayer().sendMessage(player.getName() + " is no longer in a private conversation with " + MineverseChatAPI.getMineverseChatPlayer(player.getConversation()).getName() + "."); - } - } - if(player.isOnline()) - player.getPlayer().sendMessage("You are no longer in private conversation with " + MineverseChatAPI.getMineverseChatPlayer(player.getConversation()).getName() + "."); - else - player.setModified(true); - player.setConversation(null); } - String format = ChatColor.valueOf(channel.getColor().toUpperCase()) + "[" + channel.getName() + "] " + ChatColor.valueOf(channel.getColor().toUpperCase()); if(player.isOnline()) - player.getPlayer().sendMessage("Channel Set: " + format); + player.getPlayer().sendMessage(LocalizedMessage.EXIT_PRIVATE_CONVERSATION.toString() + .replace("{player_receiver}", MineverseChatAPI.getMineverseChatPlayer(player.getConversation()).getName())); else player.setModified(true); - return; + player.setConversation(null); } + if(player.isOnline()) + player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL.toString() + .replace("{channel_color}", ChatColor.valueOf(channel.getColor().toUpperCase()) + "") + .replace("{channel_name}", channel.getName())); + else + player.setModified(true); + return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannelall.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannelall.java index 64dfd64..bd1f2e0 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannelall.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Setchannelall.java @@ -1,6 +1,5 @@ package mineverse.Aust1n46.chat.command.chat; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import mineverse.Aust1n46.chat.MineverseChat; @@ -9,6 +8,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; public class Setchannelall extends MineverseCommand { private ChatChannelInfo cc = MineverseChat.ccInfo; @@ -21,18 +21,21 @@ public class Setchannelall extends MineverseCommand { public void execute(CommandSender sender, String command, String[] args) { if(sender.hasPermission("venturechat.setchannelall")) { if(args.length < 1) { - sender.sendMessage(ChatColor.RED + "Invalid command: /setchannelall [player]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/setchannelall") + .replace("{args}", "[player]")); return; } MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(player == null) { - sender.sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; } for(ChatChannel channel : cc.getChannelsInfo()) { if(channel.hasPermission()) { if(!player.isOnline()) { - sender.sendMessage(ChatColor.RED + "Can't run permission check on offline player."); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE_NO_PERMISSIONS_CHECK.toString()); return; } if(!player.getPlayer().hasPermission(channel.getPermission())) { @@ -46,13 +49,14 @@ public class Setchannelall extends MineverseCommand { player.addListening(channel.getName()); } } - sender.sendMessage(ChatColor.GOLD + "Set player " + ChatColor.RED + args[0] + ChatColor.GOLD + " into all channels."); + sender.sendMessage(LocalizedMessage.SET_CHANNEL_ALL_SENDER.toString() + .replace("{player}", player.getName())); if(player.isOnline()) - player.getPlayer().sendMessage(ChatColor.RED + "You have been set into all channels."); + player.getPlayer().sendMessage(LocalizedMessage.SET_CHANNEL_ALL_PLAYER.toString()); else player.setModified(true); return; } - sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); + sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); } } \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java index ce0f698..b42b378 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/VentureChatGui.java @@ -20,6 +20,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.gui.GuiSlot; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.utilities.Format; import mineverse.Aust1n46.chat.versions.VersionHandler; @@ -34,18 +35,21 @@ public class VentureChatGui extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { if(!(sender instanceof Player)) { - plugin.getServer().getConsoleSender().sendMessage(ChatColor.RED + "This command must be run by a player."); + plugin.getServer().getConsoleSender().sendMessage(LocalizedMessage.COMMAND_MUST_BE_RUN_BY_PLAYER.toString()); return; } if(args.length < 3) { - sender.sendMessage(ChatColor.RED + "Invalid command: " + command + " [player] [channel] [hash]"); + sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString() + .replace("{command}", "/venturechatgui") + .replace("{args}", "[player] [channel] [hashcode]")); return; } MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); if(mcp.getPlayer().hasPermission("venturechat.gui")) { MineverseChatPlayer target = MineverseChatAPI.getMineverseChatPlayer(args[0]); if(target == null) { - mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); + mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString() + .replace("{args}", args[0])); return; /* UUID uuid = null; @@ -70,14 +74,22 @@ public class VentureChatGui extends MineverseCommand { } if(MineverseChat.ccInfo.isChannel(args[1])) { ChatChannel channel = MineverseChat.ccInfo.getChannelInfo(args[1]); - int hash = Integer.parseInt(args[2]); + final int hash; + try { + hash = Integer.parseInt(args[2]); + } + catch(Exception e) { + sender.sendMessage(LocalizedMessage.INVALID_HASH.toString()); + return; + } this.openInventory(mcp, target, channel, hash); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); + mcp.getPlayer().sendMessage(LocalizedMessage.INVALID_CHANNEL.toString() + .replace("{args}", args[1])); return; } - mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); + mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); return; } diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java index c454197..c243af8 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Venturechat.java @@ -2,6 +2,7 @@ package mineverse.Aust1n46.chat.command.chat; import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.command.MineverseCommand; +import mineverse.Aust1n46.chat.localization.LocalizedMessage; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; @@ -21,8 +22,9 @@ public class Venturechat extends MineverseCommand { @Override public void execute(CommandSender sender, String command, String[] args) { - sender.sendMessage(ChatColor.GOLD + "VentureChat Version: " + plugin.getDescription().getVersion()); - sender.sendMessage(ChatColor.GOLD + "Written by Aust1n46"); + sender.sendMessage(LocalizedMessage.VENTURECHAT_VERSION.toString() + .replace("{version}", plugin.getDescription().getVersion())); + sender.sendMessage(LocalizedMessage.VENTURECHAT_AUTHOR + " " + plugin.getDescription().getAuthors().get(0)); if (sender instanceof Player && plugin.getConfig().getString("loglevel", "info").equals("debug")) { Player player = (Player) sender; String title = ChatColor.GOLD + " | " + ChatColor.BLUE.toString() + ChatColor.BOLD + "Click here to begin..." + ChatColor.RESET + ChatColor.GOLD + " | "; diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java index 4a8c70b..4868eb8 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/Localization.java @@ -3,23 +3,35 @@ package mineverse.Aust1n46.chat.localization; import java.io.File; import mineverse.Aust1n46.chat.MineverseChat; +import mineverse.Aust1n46.chat.utilities.Format; +import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; //This class is used to create objects of localization for different languages. public class Localization { - private static MineverseChat plugin; + private static MineverseChat plugin = MineverseChat.getInstance(); private static FileConfiguration localization; - private static File localizationFile; public static void initialize() { - plugin = MineverseChat.getInstance(); - localizationFile = new File(plugin.getDataFolder().getAbsolutePath(), "Messages.yml"); + File localizationFile = new File(plugin.getDataFolder().getAbsolutePath(), "Messages.yml"); if(!localizationFile.isFile()) { - plugin.saveResource("Messages.yml", true); + plugin.saveResource("Messages.yml", true); } + localization = YamlConfiguration.loadConfiguration(localizationFile); + + String fileVersion = localization.getString("Version", "null"); + String currentVersion = plugin.getDescription().getVersion(); + + System.out.println(fileVersion + " " + currentVersion); + if(!fileVersion.equals(currentVersion)) { + Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Version Change Detected! Saving Old Messages.yml and Generating Latest File")); + localizationFile.renameTo(new File(plugin.getDataFolder().getAbsolutePath(), "Messages_Old.yml")); + plugin.saveResource("Messages.yml", true); + localization = YamlConfiguration.loadConfiguration(localizationFile); + } } public static FileConfiguration getLocalization() { diff --git a/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java index 5b6e494..1ec3392 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java +++ b/MineverseChat/mineverse/Aust1n46/chat/localization/LocalizedMessage.java @@ -6,6 +6,8 @@ import mineverse.Aust1n46.chat.utilities.Format; * Messages configurable in Messages.yml */ public enum LocalizedMessage { + BLOCK_COMMAND_PLAYER("BlockCommandPlayer"), + BLOCK_COMMAND_SENDER("BlockCommandSender"), BLOCKING_MESSAGE("BlockingMessage"), BUNGEE_TOGGLE_OFF("BungeeToggleOff"), BUNGEE_TOGGLE_ON("BungeeToggleOn"), @@ -20,10 +22,39 @@ public enum LocalizedMessage { COMMAND_INVALID_ARGUMENTS("CommandInvalidArguments"), COMMAND_MUST_BE_RUN_BY_PLAYER("CommandMustBeRunByPlayer"), COMMAND_NO_PERMISSION("CommandNoPermission"), + COMMAND_NOT_BLOCKABLE("CommandNotBlockable"), + COMMANDSPY_OFF("CommandSpyOff"), + COMMANDSPY_ON("CommandSpyOn"), CONFIG_RELOADED("ConfigReloaded"), EMPTY_STRING("EmptyString"), + EXIT_PRIVATE_CONVERSATION("ExitPrivateConversation"), + EXIT_PRIVATE_CONVERSATION_SPY("ExitPrivateConversationSpy"), + FILTER_OFF("FilterOff"), + FILTER_ON("FilterOn"), + FORCE_ALL("ForceAll"), + FORCE_PLAYER("ForcePlayer"), IGNORING_MESSAGE("IgnoringMessage"), INVALID_CHANNEL("InvalidChannel"), + INVALID_HASH("InvalidHash"), + KICK_CHANNEL("KickChannel"), + KICK_CHANNEL_ALL_PLAYER("KickChannelAllPlayer"), + KICK_CHANNEL_ALL_SENDER("KickChannelAllSender"), + LEAVE_CHANNEL("LeaveChannel"), + LISTEN_CHANNEL("ListenChannel"), + MUST_LISTEN_ONE_CHANNEL("MustListenOneChannel"), + PLAYER_OFFLINE("PlayerOffline"), + PLAYER_OFFLINE_NO_PERMISSIONS_CHECK("PlayerOfflineNoPermissionsCheck"), + RANGED_SPY_OFF("RangedSpyOff"), + RANGED_SPY_ON("RangedSpyOn"), + SET_CHANNEL("SetChannel"), + SET_CHANNEL_ALL_PLAYER("SetChannelAllPlayer"), + SET_CHANNEL_ALL_SENDER("SetChannelAllSender"), + SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION("SetChannelPlayerChannelNoPermission"), + SET_CHANNEL_SENDER("SetChannelSender"), + UNBLOCK_COMMAND_PLAYER("UnblockCommandPlayer"), + UNBLOCK_COMMAND_SENDER("UnblockCommandSender"), + VENTURECHAT_AUTHOR("VentureChatAuthor"), + VENTURECHAT_VERSION("VentureChatVersion"), Z_END("End"); private final String message; diff --git a/MineverseChat/plugin.yml b/MineverseChat/plugin.yml index c9076d7..d5532fa 100644 --- a/MineverseChat/plugin.yml +++ b/MineverseChat/plugin.yml @@ -4,8 +4,9 @@ api-version: 1.13 main: mineverse.Aust1n46.chat.MineverseChat depend: [Vault, ProtocolLib, PlaceholderAPI] softdepend: [Towny, Factions, Heroes] -Author: Aust1n46 -description: Chat with channels with many features! +author: Aust1n46 +website: https://bitbucket.org/Aust1n46/venturechat/ +description: #1 Channels Chat plugin! Spigot + Bungee. Supports PlaceholderAPI + JSON formatting. Moderation GUI! commands: mute: usage: /mute [playername] [channel]