rename and use in elytra modules

xGinko · Mar 6, 2024 · d30b6d3 · d30b6d3
1 parent 196fd52
commit d30b6d3
Show file tree

Hide file tree

Showing 14 changed files with 67 additions and 68 deletions.
diff --git a/...chyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/AnarchyExploitFixes.java b/...chyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/AnarchyExploitFixes.java
@@ -6,7 +6,7 @@
 import me.moomoo.anarchyexploitfixes.config.LanguageCache;
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import me.moomoo.anarchyexploitfixes.utils.models.CachedTickData;
-import me.moomoo.anarchyexploitfixes.utils.models.HumanPermHelper;
+import me.moomoo.anarchyexploitfixes.utils.models.FastPermTool;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.command.CommandSender;
@@ -33,7 +33,7 @@ public class AnarchyExploitFixes extends JavaPlugin {
     private static HashMap<String, LanguageCache> languageCacheMap;
     private static Config config;
     private static CachedTickData cachedTickData;
-    private static HumanPermHelper humanPermHelper;
+    private static FastPermTool fastPermTool;
     private static ComponentLogger prefixedLogger, unPrefixedLogger;
     private static Metrics metrics;
     private static boolean isServerFolia, foundProtocolLib;
@@ -43,7 +43,7 @@ public void onEnable() {
         instance = this;
         prefixedLogger = ComponentLogger.logger(getLogger().getName());
         unPrefixedLogger = ComponentLogger.logger("");
-        humanPermHelper = HumanPermHelper.create(this);
+        fastPermTool = FastPermTool.enable(this);
 
         // Fancy enable
         prefixedLogger.info("                                                          ");
@@ -106,9 +106,9 @@ public void onDisable() {
             metrics.shutdown();
             metrics = null;
         }
-        if (humanPermHelper != null) {
-            humanPermHelper.shutdown();
-            humanPermHelper = null;
+        if (fastPermTool != null) {
+            fastPermTool.shutdown();
+            fastPermTool = null;
         }
         instance = null;
         config = null;

diff --git a/...tFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraAtSpawn.java b/...tFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraAtSpawn.java
@@ -7,6 +7,7 @@
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import me.moomoo.anarchyexploitfixes.utils.LocationUtil;
 import me.moomoo.anarchyexploitfixes.utils.MaterialUtil;
+import me.moomoo.anarchyexploitfixes.utils.models.FastPermTool;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextReplacementConfig;
 import org.bukkit.Location;
@@ -82,7 +83,7 @@ private void onPlayerMove(PlayerMoveEvent event) {
         Player player = event.getPlayer();
         if (!ElytraHelper.getInstance().isGliding(player)) return;
         if (!event.hasExplicitlyChangedPosition()) return;
-        if (spawn_shouldCheckPermission && player.hasPermission(AEFPermission.BYPASS_ELYTRA.get())) return;
+        if (spawn_shouldCheckPermission && FastPermTool.hasPermission(AEFPermission.BYPASS_ELYTRA, player)) return;
         Location playerLoc = player.getLocation();
         if (ceilingSettingsEnabled && LocationUtil.isNetherCeiling(playerLoc)) return;
         if (LocationUtil.getDistance2DTo00(playerLoc) > spawn_Radius) return;

diff --git a/...itFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraGlobal.java b/...itFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraGlobal.java
@@ -7,6 +7,7 @@
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import me.moomoo.anarchyexploitfixes.utils.LocationUtil;
 import me.moomoo.anarchyexploitfixes.utils.MaterialUtil;
+import me.moomoo.anarchyexploitfixes.utils.models.FastPermTool;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextReplacementConfig;
 import org.bukkit.Location;
@@ -92,7 +93,7 @@ private void onPlayerMove(PlayerMoveEvent event) {
         Player player = event.getPlayer();
         if (!ElytraHelper.getInstance().isGliding(player)) return;
         if (!event.hasExplicitlyChangedPosition()) return;
-        if (global_shouldCheckPermission && player.hasPermission(AEFPermission.BYPASS_ELYTRA.get())) return;
+        if (global_shouldCheckPermission && FastPermTool.hasPermission(AEFPermission.BYPASS_ELYTRA, player)) return;
         Location playerLoc = player.getLocation();
         if (ceiling_SettingsEnabled && LocationUtil.isNetherCeiling(playerLoc)) return;
         if (spawn_SettingsEnabled && LocationUtil.getDistance2DTo00(playerLoc) <= spawn_Radius) return;

diff --git a/...ixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraOnCeiling.java b/...ixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraOnCeiling.java
@@ -7,6 +7,7 @@
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import me.moomoo.anarchyexploitfixes.utils.LocationUtil;
 import me.moomoo.anarchyexploitfixes.utils.MaterialUtil;
+import me.moomoo.anarchyexploitfixes.utils.models.FastPermTool;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextReplacementConfig;
 import org.bukkit.Location;
@@ -85,7 +86,7 @@ private void onPlayerMove(PlayerMoveEvent event) {
         Player player = event.getPlayer();
         if (!ElytraHelper.getInstance().isGliding(player)) return;
         if (!event.hasExplicitlyChangedPosition()) return;
-        if (ceiling_shouldCheckPermission && player.hasPermission(AEFPermission.BYPASS_ELYTRA.get())) return;
+        if (ceiling_shouldCheckPermission && FastPermTool.hasPermission(AEFPermission.BYPASS_ELYTRA, player)) return;
         Location playerLoc = player.getLocation();
         if (!LocationUtil.isNetherCeiling(playerLoc)) return;
 

diff --git a/...ixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraPacketFly.java b/...ixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraPacketFly.java
@@ -4,7 +4,6 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import me.moomoo.anarchyexploitfixes.AnarchyExploitFixes;
 import me.moomoo.anarchyexploitfixes.config.Config;
-import me.moomoo.anarchyexploitfixes.enums.AEFPermission;
 import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
 import me.moomoo.anarchyexploitfixes.utils.MaterialUtil;
 import org.bukkit.entity.EntityType;
@@ -24,14 +23,13 @@ public class ElytraPacketFly implements AnarchyExploitFixesModule, Listener {
 
     private final Cache<UUID, Integer> elytraOpenCounts;
     private final int maxElytraOpensPerTime;
-    private final boolean shouldCheckPermission, notify, kickPlayer;
+    private final boolean notify, kickPlayer;
 
     public ElytraPacketFly() {
         shouldEnable();
         Config config = AnarchyExploitFixes.getConfiguration();
         config.addComment("elytra.packet-elytra-fly.patch-packet-elytra-fly",
                 "Patches the future/rusherhack/kamiblue 2b2t elytra fly exploit");
-        this.shouldCheckPermission = config.getBoolean("elytra.packet-elytra-fly.use-bypass-permission", false);
         this.maxElytraOpensPerTime = config.getInt("elytra.packet-elytra-fly.max-elytra-opens-per-time", 25, """
                 The fly exploit causes the player to constantly toggle gliding.\s
                 If too many glide toggles occur within a timeframe, they are most likely using PacketFly.\s
@@ -75,7 +73,6 @@ public void disable() {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onElytraOpen(EntityToggleGlideEvent event) {
         if (event.getEntityType() != EntityType.PLAYER) return;
-        if (shouldCheckPermission && event.getEntity().hasPermission(AEFPermission.BYPASS_ELYTRA.get())) return;
 
         Integer elytraOpens = elytraOpenCounts.getIfPresent(event.getEntity().getUniqueId());
         if (elytraOpens == null) elytraOpens = 0;

diff --git a/...a/src/main/java/me/moomoo/anarchyexploitfixes/modules/illegals/items/BannedItemNames.java b/...a/src/main/java/me/moomoo/anarchyexploitfixes/modules/illegals/items/BannedItemNames.java
@@ -5,7 +5,7 @@
 import me.moomoo.anarchyexploitfixes.AnarchyExploitFixes;
 import me.moomoo.anarchyexploitfixes.config.Config;
 import me.moomoo.anarchyexploitfixes.enums.AEFPermission;
-import me.moomoo.anarchyexploitfixes.utils.models.HumanPermHelper;
+import me.moomoo.anarchyexploitfixes.utils.models.FastPermTool;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
@@ -90,7 +90,7 @@ public void takeAction(ItemStack itemStack, ItemCheckResult result) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onPrepareResult(PrepareResultEvent event) {
-        if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getView().getPlayer())) return;
+        if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getView().getPlayer())) return;
 
         ItemStack resultItem = event.getResult();
         if (checkItem(resultItem) == ItemCheckResult.IS_ILLEGAL) {
@@ -101,7 +101,7 @@ private void onPrepareResult(PrepareResultEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onInventoryClick(InventoryClickEvent event) {
-        if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getWhoClicked())) return;
+        if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getWhoClicked())) return;
 
         takeAction(event.getCurrentItem(), checkItem(event.getCurrentItem()));
         takeAction(event.getCursor(), checkItem(event.getCursor()));
@@ -116,7 +116,7 @@ private void onAttack(PrePlayerAttackEntityEvent event) {
         ItemStack attackItem = event.getPlayer().getActiveItem();
         final ItemCheckResult result = checkItem(attackItem);
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
 
             event.setCancelled(true);
             takeAction(attackItem, result);
@@ -128,7 +128,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
         ItemStack droppedItem = event.getItemDrop().getItemStack();
         final ItemCheckResult result = checkItem(droppedItem);
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
 
             takeAction(droppedItem, result);
             event.getItemDrop().setItemStack(droppedItem);
@@ -139,7 +139,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
     private void onInteract(PlayerInteractEvent event) {
         final ItemCheckResult result = checkItem(event.getItem());
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
 
             event.setCancelled(true);
             takeAction(event.getItem(), result);
@@ -151,7 +151,7 @@ private void onInteractEntity(PlayerInteractEntityEvent event) {
         ItemStack handItem = event.getPlayer().getInventory().getItem(event.getHand());
         final ItemCheckResult result = checkItem(handItem);
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
 
             event.setCancelled(true);
             takeAction(handItem, result);

diff --git a/...a/src/main/java/me/moomoo/anarchyexploitfixes/modules/illegals/items/BannedMaterials.java b/...a/src/main/java/me/moomoo/anarchyexploitfixes/modules/illegals/items/BannedMaterials.java
@@ -6,7 +6,7 @@
 import me.moomoo.anarchyexploitfixes.enums.AEFPermission;
 import me.moomoo.anarchyexploitfixes.utils.ItemUtil;
 import me.moomoo.anarchyexploitfixes.utils.LogUtil;
-import me.moomoo.anarchyexploitfixes.utils.models.HumanPermHelper;
+import me.moomoo.anarchyexploitfixes.utils.models.FastPermTool;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -121,7 +121,7 @@ public void takeAction(ItemStack itemStack, ItemCheckResult result) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onInventoryClick(InventoryClickEvent event) {
-        if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getWhoClicked())) return;
+        if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getWhoClicked())) return;
 
         takeAction(event.getCurrentItem(), checkItem(event.getCurrentItem()));
         takeAction(event.getCursor(), checkItem(event.getCursor()));
@@ -136,7 +136,7 @@ private void onAttack(PrePlayerAttackEntityEvent event) {
         ItemStack attackItem = event.getPlayer().getActiveItem();
         final ItemCheckResult result = checkItem(attackItem);
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
 
             event.setCancelled(true);
             takeAction(attackItem, result);
@@ -148,7 +148,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
         ItemStack droppedItem = event.getItemDrop().getItemStack();
         final ItemCheckResult result = checkItem(droppedItem);
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
 
             takeAction(droppedItem, result);
             event.getItemDrop().setItemStack(droppedItem);
@@ -159,7 +159,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
     private void onInteract(PlayerInteractEvent event) {
         final ItemCheckResult result = checkItem(event.getItem());
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
 
             event.setCancelled(true);
             takeAction(event.getItem(), result);
@@ -171,7 +171,7 @@ private void onInteractEntity(PlayerInteractEntityEvent event) {
         ItemStack handItem = event.getPlayer().getInventory().getItem(event.getHand());
         final ItemCheckResult result = checkItem(handItem);
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
 
             event.setCancelled(true);
             takeAction(handItem, result);

diff --git a/.../src/main/java/me/moomoo/anarchyexploitfixes/modules/illegals/items/OverstackedItems.java b/.../src/main/java/me/moomoo/anarchyexploitfixes/modules/illegals/items/OverstackedItems.java
@@ -7,7 +7,7 @@
 import me.moomoo.anarchyexploitfixes.enums.AEFPermission;
 import me.moomoo.anarchyexploitfixes.utils.ItemUtil;
 import me.moomoo.anarchyexploitfixes.utils.LogUtil;
-import me.moomoo.anarchyexploitfixes.utils.models.HumanPermHelper;
+import me.moomoo.anarchyexploitfixes.utils.models.FastPermTool;
 import org.bukkit.Material;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -146,7 +146,7 @@ public void takeAction(ItemStack itemStack, ItemCheckResult result) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     private void onInventoryClick(InventoryClickEvent event) {
-        if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getWhoClicked())) return;
+        if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getWhoClicked())) return;
 
         takeAction(event.getCurrentItem(), checkItem(event.getCurrentItem()));
         takeAction(event.getCursor(), checkItem(event.getCursor()));
@@ -161,7 +161,7 @@ private void onAttack(PrePlayerAttackEntityEvent event) {
         ItemStack attackItem = event.getPlayer().getActiveItem();
         final ItemCheckResult result = checkItem(attackItem);
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
 
             event.setCancelled(true);
             takeAction(attackItem, result);
@@ -173,7 +173,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
         ItemStack droppedItem = event.getItemDrop().getItemStack();
         final ItemCheckResult result = checkItem(droppedItem);
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
 
             takeAction(droppedItem, result);
             event.getItemDrop().setItemStack(droppedItem);
@@ -184,7 +184,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
     private void onInteract(PlayerInteractEvent event) {
         final ItemCheckResult result = checkItem(event.getItem());
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
 
             event.setCancelled(true);
             takeAction(event.getItem(), result);
@@ -196,7 +196,7 @@ private void onInteractEntity(PlayerInteractEntityEvent event) {
         ItemStack handItem = event.getPlayer().getInventory().getItem(event.getHand());
         final ItemCheckResult result = checkItem(handItem);
         if (result != ItemCheckResult.FINE) {
-            if (HumanPermHelper.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
+            if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
 
             event.setCancelled(true);
             takeAction(handItem, result);