fix #237

xGinko · Jan 1, 2025 · cf5dfc8 · cf5dfc8
1 parent 3eb4b4a
commit cf5dfc8
Show file tree

Hide file tree

Showing 95 changed files with 555 additions and 435 deletions.
diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/AnarchyExploitFixes.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/AnarchyExploitFixes.java
@@ -4,9 +4,9 @@
 import me.xginko.aef.commands.AEFCommand;
 import me.xginko.aef.config.Config;
 import me.xginko.aef.config.LanguageCache;
-import me.xginko.aef.enums.AEFPermission;
 import me.xginko.aef.modules.AEFModule;
-import me.xginko.aef.utils.CachingPermTool;
+import me.xginko.aef.utils.permissions.AEFPermission;
+import me.xginko.aef.utils.permissions.PermissionHandler;
 import me.xginko.aef.utils.KyoriUtil;
 import me.xginko.aef.utils.PlatformUtil;
 import me.xginko.aef.utils.tickdata.TickReporter;
@@ -41,9 +41,11 @@ public final class AnarchyExploitFixes extends JavaPlugin {
     private static AnarchyExploitFixes instance;
     private static Map<String, LanguageCache> languageCacheMap;
     private static Config config;
+
     private static TickReporter tickReporter;
-    private static CachingPermTool cachingPermTool;
+    private static PermissionHandler permissionHandler;
     private static ComponentLogger prefixedLogger, unPrefixedLogger;
+
     private static Metrics metrics;
     private static boolean isPacketEventsInstalled;
 
@@ -101,7 +103,7 @@ public void onEnable() {
         }
 
         instance = this;
-        cachingPermTool = CachingPermTool.enable(this);
+        permissionHandler = PermissionHandler.create(this);
         metrics = new Metrics(this, 8700);
 
         Stream.of("                                                          ",
@@ -149,9 +151,9 @@ public void onDisable() {
             languageCacheMap.clear();
             languageCacheMap = null;
         }
-        if (cachingPermTool != null) {
-            cachingPermTool.disable();
-            cachingPermTool = null;
+        if (permissionHandler != null) {
+            permissionHandler.disable();
+            permissionHandler = null;
         }
         if (tickReporter != null) {
             tickReporter.disable();
@@ -171,6 +173,10 @@ public static AnarchyExploitFixes getInstance()  {
         return instance;
     }
 
+    public static PermissionHandler permissions() {
+        return permissionHandler;
+    }
+
     public static TickReporter tickReporter() {
         return tickReporter;
     }

diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/commands/HelpCmd.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/commands/HelpCmd.java
@@ -1,7 +1,7 @@
 package me.xginko.aef.commands;
 
 import me.xginko.aef.AnarchyExploitFixes;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
@@ -37,7 +37,7 @@ public void enable() {
 
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_HELP.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_HELP.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/commands/SayCmd.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/commands/SayCmd.java
@@ -1,7 +1,7 @@
 package me.xginko.aef.commands;
 
 import me.xginko.aef.AnarchyExploitFixes;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import me.xginko.aef.utils.CommandUtil;
 import net.kyori.adventure.text.TextReplacementConfig;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -40,7 +40,7 @@ public void enable() {
 
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_SAY.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_SAY.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/commands/ToggleConnectionMsgsCmd.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/commands/ToggleConnectionMsgsCmd.java
@@ -1,8 +1,8 @@
 package me.xginko.aef.commands;
 
 import me.xginko.aef.AnarchyExploitFixes;
-import me.xginko.aef.enums.AEFKey;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.enums.AEFKey;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.Command;
@@ -44,7 +44,7 @@ public void enable() {
     @Override
     @SuppressWarnings("DataFlowIssue")
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_TOGGLE_CONNECT_MSGS.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_TOGGLE_CONNECT_MSGS.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/...ExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/DisableSubCmd.java b/...ExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/DisableSubCmd.java
@@ -2,7 +2,7 @@
 
 import me.xginko.aef.AnarchyExploitFixes;
 import me.xginko.aef.commands.SubCommand;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import me.xginko.aef.modules.AEFModule;
 import me.xginko.aef.utils.KyoriUtil;
 import net.kyori.adventure.text.Component;
@@ -29,7 +29,7 @@ public class DisableSubCmd extends SubCommand {
 
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_AEF_DISABLE.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_DISABLE.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/...yExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/ElytraSubCmd.java b/...yExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/ElytraSubCmd.java
@@ -2,7 +2,7 @@
 
 import me.xginko.aef.AnarchyExploitFixes;
 import me.xginko.aef.commands.SubCommand;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import me.xginko.aef.utils.KyoriUtil;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
@@ -31,7 +31,7 @@ public class ElytraSubCmd extends SubCommand {
 
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_AEF_ELYTRA.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_ELYTRA.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/...yExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/GearedSubCmd.java b/...yExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/GearedSubCmd.java
@@ -2,7 +2,7 @@
 
 import me.xginko.aef.AnarchyExploitFixes;
 import me.xginko.aef.commands.SubCommand;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import me.xginko.aef.utils.KyoriUtil;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
@@ -33,7 +33,7 @@ public class GearedSubCmd extends SubCommand {
 
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_AEF_GEARED.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_GEARED.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/LagSubCmd.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/LagSubCmd.java
@@ -2,7 +2,7 @@
 
 import me.xginko.aef.AnarchyExploitFixes;
 import me.xginko.aef.commands.SubCommand;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import me.xginko.aef.utils.KyoriUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -31,12 +31,16 @@ public LagSubCmd() {
     public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args)
             throws CommandException, IllegalArgumentException
     {
-        return args.length == 2 && sender.hasPermission(AEFPermission.CMD_AEF_LAG.get()) ? tabCompletes : Collections.emptyList();
+        if (args.length == 2 && AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_LAG.node()).toBoolean()) {
+            return tabCompletes;
+        }
+
+        return Collections.emptyList();
     }
 
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_AEF_LAG.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_LAG.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/...yExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/ReloadSubCmd.java b/...yExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/ReloadSubCmd.java
@@ -2,7 +2,7 @@
 
 import me.xginko.aef.AnarchyExploitFixes;
 import me.xginko.aef.commands.SubCommand;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import me.xginko.aef.utils.KyoriUtil;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandException;
@@ -28,7 +28,7 @@ public class ReloadSubCmd extends SubCommand {
 
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_AEF_RELOAD.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_RELOAD.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/...ExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/VersionSubCmd.java b/...ExploitFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/VersionSubCmd.java
@@ -3,7 +3,7 @@
 import io.papermc.paper.plugin.configuration.PluginMeta;
 import me.xginko.aef.AnarchyExploitFixes;
 import me.xginko.aef.commands.SubCommand;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import me.xginko.aef.utils.KyoriUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
@@ -32,7 +32,7 @@ public class VersionSubCmd extends SubCommand {
     @Override
     @SuppressWarnings({"UnstableApiUsage", "DataFlowIssue"})
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_AEF_VERSION.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_VERSION.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/...esFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/bytesize/ByteSizeSubCmd.java b/...esFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/bytesize/ByteSizeSubCmd.java
@@ -1,11 +1,11 @@
 package me.xginko.aef.commands.aef.subcommands.bytesize;
 
+import com.google.common.collect.ImmutableList;
 import me.xginko.aef.commands.SubCommand;
 import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -16,8 +16,9 @@ public class ByteSizeSubCmd extends SubCommand {
     private final List<String> tabCompletes;
 
     public ByteSizeSubCmd() {
-        this.subCommands = Arrays.asList(new InventorySubCmd(), new ItemSubCmd());
-        this.tabCompletes = subCommands.stream().map(SubCommand::label).collect(Collectors.toList());
+        this.subCommands = ImmutableList.of(new InventorySubCmd(), new ItemSubCmd());
+        this.tabCompletes = subCommands.stream().map(SubCommand::label)
+                .collect(Collectors.collectingAndThen(Collectors.toList(), ImmutableList::copyOf));
     }
 
     @Override

diff --git a/...sFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/bytesize/InventorySubCmd.java b/...sFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/bytesize/InventorySubCmd.java
@@ -4,7 +4,7 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import me.xginko.aef.AnarchyExploitFixes;
 import me.xginko.aef.commands.SubCommand;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import me.xginko.aef.utils.ItemUtil;
 import me.xginko.aef.utils.KyoriUtil;
 import net.kyori.adventure.text.Component;
@@ -40,7 +40,7 @@ public InventorySubCmd() {
     public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args)
             throws CommandException, IllegalArgumentException
     {
-        if (!sender.hasPermission(AEFPermission.CMD_AEF_SIZE_INV.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_SIZE_INV.node()).toBoolean()) {
             return Collections.emptyList();
         }
 
@@ -63,7 +63,7 @@ public InventorySubCmd() {
 
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_AEF_SIZE_INV.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_SIZE_INV.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/...tFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/bytesize/ItemSubCmd.java b/...tFixesFolia/src/main/java/me/xginko/aef/commands/aef/subcommands/bytesize/ItemSubCmd.java
@@ -4,7 +4,7 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import me.xginko.aef.AnarchyExploitFixes;
 import me.xginko.aef.commands.SubCommand;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import me.xginko.aef.utils.ItemUtil;
 import me.xginko.aef.utils.KyoriUtil;
 import net.kyori.adventure.text.Component;
@@ -40,7 +40,7 @@ public ItemSubCmd() {
     public @NotNull List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args)
             throws CommandException, IllegalArgumentException
     {
-        if (!sender.hasPermission(AEFPermission.CMD_AEF_SIZE_HAND.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_SIZE_HAND.node()).toBoolean()) {
             return Collections.emptyList();
         }
 
@@ -63,7 +63,7 @@ public ItemSubCmd() {
 
     @Override
     public boolean execute(@NotNull CommandSender sender, @NotNull String commandLabel, @NotNull String[] args) {
-        if (!sender.hasPermission(AEFPermission.CMD_AEF_SIZE_HAND.get())) {
+        if (!AnarchyExploitFixes.permissions().permissionValue(sender, AEFPermission.CMD_AEF_SIZE_HAND.node()).toBoolean()) {
             sender.sendMessage(AnarchyExploitFixes.getLang(sender).no_permission);
             return true;
         }

diff --git a/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/chat/PreventPluginScanning.java b/AnarchyExploitFixesFolia/src/main/java/me/xginko/aef/modules/chat/PreventPluginScanning.java
@@ -1,7 +1,8 @@
 package me.xginko.aef.modules.chat;
 
 import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent;
-import me.xginko.aef.enums.AEFPermission;
+import me.xginko.aef.AnarchyExploitFixes;
+import me.xginko.aef.utils.permissions.AEFPermission;
 import me.xginko.aef.modules.AEFModule;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -38,7 +39,7 @@ private boolean isSuspectedScanPacket(String buffer) {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     private void onAsyncCommandTabComplete(AsyncTabCompleteEvent event) {
-        if (event.getSender().hasPermission(AEFPermission.BYPASS_CHAT.get())) return;
+        if (AnarchyExploitFixes.permissions().permissionValue(event.getSender(), AEFPermission.BYPASS_CHAT.node()).toBoolean()) return;
 
         if (isSuspectedScanPacket(event.getBuffer())) {
             event.setCancelled(true);
@@ -47,7 +48,7 @@ private void onAsyncCommandTabComplete(AsyncTabCompleteEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     private void onCommandTabComplete(TabCompleteEvent event) {
-        if (event.getSender().hasPermission(AEFPermission.BYPASS_CHAT.get())) return;
+        if (AnarchyExploitFixes.permissions().permissionValue(event.getSender(), AEFPermission.BYPASS_CHAT.node()).toBoolean()) return;
 
         if (isSuspectedScanPacket(event.getBuffer())) {
             event.setCancelled(true);