YouHaveTrouble/CommandWhitelist
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/CommandWhitelist.git synced 2026-05-12 06:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved code readability

Browse Source
This commit is contained in:
YouHaveTrouble
2020-12-15 21:05:56 +01:00
parent 9254c7fc7b
commit c135815ce3
9 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/eu/endermite/commandwhitelist/bungee/CommandWhitelistBungee.java
-5
View File
@@ -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()));
});
}
}
src/main/java/eu/endermite/commandwhitelist/bungee/command/BungeeMainCommand.java
-1
View File
@@ -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) {
src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java
+1 -9
View File
@@ -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<String, List<String>> 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)) {
src/main/java/eu/endermite/commandwhitelist/bungee/listeners/WaterfallDefineCommandsListener.java
+1 -9
View File
@@ -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<String, Command> 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));
}
}
}
src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java
-1
View File
@@ -58,7 +58,6 @@ public class MainCommand implements TabExecutor {
} else {
sender.sendMessage("/cw remove <group> <command>");
}
} else {
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + CommandWhitelist.getConfigCache().getNoSubCommand()));
}
src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java
+1 -6
View File
@@ -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<String> 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) {}
}
});
}
}
src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java
-5
View File
@@ -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())));
}
}
src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandSendListener.java
+1 -10
View File
@@ -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<String> commandList = CommandsList.getCommands(player);
event.getCommands().removeIf((cmd) -> !commandList.contains(cmd));
}
}
src/main/java/eu/endermite/commandwhitelist/spigot/listeners/TabCompleteBlockerListener.java
-1
View File
@@ -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))