From c135815ce3728b2ad874456591e99a193fb951b7 Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Tue, 15 Dec 2020 21:05:56 +0100 Subject: [PATCH] improved code readability --- .../bungee/CommandWhitelistBungee.java | 5 ----- .../bungee/command/BungeeMainCommand.java | 1 - .../bungee/listeners/BungeeChatEventListener.java | 10 +--------- .../listeners/WaterfallDefineCommandsListener.java | 10 +--------- .../commandwhitelist/spigot/command/MainCommand.java | 1 - .../LegacyPlayerTabChatCompleteListener.java | 7 +------ .../listeners/PlayerCommandPreProcessListener.java | 5 ----- .../spigot/listeners/PlayerCommandSendListener.java | 11 +---------- .../spigot/listeners/TabCompleteBlockerListener.java | 1 - 9 files changed, 4 insertions(+), 47 deletions(-) diff --git a/src/main/java/eu/endermite/commandwhitelist/bungee/CommandWhitelistBungee.java b/src/main/java/eu/endermite/commandwhitelist/bungee/CommandWhitelistBungee.java index 647cc64..cc40abc 100644 --- a/src/main/java/eu/endermite/commandwhitelist/bungee/CommandWhitelistBungee.java +++ b/src/main/java/eu/endermite/commandwhitelist/bungee/CommandWhitelistBungee.java @@ -24,7 +24,6 @@ public final class CommandWhitelistBungee extends Plugin { @Override public void onEnable() { - plugin = this; getLogger().info("Running on "+ ChatColor.DARK_AQUA+getProxy().getName()); loadConfig(); @@ -40,18 +39,15 @@ public final class CommandWhitelistBungee extends Plugin { int pluginId = 8704; new BungeeMetrics(this, pluginId); - } public static CommandWhitelistBungee getPlugin() { return plugin; } - public static BungeeConfigCache getConfigCache() { return configCache; } - public void loadConfig() { try { if (!getDataFolder().exists()) { @@ -81,5 +77,4 @@ public final class CommandWhitelistBungee extends Plugin { sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getConfigReloaded())); }); } - } diff --git a/src/main/java/eu/endermite/commandwhitelist/bungee/command/BungeeMainCommand.java b/src/main/java/eu/endermite/commandwhitelist/bungee/command/BungeeMainCommand.java index 52af437..0c7454d 100644 --- a/src/main/java/eu/endermite/commandwhitelist/bungee/command/BungeeMainCommand.java +++ b/src/main/java/eu/endermite/commandwhitelist/bungee/command/BungeeMainCommand.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; - public class BungeeMainCommand extends Command implements TabExecutor { public BungeeMainCommand(String name) { diff --git a/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java b/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java index 01a25a3..592539b 100644 --- a/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java @@ -14,28 +14,20 @@ public class BungeeChatEventListener implements Listener { @EventHandler public void onChatEvent(net.md_5.bungee.api.event.ChatEvent event) { - if (event.isCancelled()) return; - if (!(event.getSender() instanceof ProxiedPlayer)) return; - if (!event.isProxyCommand()) return; - ProxiedPlayer player = (ProxiedPlayer) event.getSender(); - - if (player.hasPermission("commandwhitelist.bypass")) { + if (player.hasPermission("commandwhitelist.bypass")) return; - } - String command = event.getMessage().toLowerCase(); boolean found = false; for (Map.Entry> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) { if (!player.hasPermission("commandwhitelist.commands." + s.getKey())) continue; - for (String comm : s.getValue()) { comm = comm.toLowerCase(); if (command.equalsIgnoreCase("/" + comm)) { diff --git a/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/WaterfallDefineCommandsListener.java b/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/WaterfallDefineCommandsListener.java index 36e5afe..6f8595c 100644 --- a/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/WaterfallDefineCommandsListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/bungee/listeners/WaterfallDefineCommandsListener.java @@ -13,25 +13,17 @@ public class WaterfallDefineCommandsListener implements Listener { @EventHandler public void onProxyDefineCommandsEvent(io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent event) { - if (event.getReceiver() instanceof ProxiedPlayer) { ProxiedPlayer player = (ProxiedPlayer) event.getReceiver(); - - if (player.hasPermission("commandwhitelist.bypass")) { + if (player.hasPermission("commandwhitelist.bypass")) return; - } - HashMap commandHashMap = new HashMap<>(); CommandsList.getCommands(player).forEach(cmdName -> CommandWhitelistBungee.getPlugin().getProxy().getPluginManager().getCommands() .stream() .filter(commandEntry -> cmdName.equalsIgnoreCase(commandEntry.getValue().getName())) .forEach(commandEntry -> commandHashMap.put(commandEntry.getKey(), commandEntry.getValue()))); - event.getCommands().values().removeIf((cmd) -> !commandHashMap.containsValue(cmd)); } - - } - } diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java b/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java index 256d59e..45b708d 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java @@ -58,7 +58,6 @@ public class MainCommand implements TabExecutor { } else { sender.sendMessage("/cw remove "); } - } else { sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getNoSubCommand())); } diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java index c6f883c..2c5977f 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java @@ -27,9 +27,8 @@ public class LegacyPlayerTabChatCompleteListener { public void onPacketSending(PacketEvent event) { try { Player player = event.getPlayer(); - if (player.hasPermission("commandwhitelist.bypass")) { + if (player.hasPermission("commandwhitelist.bypass")) return; - } PacketContainer packet = event.getPacket(); String[] message = packet.getSpecificModifier(String[].class).read(0); List commandList = CommandsList.getCommands(player); @@ -43,18 +42,14 @@ public class LegacyPlayerTabChatCompleteListener { } } } - String[] toWrite = new String[components]; int counter = 0; for (String cmd : finalList) { toWrite[counter++] = cmd; } - packet.getSpecificModifier(String[].class).write(0, toWrite); - } catch (Exception ignored) {} } }); } - } diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java index 38d038d..2411cb4 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java @@ -9,12 +9,10 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; - import java.util.List; import java.util.Map; public class PlayerCommandPreProcessListener implements Listener { - @EventHandler(priority = EventPriority.HIGHEST) public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) { Player player = event.getPlayer(); @@ -39,13 +37,10 @@ public class PlayerCommandPreProcessListener implements Listener { } return; } - - } } event.setCancelled(true); ConfigCache config = CommandWhitelist.getConfigCache(); player.sendMessage(ChatColor.translateAlternateColorCodes('&', config.getPrefix() + RandomStuff.getMessage(config.getCommandDeniedList(), config.getCommandDenied()))); } - } diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandSendListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandSendListener.java index 3d0a032..61d8568 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandSendListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandSendListener.java @@ -8,21 +8,12 @@ import org.bukkit.event.Listener; import java.util.*; public class PlayerCommandSendListener implements Listener { - @EventHandler(priority = EventPriority.HIGHEST) public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) { Player player = event.getPlayer(); - - if (player.hasPermission("commandwhitelist.bypass")) { + if (player.hasPermission("commandwhitelist.bypass")) return; - } - List commandList = CommandsList.getCommands(player); - event.getCommands().removeIf((cmd) -> !commandList.contains(cmd)); - } - - - } diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java index 0d29a4c..3809b80 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java @@ -8,7 +8,6 @@ import org.bukkit.event.Listener; import java.util.List; public class TabCompleteBlockerListener implements Listener { - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onCommandTabComplete(org.bukkit.event.server.TabCompleteEvent event) { if (!(event.getSender() instanceof Player))