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

made perms enum

Browse Source 
added some missing stuff
This commit is contained in:
YouHaveTrouble
2021-07-06 14:48:44 +02:00
parent 55fdf0c076
commit fc26393dcf
16 changed files with 190 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/CommandWhitelistBukkit.java
+2 -1
View File
@@ -6,6 +6,7 @@ import eu.endermite.commandwhitelist.bukkit.listeners.PlayerCommandPreProcessLis
import eu.endermite.commandwhitelist.bukkit.listeners.PlayerCommandSendListener;
import eu.endermite.commandwhitelist.bukkit.listeners.TabCompleteBlockerListener;
import eu.endermite.commandwhitelist.common.CWGroup;
import eu.endermite.commandwhitelist.common.CWPermission;
import eu.endermite.commandwhitelist.common.ConfigCache;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -114,7 +115,7 @@ public class CommandWhitelistBukkit extends JavaPlugin {
for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
if (s.getKey().equalsIgnoreCase("default"))
suggestionList.addAll(s.getValue().getSubCommands());
if (player.hasPermission("commandwhitelist.group." + s.getKey())) continue;
if (player.hasPermission(s.getValue().getPermission())) continue;
suggestionList.addAll(s.getValue().getSubCommands());
}
return suggestionList;
CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java
+12 -73
View File
@@ -1,11 +1,12 @@
package eu.endermite.commandwhitelist.bukkit.command;
import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
import eu.endermite.commandwhitelist.common.ConfigCache;
import eu.endermite.commandwhitelist.common.CWPermission;
import eu.endermite.commandwhitelist.common.commands.CWCommand;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor;
@@ -22,7 +23,7 @@ public class MainCommandExecutor implements TabExecutor {
BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences();
if (args.length == 0) {
audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission("commandwhitelist.reload"), sender.hasPermission("commandwhitelist.admin")));
audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
return true;
}
@@ -30,14 +31,14 @@ public class MainCommandExecutor implements TabExecutor {
CWCommand.CommandType commandType = CWCommand.CommandType.valueOf(args[0].toUpperCase());
switch (commandType) {
case RELOAD:
if (!sender.hasPermission("commandwhitelist.reload")) {
if (!sender.hasPermission(CWPermission.RELOAD.permission())) {
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
return true;
}
CommandWhitelistBukkit.getPlugin().reloadPluginConfig(sender);
return true;
case ADD:
if (!sender.hasPermission("commandwhitelist.admin")) {
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
return true;
}
@@ -50,7 +51,7 @@ public class MainCommandExecutor implements TabExecutor {
audiences.sender(sender).sendMessage(Component.text("/" + label + " add <group> <command>"));
return true;
case REMOVE:
if (!sender.hasPermission("commandwhitelist.admin")) {
if (!sender.hasPermission(CWPermission.ADMIN.permission())) {
audiences.sender(sender).sendMessage(MiniMessage.markdown().parse(CommandWhitelistBukkit.getConfigCache().prefix + CommandWhitelistBukkit.getConfigCache().no_permission));
return true;
}
@@ -64,82 +65,20 @@ public class MainCommandExecutor implements TabExecutor {
return true;
case HELP:
default:
audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission("commandwhitelist.reload"), sender.hasPermission("commandwhitelist.admin")));
audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
}
} catch (IllegalArgumentException e) {
audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission("commandwhitelist.reload"), sender.hasPermission("commandwhitelist.admin")));
audiences.sender(sender).sendMessage(CWCommand.helpComponent(label, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())));
}
return true;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
List<String> list = new ArrayList<>();
ConfigCache config = CommandWhitelistBukkit.getConfigCache();
if (args.length == 1) {
if ("reload".startsWith(args[0]) && sender.hasPermission("commandwhitelist.reload")) {
list.add("reload");
}
if ("add".startsWith(args[0]) && sender.hasPermission("commandwhitelist.admin")) {
list.add("add");
}
if ("remove".startsWith(args[0]) && sender.hasPermission("commandwhitelist.admin")) {
list.add("remove");
}
} else if (args.length == 2) {
if (args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("remove")) {
if (!sender.hasPermission("commandwhitelist.admin"))
return list;
for (String s : config.getGroupList().keySet()) {
if (s.startsWith(args[1])) {
list.add(s);
}
}
}
} else if (args.length == 3) {
if (args[0].equalsIgnoreCase("remove")) {
if (!sender.hasPermission("commandwhitelist.admin"))
return list;
try {
for (String s : config.getGroupList().get(args[1]).getCommands()) {
if (s.startsWith(args[2])) {
list.add(s);
}
}
} catch (NullPointerException ignored) {}
return list;
}
if (args[0].equalsIgnoreCase("add")) {
if (!sender.hasPermission("commandwhitelist.admin"))
return list;
for (HelpTopic s : CommandWhitelistBukkit.getPlugin().getServer().getHelpMap().getHelpTopics()) {
String cmd = s.getName();
if (!cmd.startsWith("/"))
continue;
try {
if (cmd.contains(":")) {
cmd = cmd.split(":")[1];
}
} catch (Exception e) {
continue;
}
cmd = cmd.replace("/", "");
if (config.getGroupList().get(args[1]) == null)
continue;
if (config.getGroupList().get(args[1]).getCommands().contains(cmd))
continue;
if (cmd.startsWith(args[2])) {
list.add(cmd);
}
}
return list;
}
List<String> serverCommands = new ArrayList<>();
for (HelpTopic topic : Bukkit.getHelpMap().getHelpTopics()) {
serverCommands.add(topic.getName());
}
return list;
return CWCommand.commandSuggestions(CommandWhitelistBukkit.getConfigCache(), serverCommands, args, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission()));
}
}
CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/PacketCommandPreProcessListener.java
+3 -3
View File
@@ -8,6 +8,7 @@ import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
import eu.endermite.commandwhitelist.common.CWPermission;
import eu.endermite.commandwhitelist.common.CommandUtil;
import eu.endermite.commandwhitelist.common.ConfigCache;
import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -31,13 +32,13 @@ public class PacketCommandPreProcessListener {
String string = packet.getStrings().read(0);
if (!string.startsWith("/")) return;
Player player = event.getPlayer();
if (player.hasPermission("commandwhitelist.bypass")) return;
if (player.hasPermission(CWPermission.BYPASS.permission())) return;
ConfigCache config = CommandWhitelistBukkit.getConfigCache();
String label = CommandUtil.getCommandLabel(string.toLowerCase());
HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
if (!commands.contains(label)) {
event.setCancelled(true);
ConfigCache config = CommandWhitelistBukkit.getConfigCache();
CommandWhitelistBukkit.getAudiences().player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.command_denied));
return;
}
@@ -46,7 +47,6 @@ public class PacketCommandPreProcessListener {
for (String bannedSubCommand : bannedSubCommands) {
if (string.toLowerCase().substring(1).startsWith(bannedSubCommand)) {
event.setCancelled(true);
ConfigCache config = CommandWhitelistBukkit.getConfigCache();
CommandWhitelistBukkit.getAudiences().player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.subcommand_denied));
return;
}
CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandPreProcessListener.java
+1 -3
View File
@@ -18,13 +18,12 @@ public class PlayerCommandPreProcessListener implements Listener {
Player player = event.getPlayer();
if (player.hasPermission("commandwhitelist.bypass")) return;
String label = CommandUtil.getCommandLabel(event.getMessage().toLowerCase());
BukkitAudiences audiences = CommandWhitelistBukkit.getAudiences();
ConfigCache config = CommandWhitelistBukkit.getConfigCache();
HashSet<String> commands = CommandWhitelistBukkit.getCommands(player);
if (!commands.contains(label)) {
event.setCancelled(true);
ConfigCache config = CommandWhitelistBukkit.getConfigCache();
audiences.player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.command_denied));
return;
}
@@ -33,7 +32,6 @@ public class PlayerCommandPreProcessListener implements Listener {
for (String bannedSubCommand : bannedSubCommands) {
if (event.getMessage().toLowerCase().substring(1).startsWith(bannedSubCommand)) {
event.setCancelled(true);
ConfigCache config = CommandWhitelistBukkit.getConfigCache();
audiences.player(player).sendMessage(MiniMessage.markdown().parse(config.prefix + config.subcommand_denied));
return;
}
CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/PlayerCommandSendListener.java
+2 -1
View File
@@ -1,6 +1,7 @@
package eu.endermite.commandwhitelist.bukkit.listeners;
import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
import eu.endermite.commandwhitelist.common.CWPermission;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@@ -12,7 +13,7 @@ public class PlayerCommandSendListener implements Listener {
@EventHandler(priority = EventPriority.NORMAL)
public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
Player player = event.getPlayer();
if (player.hasPermission("commandwhitelist.bypass")) return;
if (player.hasPermission(CWPermission.BYPASS.permission())) return;
HashSet<String> commandList = CommandWhitelistBukkit.getCommands(player);
event.getCommands().removeIf((cmd) -> !commandList.contains(cmd));
}
CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/listeners/TabCompleteBlockerListener.java
+3 -1
View File
@@ -1,6 +1,7 @@
package eu.endermite.commandwhitelist.bukkit.listeners;
import eu.endermite.commandwhitelist.bukkit.CommandWhitelistBukkit;
import eu.endermite.commandwhitelist.common.CWPermission;
import eu.endermite.commandwhitelist.common.CommandUtil;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -8,10 +9,11 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
public class TabCompleteBlockerListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST)
@EventHandler(priority = EventPriority.NORMAL)
public void onCommandTabComplete(org.bukkit.event.server.TabCompleteEvent event) {
if (!(event.getSender() instanceof Player)) return;
Player player = (Player) event.getSender();
if (player.hasPermission(CWPermission.BYPASS.permission())) return;
event.setCompletions(
CommandUtil.filterSuggestions(
event.getBuffer(),