change command whitelist module to command filter module

Author: UrAvgCode

README.md

@@ -12,7 +12,7 @@ commands and features.
 - **Custom Chat Formatting**
 - **Custom Join and Quit Messages**
 - **Custom Death Messages**
-- **Custom Command Whitelist**
+- **Custom Command Filter**
 
 | MOTD                                | Chat                                | Tab List                          |
 |-------------------------------------|-------------------------------------|-----------------------------------|

…tials/module/CommandWhitelistModule.java …sentials/module/CommandFilterModule.javasrc/main/java/com/uravgcode/modernessentials/module/CommandWhitelistModule.java renamed to src/main/java/com/uravgcode/modernessentials/module/CommandFilterModule.java src/main/java/com/uravgcode/modernessentials/module/CommandWhitelistModule.java renamed to src/main/java/com/uravgcode/modernessentials/module/CommandFilterModule.java

@@ -12,35 +12,40 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collections;
 import java.util.Set;
 
-@ConfigModule(path = "command-whitelist")
-public final class CommandWhitelistModule extends PluginModule {
-    private static final String permission = "essentials.commandwhitelist.bypass";
+@ConfigModule(path = "command-filter")
+public final class CommandFilterModule extends PluginModule {
+    private enum Mode {
+        WHITELIST,
+        BLACKLIST
+    }
+
+    @ConfigValue(path = "command-filter.mode")
+    private Mode mode = Mode.BLACKLIST;
 
-    @ConfigValue(path = "command-whitelist.whitelist")
-    private Set<String> whitelist = Collections.emptySet();
+    @ConfigValue(path = "command-filter.commands")
+    private Set<String> commands = Set.of();
 
-    public CommandWhitelistModule(@NotNull JavaPlugin plugin) {
+    public CommandFilterModule(@NotNull JavaPlugin plugin) {
         super(plugin);
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerCommandSend(PlayerCommandSendEvent event) {
-        if (event.getPlayer().hasPermission(permission)) return;
-        event.getCommands().removeIf(command -> !whitelist.contains(command));
+        if (event.getPlayer().hasPermission("essentials.commandfilter.bypass")) return;
+        event.getCommands().removeIf(command -> (mode == Mode.WHITELIST) != commands.contains(command));
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
         final var player = event.getPlayer();
-        if (player.hasPermission(permission)) return;
+        if (player.hasPermission("essentials.commandfilter.bypass")) return;
 
         final var message = event.getMessage();
         final var command = message.substring(1);
         final var literal = command.split(" ")[0];
-        if (whitelist.contains(literal)) return;
+        if ((mode == Mode.WHITELIST) == commands.contains(literal)) return;
 
         event.setCancelled(true);
         player.sendMessage(Component.textOfChildren(

src/main/java/com/uravgcode/modernessentials/module/PluginModule.java

@@ -76,6 +76,7 @@ public void disable() {
             case List<?> list when type == String.class -> list.stream().map(Object::toString).collect(Collectors.joining("\n"));
             case List<?> list when type == Set.class -> Set.copyOf(list);
             case String string when type == List.class -> List.of(string);
+            case String string when type.isEnum() -> Enum.valueOf(type.asSubclass(Enum.class), string.toUpperCase());
             default -> value;
         };
     }

src/main/resources/config.yml

@@ -91,16 +91,20 @@ death-message:
   format: "<gray>☠ <white><message>"
 
 # =========================
-# Command Whitelist
+# Command Filter
 # =========================
-command-whitelist:
-  # Enables command whitelist module
+command-filter:
+  # Enables command filter module
   enabled: false
 
-  # List of whitelisted commands
-  whitelist:
+  # whitelist or blacklist
+  mode: blacklist
+
+  # Commands affected by the filter
+  # Bypass permission: essentials.commandfilter.bypass
+  commands:
     - help
-    - msg
+    - plugins
 
 # =========================
 # Commands