From 9787cde593cd8e44d27f054c873e15183ad52ad2 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 16 Feb 2021 20:14:48 +0000 Subject: [PATCH] Updated to eco 3.8.0 and removed unneeded code --- build.gradle | 2 +- .../proxy/v1_15_R1/BlockBreak.java | 19 ------------------- .../ecoenchants/proxy/v1_15_R1/Cooldown.java | 15 --------------- .../proxy/v1_15_R1/TridentStack.java | 17 ----------------- .../proxy/v1_16_R1/BlockBreak.java | 19 ------------------- .../ecoenchants/proxy/v1_16_R1/Cooldown.java | 12 ------------ .../proxy/v1_16_R1/TridentStack.java | 17 ----------------- .../proxy/v1_16_R2/BlockBreak.java | 19 ------------------- .../ecoenchants/proxy/v1_16_R2/Cooldown.java | 12 ------------ .../proxy/v1_16_R2/TridentStack.java | 17 ----------------- .../proxy/v1_16_R3/BlockBreak.java | 19 ------------------- .../ecoenchants/proxy/v1_16_R3/Cooldown.java | 12 ------------ .../proxy/v1_16_R3/TridentStack.java | 17 ----------------- .../command/commands/CommandEcodebug.java | 6 +----- .../ecoenchants/config/configs/Rarity.java | 1 - .../ecoenchants/config/configs/Target.java | 1 - .../ecoenchants/normal/Abrasion.java | 5 ++--- .../ecoenchants/normal/BlastMining.java | 5 ++--- .../ecoenchants/normal/Bleed.java | 5 ++--- .../ecoenchants/normal/Cleave.java | 5 ++--- .../ecoenchants/normal/Disable.java | 5 ++--- .../ecoenchants/normal/Drill.java | 5 ++--- .../ecoenchants/normal/Dullness.java | 5 ++--- .../ecoenchants/normal/Famine.java | 5 ++--- .../enchantments/ecoenchants/normal/Fury.java | 5 ++--- .../ecoenchants/normal/IllusionAspect.java | 5 ++--- .../ecoenchants/normal/InfernalTouch.java | 2 +- .../ecoenchants/normal/Lumberjack.java | 4 +--- .../ecoenchants/normal/Shockwave.java | 5 ++--- .../ecoenchants/normal/Spearfishing.java | 5 ++--- .../ecoenchants/normal/Splash.java | 5 ++--- .../ecoenchants/normal/StrayAspect.java | 5 ++--- .../ecoenchants/normal/Supercritical.java | 5 ++--- .../ecoenchants/normal/Telekinesis.java | 5 ++--- .../enchantments/ecoenchants/normal/Thor.java | 5 ++--- .../ecoenchants/normal/Toxic.java | 5 ++--- .../ecoenchants/normal/VampireAspect.java | 5 ++--- .../enchantments/ecoenchants/normal/Vein.java | 4 +--- .../ecoenchants/special/Bolt.java | 5 ++--- .../ecoenchants/special/Carve.java | 5 ++--- .../ecoenchants/special/Confusion.java | 5 ++--- .../ecoenchants/special/Razor.java | 5 ++--- .../ecoenchants/special/Volatile.java | 5 ++--- .../ecoenchants/spell/Dynamite.java | 5 ++--- .../enchantments/itemtypes/Artifact.java | 5 ++--- .../enchantments/meta/EnchantmentType.java | 1 - .../support/merging/anvil/AnvilListeners.java | 2 +- .../support/merging/anvil/AnvilMerge.java | 2 +- .../enchantments/util/EnchantChecks.java | 1 - .../enchantments/util/WatcherTriggers.java | 11 +++++------ .../proxy/proxies/BlockBreakProxy.java | 18 ------------------ .../proxy/proxies/CooldownProxy.java | 16 ---------------- .../proxy/proxies/TridentStackProxy.java | 17 ----------------- .../ecoenchants/mmo/enchants/mana/Elixir.java | 4 +--- .../mmo/enchants/stamina/Motivate.java | 4 +--- .../ecoenchants/precision/Precision.java | 5 ++--- .../summoning/SummoningEnchantment.java | 5 ++--- 57 files changed, 70 insertions(+), 361 deletions(-) delete mode 100644 eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/BlockBreak.java delete mode 100644 eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/Cooldown.java delete mode 100644 eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/TridentStack.java delete mode 100644 eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/BlockBreak.java delete mode 100644 eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/Cooldown.java delete mode 100644 eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/TridentStack.java delete mode 100644 eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/BlockBreak.java delete mode 100644 eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/Cooldown.java delete mode 100644 eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/TridentStack.java delete mode 100644 eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/BlockBreak.java delete mode 100644 eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/Cooldown.java delete mode 100644 eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/TridentStack.java delete mode 100644 eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/BlockBreakProxy.java delete mode 100644 eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/CooldownProxy.java delete mode 100644 eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/TridentStackProxy.java diff --git a/build.gradle b/build.gradle index 5f537294..9867cbf7 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:3.6.0' + compileOnly 'com.willfp:eco:3.8.0' compileOnly 'org.jetbrains:annotations:19.0.0' diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/BlockBreak.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/BlockBreak.java deleted file mode 100644 index 13ef8377..00000000 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/BlockBreak.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_15_R1; - -import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy; -import net.minecraft.server.v1_15_R1.BlockPosition; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public final class BlockBreak implements BlockBreakProxy { - @Override - public void breakBlock(@NotNull final Player player, - @NotNull final Block block) { - if (block.getY() > 255 || block.getY() < 0) { - return; - } - ((CraftPlayer) player).getHandle().playerInteractManager.breakBlock(new BlockPosition(block.getX(), block.getY(), block.getZ())); - } -} diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/Cooldown.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/Cooldown.java deleted file mode 100644 index 6a1094bd..00000000 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/Cooldown.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_15_R1; - -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import net.minecraft.server.v1_15_R1.EntityHuman; -import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public final class Cooldown implements CooldownProxy { - @Override - public double getAttackCooldown(@NotNull final Player player) { - EntityHuman entityHuman = ((CraftPlayer) player).getHandle(); - return entityHuman.s(0); - } -} diff --git a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/TridentStack.java b/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/TridentStack.java deleted file mode 100644 index cec867fb..00000000 --- a/eco-core/core-nms/v1_15_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_15_R1/TridentStack.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_15_R1; - -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import net.minecraft.server.v1_15_R1.EntityThrownTrident; -import org.bukkit.craftbukkit.v1_15_R1.entity.CraftTrident; -import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack; -import org.bukkit.entity.Trident; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public final class TridentStack implements TridentStackProxy { - @Override - public ItemStack getTridentStack(@NotNull final Trident trident) { - EntityThrownTrident t = ((CraftTrident) trident).getHandle(); - return CraftItemStack.asBukkitCopy(t.trident); - } -} diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/BlockBreak.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/BlockBreak.java deleted file mode 100644 index ffeb9b36..00000000 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/BlockBreak.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_16_R1; - -import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy; -import net.minecraft.server.v1_16_R1.BlockPosition; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public final class BlockBreak implements BlockBreakProxy { - @Override - public void breakBlock(@NotNull final Player player, - @NotNull final Block block) { - if (block.getY() > 255 || block.getY() < 0) { - return; - } - ((CraftPlayer) player).getHandle().playerInteractManager.breakBlock(new BlockPosition(block.getX(), block.getY(), block.getZ())); - } -} diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/Cooldown.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/Cooldown.java deleted file mode 100644 index ca7a2d90..00000000 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/Cooldown.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_16_R1; - -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public final class Cooldown implements CooldownProxy { - @Override - public double getAttackCooldown(@NotNull final Player player) { - return player.getAttackCooldown(); - } -} diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/TridentStack.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/TridentStack.java deleted file mode 100644 index 87716e66..00000000 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/TridentStack.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_16_R1; - -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import net.minecraft.server.v1_16_R1.EntityThrownTrident; -import org.bukkit.craftbukkit.v1_16_R1.entity.CraftTrident; -import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack; -import org.bukkit.entity.Trident; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public final class TridentStack implements TridentStackProxy { - @Override - public ItemStack getTridentStack(@NotNull final Trident trident) { - EntityThrownTrident t = ((CraftTrident) trident).getHandle(); - return CraftItemStack.asBukkitCopy(t.trident); - } -} diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/BlockBreak.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/BlockBreak.java deleted file mode 100644 index 8467e11c..00000000 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/BlockBreak.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_16_R2; - -import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy; -import net.minecraft.server.v1_16_R2.BlockPosition; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public final class BlockBreak implements BlockBreakProxy { - @Override - public void breakBlock(@NotNull final Player player, - @NotNull final Block block) { - if (block.getY() > 255 || block.getY() < 0) { - return; - } - ((CraftPlayer) player).getHandle().playerInteractManager.breakBlock(new BlockPosition(block.getX(), block.getY(), block.getZ())); - } -} diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/Cooldown.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/Cooldown.java deleted file mode 100644 index 1c3e0a54..00000000 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/Cooldown.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_16_R2; - -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public final class Cooldown implements CooldownProxy { - @Override - public double getAttackCooldown(@NotNull final Player player) { - return player.getAttackCooldown(); - } -} diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/TridentStack.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/TridentStack.java deleted file mode 100644 index cc3d6115..00000000 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/TridentStack.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_16_R2; - -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import net.minecraft.server.v1_16_R2.EntityThrownTrident; -import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTrident; -import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack; -import org.bukkit.entity.Trident; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public final class TridentStack implements TridentStackProxy { - @Override - public ItemStack getTridentStack(@NotNull final Trident trident) { - EntityThrownTrident t = ((CraftTrident) trident).getHandle(); - return CraftItemStack.asBukkitCopy(t.trident); - } -} diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/BlockBreak.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/BlockBreak.java deleted file mode 100644 index 26824b09..00000000 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/BlockBreak.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_16_R3; - -import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy; -import net.minecraft.server.v1_16_R3.BlockPosition; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public final class BlockBreak implements BlockBreakProxy { - @Override - public void breakBlock(@NotNull final Player player, - @NotNull final Block block) { - if (block.getY() > 255 || block.getY() < 0) { - return; - } - ((CraftPlayer) player).getHandle().playerInteractManager.breakBlock(new BlockPosition(block.getX(), block.getY(), block.getZ())); - } -} diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/Cooldown.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/Cooldown.java deleted file mode 100644 index de068c89..00000000 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/Cooldown.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_16_R3; - -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public final class Cooldown implements CooldownProxy { - @Override - public double getAttackCooldown(@NotNull final Player player) { - return player.getAttackCooldown(); - } -} diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/TridentStack.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/TridentStack.java deleted file mode 100644 index ee82a606..00000000 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/TridentStack.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.willfp.ecoenchants.proxy.v1_16_R3; - -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import net.minecraft.server.v1_16_R3.EntityThrownTrident; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTrident; -import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; -import org.bukkit.entity.Trident; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public final class TridentStack implements TridentStackProxy { - @Override - public ItemStack getTridentStack(@NotNull final Trident trident) { - EntityThrownTrident t = ((CraftTrident) trident).getHandle(); - return CraftItemStack.asBukkitCopy(t.trident); - } -} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java index b99e3f3f..06efd388 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java @@ -2,10 +2,9 @@ package com.willfp.ecoenchants.command.commands; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.events.ListenerPriority; -import com.willfp.eco.util.proxy.ProxyConstants; import com.willfp.eco.util.command.AbstractCommand; -import com.willfp.eco.util.drops.internal.DropManager; import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.proxy.ProxyConstants; import com.willfp.ecoenchants.display.EnchantmentCache; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; @@ -111,9 +110,6 @@ public class CommandEcodebug extends AbstractCommand { this.getPlugin().getLog().info("Enchantments with evident issues: " + withIssues.toString()); this.getPlugin().getLog().info(""); - this.getPlugin().getLog().info("Drop Type: " + DropManager.getType()); - this.getPlugin().getLog().info(""); - this.getPlugin().getLog().info("Packets: " + ProtocolLibrary.getProtocolManager().getPacketListeners().stream() .filter(packetListener -> packetListener.getSendingWhitelist().getPriority().equals(ListenerPriority.MONITOR)) .collect(Collectors.toList()).toString()); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/Rarity.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/Rarity.java index d838ed7e..d43364ff 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/Rarity.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/Rarity.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.config.configs; import com.willfp.eco.util.config.BaseConfig; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.EcoEnchantsPlugin; import java.util.Set; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java index 11f0db82..c603c94f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.config.configs; import com.willfp.eco.util.config.BaseConfig; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.EcoEnchantsPlugin; import org.bukkit.Material; import org.jetbrains.annotations.NotNull; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java index 3a5a92e1..18d3d17c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.eco.util.DurabilityUtils; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -32,7 +31,7 @@ public class Abrasion extends EcoEnchant { Player victim = (Player) uncastVictim; boolean notcharged = this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged"); - if (attacker instanceof Player && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f && !notcharged) { + if (attacker instanceof Player && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !notcharged) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java index 30b7c711..43f27ef7 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java @@ -1,12 +1,11 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.BlockUtils; import com.willfp.eco.util.integrations.anticheat.AnticheatManager; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; -import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.Particle; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -72,7 +71,7 @@ public class BlastMining extends EcoEnchant { toBreak.forEach((block1 -> { block1.setMetadata("block-ignore", this.getPlugin().getMetadataValueFactory().create(true)); - ProxyUtils.getProxy(BlockBreakProxy.class).breakBlock(player, block1); + BlockUtils.breakBlock(player, block1); block1.removeMetadata("block-ignore", this.getPlugin()); })); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java index 8968707b..2dc76c0f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -26,7 +25,7 @@ public class Bleed extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java index 4806a082..64dd1107 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java @@ -1,10 +1,9 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -26,7 +25,7 @@ public class Cleave extends EcoEnchant { } if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java index 0e03aaa5..f1cdc21a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -26,7 +25,7 @@ public class Disable extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java index 65b85f87..203470e8 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java @@ -1,13 +1,12 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.BlockUtils; import com.willfp.eco.util.VectorUtils; import com.willfp.eco.util.integrations.anticheat.AnticheatManager; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; -import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.block.BlockBreakEvent; @@ -54,7 +53,7 @@ public class Drill extends EcoEnchant { continue; } - ProxyUtils.getProxy(BlockBreakProxy.class).breakBlock(player, block1); + BlockUtils.breakBlock(player, block1); block1.removeMetadata("block-ignore", this.getPlugin()); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java index db2c79d7..26ed6452 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -25,7 +24,7 @@ public class Dullness extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java index b87528e7..fcb646ae 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -26,7 +25,7 @@ public class Famine extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java index e1766831..e9e32bbd 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java @@ -1,12 +1,11 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.eco.util.VectorUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Monster; @@ -28,7 +27,7 @@ public class Fury extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java index 7522c6b2..b995538d 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -26,7 +25,7 @@ public class IllusionAspect extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java index ccbf591a..3a5b0746 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java @@ -2,7 +2,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.eco.util.drops.DropQueue; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; -import com.willfp.eco.util.tuplets.Pair; +import com.willfp.eco.util.tuples.Pair; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java index fac923b5..e86b4c36 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java @@ -6,8 +6,6 @@ import com.willfp.eco.util.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; -import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -58,7 +56,7 @@ public class Lumberjack extends EcoEnchant { continue; } - ProxyUtils.getProxy(BlockBreakProxy.class).breakBlock(player, treeBlock); + BlockUtils.breakBlock(player, treeBlock); this.getPlugin().getScheduler().runLater(() -> treeBlock.removeMetadata("block-ignore", this.getPlugin()), 1); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java index fd501ca3..b97c7215 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.TridentUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.AbstractArrow; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -36,7 +35,7 @@ public class Shockwave extends EcoEnchant { AbstractArrow entity = (AbstractArrow) event.getEntity(); ItemStack item = player.getInventory().getItemInMainHand(); if (entity instanceof Trident) { - item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack((Trident) entity); + item = TridentUtils.getItemStack((Trident) entity); } if (!EnchantChecks.item(item, this)) { diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java index 584e8ff2..43b0046d 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.eco.util.NumberUtils; +import com.willfp.eco.util.TridentUtils; import com.willfp.eco.util.drops.DropQueue; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.Material; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; @@ -56,7 +55,7 @@ public class Spearfishing extends EcoEnchant { return; } - ItemStack item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); + ItemStack item = TridentUtils.getItemStack(trident); if (!EnchantChecks.item(item, this)) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java index 34dbd5d8..a85736fe 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java @@ -1,12 +1,11 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.TridentUtils; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; @@ -45,7 +44,7 @@ public class Splash extends EcoEnchant { Trident trident = (Trident) event.getEntity(); Player player = (Player) event.getEntity().getShooter(); - ItemStack item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); + ItemStack item = TridentUtils.getItemStack(trident); if (!EnchantChecks.item(item, this)) { return; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java index 3eb4bc30..759f400b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -26,7 +25,7 @@ public class StrayAspect extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java index eb6fce74..5e220a05 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -24,7 +23,7 @@ public class Supercritical extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java index 06b37050..99001c9c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java @@ -1,5 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.TridentUtils; import com.willfp.eco.util.drops.DropQueue; import com.willfp.eco.util.events.entitydeathbyentity.EntityDeathByEntityEvent; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; @@ -8,8 +9,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.block.Block; @@ -153,7 +152,7 @@ public class Telekinesis extends EcoEnchant { } else if (event.getKiller() instanceof Trident) { if (((Trident) event.getKiller()).getShooter() instanceof Player) { player = (Player) ((Trident) event.getKiller()).getShooter(); - item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack((Trident) event.getKiller()); + item = TridentUtils.getItemStack((Trident) event.getKiller()); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java index b5bd4f3b..04fb3404 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java @@ -1,12 +1,11 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.eco.util.LightningUtils; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -25,7 +24,7 @@ public class Thor extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java index 07e2ad09..e6e393dc 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -26,7 +25,7 @@ public class Toxic extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java index 5b70f3a6..75e806b2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -26,7 +25,7 @@ public class VampireAspect extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java index 6211744b..2ccd5026 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java @@ -6,8 +6,6 @@ import com.willfp.eco.util.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; -import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -58,7 +56,7 @@ public class Vein extends EcoEnchant { continue; } - ProxyUtils.getProxy(BlockBreakProxy.class).breakBlock(player, veinBlock); + BlockUtils.breakBlock(player, veinBlock); this.getPlugin().getScheduler().runLater(() -> veinBlock.removeMetadata("block-ignore", this.getPlugin()), 1); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java index b25de246..11ce4d76 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java @@ -1,12 +1,11 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.eco.util.LightningUtils; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -25,7 +24,7 @@ public class Bolt extends EcoEnchant { final int level, @NotNull final EntityDamageByEntityEvent event) { if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java index b34e2cc1..b281963d 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java @@ -1,10 +1,9 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -32,7 +31,7 @@ public class Carve extends EcoEnchant { final double radius = radiusPerLevel * level; if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0 + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0 && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java index 922af1d6..314b3823 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -33,7 +32,7 @@ public class Confusion extends EcoEnchant { Player victim = (Player) uncastVictim; if (attacker instanceof Player - && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java index 63f4b675..1d1aeaff 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java @@ -1,10 +1,9 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; +import com.willfp.eco.util.PlayerUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -26,7 +25,7 @@ public class Razor extends EcoEnchant { double baseDamage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "base-damage"); double extra = (level * perLevelMultiplier) + baseDamage; if (this.getConfig().getBool((EcoEnchants.CONFIG_LOCATION) + "decrease-if-cooldown") && attacker instanceof Player) { - extra *= ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker); + extra *= PlayerUtils.getAttackCooldown((Player) attacker); } event.setDamage(event.getDamage() + extra); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java index 1712487c..92752dd2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java @@ -1,12 +1,11 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; +import com.willfp.eco.util.PlayerUtils; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.Location; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -31,7 +30,7 @@ public class Volatile extends EcoEnchant { Player attacker = (Player) uncastAttacker; - if (ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown(attacker) != 1.0f + if (PlayerUtils.getAttackCooldown(attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java index 38187432..0e3d7df9 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/spell/Dynamite.java @@ -1,11 +1,10 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.spell; +import com.willfp.eco.util.BlockUtils; import com.willfp.eco.util.integrations.anticheat.AnticheatManager; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.itemtypes.Spell; -import com.willfp.ecoenchants.proxy.proxies.BlockBreakProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.Particle; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -75,7 +74,7 @@ public class Dynamite extends Spell { toBreak.forEach((block1 -> { block1.setMetadata("block-ignore", this.getPlugin().getMetadataValueFactory().create(true)); - ProxyUtils.getProxy(BlockBreakProxy.class).breakBlock(player, block1); + BlockUtils.breakBlock(player, block1); block1.removeMetadata("block-ignore", this.getPlugin()); })); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java index d54c5074..09a34673 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java @@ -2,13 +2,12 @@ package com.willfp.ecoenchants.enchantments.itemtypes; import com.google.common.util.concurrent.AtomicDouble; import com.willfp.eco.util.NumberUtils; +import com.willfp.eco.util.TridentUtils; import com.willfp.eco.util.optional.Prerequisite; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.Location; import org.bukkit.Particle; import org.bukkit.block.Block; @@ -202,7 +201,7 @@ public abstract class Artifact extends EcoEnchant { AbstractArrow entity = (AbstractArrow) event.getEntity(); ItemStack item = player.getInventory().getItemInMainHand(); if (entity instanceof Trident) { - item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack((Trident) entity); + item = TridentUtils.getItemStack((Trident) entity); } if (!EnchantChecks.item(item, this)) { diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java index aca757f8..e26e56b2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.meta; import com.google.common.collect.ImmutableList; import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.itemtypes.Artifact; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java index 3d09ba90..82d26eb0 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilListeners.java @@ -4,7 +4,7 @@ import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.eco.util.proxy.ProxyConstants; -import com.willfp.eco.util.tuplets.Pair; +import com.willfp.eco.util.tuples.Pair; import com.willfp.ecoenchants.proxy.proxies.OpenInventoryProxy; import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy; import com.willfp.ecoenchants.util.ProxyUtils; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java index 047e52d1..dcb41e4e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java @@ -1,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.support.merging.anvil; import com.willfp.eco.util.StringUtils; -import com.willfp.eco.util.tuplets.Pair; +import com.willfp.eco.util.tuples.Pair; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java index dd6b200a..9682039f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java @@ -5,7 +5,6 @@ import com.willfp.eco.util.DurabilityUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy; -import com.willfp.ecoenchants.proxy.proxies.RepairCostProxy; import com.willfp.ecoenchants.util.ProxyUtils; import lombok.experimental.UtilityClass; import org.bukkit.Material; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java index b8c409e9..27d73309 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.util; import com.google.common.collect.Sets; +import com.willfp.eco.util.TridentUtils; import com.willfp.eco.util.events.armorequip.ArmorEquipEvent; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; +import com.willfp.eco.util.integrations.mcmmo.McmmoManager; import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.eco.util.integrations.mcmmo.McmmoManager; -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Arrow; @@ -148,7 +147,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { LivingEntity attacker = (LivingEntity) ((Trident) event.getDamager()).getShooter(); Trident trident = (Trident) event.getDamager(); - ItemStack item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); + ItemStack item = TridentUtils.getItemStack(trident); LivingEntity victim = (LivingEntity) event.getEntity(); @@ -414,7 +413,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { } Trident trident = (Trident) event.getEntity(); - ItemStack item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); + ItemStack item = TridentUtils.getItemStack(trident); LivingEntity shooter = (LivingEntity) event.getEntity().getShooter(); EnchantChecks.getEnchantsOnItem(item).forEach(((enchant, level) -> { @@ -590,7 +589,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { Trident trident = (Trident) event.getEntity(); LivingEntity shooter = (LivingEntity) trident.getShooter(); - ItemStack item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); + ItemStack item = TridentUtils.getItemStack(trident); EnchantChecks.getEnchantsOnItem(item).forEach((enchant, level) -> { if (event.isCancelled()) { diff --git a/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/BlockBreakProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/BlockBreakProxy.java deleted file mode 100644 index 263aa31f..00000000 --- a/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/BlockBreakProxy.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.willfp.ecoenchants.proxy.proxies; - - -import com.willfp.eco.util.proxy.AbstractProxy; -import org.bukkit.block.Block; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public interface BlockBreakProxy extends AbstractProxy { - /** - * Break the block as if the player had done it manually. - * - * @param player The player to break the block as. - * @param block The block to break. - */ - void breakBlock(@NotNull Player player, - @NotNull Block block); -} diff --git a/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/CooldownProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/CooldownProxy.java deleted file mode 100644 index 618891b1..00000000 --- a/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/CooldownProxy.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.willfp.ecoenchants.proxy.proxies; - - -import com.willfp.eco.util.proxy.AbstractProxy; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public interface CooldownProxy extends AbstractProxy { - /** - * Get the attack cooldown for a player. - * - * @param player The player's attack cooldown. - * @return A value between 0 and 1, with 1 representing full power. - */ - double getAttackCooldown(@NotNull Player player); -} diff --git a/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/TridentStackProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/TridentStackProxy.java deleted file mode 100644 index 53bd166a..00000000 --- a/eco-core/core-proxy/src/main/java/com/willfp/ecoenchants/proxy/proxies/TridentStackProxy.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.willfp.ecoenchants.proxy.proxies; - - -import com.willfp.eco.util.proxy.AbstractProxy; -import org.bukkit.entity.Trident; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public interface TridentStackProxy extends AbstractProxy { - /** - * Get a trident's ItemStack. - * - * @param trident The trident to query. - * @return The trident's ItemStack. - */ - ItemStack getTridentStack(@NotNull Trident trident); -} diff --git a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Elixir.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Elixir.java index eb6575fc..c83b9788 100644 --- a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Elixir.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/mana/Elixir.java @@ -4,8 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.mmo.integrations.mmo.MMOManager; import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -23,7 +21,7 @@ public class Elixir extends MMOEnchantment { Player pVictim = (Player) victim; boolean notcharged = this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged"); - if (ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown(pAttacker) != 1.0f && !notcharged) + if (PlayerUtils.getAttackCooldown(pAttacker) != 1.0f && !notcharged) return; double victimMana = MMOManager.getMana(pVictim); diff --git a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Motivate.java b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Motivate.java index c0895aff..1c34cb81 100644 --- a/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Motivate.java +++ b/eco-extensions/mmo/src/main/java/com/willfp/ecoenchants/mmo/enchants/stamina/Motivate.java @@ -4,8 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.mmo.integrations.mmo.MMOManager; import com.willfp.ecoenchants.mmo.structure.MMOEnchantment; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -23,7 +21,7 @@ public class Motivate extends MMOEnchantment { Player pVictim = (Player) victim; boolean notcharged = this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged"); - if (ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown(pAttacker) != 1.0f && !notcharged) + if (PlayerUtils.getAttackCooldown(pVictim) != 1.0f && !notcharged) return; double victimStamina = MMOManager.getStamina(pVictim); diff --git a/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java b/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java index 7fc0823c..e2ec06d6 100644 --- a/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java +++ b/eco-extensions/precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java @@ -1,12 +1,11 @@ package com.willfp.ecoenchants.precision; +import com.willfp.eco.util.TridentUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; -import com.willfp.ecoenchants.proxy.proxies.TridentStackProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.GameMode; import org.bukkit.entity.Enderman; import org.bukkit.entity.LivingEntity; @@ -46,7 +45,7 @@ public class Precision extends EcoEnchant { Player player = (Player) event.getEntity().getShooter(); Trident trident = (Trident) event.getEntity(); - ItemStack itemStack = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); + ItemStack itemStack = TridentUtils.getItemStack(trident); if (!EnchantChecks.item(itemStack, this)) { return; } diff --git a/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java index 913b7ef8..e47b07e1 100644 --- a/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java +++ b/eco-extensions/summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java @@ -1,13 +1,12 @@ package com.willfp.ecoenchants.summoning; import com.willfp.eco.util.NumberUtils; +import com.willfp.eco.util.PlayerUtils; import com.willfp.eco.util.optional.Prerequisite; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; -import com.willfp.ecoenchants.proxy.proxies.CooldownProxy; -import com.willfp.ecoenchants.util.ProxyUtils; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.attribute.Attribute; @@ -81,7 +80,7 @@ public abstract class SummoningEnchantment extends EcoEnchant { final int level) { if (summoningType.equals(SummoningType.MELEE) - && attacker instanceof Player && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f + && attacker instanceof Player && PlayerUtils.getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) { return; }