From 1716ebf53a8e4547b960d6ba4f83d3a2c17746d1 Mon Sep 17 00:00:00 2001 From: TrueDarkLord Date: Thu, 15 Feb 2024 17:24:45 -0700 Subject: [PATCH] Cleanup Removed some un-needed events. What's a Spartan... --- .../crazyenchantments/paper/Methods.java | 18 ----- .../crazyenchantments/paper/Starter.java | 7 -- .../paper/api/PluginSupport.java | 2 - .../paper/api/events/AngelUseEvent.java | 60 ---------------- .../paper/api/events/DisarmerUseEvent.java | 69 ------------------- .../paper/api/events/HellForgedUseEvent.java | 60 ---------------- .../paper/api/objects/BlockProcessInfo.java | 38 ---------- .../support/anticheats/SpartanSupport.java | 44 ------------ .../paper/controllers/Tinkerer.java | 1 - .../paper/enchantments/ArmorEnchantments.java | 4 -- .../paper/enchantments/AxeEnchantments.java | 7 -- .../paper/enchantments/BootEnchantments.java | 9 --- .../paper/enchantments/BowEnchantments.java | 10 --- .../enchantments/PickaxeEnchantments.java | 8 --- .../paper/enchantments/SwordEnchantments.java | 14 ---- .../paper/enchantments/ToolEnchantments.java | 2 - .../paper/listeners/SlotCrystalListener.java | 2 - .../paper/processors/ArmorMoveProcessor.java | 1 - .../paper/utilities/misc/EnchantUtils.java | 1 + .../paper/utilities/misc/NumberUtils.java | 2 - paper/src/main/resources/plugin.yml | 1 - 21 files changed, 1 insertion(+), 359 deletions(-) delete mode 100644 paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/AngelUseEvent.java delete mode 100644 paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/DisarmerUseEvent.java delete mode 100644 paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/HellForgedUseEvent.java delete mode 100644 paper/src/main/java/com/badbones69/crazyenchantments/paper/api/objects/BlockProcessInfo.java delete mode 100644 paper/src/main/java/com/badbones69/crazyenchantments/paper/api/support/anticheats/SpartanSupport.java diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/Methods.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/Methods.java index ae79b57d1..6ee4cc7ea 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/Methods.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/Methods.java @@ -2,12 +2,10 @@ import com.badbones69.crazyenchantments.paper.api.FileManager.Files; import com.badbones69.crazyenchantments.paper.api.PluginSupport; -import com.badbones69.crazyenchantments.paper.api.PluginSupport.SupportedPlugins; import com.badbones69.crazyenchantments.paper.api.economy.Currency; import com.badbones69.crazyenchantments.paper.api.enums.Messages; import com.badbones69.crazyenchantments.paper.api.objects.ItemBuilder; import com.badbones69.crazyenchantments.paper.api.objects.enchants.EnchantmentType; -import com.badbones69.crazyenchantments.paper.api.support.anticheats.SpartanSupport; import com.badbones69.crazyenchantments.paper.api.support.misc.OraxenSupport; import com.badbones69.crazyenchantments.paper.utilities.misc.ColorUtils; import com.badbones69.crazyenchantments.paper.utilities.misc.EventUtils; @@ -42,8 +40,6 @@ public class Methods { private final OraxenSupport oraxenSupport = starter.getOraxenSupport(); - private final SpartanSupport spartanSupport = starter.getSpartanSupport(); - public EnchantmentType getFromName(String name) { for (EnchantmentType enchantmentType : starter.getInfoMenuManager().getEnchantmentTypes()) { if (enchantmentType.getName().equalsIgnoreCase(name)) return enchantmentType; @@ -349,14 +345,6 @@ public void explode(Entity player) { if (player.getName().equalsIgnoreCase(entity.getName())) continue; en.damage(5D); - if (en instanceof Player) { - if (SupportedPlugins.SPARTAN.isPluginLoaded()) { - spartanSupport.cancelSpeed((Player) player); - spartanSupport.cancelNormalMovements((Player) player); - spartanSupport.cancelNoFall((Player) player); - } - } - en.setVelocity(en.getLocation().toVector().subtract(player.getLocation().toVector()).normalize().multiply(1).setY(.5)); } } @@ -402,13 +390,7 @@ public void explode(Entity entity, Entity arrow) { livingEntity.damage(5D); livingEntity.setVelocity(livingEntity.getLocation().toVector().subtract(arrow.getLocation().toVector()).normalize().multiply(1).setY(.5)); - if (!(livingEntity instanceof Player player)) continue; - if (SupportedPlugins.SPARTAN.isPluginLoaded()) { - spartanSupport.cancelSpeed(player); - spartanSupport.cancelNormalMovements(player); - spartanSupport.cancelNoFall(player); - } } } } diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/Starter.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/Starter.java index f936623a8..c33ffb1ad 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/Starter.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/Starter.java @@ -15,7 +15,6 @@ import com.badbones69.crazyenchantments.paper.api.managers.ShopManager; import com.badbones69.crazyenchantments.paper.api.managers.WingsManager; import com.badbones69.crazyenchantments.paper.api.support.anticheats.NoCheatPlusSupport; -import com.badbones69.crazyenchantments.paper.api.support.anticheats.SpartanSupport; import com.badbones69.crazyenchantments.paper.api.support.claims.SuperiorSkyBlockSupport; import com.badbones69.crazyenchantments.paper.api.support.misc.OraxenSupport; import com.badbones69.crazyenchantments.paper.controllers.EnchantmentControl; @@ -48,7 +47,6 @@ public class Starter { private VaultSupport vaultSupport; private OraxenSupport oraxenSupport; private NoCheatPlusSupport noCheatPlusSupport; - private SpartanSupport spartanSupport; // Plugin Managers. private ArmorEnchantmentManager armorEnchantmentManager; @@ -85,7 +83,6 @@ public void run() { if (SupportedPlugins.NO_CHEAT_PLUS.isPluginLoaded()) this.noCheatPlusSupport = new NoCheatPlusSupport(); if (SupportedPlugins.ORAXEN.isPluginLoaded()) this.oraxenSupport = new OraxenSupport(); - if (SupportedPlugins.SPARTAN.isPluginLoaded()) this.spartanSupport = new SpartanSupport(); // Methods this.methods = new Methods(); @@ -182,10 +179,6 @@ public NoCheatPlusSupport getNoCheatPlusSupport() { return this.noCheatPlusSupport; } - public SpartanSupport getSpartanSupport() { - return this.spartanSupport; - } - // Economy Management. public CurrencyAPI getCurrencyAPI() { return this.currencyAPI; diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/PluginSupport.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/PluginSupport.java index 814bda89d..420c399d0 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/PluginSupport.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/PluginSupport.java @@ -21,7 +21,6 @@ import org.bukkit.metadata.MetadataValue; import org.bukkit.plugin.Plugin; -import java.util.HashMap; import java.util.Map; public class PluginSupport { @@ -161,7 +160,6 @@ public enum SupportedPlugins { // WILD_STACKER("WildStacker"), // Anti Cheats - SPARTAN("Spartan"), NO_CHEAT_PLUS("NoCheatPlus"), //VULCAN("Vulcan"), diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/AngelUseEvent.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/AngelUseEvent.java deleted file mode 100644 index 2ac5487fc..000000000 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/AngelUseEvent.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.badbones69.crazyenchantments.paper.api.events; - -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public class AngelUseEvent extends Event implements Cancellable { - - private static final HandlerList handlers = new HandlerList(); - private final Player player; - private final ItemStack item; - private boolean cancel; - - public AngelUseEvent(Player player, ItemStack item) { - this.player = player; - this.item = item; - this.cancel = false; - } - - /** - * @return The player that uses the enchantment. - */ - public Player getPlayer() { - return player; - } - - /** - * @return The item the enchantment is on. - */ - public ItemStack getItem() { - return item; - } - - @Override - public boolean isCancelled() { - return cancel; - } - - @Override - public void setCancelled(boolean cancel) { - this.cancel = cancel; - } - - /** - * Gets a list of handlers handling this event. - * - * @return A list of handlers handling this event. - */ - @Override - public @NotNull HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } -} \ No newline at end of file diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/DisarmerUseEvent.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/DisarmerUseEvent.java deleted file mode 100644 index 62c2ddc2a..000000000 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/DisarmerUseEvent.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.badbones69.crazyenchantments.paper.api.events; - -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public class DisarmerUseEvent extends Event implements Cancellable { - - private static final HandlerList handlers = new HandlerList(); - private final Player player; - private final Player damager; - private final ItemStack item; - private boolean cancel; - - public DisarmerUseEvent(Player player, Player damager, ItemStack item) { - this.player = player; - this.damager = damager; - this.item = item; - cancel = false; - } - - /** - * @return The player that uses the enchantment. - */ - public Player getPlayer() { - return player; - } - - /** - * @return The player that is attacking the player. - */ - public Player getDamager() { - return damager; - } - - /** - * @return The item that uses the enchantment. - */ - public ItemStack getItem() { - return item; - } - - @Override - public boolean isCancelled() { - return cancel; - } - - @Override - public void setCancelled(boolean cancel) { - this.cancel = cancel; - } - - /** - * Gets a list of handlers handling this event. - * - * @return A list of handlers handling this event. - */ - @Override - public @NotNull HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } -} \ No newline at end of file diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/HellForgedUseEvent.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/HellForgedUseEvent.java deleted file mode 100644 index 55bce8efc..000000000 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/events/HellForgedUseEvent.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.badbones69.crazyenchantments.paper.api.events; - -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public class HellForgedUseEvent extends Event implements Cancellable { - - private static final HandlerList handlers = new HandlerList(); - private final Player player; - private final ItemStack item; - private boolean cancel; - - public HellForgedUseEvent(Player player, ItemStack item) { - this.player = player; - this.item = item; - cancel = false; - } - - /** - * @return The player using the enchantment. - */ - public Player getPlayer() { - return player; - } - - /** - * @return The item with the enchantment. - */ - public ItemStack getItem() { - return item; - } - - @Override - public boolean isCancelled() { - return cancel; - } - - @Override - public void setCancelled(boolean cancel) { - this.cancel = cancel; - } - - /** - * Gets a list of handlers handling this event. - * - * @return A list of handlers handling this event. - */ - @Override - public @NotNull HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } -} \ No newline at end of file diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/objects/BlockProcessInfo.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/objects/BlockProcessInfo.java deleted file mode 100644 index e5011de89..000000000 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/objects/BlockProcessInfo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.badbones69.crazyenchantments.paper.api.objects; - -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.inventory.ItemStack; -import java.util.ArrayList; -import java.util.List; - -public class BlockProcessInfo { - - private final ItemStack item; - private final Block block; - private final List drops; - private final boolean isSpawner; - - public BlockProcessInfo(ItemStack item, Block block) { - this.item = item; - this.block = block; - this.drops = new ArrayList<>(block.getDrops(item)); - isSpawner = block.getType() == Material.SPAWNER; - } - - public ItemStack getItem() { - return item; - } - - public Block getBlock() { - return block; - } - - public List getDrops() { - return drops; - } - - public boolean isSpawner() { - return isSpawner; - } -} \ No newline at end of file diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/support/anticheats/SpartanSupport.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/support/anticheats/SpartanSupport.java deleted file mode 100644 index cfca57a81..000000000 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/api/support/anticheats/SpartanSupport.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.badbones69.crazyenchantments.paper.api.support.anticheats; - -import me.vagdedes.spartan.api.API; -import me.vagdedes.spartan.system.Enums.HackType; -import org.bukkit.entity.Player; - -public class SpartanSupport { - - public void cancelFastBreak(Player player) { - API.cancelCheck(player, HackType.FastBreak, 40); - } - - public void cancelNoSwing(Player player) { - API.cancelCheck(player, HackType.NoSwing, 40); - } - - public void cancelBlockReach(Player player) { - API.cancelCheck(player, HackType.BlockReach, 40); - } - - public void cancelFastEat(Player player) { - API.cancelCheck(player, HackType.FastEat, 40); - } - - public void cancelSpeed(Player player) { - API.cancelCheck(player, HackType.Speed, 80); - } - - public void cancelFly(Player player) { - API.cancelCheck(player, HackType.IrregularMovements, 80); - } - - public void cancelClip(Player player) { - API.cancelCheck(player, HackType.IrregularMovements, 80); - } - - public void cancelNoFall(Player player) { - API.cancelCheck(player, HackType.NoFall, 80); - } - - public void cancelNormalMovements(Player player) { - API.cancelCheck(player, HackType.IrregularMovements, 80); - } -} \ No newline at end of file diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/Tinkerer.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/Tinkerer.java index 8c588e8b4..95b6893c4 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/Tinkerer.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/controllers/Tinkerer.java @@ -17,7 +17,6 @@ import org.bukkit.Material; import org.bukkit.Sound; import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Item; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/ArmorEnchantments.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/ArmorEnchantments.java index b225ea884..7a4a78eab 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/ArmorEnchantments.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/ArmorEnchantments.java @@ -14,7 +14,6 @@ import com.badbones69.crazyenchantments.paper.api.objects.CEnchantment; import com.badbones69.crazyenchantments.paper.api.objects.PotionEffects; import com.badbones69.crazyenchantments.paper.api.support.anticheats.NoCheatPlusSupport; -import com.badbones69.crazyenchantments.paper.api.support.anticheats.SpartanSupport; import com.badbones69.crazyenchantments.paper.controllers.settings.EnchantmentBookSettings; import com.badbones69.crazyenchantments.paper.controllers.settings.ProtectionCrystalSettings; import com.badbones69.crazyenchantments.paper.processors.ArmorMoveProcessor; @@ -63,7 +62,6 @@ public class ArmorEnchantments implements Listener { // Plugin Support. private final NoCheatPlusSupport noCheatPlusSupport = starter.getNoCheatPlusSupport(); - private final SpartanSupport spartanSupport = starter.getSpartanSupport(); private final PluginSupport pluginSupport = starter.getPluginSupport(); @@ -252,8 +250,6 @@ public void onPlayerDamage(EntityDamageByEntityEvent event) { // AntiCheat Support. if (SupportedPlugins.NO_CHEAT_PLUS.isPluginLoaded()) noCheatPlusSupport.allowPlayer(player); - if (SupportedPlugins.SPARTAN.isPluginLoaded()) spartanSupport.cancelNoSwing(player); - for (LivingEntity en : methods.getNearbyLivingEntities(2D, player)) { EntityDamageByEntityEvent damageByEntityEvent = Methods.entityDamageByEntityEvent(player, en, DamageCause.CUSTOM, DamageType.INDIRECT_MAGIC); methods.entityEvent(player, en, damageByEntityEvent); diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/AxeEnchantments.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/AxeEnchantments.java index 19e985ddb..58cadd0be 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/AxeEnchantments.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/AxeEnchantments.java @@ -5,12 +5,9 @@ import com.badbones69.crazyenchantments.paper.Starter; import com.badbones69.crazyenchantments.paper.api.CrazyManager; import com.badbones69.crazyenchantments.paper.api.PluginSupport; -import com.badbones69.crazyenchantments.paper.api.PluginSupport.SupportedPlugins; import com.badbones69.crazyenchantments.paper.api.enums.CEnchantments; -import com.badbones69.crazyenchantments.paper.api.events.EnchantmentUseEvent; import com.badbones69.crazyenchantments.paper.api.objects.CEnchantment; import com.badbones69.crazyenchantments.paper.api.objects.ItemBuilder; -import com.badbones69.crazyenchantments.paper.api.support.anticheats.SpartanSupport; import com.badbones69.crazyenchantments.paper.controllers.settings.EnchantmentBookSettings; import com.badbones69.crazyenchantments.paper.utilities.misc.EnchantUtils; import com.badbones69.crazyenchantments.paper.utilities.misc.EntityUtils; @@ -45,8 +42,6 @@ public class AxeEnchantments implements Listener { // Plugin Support. private final PluginSupport pluginSupport = starter.getPluginSupport(); - private final SpartanSupport spartanSupport = starter.getSpartanSupport(); - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onPlayerDamage(EntityDamageByEntityEvent event) { if (EventUtils.isIgnoredEvent(event)) return; @@ -72,8 +67,6 @@ public void onPlayerDamage(EntityDamageByEntityEvent event) { int food = 2 * crazyManager.getLevel(item, CEnchantments.FEEDME); - if (SupportedPlugins.SPARTAN.isPluginLoaded()) spartanSupport.cancelFastEat(damager); - if (damager.getFoodLevel() + food < 20) damager.setFoodLevel((int) (damager.getSaturation() + food)); if (damager.getFoodLevel() + food > 20) damager.setFoodLevel(20); diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/BootEnchantments.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/BootEnchantments.java index 1011856cd..b3f2702e3 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/BootEnchantments.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/BootEnchantments.java @@ -2,10 +2,8 @@ import com.badbones69.crazyenchantments.paper.CrazyEnchantments; import com.badbones69.crazyenchantments.paper.Starter; -import com.badbones69.crazyenchantments.paper.api.PluginSupport.SupportedPlugins; import com.badbones69.crazyenchantments.paper.api.enums.CEnchantments; import com.badbones69.crazyenchantments.paper.api.managers.WingsManager; -import com.badbones69.crazyenchantments.paper.api.support.anticheats.SpartanSupport; import com.badbones69.crazyenchantments.paper.controllers.settings.EnchantmentBookSettings; import com.badbones69.crazyenchantments.paper.utilities.WingsUtils; import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent; @@ -24,9 +22,6 @@ public class BootEnchantments implements Listener { private final Starter starter = plugin.getStarter(); - // Plugin Support. - private final SpartanSupport spartanSupport = starter.getSpartanSupport(); - // Plugin Managers. private final WingsManager wingsManager = starter.getWingsManager(); @@ -58,8 +53,6 @@ public void onFly(PlayerToggleFlightEvent event) { if (WingsUtils.checkRegion(player) || WingsUtils.isEnemiesNearby(player)) return; - if (SupportedPlugins.SPARTAN.isPluginLoaded()) spartanSupport.cancelNormalMovements(player); - if (event.isFlying()) { if (player.getAllowFlight()) { event.setCancelled(true); @@ -111,8 +104,6 @@ public void onJoin(PlayerJoinEvent event) { if (WingsUtils.checkRegion(player) || WingsUtils.isEnemiesNearby(player)) return; - if (SupportedPlugins.SPARTAN.isPluginLoaded()) spartanSupport.cancelNormalMovements(player); - player.setAllowFlight(true); wingsManager.addFlyingPlayer(player); } diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/BowEnchantments.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/BowEnchantments.java index 2541c72c2..676a85b4c 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/BowEnchantments.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/BowEnchantments.java @@ -13,7 +13,6 @@ import com.badbones69.crazyenchantments.paper.api.objects.CEnchantment; import com.badbones69.crazyenchantments.paper.api.objects.EnchantedArrow; import com.badbones69.crazyenchantments.paper.api.support.anticheats.NoCheatPlusSupport; -import com.badbones69.crazyenchantments.paper.api.support.anticheats.SpartanSupport; import com.badbones69.crazyenchantments.paper.controllers.settings.EnchantmentBookSettings; import com.badbones69.crazyenchantments.paper.utilities.BowUtils; import com.badbones69.crazyenchantments.paper.utilities.misc.EnchantUtils; @@ -53,7 +52,6 @@ public class BowEnchantments implements Listener { private final PluginSupport pluginSupport = starter.getPluginSupport(); private final NoCheatPlusSupport noCheatPlusSupport = starter.getNoCheatPlusSupport(); - private final SpartanSupport spartanSupport = starter.getSpartanSupport(); // Plugin Managers. private final BowEnchantmentManager bowEnchantmentManager = starter.getBowEnchantmentManager(); @@ -118,8 +116,6 @@ public void onLand(ProjectileHitEvent event) { // AntiCheat Support. if (SupportedPlugins.NO_CHEAT_PLUS.isPluginLoaded()) noCheatPlusSupport.allowPlayer(shooter); - if (SupportedPlugins.SPARTAN.isPluginLoaded()) spartanSupport.cancelNoSwing(shooter); - for (LivingEntity entity : methods.getNearbyLivingEntities(2D, arrow.arrow())) { EntityDamageByEntityEvent damageByEntityEvent = Methods.entityDamageByEntityEvent(shooter, entity, DamageCause.LIGHTNING, DamageType.LIGHTNING_BOLT); @@ -172,12 +168,6 @@ public void onArrowDamage(EntityDamageByEntityEvent event) { if (EnchantUtils.isEventActive(CEnchantments.PULL, arrow.getShooter(), arrow.bow(), arrow.enchantments())) { Vector v = arrow.getShooter().getLocation().toVector().subtract(entity.getLocation().toVector()).normalize().multiply(3); - - if (entity instanceof Player player && SupportedPlugins.SPARTAN.isPluginLoaded()) { - spartanSupport.cancelSpeed(player); - spartanSupport.cancelNormalMovements(player); - spartanSupport.cancelNoFall(player); - } entity.setVelocity(v); } diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/PickaxeEnchantments.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/PickaxeEnchantments.java index 754b5cb50..6c285f3bc 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/PickaxeEnchantments.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/PickaxeEnchantments.java @@ -11,7 +11,6 @@ import com.badbones69.crazyenchantments.paper.api.support.anticheats.NoCheatPlusSupport; import com.badbones69.crazyenchantments.paper.api.objects.CEnchantment; import com.badbones69.crazyenchantments.paper.api.objects.ItemBuilder; -import com.badbones69.crazyenchantments.paper.api.support.anticheats.SpartanSupport; import com.badbones69.crazyenchantments.paper.controllers.settings.EnchantmentBookSettings; import com.badbones69.crazyenchantments.paper.utilities.misc.EnchantUtils; import com.badbones69.crazyenchantments.paper.utilities.misc.EventUtils; @@ -46,7 +45,6 @@ public class PickaxeEnchantments implements Listener { // Plugin Support. private final NoCheatPlusSupport noCheatPlusSupport = starter.getNoCheatPlusSupport(); - private final SpartanSupport spartanSupport = starter.getSpartanSupport(); private final HashMap> blocks = new HashMap<>(); @@ -139,12 +137,6 @@ private boolean massBlockBreakCheck(Player player, Set blockList) { private void antiCheat(Player player) { if (SupportedPlugins.NO_CHEAT_PLUS.isPluginLoaded()) noCheatPlusSupport.allowPlayer(player); - - if (SupportedPlugins.SPARTAN.isPluginLoaded()) { - spartanSupport.cancelFastBreak(player); - spartanSupport.cancelNoSwing(player); - spartanSupport.cancelBlockReach(player); - } } @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/SwordEnchantments.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/SwordEnchantments.java index d386d8621..ae808769a 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/SwordEnchantments.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/SwordEnchantments.java @@ -10,14 +10,11 @@ import com.badbones69.crazyenchantments.paper.api.economy.CurrencyAPI; import com.badbones69.crazyenchantments.paper.api.enums.CEnchantments; import com.badbones69.crazyenchantments.paper.api.enums.Messages; -import com.badbones69.crazyenchantments.paper.api.events.DisarmerUseEvent; -import com.badbones69.crazyenchantments.paper.api.events.EnchantmentUseEvent; import com.badbones69.crazyenchantments.paper.api.events.RageBreakEvent; import com.badbones69.crazyenchantments.paper.api.support.anticheats.NoCheatPlusSupport; import com.badbones69.crazyenchantments.paper.api.objects.CEPlayer; import com.badbones69.crazyenchantments.paper.api.objects.CEnchantment; import com.badbones69.crazyenchantments.paper.api.objects.ItemBuilder; -import com.badbones69.crazyenchantments.paper.api.support.anticheats.SpartanSupport; import com.badbones69.crazyenchantments.paper.controllers.BossBarController; import com.badbones69.crazyenchantments.paper.controllers.settings.EnchantmentBookSettings; import com.badbones69.crazyenchantments.paper.utilities.misc.EnchantUtils; @@ -61,7 +58,6 @@ public class SwordEnchantments implements Listener { private final PluginSupport pluginSupport = starter.getPluginSupport(); private final NoCheatPlusSupport noCheatPlusSupport = starter.getNoCheatPlusSupport(); - private final SpartanSupport spartanSupport = starter.getSpartanSupport(); private final BossBarController bossBarController = plugin.getBossBarController(); @@ -219,7 +215,6 @@ public void run() { } if (EnchantUtils.isEventActive(CEnchantments.NUTRITION, damager, item, enchantments)) { - if (SupportedPlugins.SPARTAN.isPluginLoaded()) spartanSupport.cancelFastEat(damager); if (damager.getSaturation() + (2 * crazyManager.getLevel(item, CEnchantments.NUTRITION)) <= 20) damager.setSaturation(damager.getSaturation() + (2 * crazyManager.getLevel(item, CEnchantments.NUTRITION))); @@ -261,13 +256,6 @@ public void run() { } if (EnchantUtils.isEventActive(CEnchantments.OBLITERATE, damager, item, enchantments)) { - - if (event.getEntity() instanceof Player && SupportedPlugins.SPARTAN.isPluginLoaded()) { - spartanSupport.cancelSpeed((Player) event.getEntity()); - spartanSupport.cancelNormalMovements((Player) event.getEntity()); - spartanSupport.cancelNoFall((Player) event.getEntity()); - } - event.getEntity().setVelocity(damager.getLocation().getDirection().multiply(2).setY(1.25)); } @@ -275,8 +263,6 @@ public void run() { if (SupportedPlugins.NO_CHEAT_PLUS.isPluginLoaded()) noCheatPlusSupport.allowPlayer(damager); - if (SupportedPlugins.SPARTAN.isPluginLoaded()) spartanSupport.cancelNoSwing(damager); - for (LivingEntity entity : methods.getNearbyLivingEntities(2D, damager)) { EntityDamageByEntityEvent damageByEntityEvent = Methods.entityDamageByEntityEvent(damager, entity, EntityDamageEvent.DamageCause.MAGIC, DamageType.INDIRECT_MAGIC); methods.entityEvent(damager, entity, damageByEntityEvent); diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/ToolEnchantments.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/ToolEnchantments.java index fdb481b54..599ac2eb5 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/ToolEnchantments.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/enchantments/ToolEnchantments.java @@ -5,7 +5,6 @@ import com.badbones69.crazyenchantments.paper.Starter; import com.badbones69.crazyenchantments.paper.api.CrazyManager; import com.badbones69.crazyenchantments.paper.api.enums.CEnchantments; -import com.badbones69.crazyenchantments.paper.api.events.EnchantmentUseEvent; import com.badbones69.crazyenchantments.paper.api.objects.CEnchantment; import com.badbones69.crazyenchantments.paper.controllers.settings.EnchantmentBookSettings; import com.badbones69.crazyenchantments.paper.utilities.misc.EnchantUtils; @@ -19,7 +18,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/listeners/SlotCrystalListener.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/listeners/SlotCrystalListener.java index e200c6130..95cd5c7a3 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/listeners/SlotCrystalListener.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/listeners/SlotCrystalListener.java @@ -7,7 +7,6 @@ import com.badbones69.crazyenchantments.paper.api.enums.pdc.DataKeys; import com.badbones69.crazyenchantments.paper.api.objects.ItemBuilder; import com.badbones69.crazyenchantments.paper.controllers.settings.EnchantmentBookSettings; -import org.bukkit.Material; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -18,7 +17,6 @@ import org.bukkit.persistence.PersistentDataType; import java.util.HashMap; -import java.util.Objects; public class SlotCrystalListener implements Listener { private final CrazyEnchantments plugin = CrazyEnchantments.getPlugin(); diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/processors/ArmorMoveProcessor.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/processors/ArmorMoveProcessor.java index ef248b08e..8f6bc6313 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/processors/ArmorMoveProcessor.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/processors/ArmorMoveProcessor.java @@ -17,7 +17,6 @@ import org.bukkit.inventory.PlayerInventory; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.Map; diff --git a/paper/src/main/java/com/badbones69/crazyenchantments/paper/utilities/misc/EnchantUtils.java b/paper/src/main/java/com/badbones69/crazyenchantments/paper/utilities/misc/EnchantUtils.java index a407d84fe..61f2dcda3 100644 --- a/paper/src/main/java/com/badbones69/crazyenchantments/paper/utilities/misc/EnchantUtils.java +++ b/paper/src/main/java/com/badbones69/crazyenchantments/paper/utilities/misc/EnchantUtils.java @@ -63,6 +63,7 @@ private static boolean isActive(Player player, CEnchantments enchant, Map