diff --git a/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java b/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java index 12033fb6..94e258bb 100644 --- a/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java +++ b/Extensions/Alchemy/src/main/java/com/willfp/ecoenchants/alchemy/Alchemy.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.alchemy; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesMain.java b/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesMain.java index f7d66b0e..671e5237 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesMain.java +++ b/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesMain.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.biomes; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.biomes.enchants.defensive.*; import com.willfp.ecoenchants.biomes.enchants.offensive.*; import com.willfp.ecoenchants.enchantments.EcoEnchant; diff --git a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java b/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java index ed288532..14c070fa 100644 --- a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java +++ b/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.effects; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent; diff --git a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsMain.java b/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsMain.java index f11c221a..5b1bcb9e 100644 --- a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsMain.java +++ b/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsMain.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.effects; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.effects.enchants.*; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.extensions.Extension; diff --git a/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/EndershotMain.java b/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/EndershotMain.java index c4b801b8..3da85d47 100644 --- a/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/EndershotMain.java +++ b/Extensions/Endershot/src/main/java/com/willfp/ecoenchants/endershot/EndershotMain.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.endershot; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.extensions.Extension; import org.bukkit.Bukkit; diff --git a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java b/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java index d9bed2cb..bd33fbf2 100644 --- a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java +++ b/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.firewand; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.itemtypes.Spell; import org.bukkit.entity.Player; diff --git a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/FirewandMain.java b/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/FirewandMain.java index f461f3fd..6d40a4c4 100644 --- a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/FirewandMain.java +++ b/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/FirewandMain.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.firewand; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.extensions.Extension; import org.bukkit.Bukkit; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java b/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java index e1ec1e1c..a6fd16ba 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java +++ b/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOMain.java @@ -1,17 +1,16 @@ package com.willfp.ecoenchants.mmo; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.extensions.Extension; -import com.willfp.ecoenchants.mmo.enchants.misc.Strengthening; -import com.willfp.ecoenchants.mmo.enchants.stamina.Athletic; -import com.willfp.ecoenchants.mmo.enchants.mana.Augment; import com.willfp.ecoenchants.mmo.enchants.abilities.Discounted; import com.willfp.ecoenchants.mmo.enchants.abilities.Recover; +import com.willfp.ecoenchants.mmo.enchants.mana.Augment; import com.willfp.ecoenchants.mmo.enchants.mana.Drain; import com.willfp.ecoenchants.mmo.enchants.mana.Elixir; import com.willfp.ecoenchants.mmo.enchants.mana.Siphon; import com.willfp.ecoenchants.mmo.enchants.mana.Spirituality; +import com.willfp.ecoenchants.mmo.enchants.misc.Strengthening; +import com.willfp.ecoenchants.mmo.enchants.stamina.Athletic; import com.willfp.ecoenchants.mmo.enchants.stamina.Endurance; import com.willfp.ecoenchants.mmo.enchants.stamina.Fortitude; import com.willfp.ecoenchants.mmo.enchants.stamina.Motivate; diff --git a/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java b/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java index 0521fcd9..082e6345 100644 --- a/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java +++ b/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/Precision.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.precision; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; diff --git a/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/PrecisionMain.java b/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/PrecisionMain.java index 784f4125..ea5109fe 100644 --- a/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/PrecisionMain.java +++ b/Extensions/Precision/src/main/java/com/willfp/ecoenchants/precision/PrecisionMain.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.precision; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.extensions.Extension; import org.bukkit.Bukkit; diff --git a/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsMain.java b/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsMain.java index 1c871733..b3243658 100644 --- a/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsMain.java +++ b/Extensions/SprintArtifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsMain.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.sprintartifacts; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.extensions.Extension; import org.bukkit.Bukkit; diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java b/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java index c32f20d2..6e338578 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java +++ b/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.summoning; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningMain.java b/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningMain.java index 64a19745..7abaf0f9 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningMain.java +++ b/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningMain.java @@ -1,6 +1,5 @@ package com.willfp.ecoenchants.summoning; -import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.extensions.Extension; import com.willfp.ecoenchants.summoning.enchants.*; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java index fdfb3cc7..bb5e5909 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java @@ -4,10 +4,10 @@ import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.ListenerPriority; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.wrappers.WrappedChatComponent; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.ChatComponentProxy; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.packets.AbstractPacketAdapter; +import com.willfp.eco.util.plugin.AbstractEcoPlugin; public class PacketChat extends AbstractPacketAdapter { public PacketChat(AbstractEcoPlugin plugin) { @@ -22,7 +22,7 @@ public class PacketChat extends AbstractPacketAdapter { continue; if (component.getHandle() == null) return; - WrappedChatComponent newComponent = WrappedChatComponent.fromHandle(new ProxyFactory<>(ChatComponentProxy.class).getProxy().modifyComponent(component.getHandle())); + WrappedChatComponent newComponent = WrappedChatComponent.fromHandle(ProxyUtils.getProxy(ChatComponentProxy.class).modifyComponent(component.getHandle())); packet.getChatComponents().write(i, newComponent); } } 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 3ef29541..4b66bc9b 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,8 +1,8 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; import com.willfp.eco.util.DurabilityUtils; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -29,7 +29,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 && new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !notcharged) + if (attacker instanceof Player && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f && !notcharged) return; ArrayList armor = new ArrayList<>(Arrays.asList(victim.getInventory().getArmorContents())); 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 922d917c..226abb4b 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.BlockBreakProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -65,7 +65,7 @@ public class BlastMining extends EcoEnchant { toBreak.forEach((block1 -> { block1.setMetadata("block-ignore", new FixedMetadataValue(this.plugin, true)); - new ProxyFactory<>(BlockBreakProxy.class).getProxy().breakBlock(player, block1); + ProxyUtils.getProxy(BlockBreakProxy.class).breakBlock(player, block1); block1.removeMetadata("block-ignore", this.plugin); })); 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 c5ab9bba..ac3f2f20 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -25,7 +25,7 @@ public class Bleed extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { - if (attacker instanceof Player && new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (attacker instanceof Player && ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) return; if (!EnchantmentUtils.passedChance(this, level)) 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 15315fc7..8956e9bb 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -26,7 +26,7 @@ public class Cleave extends EcoEnchant { return; if (attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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 7565c242..d9c51426 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -25,7 +25,7 @@ public class Disable extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if(attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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 2f0c756c..2f78edb1 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.BlockBreakProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.VectorUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; @@ -48,7 +48,7 @@ public class Drill extends EcoEnchant { if (!AntigriefManager.canBreakBlock(player, block1)) continue; - new ProxyFactory<>(BlockBreakProxy.class).getProxy().breakBlock(player, block1); + ProxyUtils.getProxy(BlockBreakProxy.class).breakBlock(player, block1); block1.removeMetadata("block-ignore", this.plugin); } 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 31af79a7..c0e5a5c7 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -24,7 +24,7 @@ public class Dullness extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if(attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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 6e2b667e..caa7a1e0 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -25,7 +25,7 @@ public class Famine extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if (attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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 a0930f28..9c49a58d 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.VectorUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; @@ -27,7 +27,7 @@ public class Fury extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if (attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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 5d634179..1d846218 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -25,7 +25,7 @@ public class IllusionAspect extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if(attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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/Lumberjack.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java index e7ecf552..16d8ec79 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 @@ -1,8 +1,8 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.BlockBreakProxy; import com.willfp.eco.util.BlockUtils; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -53,7 +53,7 @@ public class Lumberjack extends EcoEnchant { treeBlock.setMetadata("block-ignore", new FixedMetadataValue(this.plugin, true)); if(!AntigriefManager.canBreakBlock(player, treeBlock)) continue; - new ProxyFactory<>(BlockBreakProxy.class).getProxy().breakBlock(player, treeBlock); + ProxyUtils.getProxy(BlockBreakProxy.class).breakBlock(player, treeBlock); Bukkit.getScheduler().runTaskLater(this.plugin, () -> treeBlock.removeMetadata("block-ignore", this.plugin),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 5f371522..699d676a 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.TridentStackProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.bukkit.scheduling.EcoBukkitRunnable; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; @@ -36,7 +36,7 @@ public class Shockwave extends EcoEnchant { AbstractArrow entity = (AbstractArrow) event.getEntity(); ItemStack item = player.getInventory().getItemInMainHand(); if(entity instanceof Trident) { - item = new ProxyFactory<>(TridentStackProxy.class).getProxy().getTridentStack((Trident) entity); + item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack((Trident) entity); } if (!EnchantChecks.item(item, this)) return; 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 90894799..4c244f68 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,8 +1,8 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.TridentStackProxy; import com.willfp.eco.util.NumberUtils; +import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.drops.DropQueue; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; @@ -48,7 +48,7 @@ public class Spearfishing extends EcoEnchant { Player player = (Player) event.getEntity().getShooter(); if(this.getDisabledWorlds().contains(player.getWorld())) return; - ItemStack item = new ProxyFactory<>(TridentStackProxy.class).getProxy().getTridentStack(trident); + ItemStack item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(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 f0e949a0..edb38f60 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.TridentStackProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -42,7 +42,7 @@ public class Splash extends EcoEnchant { Trident trident = (Trident) event.getEntity(); Player player = (Player) event.getEntity().getShooter(); - ItemStack item = new ProxyFactory<>(TridentStackProxy.class).getProxy().getTridentStack(trident); + ItemStack item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); if (!EnchantChecks.item(item, this)) return; if(this.getDisabledWorlds().contains(player.getWorld())) 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 f741c1e3..6e7be342 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -25,7 +25,7 @@ public class StrayAspect extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if(attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) return; } if(!EnchantmentUtils.passedChance(this, level)) 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 0ca94962..64144c6f 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -23,7 +23,7 @@ public class Supercritical extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if(attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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 1387fb19..f215d67b 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.TridentStackProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.config.Configs; import com.willfp.eco.util.drops.DropQueue; import com.willfp.eco.util.events.entitydeathbyentity.EntityDeathByEntityEvent; @@ -119,7 +119,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 = new ProxyFactory<>(TridentStackProxy.class).getProxy().getTridentStack((Trident) event.getKiller()); + item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack((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 71037a94..41847e05 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,8 +1,8 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; import com.willfp.eco.util.LightningUtils; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -24,7 +24,7 @@ public class Thor extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if (attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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 336b71e4..ba236d3d 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -25,7 +25,7 @@ public class Toxic extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if (attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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 57096db1..70f7fe37 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -25,7 +25,7 @@ public class VampireAspect extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if(attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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 bd7e12ff..9817f903 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 @@ -1,8 +1,8 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.BlockBreakProxy; import com.willfp.eco.util.BlockUtils; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -53,7 +53,7 @@ public class Vein extends EcoEnchant { veinBlock.setMetadata("block-ignore", new FixedMetadataValue(this.plugin, true)); if (!AntigriefManager.canBreakBlock(player, veinBlock)) continue; - new ProxyFactory<>(BlockBreakProxy.class).getProxy().breakBlock(player, veinBlock); + ProxyUtils.getProxy(BlockBreakProxy.class).breakBlock(player, veinBlock); Bukkit.getScheduler().runTaskLater(this.plugin, () -> veinBlock.removeMetadata("block-ignore", this.plugin), 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 90efa88d..2309c5c1 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,8 +1,8 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; import com.willfp.eco.util.LightningUtils; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -24,7 +24,7 @@ public class Bolt extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if(attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) return; } if(!EnchantmentUtils.passedChance(this, level)) 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 37d42cf8..cc43ed12 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -32,7 +32,7 @@ public class Carve extends EcoEnchant { final double radius = radiusPerLevel * level; if(attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).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/Confusion.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java index 0d0169a4..bb0020c1 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -30,7 +30,7 @@ public class Confusion extends EcoEnchant { Player victim = (Player) uncastVictim; if(attacker instanceof Player) { - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) return; } if(!EnchantmentUtils.passedChance(this, level)) 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 588273f2..2935fd43 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -26,7 +26,7 @@ public class Razor extends EcoEnchant { double extra = level*perLevelMultiplier + baseDamage; if(this.getConfig().getBool((EcoEnchants.CONFIG_LOCATION) + "decrease-if-cooldown")) { if(attacker instanceof Player) { - extra *= new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown((Player) attacker); + extra *= ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown((Player) attacker); } } 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 d2f1dc1a..02263849 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,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.CooldownProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -28,7 +28,7 @@ public class Volatile extends EcoEnchant { Player attacker = (Player) uncastAttacker; - if (new ProxyFactory<>(CooldownProxy.class).getProxy().getAttackCooldown(attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) + if (ProxyUtils.getProxy(CooldownProxy.class).getAttackCooldown(attacker) != 1.0f && !this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "allow-not-fully-charged")) return; if(!EnchantmentUtils.passedChance(this, level)) 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 da19304d..1170d25a 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,8 +1,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.spell; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.BlockBreakProxy; -import com.willfp.ecoenchants.EcoEnchantsPlugin; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.itemtypes.Spell; import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager; @@ -68,7 +67,7 @@ public class Dynamite extends Spell { toBreak.forEach((block1 -> { block1.setMetadata("block-ignore", new FixedMetadataValue(this.plugin, true)); - new ProxyFactory<>(BlockBreakProxy.class).getProxy().breakBlock(player, block1); + ProxyUtils.getProxy(BlockBreakProxy.class).breakBlock(player, block1); block1.removeMetadata("block-ignore", this.plugin); })); 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 a0eb775b..554458ca 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 @@ -1,9 +1,9 @@ package com.willfp.ecoenchants.enchantments.itemtypes; import com.google.common.util.concurrent.AtomicDouble; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.TridentStackProxy; import com.willfp.eco.util.NumberUtils; +import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.optional.Prerequisite; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; @@ -134,7 +134,7 @@ public abstract class Artifact extends EcoEnchant { AbstractArrow entity = (AbstractArrow) event.getEntity(); ItemStack item = player.getInventory().getItemInMainHand(); if (entity instanceof Trident) { - item = new ProxyFactory<>(TridentStackProxy.class).getProxy().getTridentStack((Trident) entity); + item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack((Trident) entity); } if (!EnchantChecks.item(item, this)) return; 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 5a27ef12..1694d868 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 @@ -1,10 +1,10 @@ package com.willfp.ecoenchants.enchantments.support.merging.anvil; import com.willfp.eco.core.proxy.ProxyConstants; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.OpenInventoryProxy; import com.willfp.eco.core.proxy.proxies.RepairCostProxy; import com.willfp.eco.util.NumberUtils; +import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.config.Configs; import com.willfp.eco.util.injection.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; @@ -43,7 +43,7 @@ public class AnvilListeners extends PluginDependent implements Listener { if (event.getViewers().isEmpty()) return; // Prevent ArrayIndexOutOfBoundsException when using AnvilGUI Player player = (Player) event.getViewers().get(0); - if (new ProxyFactory<>(OpenInventoryProxy.class).getProxy().getOpenInventory(player).getClass().toString().equals(ANVIL_GUI_CLASS)) + if (ProxyUtils.getProxy(OpenInventoryProxy.class).getOpenInventory(player).getClass().toString().equals(ANVIL_GUI_CLASS)) return; Pair newOut = AnvilMerge.doMerge(left, right, out, name, player); @@ -84,12 +84,12 @@ public class AnvilListeners extends PluginDependent implements Listener { if (!Objects.requireNonNull(event.getInventory().getItem(0)).getType().equals(item.getType())) return; if (Configs.CONFIG.getBool("anvil.rework-cost")) { - int repairCost = new ProxyFactory<>(RepairCostProxy.class).getProxy().getRepairCost(item); + int repairCost = ProxyUtils.getProxy(RepairCostProxy.class).getRepairCost(item); int reworkCount = NumberUtils.log2(repairCost + 1); if (repairCost == 0) reworkCount = 0; reworkCount++; repairCost = (int) Math.pow(2, reworkCount) - 1; - item = new ProxyFactory<>(RepairCostProxy.class).getProxy().setRepairCost(item, repairCost); + item = ProxyUtils.getProxy(RepairCostProxy.class).setRepairCost(item, repairCost); } int cost; 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 28ff565a..8c3a3b4e 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 @@ -1,9 +1,9 @@ package com.willfp.ecoenchants.enchantments.util; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.FastGetEnchantsProxy; import com.willfp.eco.util.DurabilityUtils; +import com.willfp.eco.util.ProxyUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Material; @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ @SuppressWarnings("unchecked") public class EnchantChecks { - private static final FastGetEnchantsProxy PROXY = new ProxyFactory<>(FastGetEnchantsProxy.class).getProxy(); + private static final FastGetEnchantsProxy PROXY = ProxyUtils.getProxy(FastGetEnchantsProxy.class); /** * Does the specified ItemStack have a certain Enchantment present? 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 3707f5db..f8660f31 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,8 +1,8 @@ package com.willfp.ecoenchants.enchantments.util; import com.google.common.collect.Sets; -import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.proxy.proxies.TridentStackProxy; +import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.events.armorequip.ArmorEquipEvent; import com.willfp.eco.util.injection.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; @@ -93,7 +93,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { LivingEntity attacker = (LivingEntity) ((Trident) event.getDamager()).getShooter(); Trident trident = (Trident) event.getDamager(); - ItemStack item = new ProxyFactory<>(TridentStackProxy.class).getProxy().getTridentStack(trident); + ItemStack item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); LivingEntity victim = (LivingEntity) event.getEntity(); @@ -246,7 +246,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { if (!(event.getEntity() instanceof Trident)) return; Trident trident = (Trident) event.getEntity(); - ItemStack item = new ProxyFactory<>(TridentStackProxy.class).getProxy().getTridentStack(trident); + ItemStack item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); LivingEntity shooter = (LivingEntity) event.getEntity().getShooter(); EnchantChecks.getEnchantsOnItem(item).forEach(((enchant, level) -> { @@ -341,7 +341,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { Trident trident = (Trident) event.getEntity(); LivingEntity shooter = (LivingEntity) trident.getShooter(); - ItemStack item = new ProxyFactory<>(TridentStackProxy.class).getProxy().getTridentStack(trident); + ItemStack item = ProxyUtils.getProxy(TridentStackProxy.class).getTridentStack(trident); EnchantChecks.getEnchantsOnItem(item).forEach((enchant, level) -> { if (event.isCancelled()) return; diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/util/ProxyUtils.java b/eco-core/core-proxy/src/main/java/com/willfp/eco/util/ProxyUtils.java new file mode 100644 index 00000000..3e057b5e --- /dev/null +++ b/eco-core/core-proxy/src/main/java/com/willfp/eco/util/ProxyUtils.java @@ -0,0 +1,10 @@ +package com.willfp.eco.util; + +import com.willfp.eco.core.proxy.AbstractProxy; +import com.willfp.eco.core.proxy.ProxyFactory; + +public class ProxyUtils { + public static T getProxy(Class proxyClass) { + return new ProxyFactory<>(proxyClass).getProxy(); + } +}