Skip to content

Commit cb5ff8c

Browse files
xGinkoxGinko
committed
config default adjustments for legacy
rename perm tool
1 parent 606746a commit cb5ff8c

30 files changed

+192
-185
lines changed

‎AnarchyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/AnarchyExploitFixes.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import me.moomoo.anarchyexploitfixes.config.LanguageCache;
77
import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
88
import me.moomoo.anarchyexploitfixes.utils.models.CachedTickData;
9-
import me.moomoo.anarchyexploitfixes.utils.FastPermTool;
9+
import me.moomoo.anarchyexploitfixes.utils.CachingPermTool;
1010
import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
1111
import org.bstats.bukkit.Metrics;
1212
import org.bukkit.command.CommandSender;
@@ -33,7 +33,7 @@ public class AnarchyExploitFixes extends JavaPlugin {
3333
private static HashMap<String, LanguageCache> languageCacheMap;
3434
private static Config config;
3535
private static CachedTickData cachedTickData;
36-
private static FastPermTool fastPermTool;
36+
private static CachingPermTool cachingPermTool;
3737
private static ComponentLogger prefixedLogger, unPrefixedLogger;
3838
private static Metrics metrics;
3939
private static boolean isServerFolia, foundProtocolLib;
@@ -43,7 +43,7 @@ public void onEnable() {
4343
instance = this;
4444
prefixedLogger = ComponentLogger.logger(getLogger().getName());
4545
unPrefixedLogger = ComponentLogger.logger("");
46-
fastPermTool = FastPermTool.enable(this);
46+
cachingPermTool = CachingPermTool.enable(this);
4747

4848
// Fancy enable
4949
prefixedLogger.info(" ");
@@ -106,9 +106,9 @@ public void onDisable() {
106106
metrics.shutdown();
107107
metrics = null;
108108
}
109-
if (fastPermTool != null) {
110-
fastPermTool.shutdown();
111-
fastPermTool = null;
109+
if (cachingPermTool != null) {
110+
cachingPermTool.shutdown();
111+
cachingPermTool = null;
112112
}
113113
instance = null;
114114
config = null;

‎AnarchyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraAtSpawn.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
88
import me.moomoo.anarchyexploitfixes.utils.LocationUtil;
99
import me.moomoo.anarchyexploitfixes.utils.MaterialUtil;
10-
import me.moomoo.anarchyexploitfixes.utils.FastPermTool;
10+
import me.moomoo.anarchyexploitfixes.utils.CachingPermTool;
1111
import net.kyori.adventure.text.Component;
1212
import net.kyori.adventure.text.TextReplacementConfig;
1313
import org.bukkit.Location;
@@ -83,7 +83,7 @@ private void onPlayerMove(PlayerMoveEvent event) {
8383
Player player = event.getPlayer();
8484
if (!ElytraHelper.getInstance().isGliding(player)) return;
8585
if (!event.hasExplicitlyChangedPosition()) return;
86-
if (spawn_shouldCheckPermission && FastPermTool.hasPermission(AEFPermission.BYPASS_ELYTRA, player)) return;
86+
if (spawn_shouldCheckPermission && CachingPermTool.hasPermission(AEFPermission.BYPASS_ELYTRA, player)) return;
8787
Location playerLoc = player.getLocation();
8888
if (ceilingSettingsEnabled && LocationUtil.isNetherCeiling(playerLoc)) return;
8989
if (LocationUtil.getDistance2DTo00(playerLoc) > spawn_Radius) return;

‎AnarchyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraGlobal.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
88
import me.moomoo.anarchyexploitfixes.utils.LocationUtil;
99
import me.moomoo.anarchyexploitfixes.utils.MaterialUtil;
10-
import me.moomoo.anarchyexploitfixes.utils.FastPermTool;
10+
import me.moomoo.anarchyexploitfixes.utils.CachingPermTool;
1111
import net.kyori.adventure.text.Component;
1212
import net.kyori.adventure.text.TextReplacementConfig;
1313
import org.bukkit.Location;
@@ -93,7 +93,7 @@ private void onPlayerMove(PlayerMoveEvent event) {
9393
Player player = event.getPlayer();
9494
if (!ElytraHelper.getInstance().isGliding(player)) return;
9595
if (!event.hasExplicitlyChangedPosition()) return;
96-
if (global_shouldCheckPermission && FastPermTool.hasPermission(AEFPermission.BYPASS_ELYTRA, player)) return;
96+
if (global_shouldCheckPermission && CachingPermTool.hasPermission(AEFPermission.BYPASS_ELYTRA, player)) return;
9797
Location playerLoc = player.getLocation();
9898
if (ceiling_SettingsEnabled && LocationUtil.isNetherCeiling(playerLoc)) return;
9999
if (spawn_SettingsEnabled && LocationUtil.getDistance2DTo00(playerLoc) <= spawn_Radius) return;

‎AnarchyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/elytra/ElytraOnCeiling.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import me.moomoo.anarchyexploitfixes.modules.AnarchyExploitFixesModule;
88
import me.moomoo.anarchyexploitfixes.utils.LocationUtil;
99
import me.moomoo.anarchyexploitfixes.utils.MaterialUtil;
10-
import me.moomoo.anarchyexploitfixes.utils.FastPermTool;
10+
import me.moomoo.anarchyexploitfixes.utils.CachingPermTool;
1111
import net.kyori.adventure.text.Component;
1212
import net.kyori.adventure.text.TextReplacementConfig;
1313
import org.bukkit.Location;
@@ -86,7 +86,7 @@ private void onPlayerMove(PlayerMoveEvent event) {
8686
Player player = event.getPlayer();
8787
if (!ElytraHelper.getInstance().isGliding(player)) return;
8888
if (!event.hasExplicitlyChangedPosition()) return;
89-
if (ceiling_shouldCheckPermission && FastPermTool.hasPermission(AEFPermission.BYPASS_ELYTRA, player)) return;
89+
if (ceiling_shouldCheckPermission && CachingPermTool.hasPermission(AEFPermission.BYPASS_ELYTRA, player)) return;
9090
Location playerLoc = player.getLocation();
9191
if (!LocationUtil.isNetherCeiling(playerLoc)) return;
9292

‎AnarchyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/illegals/items/BannedItemNames.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import me.moomoo.anarchyexploitfixes.AnarchyExploitFixes;
66
import me.moomoo.anarchyexploitfixes.config.Config;
77
import me.moomoo.anarchyexploitfixes.enums.AEFPermission;
8-
import me.moomoo.anarchyexploitfixes.utils.FastPermTool;
8+
import me.moomoo.anarchyexploitfixes.utils.CachingPermTool;
99
import net.kyori.adventure.text.Component;
1010
import net.kyori.adventure.text.minimessage.MiniMessage;
1111
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
@@ -90,7 +90,7 @@ public void handleItem(ItemStack itemStack, ItemLegality checkResult) {
9090

9191
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
9292
private void onPrepareResult(PrepareResultEvent event) {
93-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getView().getPlayer())) return;
93+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getView().getPlayer())) return;
9494

9595
ItemStack resultItem = event.getResult();
9696
if (getLegality(resultItem) == ItemLegality.ILLEGAL) {
@@ -101,7 +101,7 @@ private void onPrepareResult(PrepareResultEvent event) {
101101

102102
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
103103
private void onInventoryClick(InventoryClickEvent event) {
104-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getWhoClicked())) return;
104+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getWhoClicked())) return;
105105

106106
handleItem(event.getCurrentItem(), getLegality(event.getCurrentItem()));
107107
handleItem(event.getCursor(), getLegality(event.getCursor()));
@@ -116,7 +116,7 @@ private void onAttack(PrePlayerAttackEntityEvent event) {
116116
ItemStack attackItem = event.getPlayer().getActiveItem();
117117
final ItemLegality result = getLegality(attackItem);
118118
if (result != ItemLegality.LEGAL) {
119-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
119+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
120120

121121
event.setCancelled(true);
122122
handleItem(attackItem, result);
@@ -128,7 +128,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
128128
ItemStack droppedItem = event.getItemDrop().getItemStack();
129129
final ItemLegality result = getLegality(droppedItem);
130130
if (result != ItemLegality.LEGAL) {
131-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
131+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
132132

133133
handleItem(droppedItem, result);
134134
event.getItemDrop().setItemStack(droppedItem);
@@ -139,7 +139,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
139139
private void onInteract(PlayerInteractEvent event) {
140140
final ItemLegality result = getLegality(event.getItem());
141141
if (result != ItemLegality.LEGAL) {
142-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
142+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
143143

144144
event.setCancelled(true);
145145
handleItem(event.getItem(), result);
@@ -151,7 +151,7 @@ private void onInteractEntity(PlayerInteractEntityEvent event) {
151151
ItemStack handItem = event.getPlayer().getInventory().getItem(event.getHand());
152152
final ItemLegality result = getLegality(handItem);
153153
if (result != ItemLegality.LEGAL) {
154-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
154+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDNAME, event.getPlayer())) return;
155155

156156
event.setCancelled(true);
157157
handleItem(handItem, result);

‎AnarchyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/illegals/items/BannedMaterials.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import me.moomoo.anarchyexploitfixes.enums.AEFPermission;
77
import me.moomoo.anarchyexploitfixes.utils.ItemUtil;
88
import me.moomoo.anarchyexploitfixes.utils.LogUtil;
9-
import me.moomoo.anarchyexploitfixes.utils.FastPermTool;
9+
import me.moomoo.anarchyexploitfixes.utils.CachingPermTool;
1010
import org.bukkit.Material;
1111
import org.bukkit.event.EventHandler;
1212
import org.bukkit.event.EventPriority;
@@ -121,7 +121,7 @@ public void handleItem(ItemStack itemStack, ItemLegality checkResult) {
121121

122122
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
123123
private void onInventoryClick(InventoryClickEvent event) {
124-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getWhoClicked())) return;
124+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getWhoClicked())) return;
125125

126126
handleItem(event.getCurrentItem(), getLegality(event.getCurrentItem()));
127127
handleItem(event.getCursor(), getLegality(event.getCursor()));
@@ -136,7 +136,7 @@ private void onAttack(PrePlayerAttackEntityEvent event) {
136136
ItemStack attackItem = event.getPlayer().getActiveItem();
137137
final ItemLegality result = getLegality(attackItem);
138138
if (result != ItemLegality.LEGAL) {
139-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
139+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
140140

141141
event.setCancelled(true);
142142
handleItem(attackItem, result);
@@ -148,7 +148,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
148148
ItemStack droppedItem = event.getItemDrop().getItemStack();
149149
final ItemLegality result = getLegality(droppedItem);
150150
if (result != ItemLegality.LEGAL) {
151-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
151+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
152152

153153
handleItem(droppedItem, result);
154154
event.getItemDrop().setItemStack(droppedItem);
@@ -159,7 +159,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
159159
private void onInteract(PlayerInteractEvent event) {
160160
final ItemLegality result = getLegality(event.getItem());
161161
if (result != ItemLegality.LEGAL) {
162-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
162+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
163163

164164
event.setCancelled(true);
165165
handleItem(event.getItem(), result);
@@ -171,7 +171,7 @@ private void onInteractEntity(PlayerInteractEntityEvent event) {
171171
ItemStack handItem = event.getPlayer().getInventory().getItem(event.getHand());
172172
final ItemLegality result = getLegality(handItem);
173173
if (result != ItemLegality.LEGAL) {
174-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
174+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_BANNEDMATERIAL, event.getPlayer())) return;
175175

176176
event.setCancelled(true);
177177
handleItem(handItem, result);

‎AnarchyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/illegals/items/OverstackedItems.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import me.moomoo.anarchyexploitfixes.enums.AEFPermission;
88
import me.moomoo.anarchyexploitfixes.utils.ItemUtil;
99
import me.moomoo.anarchyexploitfixes.utils.LogUtil;
10-
import me.moomoo.anarchyexploitfixes.utils.FastPermTool;
10+
import me.moomoo.anarchyexploitfixes.utils.CachingPermTool;
1111
import org.bukkit.Material;
1212
import org.bukkit.event.EventHandler;
1313
import org.bukkit.event.EventPriority;
@@ -146,7 +146,7 @@ public void handleItem(ItemStack itemStack, ItemLegality checkResult) {
146146

147147
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
148148
private void onInventoryClick(InventoryClickEvent event) {
149-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getWhoClicked())) return;
149+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getWhoClicked())) return;
150150

151151
handleItem(event.getCurrentItem(), getLegality(event.getCurrentItem()));
152152
handleItem(event.getCursor(), getLegality(event.getCursor()));
@@ -161,7 +161,7 @@ private void onAttack(PrePlayerAttackEntityEvent event) {
161161
ItemStack attackItem = event.getPlayer().getActiveItem();
162162
final ItemLegality result = getLegality(attackItem);
163163
if (result != ItemLegality.LEGAL) {
164-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
164+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
165165

166166
event.setCancelled(true);
167167
handleItem(attackItem, result);
@@ -173,7 +173,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
173173
ItemStack droppedItem = event.getItemDrop().getItemStack();
174174
final ItemLegality result = getLegality(droppedItem);
175175
if (result != ItemLegality.LEGAL) {
176-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
176+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
177177

178178
handleItem(droppedItem, result);
179179
event.getItemDrop().setItemStack(droppedItem);
@@ -184,7 +184,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
184184
private void onInteract(PlayerInteractEvent event) {
185185
final ItemLegality result = getLegality(event.getItem());
186186
if (result != ItemLegality.LEGAL) {
187-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
187+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
188188

189189
event.setCancelled(true);
190190
handleItem(event.getItem(), result);
@@ -196,7 +196,7 @@ private void onInteractEntity(PlayerInteractEntityEvent event) {
196196
ItemStack handItem = event.getPlayer().getInventory().getItem(event.getHand());
197197
final ItemLegality result = getLegality(handItem);
198198
if (result != ItemLegality.LEGAL) {
199-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
199+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_OVERSTACKED, event.getPlayer())) return;
200200

201201
event.setCancelled(true);
202202
handleItem(handItem, result);

‎AnarchyExploitFixesFolia/src/main/java/me/moomoo/anarchyexploitfixes/modules/illegals/items/PlayerHeadItems.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import me.moomoo.anarchyexploitfixes.config.Config;
66
import me.moomoo.anarchyexploitfixes.enums.AEFPermission;
77
import me.moomoo.anarchyexploitfixes.utils.ItemUtil;
8-
import me.moomoo.anarchyexploitfixes.utils.FastPermTool;
8+
import me.moomoo.anarchyexploitfixes.utils.CachingPermTool;
99
import org.bukkit.Material;
1010
import org.bukkit.event.EventHandler;
1111
import org.bukkit.event.EventPriority;
@@ -99,7 +99,7 @@ private void onDispense(BlockDispenseEvent event) {
9999

100100
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
101101
private void onInventoryClick(InventoryClickEvent event) {
102-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_PLAYERHEAD, event.getWhoClicked())) return;
102+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_PLAYERHEAD, event.getWhoClicked())) return;
103103

104104
handleItem(event.getCurrentItem(), getLegality(event.getCurrentItem()));
105105
handleItem(event.getCursor(), getLegality(event.getCursor()));
@@ -114,7 +114,7 @@ private void onAttack(PrePlayerAttackEntityEvent event) {
114114
ItemStack attackItem = event.getPlayer().getActiveItem();
115115
final ItemLegality result = getLegality(attackItem);
116116
if (result != ItemLegality.LEGAL) {
117-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_PLAYERHEAD, event.getPlayer())) return;
117+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_PLAYERHEAD, event.getPlayer())) return;
118118

119119
event.setCancelled(true);
120120
handleItem(attackItem, result);
@@ -126,7 +126,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
126126
ItemStack droppedItem = event.getItemDrop().getItemStack();
127127
final ItemLegality result = getLegality(droppedItem);
128128
if (result != ItemLegality.LEGAL) {
129-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_PLAYERHEAD, event.getPlayer())) return;
129+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_PLAYERHEAD, event.getPlayer())) return;
130130

131131
handleItem(droppedItem, result);
132132
event.getItemDrop().setItemStack(droppedItem);
@@ -137,7 +137,7 @@ private void onPlayerDropItem(PlayerDropItemEvent event) {
137137
private void onInteract(PlayerInteractEvent event) {
138138
final ItemLegality result = getLegality(event.getItem());
139139
if (result != ItemLegality.LEGAL) {
140-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_PLAYERHEAD, event.getPlayer())) return;
140+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_PLAYERHEAD, event.getPlayer())) return;
141141

142142
event.setCancelled(true);
143143
handleItem(event.getItem(), result);
@@ -149,7 +149,7 @@ private void onInteractEntity(PlayerInteractEntityEvent event) {
149149
ItemStack handItem = event.getPlayer().getInventory().getItem(event.getHand());
150150
final ItemLegality result = getLegality(handItem);
151151
if (result != ItemLegality.LEGAL) {
152-
if (FastPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_PLAYERHEAD, event.getPlayer())) return;
152+
if (CachingPermTool.hasPermission(AEFPermission.BYPASS_ILLEGAL_PLAYERHEAD, event.getPlayer())) return;
153153

154154
event.setCancelled(true);
155155
handleItem(handItem, result);

0 commit comments

Comments
 (0)