Added next batch of custom messages

This commit is contained in:
Aust1n46 2020-03-19 20:25:50 -04:00
parent 4812e4f26a
commit 069d757c19
18 changed files with 252 additions and 94 deletions

View File

@ -6,6 +6,7 @@ BungeeToggleOff: '&6You are now blocking BungeeCord chat.'
BungeeToggleOn: '&6You are now receiving BungeeCord chat.' BungeeToggleOn: '&6You are now receiving BungeeCord chat.'
ClearChatSender: '&aCleared the server chat.' ClearChatSender: '&aCleared the server chat.'
ClearChatServer: '&aYour chat has been cleared.' ClearChatServer: '&aYour chat has been cleared.'
ChannelCannotMute: '&cYou cannot mute players in this channel: {channel_color}{channel_name}'
ChannelList: '{channel_color}{channel_name} : {channel_alias}' ChannelList: '{channel_color}{channel_name} : {channel_alias}'
ChannelListHeader: '&6Channel List : Alias' ChannelListHeader: '&6Channel List : Alias'
ChannelListWithPermissions: '{channel_color}{channel_name} : {channel_alias} - Permission Required' ChannelListWithPermissions: '{channel_color}{channel_name} : {channel_alias} - Permission Required'
@ -13,28 +14,49 @@ ChannelNoPermission: '&cYou do not have permission for this channel.'
ChannelNoPermissionView: '&cYou do not have permission to look at this channel.' ChannelNoPermissionView: '&cYou do not have permission to look at this channel.'
ChannelPlayerListHeader: '&6Players in Channel: {channel_color}{channel_name}' ChannelPlayerListHeader: '&6Players in Channel: {channel_color}{channel_name}'
CommandInvalidArguments: '&cInvalid command: {command} {args}' CommandInvalidArguments: '&cInvalid command: {command} {args}'
CommandInvalidArgumentsIgnore: '&cInvalid command: /ignore [player] or /ignore list'
CommandMustBeRunByPlayer: '&cThis command must be run by a player.' CommandMustBeRunByPlayer: '&cThis command must be run by a player.'
CommandNoPermission: '&cYou do not have permission for this command.' CommandNoPermission: '&cYou do not have permission for this command.'
CommandNotBlockable: '&cCommand is not blockable.' CommandNotBlockable: '&cCommand is not blockable.'
CommandSpyOff: '&6You are no longer spying on commands.' CommandSpyOff: '&6You are no longer spying on commands.'
CommandSpyOn: '&6You are now spying on commands.' CommandSpyOn: '&6You are now spying on commands.'
ConfigReloaded: '&6VentureChat config reloaded.' ConfigReloaded: '&6VentureChat config reloaded.'
EmptyString: '' EnterPrivateConversation: 'You are now in private conversation with {player_receiver}.'
EnterPrivateConversationSpy: '{player_sender} started a private conversation with {player_receiver}.'
ExitPrivateConversation: 'You are no longer in private conversation with {player_receiver}.' ExitPrivateConversation: 'You are no longer in private conversation with {player_receiver}.'
ExitPrivateConversationSpy: '{player_sender} is no longer in a 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.' FilterOff: '&6You are now ignoring the filter.'
FilterOn: '&6You are no longer ignoring the filter.' FilterOn: '&6You are no longer ignoring the filter.'
ForceAll: '&6Forcing all players to run: &c{message}' ForceAll: '&6Forcing all players to run: &c{message}'
ForcePlayer: '&6Forcing player &c{player} &6to 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.' IgnoringMessage: '&6{player} is currently ignoring your messages.'
InvalidChannel: '&cInvalid channel: {args}' InvalidChannel: '&cInvalid channel: {args}'
InvalidHash: '&cInvalid hashcode.' InvalidHash: '&cInvalid hashcode.'
InvalidTime: '&cInvalid time: {args}'
KickChannel: '&6Kicked player &c{player} &6from channel: {channel_color}{channel_name}' KickChannel: '&6Kicked player &c{player} &6from channel: {channel_color}{channel_name}'
KickChannelAllPlayer: '&cYou have been kicked from all channels.' KickChannelAllPlayer: '&cYou have been kicked from all channels.'
KickChannelAllSender: '&6Kicked player &c{player} &6from all channels.' KickChannelAllSender: '&6Kicked player &c{player} &6from all channels.'
LeaveChannel: 'Leaving channel: {channel_color}[{channel_name}]' LeaveChannel: 'Leaving channel: {channel_color}[{channel_name}]'
ListenChannel: 'Listening to 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.' MustListenOneChannel: '&cYou need to be listening on at least one channel, setting you into the default channel.'
MutePlayerAllPlayer: '&cYou have just been muted in all channels.'
MutePlayerAllSender: '&cMuted player &6{player} &cin all channels.'
MutePlayerPlayer: '&cYou have just been muted in: {channel_color}{channel_name}'
MutePlayerPlayerTime: '&cYou have just been muted in: {channel_color}{channel_name} &cfor {time} {units}'
MutePlayerSender: '&cMuted player &6{player} &cin: {channel_color}{channel_name}'
MutePlayerSenderTime: '&cMuted player &6{player} &cin: {channel_color}{channel_name} &cfor {time} {units}'
NoPlayerToReplyTo: '&cYou do not have anyone to reply to.'
NotificationsOff: '&aYou are no longer receiving notifications.'
NotificationsOn: '&aYou are now receiving notifications.'
PlayerAlreadyMuted: '&6{player} &cis already muted in channel: {channel_color}{channel_name}'
PlayerNotMuted: '&6{player} &cis not muted in channel: {channel_color}{channel_name}'
PlayerOffline: '&cPlayer: &6{args} &cis not online.' PlayerOffline: '&cPlayer: &6{args} &cis not online.'
PlayerOfflineNoPermissionsCheck: '&cCan''t run permission check on offline player.' PlayerOfflineNoPermissionsCheck: '&cCan''t run permission check on offline player.'
RangedSpyOff: '&6You are no longer spying on ranged channels.' RangedSpyOff: '&6You are no longer spying on ranged channels.'
@ -44,8 +66,11 @@ SetChannelAllPlayer: '&cYou have been set into all channels.'
SetChannelAllSender: '&6Set player &c{player} &6into all channels.' SetChannelAllSender: '&6Set player &c{player} &6into all channels.'
SetChannelPlayerChannelNoPermission: '&cThis player does not have permission for channel: {channel_color}{channel_name}' SetChannelPlayerChannelNoPermission: '&cThis player does not have permission for channel: {channel_color}{channel_name}'
SetChannelSender: '&6Set player &c{player} &6into channel: {channel_color}{channel_name}' SetChannelSender: '&6Set player &c{player} &6into channel: {channel_color}{channel_name}'
SpyOff: '&6You are no longer spying.'
SpyOn: '&6You are now spying.'
UnblockCommandPlayer: '&cYou have been unblocked from entering command {command}.' UnblockCommandPlayer: '&cYou have been unblocked from entering command {command}.'
UnblockCommandSender: '&cUnblocked player &6{player} &cfrom entering command {command}.' UnblockCommandSender: '&cUnblocked player &6{player} &cfrom entering command {command}.'
#Author added in automatically UnmutePlayerAllPlayer: '&cYou have just been unmuted in all channels.'
VentureChatAuthor: '&6Written by' UnmutePlayerAllSender: '&cUnmuted player &6{player} &cin all channels.'
VentureChatVersion: '&6VentureChat Version: {version}' UnmutePlayerPlayer: '&cYou have just been unmuted in: {channel_color}{channel_name}'
UnmutePlayerSender: '&cUnmuted player &6{player} &cin: {channel_color}{channel_name}'

View File

@ -37,6 +37,7 @@ import mineverse.Aust1n46.chat.listeners.ChatListener;
import mineverse.Aust1n46.chat.listeners.PacketListener; import mineverse.Aust1n46.chat.listeners.PacketListener;
import mineverse.Aust1n46.chat.listeners.SignListener; 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.Alias;
import mineverse.Aust1n46.chat.alias.AliasInfo; import mineverse.Aust1n46.chat.alias.AliasInfo;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
@ -854,7 +855,9 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
if(playerList.length() > 2) { if(playerList.length() > 2) {
playerList = playerList.substring(0, 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)); mcp.getPlayer().sendMessage(Format.FormatStringAll(playerList));
} }
} }
@ -969,7 +972,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
String receiver = msgin.readUTF(); String receiver = msgin.readUTF();
UUID sender = UUID.fromString(msgin.readUTF()); UUID sender = UUID.fromString(msgin.readUTF());
MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender); 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")) { if(identifier.equals("Echo")) {
UUID receiver = UUID.fromString(msgin.readUTF()); UUID receiver = UUID.fromString(msgin.readUTF());
@ -981,7 +985,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
rName = Format.FormatStringAll(r.getNickname()); rName = Format.FormatStringAll(r.getNickname());
} }
p.addIgnore(receiver); 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); this.synchronize(p, true);
} }
} }
@ -1070,20 +1075,23 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
String receiver = msgin.readUTF(); String receiver = msgin.readUTF();
UUID sender = UUID.fromString(msgin.readUTF()); UUID sender = UUID.fromString(msgin.readUTF());
MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender); 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); p.setReplyPlayer(null);
} }
if(identifier.equals("Ignore")) { if(identifier.equals("Ignore")) {
String receiver = msgin.readUTF(); String receiver = msgin.readUTF();
UUID sender = UUID.fromString(msgin.readUTF()); UUID sender = UUID.fromString(msgin.readUTF());
MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender); 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")) { if(identifier.equals("Blocked")) {
String receiver = msgin.readUTF(); String receiver = msgin.readUTF();
UUID sender = UUID.fromString(msgin.readUTF()); UUID sender = UUID.fromString(msgin.readUTF());
MineverseChatPlayer p = MineverseChatAPI.getOnlineMineverseChatPlayer(sender); 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")) { if(identifier.equals("Echo")) {
String receiver = msgin.readUTF(); String receiver = msgin.readUTF();

View File

@ -5,6 +5,7 @@ import org.bukkit.command.CommandSender;
import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.InternalMessage;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Clearchat extends MineverseCommand { public class Clearchat extends MineverseCommand {
@ -19,7 +20,7 @@ public class Clearchat extends MineverseCommand {
for(MineverseChatPlayer player : MineverseChat.players) { for(MineverseChatPlayer player : MineverseChat.players) {
if(player.isOnline() && !player.getPlayer().hasPermission("venturechat.clearchat.bypass")) { if(player.isOnline() && !player.getPlayer().hasPermission("venturechat.clearchat.bypass")) {
for(int a = 1; a <= 20; a++) for(int a = 1; a <= 20; a++)
player.getPlayer().sendMessage(LocalizedMessage.EMPTY_STRING.toString()); player.getPlayer().sendMessage(InternalMessage.EMPTY_STRING.toString());
player.getPlayer().sendMessage(LocalizedMessage.CLEAR_CHAT_SERVER.toString()); player.getPlayer().sendMessage(LocalizedMessage.CLEAR_CHAT_SERVER.toString());
} }
} }

View File

@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
@ -18,6 +17,7 @@ import mineverse.Aust1n46.chat.ChatMessage;
import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
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 mineverse.Aust1n46.chat.utilities.Format;
public class Edit extends MineverseCommand { public class Edit extends MineverseCommand {
@ -34,7 +34,9 @@ public class Edit extends MineverseCommand {
@SuppressWarnings({ "unchecked", "rawtypes" }) @SuppressWarnings({ "unchecked", "rawtypes" })
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(args.length == 0) { 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; return;
} }
final int hash; final int hash;
@ -42,7 +44,7 @@ public class Edit extends MineverseCommand {
hash = Integer.parseInt(args[0]); hash = Integer.parseInt(args[0]);
} }
catch(Exception e) { catch(Exception e) {
sender.sendMessage(ChatColor.RED + "Invalid hashcode."); sender.sendMessage(LocalizedMessage.INVALID_HASH.toString());
return; return;
} }
new BukkitRunnable() { new BukkitRunnable() {

View File

@ -2,7 +2,7 @@ package mineverse.Aust1n46.chat.command.chat;
import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage; import mineverse.Aust1n46.chat.localization.InternalMessage;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.HoverEvent;
@ -22,9 +22,9 @@ public class Venturechat extends MineverseCommand {
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
sender.sendMessage(LocalizedMessage.VENTURECHAT_VERSION.toString() sender.sendMessage(InternalMessage.VENTURECHAT_VERSION.toString()
.replace("{version}", plugin.getDescription().getVersion())); .replace("{version}", plugin.getDescription().getVersion()));
sender.sendMessage(LocalizedMessage.VENTURECHAT_AUTHOR + " " + plugin.getDescription().getAuthors().get(0)); sender.sendMessage(InternalMessage.VENTURECHAT_AUTHOR.toString());
if (sender instanceof Player && plugin.getConfig().getString("loglevel", "info").equals("debug")) { if (sender instanceof Player && plugin.getConfig().getString("loglevel", "info").equals("debug")) {
Player player = (Player) sender; Player player = (Player) sender;
String title = ChatColor.GOLD + " | " + ChatColor.BLUE.toString() + ChatColor.BOLD + "Click here to begin..." + ChatColor.RESET + ChatColor.GOLD + " | "; String title = ChatColor.GOLD + " | " + ChatColor.BLUE.toString() + ChatColor.BOLD + "Click here to begin..." + ChatColor.RESET + ChatColor.GOLD + " | ";

View File

@ -12,6 +12,7 @@ import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Ignore extends MineverseCommand { public class Ignore extends MineverseCommand {
private MineverseChat plugin; private MineverseChat plugin;
@ -24,12 +25,12 @@ public class Ignore extends MineverseCommand {
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
if(args.length == 0) { 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; return;
} }
if(args[0].equalsIgnoreCase("list")) { if(args[0].equalsIgnoreCase("list")) {
@ -40,7 +41,7 @@ public class Ignore extends MineverseCommand {
ignoreList += ChatColor.RED + i.getName() + ChatColor.WHITE + ", "; ignoreList += ChatColor.RED + i.getName() + ChatColor.WHITE + ", ";
} }
} }
mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are currently ignoring these players:"); mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_LIST_HEADER.toString());
if(ignoreList.length() > 0) { if(ignoreList.length() > 0) {
mcp.getPlayer().sendMessage(ignoreList.substring(0, ignoreList.length() - 2)); mcp.getPlayer().sendMessage(ignoreList.substring(0, ignoreList.length() - 2));
} }
@ -48,17 +49,19 @@ public class Ignore extends MineverseCommand {
} }
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
if(player == null) { if(player == null) {
mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online."); mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", args[0]));
return; return;
} }
if(mcp.getIgnores().contains(player.getUUID())) { if(mcp.getIgnores().contains(player.getUUID())) {
mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring player: " + ChatColor.RED + player.getName()); mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_PLAYER_OFF.toString()
.replace("{player}", player.getName()));
mcp.removeIgnore(player.getUUID()); mcp.removeIgnore(player.getUUID());
plugin.synchronize(mcp, true); plugin.synchronize(mcp, true);
return; return;
} }
if(mcp.getName().equalsIgnoreCase(player.getName())) { if(mcp.getName().equalsIgnoreCase(player.getName())) {
mcp.getPlayer().sendMessage(ChatColor.RED + "You can not ignore yourself!"); mcp.getPlayer().sendMessage(LocalizedMessage.IGNORE_YOURSELF.toString());
return; return;
} }
if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) { if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
@ -78,14 +81,17 @@ public class Ignore extends MineverseCommand {
return; return;
} }
if(!player.isOnline()) { if(!player.isOnline()) {
mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + player.getName() + ChatColor.RED + " is not online."); mcp.getPlayer().sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString()
.replace("{args}", player.getName()));
return; return;
} }
if(player.getPlayer().hasPermission("venturechat.ignore.bypass")) { 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; 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()); mcp.addIgnore(player.getUUID());
plugin.synchronize(mcp, true); plugin.synchronize(mcp, true);
return; return;

View File

@ -108,19 +108,23 @@ public class Message extends MineverseCommand {
} }
} }
if(player == null || !player.isOnline()) { 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; return;
} }
if(!mcp.getPlayer().canSee(player.getPlayer())) { 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; return;
} }
if(player.getIgnores().contains(mcp.getUUID())) { if(player.getIgnores().contains(mcp.getUUID())) {
mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString()); mcp.getPlayer().sendMessage(LocalizedMessage.IGNORING_MESSAGE.toString()
.replace("{player}", player.getName()));
return; return;
} }
if(!player.getMessageToggle()) { if(!player.getMessageToggle()) {
mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString()); mcp.getPlayer().sendMessage(LocalizedMessage.BLOCKING_MESSAGE.toString()
.replace("{player}", player.getName()));
return; return;
} }
if(args.length >= 2) { if(args.length >= 2) {
@ -190,22 +194,28 @@ public class Message extends MineverseCommand {
if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) { for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) {
if(sp.isSpy()) { 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 { else {
mcp.setConversation(null); mcp.setConversation(null);
if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) { if(!mcp.getPlayer().hasPermission("venturechat.spy.override")) {
for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) { for(MineverseChatPlayer sp : MineverseChat.onlinePlayers) {
if(sp.isSpy()) { 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()));
} }
} }
} }

View File

@ -1,6 +1,5 @@
package mineverse.Aust1n46.chat.command.message; package mineverse.Aust1n46.chat.command.message;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; 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.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class MessageToggle extends MineverseCommand { public class MessageToggle extends MineverseCommand {
private MineverseChat plugin; private MineverseChat plugin;
@ -20,23 +20,23 @@ public class MessageToggle extends MineverseCommand {
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.messagetoggle")) { if(mcp.getPlayer().hasPermission("venturechat.messagetoggle")) {
if(!mcp.getMessageToggle()) { if(!mcp.getMessageToggle()) {
mcp.setMessageToggle(true); 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); MineverseChat.getInstance().synchronize(mcp, true);
return; return;
} }
mcp.setMessageToggle(false); 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); MineverseChat.getInstance().synchronize(mcp, true);
return; return;
} }
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());
return; return;
} }
} }

View File

@ -1,6 +1,5 @@
package mineverse.Aust1n46.chat.command.message; package mineverse.Aust1n46.chat.command.message;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; 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.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Notifications extends MineverseCommand { public class Notifications extends MineverseCommand {
private MineverseChat plugin; private MineverseChat plugin;
@ -20,18 +20,18 @@ public class Notifications extends MineverseCommand {
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
if(!mcp.hasNotifications()) { if(!mcp.hasNotifications()) {
mcp.setNotifications(true); mcp.setNotifications(true);
mcp.getPlayer().sendMessage(ChatColor.GREEN + "You are now receiving notifications."); mcp.getPlayer().sendMessage(LocalizedMessage.NOTIFICATIONS_ON.toString());
return; return;
} }
mcp.setNotifications(false); mcp.setNotifications(false);
mcp.getPlayer().sendMessage(ChatColor.GREEN + "You are no longer receiving notifications."); mcp.getPlayer().sendMessage(LocalizedMessage.NOTIFICATIONS_OFF.toString());
return; return;
} }
} }

View File

@ -13,6 +13,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
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 mineverse.Aust1n46.chat.utilities.Format;
import mineverse.Aust1n46.chat.versions.VersionHandler; import mineverse.Aust1n46.chat.versions.VersionHandler;
@ -28,7 +29,7 @@ public class Reply extends MineverseCommand {
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
@ -82,19 +83,21 @@ public class Reply extends MineverseCommand {
return; return;
} }
if(player == null || !player.isOnline()) { 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; return;
} }
if(!mcp.getPlayer().canSee(player.getPlayer())) { 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; return;
} }
if(player.getIgnores().contains(mcp.getUUID())) { 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; return;
} }
if(!player.getMessageToggle()) { 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; return;
} }
String msg = ""; String msg = "";
@ -155,9 +158,11 @@ public class Reply extends MineverseCommand {
return; 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; return;
} }
mcp.getPlayer().sendMessage(ChatColor.RED + "Invalid command: /reply [msg]"); mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString()
.replace("{command}", "/reply")
.replace("{args}", "[message]"));
} }
} }

View File

@ -1,6 +1,5 @@
package mineverse.Aust1n46.chat.command.message; package mineverse.Aust1n46.chat.command.message;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; 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.MineverseChatAPI;
import mineverse.Aust1n46.chat.api.MineverseChatPlayer; import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Spy extends MineverseCommand { public class Spy extends MineverseCommand {
private MineverseChat plugin; private MineverseChat plugin;
@ -20,23 +20,23 @@ public class Spy extends MineverseCommand {
@Override @Override
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(!(sender instanceof Player)) { 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; return;
} }
MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender); MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer((Player) sender);
if(mcp.getPlayer().hasPermission("venturechat.spy")) { if(mcp.getPlayer().hasPermission("venturechat.spy")) {
if(!mcp.isSpy()) { if(!mcp.isSpy()) {
mcp.setSpy(true); mcp.setSpy(true);
mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are now spying."); mcp.getPlayer().sendMessage(LocalizedMessage.SPY_ON.toString());
MineverseChat.getInstance().synchronize(mcp, true); MineverseChat.getInstance().synchronize(mcp, true);
return; return;
} }
mcp.setSpy(false); 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); MineverseChat.getInstance().synchronize(mcp, true);
return; return;
} }
mcp.getPlayer().sendMessage(ChatColor.RED + "You do not have permission for this command."); mcp.getPlayer().sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());
return; return;
} }
} }

View File

@ -9,6 +9,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Mute extends MineverseCommand { public class Mute extends MineverseCommand {
private ChatChannelInfo cc = MineverseChat.ccInfo; private ChatChannelInfo cc = MineverseChat.ccInfo;
@ -21,26 +22,37 @@ public class Mute extends MineverseCommand {
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.mute")) { if(sender.hasPermission("venturechat.mute")) {
if(args.length < 2) { 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; return;
} }
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
if(player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) { 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; return;
} }
if(args.length == 2) { if(args.length == 2) {
if(cc.isChannel(args[1])) { if(cc.isChannel(args[1])) {
ChatChannel channel = cc.getChannelInfo(args[1]); ChatChannel channel = cc.getChannelInfo(args[1]);
if(player.isMuted(channel.getName())) { 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; return;
} }
if(channel.isMutable()) { if(channel.isMutable()) {
player.addMute(channel.getName(), 0); 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()) 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 else
player.setModified(true); player.setModified(true);
if(channel.getBungee()) { if(channel.getBungee()) {
@ -48,16 +60,22 @@ public class Mute extends MineverseCommand {
} }
return; 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; return;
} }
sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
.replace("{args}", args[1]));
return; return;
} }
if(cc.isChannel(args[1])) { if(cc.isChannel(args[1])) {
ChatChannel channel = cc.getChannelInfo(args[1]); ChatChannel channel = cc.getChannelInfo(args[1]);
if(player.isMuted(channel.getName())) { 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; return;
} }
if(channel.isMutable()) { if(channel.isMutable()) {
@ -76,9 +94,18 @@ public class Mute extends MineverseCommand {
String keyword = "minutes"; String keyword = "minutes";
if(time == 1) if(time == 1)
keyword = "minute"; 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()) 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 else
player.setModified(true); player.setModified(true);
if(channel.getBungee()) { if(channel.getBungee()) {
@ -86,19 +113,24 @@ public class Mute extends MineverseCommand {
} }
return; return;
} }
sender.sendMessage(ChatColor.RED + "Invalid time: " + args[2]); sender.sendMessage(LocalizedMessage.INVALID_TIME.toString()
.replace("{args}", args[2]));
} }
catch(Exception e) { catch(Exception e) {
sender.sendMessage(ChatColor.RED + "Invalid time: " + args[2]); sender.sendMessage(LocalizedMessage.INVALID_TIME.toString()
.replace("{args}", args[2]));
} }
return; 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; return;
} }
sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
.replace("{args}", args[1]));
return; return;
} }
sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());
} }
} }

View File

@ -1,6 +1,5 @@
package mineverse.Aust1n46.chat.command.mute; package mineverse.Aust1n46.chat.command.mute;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import mineverse.Aust1n46.chat.MineverseChat; 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.ChatChannel;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Muteall extends MineverseCommand { public class Muteall extends MineverseCommand {
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ -24,12 +24,15 @@ public class Muteall extends MineverseCommand {
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.mute")) { if(sender.hasPermission("venturechat.mute")) {
if(args.length < 1) { 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; return;
} }
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
if(player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) { 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; return;
} }
boolean bungee = false; boolean bungee = false;
@ -44,16 +47,17 @@ public class Muteall extends MineverseCommand {
if(bungee) { if(bungee) {
MineverseChat.getInstance().synchronize(player, true); 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()) { 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 else
player.setModified(true); player.setModified(true);
return; return;
} }
else { else {
sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());
return; return;
} }
} }

View File

@ -9,6 +9,7 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
import mineverse.Aust1n46.chat.channel.ChatChannel; import mineverse.Aust1n46.chat.channel.ChatChannel;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Unmute extends MineverseCommand { public class Unmute extends MineverseCommand {
private ChatChannelInfo cc = MineverseChat.ccInfo; private ChatChannelInfo cc = MineverseChat.ccInfo;
@ -21,24 +22,36 @@ public class Unmute extends MineverseCommand {
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.mute")) { if(sender.hasPermission("venturechat.mute")) {
if(args.length < 2) { 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; return;
} }
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
if(player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) { 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; return;
} }
for(ChatChannel channel : cc.getChannelsInfo()) { for(ChatChannel channel : cc.getChannelsInfo()) {
if(channel.getName().equalsIgnoreCase(args[1]) || channel.getAlias().equalsIgnoreCase(args[1])) { if(channel.getName().equalsIgnoreCase(args[1]) || channel.getAlias().equalsIgnoreCase(args[1])) {
if(!player.isMuted(channel.getName())) { 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; return;
} }
player.removeMute(channel.getName()); 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()) { 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 { else {
player.setModified(true); player.setModified(true);
@ -49,11 +62,12 @@ public class Unmute extends MineverseCommand {
return; return;
} }
} }
sender.sendMessage(ChatColor.RED + "Invalid channel: " + args[1]); sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString()
.replace("{args}", args[1]));
return; return;
} }
else { else {
sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());
return; return;
} }
} }

View File

@ -1,6 +1,5 @@
package mineverse.Aust1n46.chat.command.mute; package mineverse.Aust1n46.chat.command.mute;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import mineverse.Aust1n46.chat.MineverseChat; 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.ChatChannel;
import mineverse.Aust1n46.chat.channel.ChatChannelInfo; import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
import mineverse.Aust1n46.chat.command.MineverseCommand; import mineverse.Aust1n46.chat.command.MineverseCommand;
import mineverse.Aust1n46.chat.localization.LocalizedMessage;
public class Unmuteall extends MineverseCommand { public class Unmuteall extends MineverseCommand {
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ -24,12 +24,15 @@ public class Unmuteall extends MineverseCommand {
public void execute(CommandSender sender, String command, String[] args) { public void execute(CommandSender sender, String command, String[] args) {
if(sender.hasPermission("venturechat.mute")) { if(sender.hasPermission("venturechat.mute")) {
if(args.length < 1) { 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; return;
} }
MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
if(player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) { 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; return;
} }
boolean bungee = false; boolean bungee = false;
@ -42,16 +45,17 @@ public class Unmuteall extends MineverseCommand {
if(bungee) { if(bungee) {
MineverseChat.getInstance().synchronize(player, true); 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()) { 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 else
player.setModified(true); player.setModified(true);
return; return;
} }
else { else {
sender.sendMessage(ChatColor.RED + "You do not have permission for this command."); sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString());
return; return;
} }
} }

View File

@ -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);
}
}

View File

@ -25,7 +25,6 @@ public class Localization {
String fileVersion = localization.getString("Version", "null"); String fileVersion = localization.getString("Version", "null");
String currentVersion = plugin.getDescription().getVersion(); String currentVersion = plugin.getDescription().getVersion();
System.out.println(fileVersion + " " + currentVersion);
if(!fileVersion.equals(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")); 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")); localizationFile.renameTo(new File(plugin.getDataFolder().getAbsolutePath(), "Messages_Old.yml"));

View File

@ -13,6 +13,7 @@ public enum LocalizedMessage {
BUNGEE_TOGGLE_ON("BungeeToggleOn"), BUNGEE_TOGGLE_ON("BungeeToggleOn"),
CLEAR_CHAT_SENDER("ClearChatSender"), CLEAR_CHAT_SENDER("ClearChatSender"),
CLEAR_CHAT_SERVER("ClearChatServer"), CLEAR_CHAT_SERVER("ClearChatServer"),
CHANNEL_CANNOT_MUTE("ChannelCannotMute"),
CHANNEL_LIST("ChannelList"), CHANNEL_LIST("ChannelList"),
CHANNEL_LIST_HEADER("ChannelListHeader"), CHANNEL_LIST_HEADER("ChannelListHeader"),
CHANNEL_LIST_WITH_PERMISSIONS("ChannelListWithPermissions"), CHANNEL_LIST_WITH_PERMISSIONS("ChannelListWithPermissions"),
@ -20,28 +21,49 @@ public enum LocalizedMessage {
CHANNEL_NO_PERMISSION_VIEW("ChannelNoPermissionView"), CHANNEL_NO_PERMISSION_VIEW("ChannelNoPermissionView"),
CHANNEL_PLAYER_LIST_HEADER("ChannelPlayerListHeader"), CHANNEL_PLAYER_LIST_HEADER("ChannelPlayerListHeader"),
COMMAND_INVALID_ARGUMENTS("CommandInvalidArguments"), COMMAND_INVALID_ARGUMENTS("CommandInvalidArguments"),
COMMAND_INVALID_ARGUMENTS_IGNORE("CommandInvalidArgumentsIgnore"),
COMMAND_MUST_BE_RUN_BY_PLAYER("CommandMustBeRunByPlayer"), COMMAND_MUST_BE_RUN_BY_PLAYER("CommandMustBeRunByPlayer"),
COMMAND_NO_PERMISSION("CommandNoPermission"), COMMAND_NO_PERMISSION("CommandNoPermission"),
COMMAND_NOT_BLOCKABLE("CommandNotBlockable"), COMMAND_NOT_BLOCKABLE("CommandNotBlockable"),
COMMANDSPY_OFF("CommandSpyOff"), COMMANDSPY_OFF("CommandSpyOff"),
COMMANDSPY_ON("CommandSpyOn"), COMMANDSPY_ON("CommandSpyOn"),
CONFIG_RELOADED("ConfigReloaded"), CONFIG_RELOADED("ConfigReloaded"),
EMPTY_STRING("EmptyString"), ENTER_PRIVATE_CONVERSATION("EnterPrivateConversation"),
ENTER_PRIVATE_CONVERSATION_SPY("EnterPrivateConversationSpy"),
EXIT_PRIVATE_CONVERSATION("ExitPrivateConversation"), EXIT_PRIVATE_CONVERSATION("ExitPrivateConversation"),
EXIT_PRIVATE_CONVERSATION_SPY("ExitPrivateConversationSpy"), EXIT_PRIVATE_CONVERSATION_SPY("ExitPrivateConversationSpy"),
FILTER_OFF("FilterOff"), FILTER_OFF("FilterOff"),
FILTER_ON("FilterOn"), FILTER_ON("FilterOn"),
FORCE_ALL("ForceAll"), FORCE_ALL("ForceAll"),
FORCE_PLAYER("ForcePlayer"), 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"), IGNORING_MESSAGE("IgnoringMessage"),
INVALID_CHANNEL("InvalidChannel"), INVALID_CHANNEL("InvalidChannel"),
INVALID_HASH("InvalidHash"), INVALID_HASH("InvalidHash"),
INVALID_TIME("InvalidTime"),
KICK_CHANNEL("KickChannel"), KICK_CHANNEL("KickChannel"),
KICK_CHANNEL_ALL_PLAYER("KickChannelAllPlayer"), KICK_CHANNEL_ALL_PLAYER("KickChannelAllPlayer"),
KICK_CHANNEL_ALL_SENDER("KickChannelAllSender"), KICK_CHANNEL_ALL_SENDER("KickChannelAllSender"),
LEAVE_CHANNEL("LeaveChannel"), LEAVE_CHANNEL("LeaveChannel"),
LISTEN_CHANNEL("ListenChannel"), LISTEN_CHANNEL("ListenChannel"),
MESSAGE_TOGGLE_OFF("MessageToggleOff"),
MESSAGE_TOGGLE_ON("MessageToggleOn"),
MUST_LISTEN_ONE_CHANNEL("MustListenOneChannel"), MUST_LISTEN_ONE_CHANNEL("MustListenOneChannel"),
MUTE_PLAYER_ALL_PLAYER("MutePlayerAllPlayer"),
MUTE_PLAYER_ALL_SENDER("MutePlayerAllSender"),
MUTE_PLAYER_PLAYER("MutePlayerPlayer"),
MUTE_PLAYER_PLAYER_TIME("MutePlayerPlayerTime"),
MUTE_PLAYER_SENDER("MutePlayerSender"),
MUTE_PLAYER_SENDER_TIME("MutePlayerSenderTime"),
NO_PLAYER_TO_REPLY_TO("NoPlayerToReplyTo"),
NOTIFICATIONS_OFF("NotificationsOff"),
NOTIFICATIONS_ON("NotificationsOn"),
PLAYER_ALREADY_MUTED("PlayerAlreadyMuted"),
PLAYER_NOT_MUTED("PlayerNotMuted"),
PLAYER_OFFLINE("PlayerOffline"), PLAYER_OFFLINE("PlayerOffline"),
PLAYER_OFFLINE_NO_PERMISSIONS_CHECK("PlayerOfflineNoPermissionsCheck"), PLAYER_OFFLINE_NO_PERMISSIONS_CHECK("PlayerOfflineNoPermissionsCheck"),
RANGED_SPY_OFF("RangedSpyOff"), RANGED_SPY_OFF("RangedSpyOff"),
@ -51,11 +73,14 @@ public enum LocalizedMessage {
SET_CHANNEL_ALL_SENDER("SetChannelAllSender"), SET_CHANNEL_ALL_SENDER("SetChannelAllSender"),
SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION("SetChannelPlayerChannelNoPermission"), SET_CHANNEL_PLAYER_CHANNEL_NO_PERMISSION("SetChannelPlayerChannelNoPermission"),
SET_CHANNEL_SENDER("SetChannelSender"), SET_CHANNEL_SENDER("SetChannelSender"),
SPY_OFF("SpyOff"),
SPY_ON("SpyOn"),
UNBLOCK_COMMAND_PLAYER("UnblockCommandPlayer"), UNBLOCK_COMMAND_PLAYER("UnblockCommandPlayer"),
UNBLOCK_COMMAND_SENDER("UnblockCommandSender"), UNBLOCK_COMMAND_SENDER("UnblockCommandSender"),
VENTURECHAT_AUTHOR("VentureChatAuthor"), UNMUTE_PLAYER_ALL_PLAYER("UnmutePlayerAllPlayer"),
VENTURECHAT_VERSION("VentureChatVersion"), UNMUTE_PLAYER_ALL_SENDER("UnmutePlayerAllSender"),
Z_END("End"); UNMUTE_PLAYER_PLAYER("UnmutePlayerPlayer"),
UNMUTE_PLAYER_SENDER("UnmutePlayerSender");
private final String message; private final String message;