From 264ddf8c2e33c1cdcb1d08ea1ee50f971fd7a146 Mon Sep 17 00:00:00 2001 From: Aust1n46 Date: Sun, 21 Mar 2021 20:33:28 -0500 Subject: [PATCH] Changed parameter order for /mute and /unmute. For better tab completion control. --- .../Aust1n46/chat/MineverseChat.java | 3 ++- .../Aust1n46/chat/command/mute/Mute.java | 27 ++++++++++--------- .../Aust1n46/chat/command/mute/Unmute.java | 25 +++++++++-------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/src/mineverse/Aust1n46/chat/MineverseChat.java b/src/mineverse/Aust1n46/chat/MineverseChat.java index 0530256..21f7801 100644 --- a/src/mineverse/Aust1n46/chat/MineverseChat.java +++ b/src/mineverse/Aust1n46/chat/MineverseChat.java @@ -938,7 +938,8 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { return; } if(time > 0) { - playerToMuteMCP.addMute(chatChannelObj.getName(), time); + long datetime = System.currentTimeMillis(); + playerToMuteMCP.addMute(chatChannelObj.getName(), datetime + time); String timeString = Format.parseTimeStringFromMillis(time); playerToMuteMCP.getPlayer() .sendMessage(LocalizedMessage.MUTE_PLAYER_PLAYER_TIME.toString() diff --git a/src/mineverse/Aust1n46/chat/command/mute/Mute.java b/src/mineverse/Aust1n46/chat/command/mute/Mute.java index 7f88bb5..3836da6 100644 --- a/src/mineverse/Aust1n46/chat/command/mute/Mute.java +++ b/src/mineverse/Aust1n46/chat/command/mute/Mute.java @@ -33,11 +33,11 @@ public class Mute extends MineverseCommand { if (sender.hasPermission("venturechat.mute")) { if (args.length < 2) { sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/mute") - .replace("{args}", "[player] [channel] {time}")); + .replace("{args}", "[channel] [player] {time}")); return; } - if (ChatChannel.isChannel(args[1])) { - ChatChannel channel = ChatChannel.getChannel(args[1]); + if (ChatChannel.isChannel(args[0])) { + ChatChannel channel = ChatChannel.getChannel(args[0]); if (channel.isMutable()) { long datetime = System.currentTimeMillis(); long time = 0; @@ -56,15 +56,15 @@ public class Mute extends MineverseCommand { } if(channel.getBungee()) { if(args.length > 2) { - sendBungeeCordMute(sender, args[0], channel, datetime + time); + sendBungeeCordMute(sender, args[1], channel, time); return; } - sendBungeeCordMute(sender, args[0], channel, 0); + sendBungeeCordMute(sender, args[1], channel, 0); return; } - MineverseChatPlayer playerToMute = MineverseChatAPI.getMineverseChatPlayer(args[0]); + MineverseChatPlayer playerToMute = MineverseChatAPI.getMineverseChatPlayer(args[1]); if (playerToMute == null || (!playerToMute.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) { - sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0])); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[1])); return; } if (playerToMute.isMuted(channel.getName())) { @@ -113,7 +113,7 @@ public class Mute extends MineverseCommand { .replace("{channel_name}", channel.getName())); return; } - sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString().replace("{args}", args[1])); + sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString().replace("{args}", args[0])); return; } sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); @@ -123,14 +123,17 @@ public class Mute extends MineverseCommand { public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { List completions = new ArrayList<>(); if(args.length == 1) { - StringUtil.copyPartialMatches(args[0], MineverseChat.networkPlayerNames, completions); + StringUtil.copyPartialMatches(args[0], ChatChannel.getChatChannels().stream().map(ChatChannel::getName).collect(Collectors.toList()), completions); Collections.sort(completions); return completions; } if(args.length == 2) { - StringUtil.copyPartialMatches(args[1], ChatChannel.getChatChannels().stream().map(ChatChannel::getName).collect(Collectors.toList()), completions); - Collections.sort(completions); - return completions; + if(ChatChannel.isChannel(args[0]) && ChatChannel.getChannel(args[0]).getBungee()) { + StringUtil.copyPartialMatches(args[1], MineverseChat.networkPlayerNames, completions); + Collections.sort(completions); + return completions; + } + return null; } if(args.length == 3) { StringUtil.copyPartialMatches(args[2], COMMON_MUTE_TIMES, completions); diff --git a/src/mineverse/Aust1n46/chat/command/mute/Unmute.java b/src/mineverse/Aust1n46/chat/command/mute/Unmute.java index 961dd45..289d326 100644 --- a/src/mineverse/Aust1n46/chat/command/mute/Unmute.java +++ b/src/mineverse/Aust1n46/chat/command/mute/Unmute.java @@ -30,18 +30,18 @@ public class Unmute extends MineverseCommand { if (sender.hasPermission("venturechat.mute")) { if (args.length < 2) { sender.sendMessage(LocalizedMessage.COMMAND_INVALID_ARGUMENTS.toString().replace("{command}", "/unmute") - .replace("{args}", "[player] [channel]")); + .replace("{args}", "[channel] [player]")); return; } - if (ChatChannel.isChannel(args[1])) { - ChatChannel channel = ChatChannel.getChannel(args[1]); + if (ChatChannel.isChannel(args[0])) { + ChatChannel channel = ChatChannel.getChannel(args[0]); if(channel.getBungee()) { - sendBungeeCordUnmute(sender, args[0], channel); + sendBungeeCordUnmute(sender, args[1], channel); return; } - MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]); + MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[1]); if (player == null || (!player.isOnline() && !sender.hasPermission("venturechat.mute.offline"))) { - sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[0])); + sender.sendMessage(LocalizedMessage.PLAYER_OFFLINE.toString().replace("{args}", args[1])); return; } if (!player.isMuted(channel.getName())) { @@ -64,7 +64,7 @@ public class Unmute extends MineverseCommand { } return; } - sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString().replace("{args}", args[1])); + sender.sendMessage(LocalizedMessage.INVALID_CHANNEL.toString().replace("{args}", args[0])); return; } else { sender.sendMessage(LocalizedMessage.COMMAND_NO_PERMISSION.toString()); @@ -76,14 +76,17 @@ public class Unmute extends MineverseCommand { public List onTabComplete(CommandSender sender, Command command, String label, String[] args) { List completions = new ArrayList<>(); if(args.length == 1) { - StringUtil.copyPartialMatches(args[0], MineverseChat.networkPlayerNames, completions); + StringUtil.copyPartialMatches(args[0], ChatChannel.getChatChannels().stream().map(ChatChannel::getName).collect(Collectors.toList()), completions); Collections.sort(completions); return completions; } if(args.length == 2) { - StringUtil.copyPartialMatches(args[1], ChatChannel.getChatChannels().stream().map(ChatChannel::getName).collect(Collectors.toList()), completions); - Collections.sort(completions); - return completions; + if(ChatChannel.isChannel(args[0]) && ChatChannel.getChannel(args[0]).getBungee()) { + StringUtil.copyPartialMatches(args[1], MineverseChat.networkPlayerNames, completions); + Collections.sort(completions); + return completions; + } + return null; } return Collections.emptyList(); }