From a354d62f5d8e61bbc029f44d5512d496a99fb2b4 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 17 Oct 2020 17:50:17 +0100 Subject: [PATCH] Removed EcoEnchantBuilder --- .../ecoenchants/enchantments/EcoEnchant.java | 41 ++++++++------- .../enchantments/EcoEnchantBuilder.java | 50 ------------------- .../ecoenchants/curse/BreaklessnessCurse.java | 3 +- .../ecoenchants/curse/CallingCurse.java | 3 +- .../ecoenchants/curse/DecayCurse.java | 3 +- .../ecoenchants/curse/FragilityCurse.java | 3 +- .../ecoenchants/curse/HarmlessnessCurse.java | 3 +- .../ecoenchants/curse/HungerCurse.java | 3 +- .../ecoenchants/curse/InaccuracyCurse.java | 3 +- .../ecoenchants/curse/MisfortuneCurse.java | 3 +- .../ecoenchants/curse/PermanenceCurse.java | 3 +- .../ecoenchants/normal/Abattoir.java | 3 +- .../ecoenchants/normal/Abrasion.java | 3 +- .../ecoenchants/normal/Aerial.java | 3 +- .../ecoenchants/normal/Aquatic.java | 3 +- .../ecoenchants/normal/Arachnid.java | 3 +- .../ecoenchants/normal/Arcanic.java | 3 +- .../ecoenchants/normal/Atmospheric.java | 3 +- .../ecoenchants/normal/Backstab.java | 3 +- .../ecoenchants/normal/Beheading.java | 3 +- .../ecoenchants/normal/BlastMining.java | 3 +- .../ecoenchants/normal/Bleed.java | 3 +- .../ecoenchants/normal/Blind.java | 3 +- .../ecoenchants/normal/BlockBreather.java | 3 +- .../ecoenchants/normal/BossHunter.java | 3 +- .../ecoenchants/normal/Buckshot.java | 3 +- .../ecoenchants/normal/Butchering.java | 3 +- .../ecoenchants/normal/Cerebral.java | 3 +- .../ecoenchants/normal/Chopless.java | 3 +- .../ecoenchants/normal/Cleave.java | 3 +- .../ecoenchants/normal/Collateral.java | 3 +- .../ecoenchants/normal/Conclude.java | 3 +- .../ecoenchants/normal/Corrosive.java | 3 +- .../ecoenchants/normal/Cranial.java | 3 +- .../ecoenchants/normal/Criticals.java | 3 +- .../ecoenchants/normal/Cubism.java | 3 +- .../ecoenchants/normal/Defender.java | 3 +- .../ecoenchants/normal/Deflection.java | 3 +- .../ecoenchants/normal/Defusion.java | 3 +- .../ecoenchants/normal/Dexterous.java | 3 +- .../ecoenchants/normal/Disable.java | 3 +- .../ecoenchants/normal/Disappear.java | 3 +- .../ecoenchants/normal/Diurnal.java | 3 +- .../ecoenchants/normal/Diverse.java | 3 +- .../ecoenchants/normal/Drill.java | 3 +- .../ecoenchants/normal/Dullness.java | 3 +- .../ecoenchants/normal/Economical.java | 3 +- .../ecoenchants/normal/Electroshock.java | 3 +- .../ecoenchants/normal/EndInfusion.java | 3 +- .../ecoenchants/normal/EnderSlayer.java | 3 +- .../ecoenchants/normal/Enderism.java | 3 +- .../ecoenchants/normal/Evasion.java | 3 +- .../ecoenchants/normal/Extinguishing.java | 3 +- .../ecoenchants/normal/Extract.java | 3 +- .../ecoenchants/normal/Famine.java | 3 +- .../ecoenchants/normal/Farmhand.java | 3 +- .../ecoenchants/normal/Fetching.java | 3 +- .../ecoenchants/normal/Finality.java | 3 +- .../ecoenchants/normal/Finishing.java | 3 +- .../ecoenchants/normal/FireAffinity.java | 3 +- .../ecoenchants/normal/FirstStrike.java | 3 +- .../ecoenchants/normal/Flinch.java | 3 +- .../ecoenchants/normal/Forcefield.java | 3 +- .../ecoenchants/normal/Freerunner.java | 3 +- .../ecoenchants/normal/Frozen.java | 3 +- .../enchantments/ecoenchants/normal/Fury.java | 3 +- .../ecoenchants/normal/Goliath.java | 3 +- .../ecoenchants/normal/Graceful.java | 3 +- .../ecoenchants/normal/Grapple.java | 3 +- .../ecoenchants/normal/GreenThumb.java | 3 +- .../enchantments/ecoenchants/normal/Grit.java | 3 +- .../ecoenchants/normal/Hellish.java | 3 +- .../enchantments/ecoenchants/normal/Hook.java | 3 +- .../ecoenchants/normal/Horde.java | 3 +- .../ecoenchants/normal/IceShot.java | 3 +- .../ecoenchants/normal/Identify.java | 3 +- .../ecoenchants/normal/Ignite.java | 3 +- .../ecoenchants/normal/IllusionAspect.java | 3 +- .../ecoenchants/normal/Impact.java | 3 +- .../ecoenchants/normal/Incandescence.java | 3 +- .../ecoenchants/normal/InfernalTouch.java | 3 +- .../ecoenchants/normal/Inferno.java | 3 +- .../ecoenchants/normal/Infuriate.java | 3 +- .../ecoenchants/normal/Insecticide.java | 3 +- .../ecoenchants/normal/Instantaneous.java | 3 +- .../ecoenchants/normal/Invigoration.java | 3 +- .../ecoenchants/normal/Kinetic.java | 3 +- .../ecoenchants/normal/Launch.java | 3 +- .../ecoenchants/normal/Leeching.java | 3 +- .../ecoenchants/normal/Lesion.java | 3 +- .../ecoenchants/normal/Levitate.java | 3 +- .../ecoenchants/normal/LiquidShot.java | 3 +- .../ecoenchants/normal/Lumberjack.java | 3 +- .../ecoenchants/normal/MagmaWalker.java | 3 +- .../ecoenchants/normal/Magnetic.java | 3 +- .../ecoenchants/normal/Marking.java | 3 +- .../ecoenchants/normal/Marksman.java | 3 +- .../ecoenchants/normal/Necrotic.java | 3 +- .../ecoenchants/normal/NetherInfusion.java | 3 +- .../ecoenchants/normal/Netheric.java | 3 +- .../ecoenchants/normal/Nocturnal.java | 3 +- .../ecoenchants/normal/Optics.java | 3 +- .../ecoenchants/normal/Oxygenate.java | 3 +- .../ecoenchants/normal/Pacify.java | 3 +- .../ecoenchants/normal/Paladin.java | 3 +- .../ecoenchants/normal/Paralyze.java | 3 +- .../ecoenchants/normal/Parasitic.java | 3 +- .../ecoenchants/normal/Parry.java | 3 +- .../ecoenchants/normal/Phantasm.java | 3 +- .../ecoenchants/normal/Protector.java | 3 +- .../ecoenchants/normal/Proximity.java | 3 +- .../ecoenchants/normal/Puncture.java | 3 +- .../ecoenchants/normal/Quadrilateralism.java | 3 +- .../ecoenchants/normal/Radiance.java | 3 +- .../enchantments/ecoenchants/normal/Rage.java | 3 +- .../ecoenchants/normal/Rapid.java | 3 +- .../enchantments/ecoenchants/normal/Reel.java | 3 +- .../ecoenchants/normal/Reinforcement.java | 3 +- .../ecoenchants/normal/Rejuvenation.java | 3 +- .../ecoenchants/normal/Replenish.java | 3 +- .../ecoenchants/normal/Respirator.java | 3 +- .../ecoenchants/normal/Revenant.java | 3 +- .../ecoenchants/normal/Sating.java | 3 +- .../ecoenchants/normal/Serrated.java | 3 +- .../ecoenchants/normal/Settle.java | 3 +- .../ecoenchants/normal/Shockwave.java | 3 +- .../ecoenchants/normal/ShotAssist.java | 3 +- .../ecoenchants/normal/Sickening.java | 3 +- .../ecoenchants/normal/Slaughter.java | 3 +- .../ecoenchants/normal/Slicing.java | 3 +- .../ecoenchants/normal/Spearfishing.java | 3 +- .../ecoenchants/normal/Spiked.java | 3 +- .../ecoenchants/normal/Splash.java | 3 +- .../enchantments/ecoenchants/normal/Stab.java | 3 +- .../ecoenchants/normal/Stamina.java | 3 +- .../ecoenchants/normal/StoneSwitcher.java | 3 +- .../ecoenchants/normal/StrayAspect.java | 3 +- .../ecoenchants/normal/Succession.java | 3 +- .../ecoenchants/normal/Supercritical.java | 3 +- .../ecoenchants/normal/Sycophant.java | 3 +- .../ecoenchants/normal/Tectonic.java | 3 +- .../ecoenchants/normal/Telekinesis.java | 3 +- .../enchantments/ecoenchants/normal/Thor.java | 3 +- .../ecoenchants/normal/Thrive.java | 3 +- .../ecoenchants/normal/Tornado.java | 3 +- .../ecoenchants/normal/Toxic.java | 3 +- .../ecoenchants/normal/Transfuse.java | 3 +- .../ecoenchants/normal/Tripleshot.java | 3 +- .../ecoenchants/normal/VampireAspect.java | 3 +- .../enchantments/ecoenchants/normal/Vein.java | 3 +- .../ecoenchants/normal/Venom.java | 3 +- .../ecoenchants/normal/VoidAffinity.java | 3 +- .../ecoenchants/normal/Voltage.java | 3 +- .../ecoenchants/normal/WaterAffinity.java | 3 +- .../ecoenchants/normal/WaterAspect.java | 3 +- .../ecoenchants/normal/Weakening.java | 3 +- .../ecoenchants/normal/Wisdom.java | 3 +- .../ecoenchants/normal/Wound.java | 3 +- .../enchantments/ecoenchants/normal/Zeus.java | 3 +- .../ecoenchants/special/Aiming.java | 3 +- .../ecoenchants/special/Annihilate.java | 3 +- .../ecoenchants/special/Bladed.java | 3 +- .../ecoenchants/special/Bolt.java | 3 +- .../ecoenchants/special/Carve.java | 3 +- .../ecoenchants/special/Confusion.java | 3 +- .../ecoenchants/special/Energizing.java | 3 +- .../ecoenchants/special/Force.java | 3 +- .../ecoenchants/special/Frenzy.java | 3 +- .../ecoenchants/special/Harpoon.java | 3 +- .../special/Indestructibility.java | 3 +- .../ecoenchants/special/Instability.java | 3 +- .../ecoenchants/special/Intellect.java | 3 +- .../ecoenchants/special/LifeSteal.java | 3 +- .../ecoenchants/special/Pentashot.java | 3 +- .../ecoenchants/special/Preservation.java | 3 +- .../ecoenchants/special/Prosperity.java | 3 +- .../ecoenchants/special/Razor.java | 3 +- .../ecoenchants/special/Repairing.java | 3 +- .../ecoenchants/special/Soulbound.java | 3 +- .../ecoenchants/special/Spring.java | 3 +- .../ecoenchants/special/Streamlining.java | 3 +- .../ecoenchants/special/Volatile.java | 3 +- .../enchantments/itemtypes/Artifact.java | 3 +- 183 files changed, 203 insertions(+), 431 deletions(-) delete mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchantBuilder.java diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index b70bab9b..6b888657 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -1,5 +1,6 @@ package com.willfp.ecoenchants.enchantments; +import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.config.ConfigManager; import com.willfp.ecoenchants.config.configs.EnchantmentConfig; import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity; @@ -22,6 +23,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.regex.Pattern; @SuppressWarnings("unchecked") public abstract class EcoEnchant extends Enchantment implements Listener, Registerable, Watcher { @@ -43,17 +45,27 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Regist private boolean enabled; - /** - * Create new EcoEnchant matching builder and prerequisites - * - * @param builder The {@link EcoEnchantBuilder} for enchantment - */ - protected EcoEnchant(EcoEnchantBuilder builder, Prerequisite[] prerequisites) { - super(NamespacedKey.minecraft(builder.key)); + protected EcoEnchant(String key, EcoEnchant.EnchantmentType type) { + this(key, type, EcoEnchantsPlugin.class, new Prerequisite[]{}); + } - this.type = builder.type; - this.permissionName = builder.permission; - this.config = builder.config; + protected EcoEnchant(String key, EcoEnchant.EnchantmentType type, Prerequisite[] prerequisites) { + this(key, type, EcoEnchantsPlugin.class, prerequisites); + } + + protected EcoEnchant(String key, EcoEnchant.EnchantmentType type, Class plugin) { + this(key, type, plugin, new Prerequisite[]{}); + } + + protected EcoEnchant(String key, EcoEnchant.EnchantmentType type, Class plugin, Prerequisite[] prerequisites) { + super(NamespacedKey.minecraft(key)); + + if(Pattern.matches("[a-z_]", key)) throw new InvalidEnchantmentException("Key must only contain lowercase letters and underscores"); + + this.type = type; + this.permissionName = key.replace("_", ""); + ConfigManager.addEnchantmentConfig(new EnchantmentConfig(this.permissionName, plugin, this.type)); + this.config = ConfigManager.getEnchantmentConfig(permissionName); if(!Prerequisite.areMet(prerequisites)) return; @@ -62,15 +74,6 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Regist this.add(); } - /** - * Create new EcoEnchant matching builder - * - * @param builder The {@link EcoEnchantBuilder} for enchantment - */ - protected EcoEnchant(EcoEnchantBuilder builder) { - this(builder, new Prerequisite[]{}); - } - /** * Update the enchantment based off config values */ diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchantBuilder.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchantBuilder.java deleted file mode 100644 index b0c156e5..00000000 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchantBuilder.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.willfp.ecoenchants.enchantments; - -import com.willfp.ecoenchants.EcoEnchantsPlugin; -import com.willfp.ecoenchants.config.ConfigManager; -import com.willfp.ecoenchants.config.configs.EnchantmentConfig; - -import java.util.regex.Pattern; - -public class EcoEnchantBuilder { - public final String name; - public final String key; - public final String permission; - public final EnchantmentConfig config; - public Class plugin; - public final EcoEnchant.EnchantmentType type; - - /** - * Creates new EcoEnchantBuilder - * Only used by base enchantments, do not use for extensions. - * - * @param key The enchantment key name - * @param type The enchantment type - */ - public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type) { - this(key, type, EcoEnchantsPlugin.class); - } - - /** - * Creates new EcoEnchantBuilder for Extension - * Use for extensions - * - * @param key The enchantment key name - * @param type The enchantment type - * @param plugin The main class of extension - */ - public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Class plugin) { - if(Pattern.matches("[a-z_]", key)) throw new InvalidEnchantmentException("Key must only contain lowercase letters and underscores"); - this.key = key; - this.permission = key.replace("_",""); - - this.type = type; - - this.plugin = plugin; - - ConfigManager.addEnchantmentConfig(new EnchantmentConfig(permission, plugin, this.type)); - this.config = ConfigManager.getEnchantmentConfig(permission); - - this.name = config.getString("name"); - } -} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/BreaklessnessCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/BreaklessnessCurse.java index 4c3c892e..4c28e8fe 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/BreaklessnessCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/BreaklessnessCurse.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -9,7 +8,7 @@ import org.bukkit.event.block.BlockDamageEvent; public final class BreaklessnessCurse extends EcoEnchant { public BreaklessnessCurse() { super( - new EcoEnchantBuilder("breaklessness_curse", EnchantmentType.CURSE) + "breaklessness_curse", EnchantmentType.CURSE ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java index 18f69c7b..23c1d2e9 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/CallingCurse.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent; @@ -22,7 +21,7 @@ import java.util.HashMap; public final class CallingCurse extends EcoEnchant implements EcoRunnable { public CallingCurse() { super( - new EcoEnchantBuilder("calling_curse", EnchantmentType.CURSE) + "calling_curse", EnchantmentType.CURSE ); } private final HashMap players = new HashMap<>(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java index 1aa1057d..a9bd887d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.util.DurabilityUtils; @@ -24,7 +23,7 @@ import java.util.Set; public final class DecayCurse extends EcoEnchant implements EcoRunnable { public DecayCurse() { super( - new EcoEnchantBuilder("decay_curse", EnchantmentType.CURSE) + "decay_curse", EnchantmentType.CURSE ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/FragilityCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/FragilityCurse.java index 59b66d72..6bc13905 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/FragilityCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/FragilityCurse.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.util.NumberUtils; @@ -11,7 +10,7 @@ import org.bukkit.inventory.ItemStack; public final class FragilityCurse extends EcoEnchant { public FragilityCurse() { super( - new EcoEnchantBuilder("fragility_curse", EnchantmentType.CURSE) + "fragility_curse", EnchantmentType.CURSE ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HarmlessnessCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HarmlessnessCurse.java index d6885d7f..f683c26c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HarmlessnessCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HarmlessnessCurse.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class HarmlessnessCurse extends EcoEnchant { public HarmlessnessCurse() { super( - new EcoEnchantBuilder("harmlessness_curse", EnchantmentType.CURSE) + "harmlessness_curse", EnchantmentType.CURSE ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HungerCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HungerCurse.java index 1fa75e8b..2b06fada 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HungerCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/HungerCurse.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Player; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.FoodLevelChangeEvent; public final class HungerCurse extends EcoEnchant { public HungerCurse() { super( - new EcoEnchantBuilder("hunger_curse", EnchantmentType.CURSE) + "hunger_curse", EnchantmentType.CURSE ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/InaccuracyCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/InaccuracyCurse.java index f32bb47a..144c738f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/InaccuracyCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/InaccuracyCurse.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.util.NumberUtils; import org.bukkit.entity.Arrow; @@ -12,7 +11,7 @@ import org.bukkit.util.Vector; public final class InaccuracyCurse extends EcoEnchant { public InaccuracyCurse() { super( - new EcoEnchantBuilder("inaccuracy_curse", EnchantmentType.CURSE) + "inaccuracy_curse", EnchantmentType.CURSE ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/MisfortuneCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/MisfortuneCurse.java index 7549ee9e..e39bbc24 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/MisfortuneCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/MisfortuneCurse.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -9,7 +8,7 @@ import org.bukkit.event.block.BlockBreakEvent; public final class MisfortuneCurse extends EcoEnchant { public MisfortuneCurse() { super( - new EcoEnchantBuilder("misfortune_curse", EnchantmentType.CURSE) + "misfortune_curse", EnchantmentType.CURSE ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/PermanenceCurse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/PermanenceCurse.java index 20952b1a..1cf80dba 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/PermanenceCurse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/PermanenceCurse.java @@ -1,12 +1,11 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; public final class PermanenceCurse extends EcoEnchant { public PermanenceCurse() { super( - new EcoEnchantBuilder("permanence_curse", EnchantmentType.CURSE) + "permanence_curse", EnchantmentType.CURSE ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abattoir.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abattoir.java index ad4cc44d..4bf2d384 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abattoir.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abattoir.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Monster; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Abattoir extends EcoEnchant { public Abattoir() { super( - new EcoEnchantBuilder("abattoir", EnchantmentType.NORMAL) + "abattoir", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java index 664768aa..cdeedf1a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Abrasion.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.nms.Cooldown; import com.willfp.ecoenchants.util.DurabilityUtils; @@ -15,7 +14,7 @@ import java.util.Arrays; public final class Abrasion extends EcoEnchant { public Abrasion() { super( - new EcoEnchantBuilder("abrasion", EnchantmentType.NORMAL) + "abrasion", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java index 809bec3a..118acef5 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -13,7 +12,7 @@ import org.bukkit.metadata.FixedMetadataValue; public final class Aerial extends EcoEnchant { public Aerial() { super( - new EcoEnchantBuilder("aerial", EnchantmentType.NORMAL) + "aerial", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aquatic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aquatic.java index d5f363e2..d5c6b70d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aquatic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aquatic.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Aquatic extends EcoEnchant { public Aquatic() { super( - new EcoEnchantBuilder("aquatic", EnchantmentType.NORMAL) + "aquatic", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arachnid.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arachnid.java index bb19aea7..9326fe46 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arachnid.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arachnid.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Spider; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Arachnid extends EcoEnchant { public Arachnid() { super( - new EcoEnchantBuilder("arachnid", EnchantmentType.NORMAL) + "arachnid", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arcanic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arcanic.java index 6e830b96..ac4ea6d4 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arcanic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arcanic.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageEvent; public final class Arcanic extends EcoEnchant { public Arcanic() { super( - new EcoEnchantBuilder("arcanic", EnchantmentType.NORMAL) + "arcanic", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java index 3a491a34..c531aaad 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Trident; @@ -13,7 +12,7 @@ import org.bukkit.metadata.FixedMetadataValue; public final class Atmospheric extends EcoEnchant { public Atmospheric() { super( - new EcoEnchantBuilder("atmospheric", EnchantmentType.NORMAL) + "atmospheric", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Backstab.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Backstab.java index 41f6115f..764b5a44 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Backstab.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Backstab.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -10,7 +9,7 @@ import org.bukkit.util.Vector; public final class Backstab extends EcoEnchant { public Backstab() { super( - new EcoEnchantBuilder("backstab", EnchantmentType.NORMAL) + "backstab", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java index 236864f9..d26890e1 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Beheading.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.queue.DropQueue; @@ -17,7 +16,7 @@ import org.bukkit.inventory.meta.SkullMeta; public final class Beheading extends EcoEnchant { public Beheading() { super( - new EcoEnchantBuilder("beheading", EnchantmentType.NORMAL) + "beheading", EnchantmentType.NORMAL ); } // START OF LISTENERS diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java index 6e48675a..8f3e48ba 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlastMining.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -19,7 +18,7 @@ import java.util.Set; public final class BlastMining extends EcoEnchant { public BlastMining() { super( - new EcoEnchantBuilder("blast_mining", EnchantmentType.NORMAL) + "blast_mining", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java index e58a8174..0d130aa4 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Bleed.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -15,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; public final class Bleed extends EcoEnchant { public Bleed() { super( - new EcoEnchantBuilder("bleed", EnchantmentType.NORMAL) + "bleed", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Blind.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Blind.java index 6dd55ee0..7b665e14 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Blind.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Blind.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.Arrow; @@ -14,7 +13,7 @@ import org.bukkit.util.Vector; public final class Blind extends EcoEnchant { public Blind() { super( - new EcoEnchantBuilder("blind", EnchantmentType.NORMAL) + "blind", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlockBreather.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlockBreather.java index a8a57a1d..922a5ef7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlockBreather.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BlockBreather.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageEvent; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageEvent; public final class BlockBreather extends EcoEnchant { public BlockBreather() { super( - new EcoEnchantBuilder("block_breather", EnchantmentType.NORMAL) + "block_breather", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BossHunter.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BossHunter.java index 0a9bbad4..304f17ef 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BossHunter.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/BossHunter.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.Boss; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class BossHunter extends EcoEnchant { public BossHunter() { super( - new EcoEnchantBuilder("boss_hunter", EnchantmentType.NORMAL) + "boss_hunter", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Buckshot.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Buckshot.java index 74d46940..896e751a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Buckshot.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Buckshot.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.util.NumberUtils; @@ -17,7 +16,7 @@ import org.bukkit.util.Vector; public final class Buckshot extends EcoEnchant { public Buckshot() { super( - new EcoEnchantBuilder("buckshot", EnchantmentType.NORMAL) + "buckshot", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Butchering.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Butchering.java index a092b5ff..cfcccad7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Butchering.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Butchering.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Monster; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Butchering extends EcoEnchant { public Butchering() { super( - new EcoEnchantBuilder("butchering", EnchantmentType.NORMAL) + "butchering", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cerebral.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cerebral.java index f631535f..6ccf9e6b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cerebral.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cerebral.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Arrow; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Cerebral extends EcoEnchant { public Cerebral() { super( - new EcoEnchantBuilder("cerebral", EnchantmentType.NORMAL) + "cerebral", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Chopless.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Chopless.java index 326306e9..d21675ef 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Chopless.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Chopless.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageEvent; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageEvent; public final class Chopless extends EcoEnchant { public Chopless() { super( - new EcoEnchantBuilder("chopless", EnchantmentType.NORMAL) + "chopless", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java index ceec0a10..7e9d73e3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cleave.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.nms.Cooldown; import org.bukkit.Bukkit; @@ -13,7 +12,7 @@ import org.bukkit.metadata.FixedMetadataValue; public final class Cleave extends EcoEnchant { public Cleave() { super( - new EcoEnchantBuilder("cleave", EnchantmentType.NORMAL) + "cleave", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Collateral.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Collateral.java index 30627cfd..ad6f163b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Collateral.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Collateral.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityShootBowEvent; public final class Collateral extends EcoEnchant { public Collateral() { super( - new EcoEnchantBuilder("collateral", EnchantmentType.NORMAL) + "collateral", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Conclude.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Conclude.java index 4babdd7c..5f36f4f5 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Conclude.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Conclude.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Conclude extends EcoEnchant { public Conclude() { super( - new EcoEnchantBuilder("conclude", EnchantmentType.NORMAL) + "conclude", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Corrosive.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Corrosive.java index a8aef8b0..c44d325f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Corrosive.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Corrosive.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.util.DurabilityUtils; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -15,7 +14,7 @@ import java.util.Arrays; public final class Corrosive extends EcoEnchant { public Corrosive() { super( - new EcoEnchantBuilder("corrosive", EnchantmentType.NORMAL) + "corrosive", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cranial.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cranial.java index 7b7dbc34..000b7fed 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cranial.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cranial.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Trident; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Cranial extends EcoEnchant { public Cranial() { super( - new EcoEnchantBuilder("cranial", EnchantmentType.NORMAL) + "cranial", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Criticals.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Criticals.java index 12423662..0a049415 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Criticals.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Criticals.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Criticals extends EcoEnchant { public Criticals() { super( - new EcoEnchantBuilder("criticals", EnchantmentType.NORMAL) + "criticals", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cubism.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cubism.java index 4beb0f20..61a37603 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cubism.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Cubism.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Slime; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Cubism extends EcoEnchant { public Cubism() { super( - new EcoEnchantBuilder("cubism", EnchantmentType.NORMAL) + "cubism", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defender.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defender.java index 60dece90..79d91fbd 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defender.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defender.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Tameable; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Defender extends EcoEnchant { public Defender() { super( - new EcoEnchantBuilder("defender", EnchantmentType.NORMAL) + "defender", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Deflection.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Deflection.java index 7b6056f2..b7a178bd 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Deflection.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Deflection.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Deflection extends EcoEnchant { public Deflection() { super( - new EcoEnchantBuilder("deflection", EnchantmentType.NORMAL) + "deflection", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defusion.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defusion.java index b9d183a5..87438358 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defusion.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Defusion.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Creeper; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Defusion extends EcoEnchant { public Defusion() { super( - new EcoEnchantBuilder("defusion", EnchantmentType.NORMAL) + "defusion", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dexterous.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dexterous.java index 54b53d56..52139542 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dexterous.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dexterous.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.attribute.Attribute; @@ -12,7 +11,7 @@ import org.bukkit.inventory.ItemStack; public final class Dexterous extends EcoEnchant { public Dexterous() { super( - new EcoEnchantBuilder("dexterous", EnchantmentType.NORMAL) + "dexterous", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java index 3c14da4e..cba043cd 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disable.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -14,7 +13,7 @@ import org.bukkit.potion.PotionEffectType; public final class Disable extends EcoEnchant { public Disable() { super( - new EcoEnchantBuilder("disable", EnchantmentType.NORMAL) + "disable", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disappear.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disappear.java index 2494fe84..d5036386 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disappear.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Disappear.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Bukkit; import org.bukkit.entity.LivingEntity; @@ -12,7 +11,7 @@ import org.bukkit.potion.PotionEffectType; public final class Disappear extends EcoEnchant { public Disappear() { super( - new EcoEnchantBuilder("disappear", EnchantmentType.NORMAL) + "disappear", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java index 32d9a53a..81fce125 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.World; import org.bukkit.entity.LivingEntity; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Diurnal extends EcoEnchant { public Diurnal() { super( - new EcoEnchantBuilder("diurnal", EnchantmentType.NORMAL) + "diurnal", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diverse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diverse.java index aa278cb8..fd46804e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diverse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diverse.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Diverse extends EcoEnchant { public Diverse() { super( - new EcoEnchantBuilder("diverse", EnchantmentType.NORMAL) + "diverse", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java index 31600482..927abe75 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Drill.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -16,7 +15,7 @@ import org.bukkit.util.Vector; public final class Drill extends EcoEnchant { public Drill() { super( - new EcoEnchantBuilder("drill", EnchantmentType.NORMAL) + "drill", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java index 8624c4a6..04fcb04f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Dullness.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -13,7 +12,7 @@ import org.bukkit.potion.PotionEffectType; public final class Dullness extends EcoEnchant { public Dullness() { super( - new EcoEnchantBuilder("dullness", EnchantmentType.NORMAL) + "dullness", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java index cc60b1aa..d92a772b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.util.optional.Prerequisite; @@ -11,7 +10,7 @@ import org.bukkit.event.EventHandler; public final class Economical extends EcoEnchant { public Economical() { super( - new EcoEnchantBuilder("economical", EnchantmentType.NORMAL), + "economical", EnchantmentType.NORMAL, new Prerequisite[]{Prerequisite.HasPaper} ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Electroshock.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Electroshock.java index 3a8151db..02cc69ee 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Electroshock.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Electroshock.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.util.LightningUtils; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Electroshock extends EcoEnchant { public Electroshock() { super( - new EcoEnchantBuilder("electroshock", EnchantmentType.NORMAL) + "electroshock", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EndInfusion.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EndInfusion.java index 9fcca383..e603c54e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EndInfusion.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EndInfusion.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.World; import org.bukkit.entity.LivingEntity; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class EndInfusion extends EcoEnchant { public EndInfusion() { super( - new EcoEnchantBuilder("end_infusion", EnchantmentType.NORMAL) + "end_infusion", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EnderSlayer.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EnderSlayer.java index ff469d3f..52c7f15f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EnderSlayer.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EnderSlayer.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; @@ -12,7 +11,7 @@ import java.util.Set; public final class EnderSlayer extends EcoEnchant { public EnderSlayer() { super( - new EcoEnchantBuilder("ender_slayer", EnchantmentType.NORMAL) + "ender_slayer", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java index c93a28e8..df89569a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.World; @@ -14,7 +13,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Enderism extends EcoEnchant { public Enderism() { super( - new EcoEnchantBuilder("enderism", EnchantmentType.NORMAL) + "enderism", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Evasion.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Evasion.java index 87e51a42..bb224fc5 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Evasion.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Evasion.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageEvent; public final class Evasion extends EcoEnchant { public Evasion() { super( - new EcoEnchantBuilder("evasion", EnchantmentType.NORMAL) + "evasion", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extinguishing.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extinguishing.java index 661f6dbe..88a2b5fa 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extinguishing.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extinguishing.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageEvent; public final class Extinguishing extends EcoEnchant { public Extinguishing() { super( - new EcoEnchantBuilder("extinguishing", EnchantmentType.NORMAL) + "extinguishing", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extract.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extract.java index e4c52029..1720018c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extract.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extract.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.attribute.Attribute; import org.bukkit.entity.LivingEntity; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Extract extends EcoEnchant { public Extract() { super( - new EcoEnchantBuilder("extract", EnchantmentType.NORMAL) + "extract", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java index 5ee00896..5d1d2e86 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Famine.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -13,7 +12,7 @@ import org.bukkit.potion.PotionEffectType; public final class Famine extends EcoEnchant { public Famine() { super( - new EcoEnchantBuilder("famine", EnchantmentType.NORMAL) + "famine", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java index b52cbdb7..115b3a22 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Farmhand.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -19,7 +18,7 @@ import org.bukkit.util.Vector; public final class Farmhand extends EcoEnchant { public Farmhand() { super( - new EcoEnchantBuilder("farmhand", EnchantmentType.NORMAL) + "farmhand", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java index 6e1662b3..01cb2840 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.events.entitydeathbyentity.EntityDeathByEntityEvent; @@ -18,7 +17,7 @@ import java.util.Collection; public final class Fetching extends EcoEnchant { public Fetching() { super( - new EcoEnchantBuilder("fetching", EnchantmentType.NORMAL) + "fetching", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finality.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finality.java index b9ce32b0..0befec08 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finality.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finality.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.Arrow; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Finality extends EcoEnchant { public Finality() { super( - new EcoEnchantBuilder("finality", EnchantmentType.NORMAL) + "finality", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finishing.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finishing.java index 55d73aac..cd4f6711 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finishing.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Finishing.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Finishing extends EcoEnchant { public Finishing() { super( - new EcoEnchantBuilder("finishing", EnchantmentType.NORMAL) + "finishing", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FireAffinity.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FireAffinity.java index 154f4918..3785d7ad 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FireAffinity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FireAffinity.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class FireAffinity extends EcoEnchant { public FireAffinity() { super( - new EcoEnchantBuilder("fire_affinity", EnchantmentType.NORMAL) + "fire_affinity", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FirstStrike.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FirstStrike.java index 66944f5a..b32b352b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FirstStrike.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FirstStrike.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.attribute.Attribute; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class FirstStrike extends EcoEnchant { public FirstStrike() { super( - new EcoEnchantBuilder("first_strike", EnchantmentType.NORMAL) + "first_strike", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Flinch.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Flinch.java index 50a9de63..695a094b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Flinch.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Flinch.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; @@ -12,7 +11,7 @@ import org.bukkit.potion.PotionEffectType; public final class Flinch extends EcoEnchant { public Flinch() { super( - new EcoEnchantBuilder("flinch", EnchantmentType.NORMAL) + "flinch", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java index c5886fbd..e927704c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Forcefield.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent; @@ -20,7 +19,7 @@ import java.util.HashMap; public final class Forcefield extends EcoEnchant implements EcoRunnable { public Forcefield() { super( - new EcoEnchantBuilder("forcefield", EnchantmentType.NORMAL) + "forcefield", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Freerunner.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Freerunner.java index 69d947e1..cb889478 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Freerunner.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Freerunner.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageEvent; public final class Freerunner extends EcoEnchant { public Freerunner() { super( - new EcoEnchantBuilder("freerunner", EnchantmentType.NORMAL) + "freerunner", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java index 52879262..bce94bb9 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Frozen.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; @@ -16,7 +15,7 @@ import org.bukkit.potion.PotionEffectType; public final class Frozen extends EcoEnchant { public Frozen() { super( - new EcoEnchantBuilder("frozen", EnchantmentType.NORMAL) + "frozen", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java index 20b7cc86..50179f4f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fury.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -16,7 +15,7 @@ import org.bukkit.util.Vector; public final class Fury extends EcoEnchant { public Fury() { super( - new EcoEnchantBuilder("fury", EnchantmentType.NORMAL) + "fury", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Goliath.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Goliath.java index a4e587a3..a3e24f6f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Goliath.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Goliath.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.attribute.Attribute; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Goliath extends EcoEnchant { public Goliath() { super( - new EcoEnchantBuilder("goliath", EnchantmentType.NORMAL) + "goliath", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Graceful.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Graceful.java index 27136d24..f4293932 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Graceful.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Graceful.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.Material; @@ -14,7 +13,7 @@ import org.bukkit.potion.PotionEffectType; public final class Graceful extends EcoEnchant { public Graceful() { super( - new EcoEnchantBuilder("graceful", EnchantmentType.NORMAL) + "graceful", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grapple.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grapple.java index 8c0e9eae..51abdaef 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grapple.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grapple.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.util.VectorUtils; import org.bukkit.entity.LivingEntity; @@ -10,7 +9,7 @@ import org.bukkit.util.Vector; public final class Grapple extends EcoEnchant { public Grapple() { super( - new EcoEnchantBuilder("grapple", EnchantmentType.NORMAL) + "grapple", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java index d685598b..05ec961c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -14,7 +13,7 @@ import org.bukkit.event.player.PlayerInteractEvent; public final class GreenThumb extends EcoEnchant { public GreenThumb() { super( - new EcoEnchantBuilder("green_thumb", EnchantmentType.NORMAL) + "green_thumb", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grit.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grit.java index 4d2436bb..97d50a23 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grit.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grit.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -13,7 +12,7 @@ import org.bukkit.inventory.meta.Damageable; public final class Grit extends EcoEnchant { public Grit() { super( - new EcoEnchantBuilder("grit", EnchantmentType.NORMAL) + "grit", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hellish.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hellish.java index c8b451d3..98a85e3e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hellish.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hellish.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.World; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Hellish extends EcoEnchant { public Hellish() { super( - new EcoEnchantBuilder("hellish", EnchantmentType.NORMAL) + "hellish", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hook.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hook.java index 66f57c04..50ce77eb 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hook.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hook.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.util.VectorUtils; import org.bukkit.entity.Arrow; @@ -11,7 +10,7 @@ import org.bukkit.util.Vector; public final class Hook extends EcoEnchant { public Hook() { super( - new EcoEnchantBuilder("hook", EnchantmentType.NORMAL) + "hook", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Horde.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Horde.java index 3e37941d..04d85060 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Horde.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Horde.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Horde extends EcoEnchant { public Horde() { super( - new EcoEnchantBuilder("horde", EnchantmentType.NORMAL) + "horde", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IceShot.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IceShot.java index 930e4a0e..2c1edaa8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IceShot.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IceShot.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -12,7 +11,7 @@ import org.bukkit.util.Vector; public final class IceShot extends EcoEnchant { public IceShot() { super( - new EcoEnchantBuilder("ice_shot", EnchantmentType.NORMAL) + "ice_shot", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Identify.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Identify.java index 9b54e88f..06a8464d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Identify.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Identify.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; @@ -13,7 +12,7 @@ import org.bukkit.potion.PotionEffectType; public final class Identify extends EcoEnchant { public Identify() { super( - new EcoEnchantBuilder("identify", EnchantmentType.NORMAL) + "identify", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Ignite.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Ignite.java index fef65708..60521db8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Ignite.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Ignite.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; import org.bukkit.Material; @@ -13,7 +12,7 @@ import org.bukkit.event.entity.ProjectileHitEvent; public final class Ignite extends EcoEnchant { public Ignite() { super( - new EcoEnchantBuilder("ignite", EnchantmentType.NORMAL) + "ignite", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java index 3f07271a..ba94196e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/IllusionAspect.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -13,7 +12,7 @@ import org.bukkit.potion.PotionEffectType; public final class IllusionAspect extends EcoEnchant { public IllusionAspect() { super( - new EcoEnchantBuilder("illusion_aspect", EnchantmentType.NORMAL) + "illusion_aspect", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Impact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Impact.java index db6b2282..37066625 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Impact.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Impact.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Impact extends EcoEnchant { public Impact() { super( - new EcoEnchantBuilder("impact", EnchantmentType.NORMAL) + "impact", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Incandescence.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Incandescence.java index a82206dd..749ba3d2 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Incandescence.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Incandescence.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.Bukkit; @@ -13,7 +12,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Incandescence extends EcoEnchant { public Incandescence() { super( - new EcoEnchantBuilder("incandescence", EnchantmentType.NORMAL) + "incandescence", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java index 46977c64..6b6a06e6 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/InfernalTouch.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -26,7 +25,7 @@ import java.util.List; public final class InfernalTouch extends EcoEnchant { public InfernalTouch() { super( - new EcoEnchantBuilder("infernal_touch", EnchantmentType.NORMAL) + "infernal_touch", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Inferno.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Inferno.java index 13f6bbd0..23cea1ca 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Inferno.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Inferno.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Trident; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.ProjectileLaunchEvent; public final class Inferno extends EcoEnchant { public Inferno() { super( - new EcoEnchantBuilder("inferno", EnchantmentType.NORMAL) + "inferno", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Infuriate.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Infuriate.java index cb6d8adb..338ae748 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Infuriate.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Infuriate.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.util.VectorUtils; @@ -16,7 +15,7 @@ import org.bukkit.util.Vector; public final class Infuriate extends EcoEnchant { public Infuriate() { super( - new EcoEnchantBuilder("infuriate", EnchantmentType.NORMAL) + "infuriate", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Insecticide.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Insecticide.java index 94eba87b..d664cde0 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Insecticide.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Insecticide.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Insecticide extends EcoEnchant { public Insecticide() { super( - new EcoEnchantBuilder("insecticide", EnchantmentType.NORMAL) + "insecticide", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Instantaneous.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Instantaneous.java index c9f8145d..8d276703 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Instantaneous.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Instantaneous.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager; import org.bukkit.block.Block; @@ -10,7 +9,7 @@ import org.bukkit.event.block.BlockDamageEvent; public final class Instantaneous extends EcoEnchant { public Instantaneous() { super( - new EcoEnchantBuilder("instantaneous", EnchantmentType.NORMAL) + "instantaneous", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Invigoration.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Invigoration.java index 1091334f..38385cce 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Invigoration.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Invigoration.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Player; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageEvent; public final class Invigoration extends EcoEnchant { public Invigoration() { super( - new EcoEnchantBuilder("invigoration", EnchantmentType.NORMAL) + "invigoration", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Kinetic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Kinetic.java index 50ccc69e..573fe5e7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Kinetic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Kinetic.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageEvent; public final class Kinetic extends EcoEnchant { public Kinetic() { super( - new EcoEnchantBuilder("kinetic", EnchantmentType.NORMAL) + "kinetic", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java index c0cf9bf5..ecfa8159 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Launch.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.Bukkit; @@ -14,7 +13,7 @@ import org.bukkit.event.player.PlayerInteractEvent; public final class Launch extends EcoEnchant { public Launch() { super( - new EcoEnchantBuilder("launch", EnchantmentType.NORMAL) + "launch", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Leeching.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Leeching.java index d7e9c7f0..191b1124 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Leeching.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Leeching.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.attribute.Attribute; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Leeching extends EcoEnchant { public Leeching() { super( - new EcoEnchantBuilder("leeching", EnchantmentType.NORMAL) + "leeching", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lesion.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lesion.java index 48ad7a71..f30d5674 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lesion.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lesion.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; @@ -15,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; public final class Lesion extends EcoEnchant { public Lesion() { super( - new EcoEnchantBuilder("lesion", EnchantmentType.NORMAL) + "lesion", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Levitate.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Levitate.java index b863663f..cdda5359 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Levitate.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Levitate.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.Arrow; @@ -13,7 +12,7 @@ import org.bukkit.util.Vector; public final class Levitate extends EcoEnchant { public Levitate() { super( - new EcoEnchantBuilder("levitate", EnchantmentType.NORMAL) + "levitate", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/LiquidShot.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/LiquidShot.java index 4d8f5542..fe43acee 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/LiquidShot.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/LiquidShot.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.Blaze; @@ -12,7 +11,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class LiquidShot extends EcoEnchant { public LiquidShot() { super( - new EcoEnchantBuilder("liquid_shot", EnchantmentType.NORMAL) + "liquid_shot", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java index 6c166b8d..7c8d590e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Lumberjack.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -22,7 +21,7 @@ import java.util.Set; public final class Lumberjack extends EcoEnchant { public Lumberjack() { super( - new EcoEnchantBuilder("lumberjack", EnchantmentType.NORMAL) + "lumberjack", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java index 86cdafc0..7afb2c22 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/MagmaWalker.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager; @@ -22,7 +21,7 @@ import org.bukkit.util.Vector; public final class MagmaWalker extends EcoEnchant { public MagmaWalker() { super( - new EcoEnchantBuilder("magma_walker", EnchantmentType.NORMAL) + "magma_walker", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java index 800a5ed7..44f63696 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Magnetic.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent; @@ -22,7 +21,7 @@ import java.util.HashMap; public final class Magnetic extends EcoEnchant implements EcoRunnable { public Magnetic() { super( - new EcoEnchantBuilder("magnetic", EnchantmentType.NORMAL) + "magnetic", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marking.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marking.java index 376fd703..19dd2f12 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marking.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marking.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Bukkit; import org.bukkit.entity.Arrow; @@ -15,7 +14,7 @@ import org.bukkit.metadata.FixedMetadataValue; public final class Marking extends EcoEnchant { public Marking() { super( - new EcoEnchantBuilder("marking", EnchantmentType.NORMAL) + "marking", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marksman.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marksman.java index ce2b9531..b873b0d0 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marksman.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Marksman.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Arrow; @@ -14,7 +13,7 @@ import org.bukkit.scheduler.BukkitRunnable; public final class Marksman extends EcoEnchant { public Marksman() { super( - new EcoEnchantBuilder("marksman", EnchantmentType.NORMAL) + "marksman", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java index 5482141d..cc5b8d52 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Necrotic.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.queue.DropQueue; @@ -14,7 +13,7 @@ import org.bukkit.inventory.ItemStack; public final class Necrotic extends EcoEnchant { public Necrotic() { super( - new EcoEnchantBuilder("necrotic", EnchantmentType.NORMAL) + "necrotic", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/NetherInfusion.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/NetherInfusion.java index 35205baf..78d5c6a5 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/NetherInfusion.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/NetherInfusion.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.World; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class NetherInfusion extends EcoEnchant { public NetherInfusion() { super( - new EcoEnchantBuilder("nether_infusion", EnchantmentType.NORMAL) + "nether_infusion", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java index d5897384..8e6bc3fa 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.World; import org.bukkit.entity.Arrow; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Netheric extends EcoEnchant { public Netheric() { super( - new EcoEnchantBuilder("netheric", EnchantmentType.NORMAL) + "netheric", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java index 3bfcab4d..318df646 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.World; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Nocturnal extends EcoEnchant { public Nocturnal() { super( - new EcoEnchantBuilder("nocturnal", EnchantmentType.NORMAL) + "nocturnal", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Optics.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Optics.java index 6129fd85..c1b34168 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Optics.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Optics.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Location; import org.bukkit.entity.Arrow; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Optics extends EcoEnchant { public Optics() { super( - new EcoEnchantBuilder("optics", EnchantmentType.NORMAL) + "optics", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Oxygenate.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Oxygenate.java index b4a2adec..01a66e08 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Oxygenate.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Oxygenate.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.util.NumberUtils; import org.bukkit.block.Block; @@ -10,7 +9,7 @@ import org.bukkit.event.block.BlockBreakEvent; public final class Oxygenate extends EcoEnchant { public Oxygenate() { super( - new EcoEnchantBuilder("oxygenate", EnchantmentType.NORMAL) + "oxygenate", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Pacify.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Pacify.java index fa789d33..119bab5f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Pacify.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Pacify.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Creeper; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Pacify extends EcoEnchant { public Pacify() { super( - new EcoEnchantBuilder("pacify", EnchantmentType.NORMAL) + "pacify", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paladin.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paladin.java index 6e6bde65..25113b48 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paladin.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paladin.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Horse; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Paladin extends EcoEnchant { public Paladin() { super( - new EcoEnchantBuilder("paladin", EnchantmentType.NORMAL) + "paladin", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paralyze.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paralyze.java index 874c7b61..02077bb8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paralyze.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paralyze.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.LivingEntity; @@ -13,7 +12,7 @@ import org.bukkit.potion.PotionEffectType; public final class Paralyze extends EcoEnchant { public Paralyze() { super( - new EcoEnchantBuilder("paralyze", EnchantmentType.NORMAL) + "paralyze", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java index 55743a3c..43883873 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.attribute.Attribute; import org.bukkit.entity.Arrow; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Parasitic extends EcoEnchant { public Parasitic() { super( - new EcoEnchantBuilder("parasitic", EnchantmentType.NORMAL) + "parasitic", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java index ee338553..e5ffabf8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Player; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Parry extends EcoEnchant { public Parry() { super( - new EcoEnchantBuilder("parry", EnchantmentType.NORMAL) + "parry", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Phantasm.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Phantasm.java index a5f6a522..8cdf85b7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Phantasm.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Phantasm.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Skeleton; @@ -12,7 +11,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Phantasm extends EcoEnchant { public Phantasm() { super( - new EcoEnchantBuilder("phantasm", EnchantmentType.NORMAL) + "phantasm", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Protector.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Protector.java index 6e12182f..691832e5 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Protector.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Protector.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Tameable; import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Protector extends EcoEnchant { public Protector() { super( - new EcoEnchantBuilder("protector", EnchantmentType.NORMAL) + "protector", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Proximity.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Proximity.java index 88f2084e..eca08c7a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Proximity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Proximity.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Proximity extends EcoEnchant { public Proximity() { super( - new EcoEnchantBuilder("proximity", EnchantmentType.NORMAL) + "proximity", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Puncture.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Puncture.java index 4261d753..6460a3f3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Puncture.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Puncture.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Shulker; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Puncture extends EcoEnchant { public Puncture() { super( - new EcoEnchantBuilder("puncture", EnchantmentType.NORMAL) + "puncture", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Quadrilateralism.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Quadrilateralism.java index c1cd8204..2a4f2afa 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Quadrilateralism.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Quadrilateralism.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Quadrilateralism extends EcoEnchant { public Quadrilateralism() { super( - new EcoEnchantBuilder("quadrilateralism", EnchantmentType.NORMAL) + "quadrilateralism", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Radiance.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Radiance.java index 22c5b374..12126ea0 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Radiance.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Radiance.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.Entity; @@ -12,7 +11,7 @@ import org.bukkit.potion.PotionEffectType; public final class Radiance extends EcoEnchant { public Radiance() { super( - new EcoEnchantBuilder("radiance", EnchantmentType.NORMAL) + "radiance", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rage.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rage.java index 6a1b8c5d..017c53b9 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rage.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rage.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.util.VectorUtils; @@ -16,7 +15,7 @@ import org.bukkit.util.Vector; public final class Rage extends EcoEnchant { public Rage() { super( - new EcoEnchantBuilder("rage", EnchantmentType.NORMAL) + "rage", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rapid.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rapid.java index 7c08ad86..6aea0eab 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rapid.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rapid.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityShootBowEvent; public final class Rapid extends EcoEnchant { public Rapid() { super( - new EcoEnchantBuilder("rapid", EnchantmentType.NORMAL) + "rapid", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reel.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reel.java index 4f71b44a..cc15719f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reel.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reel.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -14,7 +13,7 @@ import org.bukkit.util.Vector; public final class Reel extends EcoEnchant { public Reel() { super( - new EcoEnchantBuilder("reel", EnchantmentType.NORMAL) + "reel", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reinforcement.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reinforcement.java index ecbdfd84..f28d8a02 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reinforcement.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Reinforcement.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageEvent; public final class Reinforcement extends EcoEnchant { public Reinforcement() { super( - new EcoEnchantBuilder("reinforcement", EnchantmentType.NORMAL) + "reinforcement", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rejuvenation.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rejuvenation.java index 71ef182d..16d4a606 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rejuvenation.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Rejuvenation.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Player; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent; public final class Rejuvenation extends EcoEnchant { public Rejuvenation() { super( - new EcoEnchantBuilder("rejuvenation", EnchantmentType.NORMAL) + "rejuvenation", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Replenish.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Replenish.java index c6504493..b4504fa0 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Replenish.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Replenish.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.data.Ageable; @@ -12,7 +11,7 @@ import org.bukkit.scheduler.BukkitRunnable; public final class Replenish extends EcoEnchant { public Replenish() { super( - new EcoEnchantBuilder("replenish", EnchantmentType.NORMAL) + "replenish", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Respirator.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Respirator.java index 1040378a..c0282afe 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Respirator.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Respirator.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageEvent; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageEvent; public final class Respirator extends EcoEnchant { public Respirator() { super( - new EcoEnchantBuilder("respirator", EnchantmentType.NORMAL) + "respirator", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Revenant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Revenant.java index cc14da5b..0c7ef686 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Revenant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Revenant.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -12,7 +11,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Revenant extends EcoEnchant { public Revenant() { super( - new EcoEnchantBuilder("revenant", EnchantmentType.NORMAL) + "revenant", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sating.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sating.java index f512954b..2bb8293c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sating.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sating.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.Player; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.FoodLevelChangeEvent; public final class Sating extends EcoEnchant { public Sating() { super( - new EcoEnchantBuilder("sating", EnchantmentType.NORMAL) + "sating", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java index f4a4ff85..38f2c38d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Trident; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Serrated extends EcoEnchant { public Serrated() { super( - new EcoEnchantBuilder("serrated", EnchantmentType.NORMAL) + "serrated", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Settle.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Settle.java index bd3a3e74..cbf27563 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Settle.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Settle.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.Creeper; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Settle extends EcoEnchant { public Settle() { super( - new EcoEnchantBuilder("settle", EnchantmentType.NORMAL) + "settle", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java index c58b43ac..4eb2281b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Shockwave.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.nms.TridentStack; @@ -19,7 +18,7 @@ import org.bukkit.scheduler.BukkitRunnable; public final class Shockwave extends EcoEnchant { public Shockwave() { super( - new EcoEnchantBuilder("shockwave", EnchantmentType.NORMAL) + "shockwave", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java index e377308a..78c69c1c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Arrow; @@ -12,7 +11,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class ShotAssist extends EcoEnchant { public ShotAssist() { super( - new EcoEnchantBuilder("shot_assist", EnchantmentType.NORMAL) + "shot_assist", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sickening.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sickening.java index 50f5594d..f8c7416c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sickening.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sickening.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.Arrow; @@ -14,7 +13,7 @@ import org.bukkit.util.Vector; public final class Sickening extends EcoEnchant { public Sickening() { super( - new EcoEnchantBuilder("sickening", EnchantmentType.NORMAL) + "sickening", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slaughter.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slaughter.java index 5e3a31bb..72f36526 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slaughter.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slaughter.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Slaughter extends EcoEnchant { public Slaughter() { super( - new EcoEnchantBuilder("slaughter", EnchantmentType.NORMAL) + "slaughter", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slicing.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slicing.java index f9687af4..2c832463 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slicing.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Slicing.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.util.DurabilityUtils; @@ -17,7 +16,7 @@ import java.util.ArrayList; public final class Slicing extends EcoEnchant { public Slicing() { super( - new EcoEnchantBuilder("slicing", EnchantmentType.NORMAL) + "slicing", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java index 6364fdc3..95c8c5e3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spearfishing.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; @@ -23,7 +22,7 @@ import java.util.Random; public final class Spearfishing extends EcoEnchant { public Spearfishing() { super( - new EcoEnchantBuilder("spearfishing", EnchantmentType.NORMAL) + "spearfishing", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spiked.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spiked.java index 802250db..ca4fa35b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spiked.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Spiked.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -12,7 +11,7 @@ import org.bukkit.event.player.PlayerFishEvent; public final class Spiked extends EcoEnchant { public Spiked() { super( - new EcoEnchantBuilder("spiked", EnchantmentType.NORMAL) + "spiked", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java index bd3bb452..69687eda 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Splash.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.nms.TridentStack; @@ -19,7 +18,7 @@ import org.bukkit.inventory.ItemStack; public final class Splash extends EcoEnchant { public Splash() { super( - new EcoEnchantBuilder("splash", EnchantmentType.NORMAL) + "splash", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stab.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stab.java index 9ce4b883..2a7c5399 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stab.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stab.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Stab extends EcoEnchant { public Stab() { super( - new EcoEnchantBuilder("stab", EnchantmentType.NORMAL) + "stab", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stamina.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stamina.java index ddba5438..f3635c32 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stamina.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Stamina.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.Player; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.FoodLevelChangeEvent; public final class Stamina extends EcoEnchant { public Stamina() { super( - new EcoEnchantBuilder("stamina", EnchantmentType.NORMAL) + "stamina", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StoneSwitcher.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StoneSwitcher.java index 0ba38c4c..751efed9 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StoneSwitcher.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StoneSwitcher.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.queue.DropQueue; @@ -15,7 +14,7 @@ import org.bukkit.inventory.ItemStack; public final class StoneSwitcher extends EcoEnchant { public StoneSwitcher() { super( - new EcoEnchantBuilder("stone_switcher", EnchantmentType.NORMAL) + "stone_switcher", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java index d35a878e..273d9def 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/StrayAspect.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -13,7 +12,7 @@ import org.bukkit.potion.PotionEffectType; public final class StrayAspect extends EcoEnchant { public StrayAspect() { super( - new EcoEnchantBuilder("stray_aspect", EnchantmentType.NORMAL) + "stray_aspect", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Succession.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Succession.java index c4465471..197a8c15 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Succession.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Succession.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.util.DurabilityUtils; @@ -16,7 +15,7 @@ import org.bukkit.event.entity.EntityShootBowEvent; public final class Succession extends EcoEnchant { public Succession() { super( - new EcoEnchantBuilder("succession", EnchantmentType.NORMAL) + "succession", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java index 94f44ad9..0baa7e6d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Supercritical.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Supercritical extends EcoEnchant { public Supercritical() { super( - new EcoEnchantBuilder("supercritical", EnchantmentType.NORMAL) + "supercritical", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sycophant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sycophant.java index b15e1ace..252b41f1 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sycophant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sycophant.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.attribute.Attribute; import org.bukkit.entity.LivingEntity; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Sycophant extends EcoEnchant { public Sycophant() { super( - new EcoEnchantBuilder("sycophant", EnchantmentType.NORMAL) + "sycophant", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tectonic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tectonic.java index aff58892..06d8f725 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tectonic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tectonic.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import java.util.Collection; public final class Tectonic extends EcoEnchant { public Tectonic() { super( - new EcoEnchantBuilder("tectonic", EnchantmentType.NORMAL) + "tectonic", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java index e73493eb..7f77e200 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Telekinesis.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.ecoenchants.special.Soulbound; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; @@ -29,7 +28,7 @@ import java.util.List; public final class Telekinesis extends EcoEnchant { public Telekinesis() { super( - new EcoEnchantBuilder("telekinesis", EnchantmentType.NORMAL) + "telekinesis", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java index c49fda24..0203455b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thor.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -12,7 +11,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Thor extends EcoEnchant { public Thor() { super( - new EcoEnchantBuilder("thor", EnchantmentType.NORMAL) + "thor", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java index ac4edff2..486b4033 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Thrive.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent; @@ -15,7 +14,7 @@ import org.bukkit.scheduler.BukkitRunnable; public final class Thrive extends EcoEnchant { public Thrive() { super( - new EcoEnchantBuilder("thrive", EnchantmentType.NORMAL) + "thrive", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tornado.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tornado.java index c8c66096..f7f35130 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tornado.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tornado.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Bukkit; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import org.bukkit.util.Vector; public final class Tornado extends EcoEnchant { public Tornado() { super( - new EcoEnchantBuilder("tornado", EnchantmentType.NORMAL) + "tornado", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java index 60c8d88b..522b7c64 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Toxic.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -13,7 +12,7 @@ import org.bukkit.potion.PotionEffectType; public final class Toxic extends EcoEnchant { public Toxic() { super( - new EcoEnchantBuilder("toxic", EnchantmentType.NORMAL) + "toxic", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Transfuse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Transfuse.java index fede2bef..a04309cf 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Transfuse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Transfuse.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.queue.DropQueue; @@ -16,7 +15,7 @@ import org.bukkit.inventory.ItemStack; public final class Transfuse extends EcoEnchant { public Transfuse() { super( - new EcoEnchantBuilder("transfuse", EnchantmentType.NORMAL) + "transfuse", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tripleshot.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tripleshot.java index 0bac61e8..738c5d45 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tripleshot.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Tripleshot.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.enchantments.Enchantment; @@ -13,7 +12,7 @@ import org.bukkit.util.Vector; public final class Tripleshot extends EcoEnchant { public Tripleshot() { super( - new EcoEnchantBuilder("tripleshot", EnchantmentType.NORMAL) + "tripleshot", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java index 6bba317d..2d86ba59 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VampireAspect.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -13,7 +12,7 @@ import org.bukkit.potion.PotionEffectType; public final class VampireAspect extends EcoEnchant { public VampireAspect() { super( - new EcoEnchantBuilder("vampire_aspect", EnchantmentType.NORMAL) + "vampire_aspect", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java index 199b7a28..507e21fd 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Vein.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -22,7 +21,7 @@ import java.util.Set; public final class Vein extends EcoEnchant { public Vein() { super( - new EcoEnchantBuilder("vein", EnchantmentType.NORMAL) + "vein", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Venom.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Venom.java index 5d3bdf8a..e98030a2 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Venom.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Venom.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import org.bukkit.potion.PotionEffectType; public final class Venom extends EcoEnchant { public Venom() { super( - new EcoEnchantBuilder("venom", EnchantmentType.NORMAL) + "venom", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VoidAffinity.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VoidAffinity.java index dce67663..22056bd9 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VoidAffinity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VoidAffinity.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.World; import org.bukkit.entity.LivingEntity; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class VoidAffinity extends EcoEnchant { public VoidAffinity() { super( - new EcoEnchantBuilder("void_affinity", EnchantmentType.NORMAL) + "void_affinity", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Voltage.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Voltage.java index e2bc137b..bb9a1a72 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Voltage.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Voltage.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; @@ -14,7 +13,7 @@ import java.util.Arrays; public final class Voltage extends EcoEnchant { public Voltage() { super( - new EcoEnchantBuilder("voltage", EnchantmentType.NORMAL) + "voltage", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAffinity.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAffinity.java index 4ec92625..24b71cf8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAffinity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAffinity.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class WaterAffinity extends EcoEnchant { public WaterAffinity() { super( - new EcoEnchantBuilder("water_affinity", EnchantmentType.NORMAL) + "water_affinity", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAspect.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAspect.java index 99839242..1bd1fa31 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAspect.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAspect.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Blaze; import org.bukkit.entity.Enderman; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class WaterAspect extends EcoEnchant { public WaterAspect() { super( - new EcoEnchantBuilder("water_aspect", EnchantmentType.NORMAL) + "water_aspect", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Weakening.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Weakening.java index dea02662..b18e6fe6 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Weakening.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Weakening.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Bukkit; import org.bukkit.entity.LivingEntity; @@ -14,7 +13,7 @@ import org.bukkit.metadata.FixedMetadataValue; public final class Weakening extends EcoEnchant { public Weakening() { super( - new EcoEnchantBuilder("weakening", EnchantmentType.NORMAL) + "weakening", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java index fe34cb47..e1f7ffc1 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wisdom.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.events.naturalexpgainevent.NaturalExpGainEvent; @@ -10,7 +9,7 @@ import org.bukkit.event.EventHandler; public final class Wisdom extends EcoEnchant { public Wisdom() { super( - new EcoEnchantBuilder("wisdom", EnchantmentType.NORMAL) + "wisdom", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wound.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wound.java index c02931d1..cd8596d4 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wound.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Wound.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import org.bukkit.entity.Arrow; @@ -15,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; public final class Wound extends EcoEnchant { public Wound() { super( - new EcoEnchantBuilder("wound", EnchantmentType.NORMAL) + "wound", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Zeus.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Zeus.java index eb532892..4d7cddf7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Zeus.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Zeus.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.util.LightningUtils; @@ -11,7 +10,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Zeus extends EcoEnchant { public Zeus() { super( - new EcoEnchantBuilder("zeus", EnchantmentType.NORMAL) + "zeus", EnchantmentType.NORMAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java index d8d3a3d2..36fc068e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.util.NumberUtils; @@ -24,7 +23,7 @@ import java.util.List; public final class Aiming extends EcoEnchant { public Aiming() { super( - new EcoEnchantBuilder("aiming", EnchantmentType.SPECIAL) + "aiming", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Annihilate.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Annihilate.java index d38d0558..7f1b10b7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Annihilate.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Annihilate.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageByEntityEvent; @@ -9,7 +8,7 @@ import org.bukkit.util.Vector; public final class Annihilate extends EcoEnchant { public Annihilate() { super( - new EcoEnchantBuilder("annihilate", EnchantmentType.SPECIAL) + "annihilate", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java index 0c2282d8..d4582078 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Trident; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Bladed extends EcoEnchant { public Bladed() { super( - new EcoEnchantBuilder("bladed", EnchantmentType.SPECIAL) + "bladed", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java index 3f746aa9..b8dd08fd 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bolt.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -12,7 +11,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Bolt extends EcoEnchant { public Bolt() { super( - new EcoEnchantBuilder("bolt", EnchantmentType.SPECIAL) + "bolt", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java index 84a64a62..ebd0cf5a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Carve.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.nms.Cooldown; import org.bukkit.Bukkit; @@ -13,7 +12,7 @@ import org.bukkit.metadata.FixedMetadataValue; public final class Carve extends EcoEnchant { public Carve() { super( - new EcoEnchantBuilder("carve", EnchantmentType.SPECIAL) + "carve", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java index 23f730a2..c02d26cc 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Confusion.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.nms.Cooldown; @@ -16,7 +15,7 @@ import java.util.List; public final class Confusion extends EcoEnchant { public Confusion() { super( - new EcoEnchantBuilder("confusion", EnchantmentType.SPECIAL) + "confusion", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Energizing.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Energizing.java index de2d943f..f280426b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Energizing.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Energizing.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.block.Block; import org.bukkit.entity.Player; @@ -12,7 +11,7 @@ import org.bukkit.potion.PotionEffectType; public final class Energizing extends EcoEnchant { public Energizing() { super( - new EcoEnchantBuilder("energizing", EnchantmentType.SPECIAL) + "energizing", EnchantmentType.SPECIAL ); } // START OF LISTENERS diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Force.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Force.java index b2c77a88..d4845356 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Force.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Force.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Force extends EcoEnchant { public Force() { super( - new EcoEnchantBuilder("force", EnchantmentType.SPECIAL) + "force", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Frenzy.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Frenzy.java index 2f3c89d3..b447b6e7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Frenzy.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Frenzy.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.entity.Player; @@ -13,7 +12,7 @@ import org.bukkit.potion.PotionEffectType; public final class Frenzy extends EcoEnchant { public Frenzy() { super( - new EcoEnchantBuilder("frenzy", EnchantmentType.SPECIAL) + "frenzy", EnchantmentType.SPECIAL ); } // START OF LISTENERS diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Harpoon.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Harpoon.java index e74a3a37..75e8819e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Harpoon.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Harpoon.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -12,7 +11,7 @@ import org.bukkit.event.player.PlayerFishEvent; public final class Harpoon extends EcoEnchant { public Harpoon() { super( - new EcoEnchantBuilder("harpoon", EnchantmentType.SPECIAL) + "harpoon", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Indestructibility.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Indestructibility.java index 8336e0f8..493c87f3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Indestructibility.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Indestructibility.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.util.NumberUtils; @@ -11,7 +10,7 @@ import org.bukkit.inventory.ItemStack; public final class Indestructibility extends EcoEnchant { public Indestructibility() { super( - new EcoEnchantBuilder("indestructibility", EnchantmentType.SPECIAL) + "indestructibility", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Instability.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Instability.java index 2ef4e60c..59f980d5 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Instability.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Instability.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -13,7 +12,7 @@ import org.bukkit.event.entity.ProjectileHitEvent; public final class Instability extends EcoEnchant { public Instability() { super( - new EcoEnchantBuilder("instability", EnchantmentType.SPECIAL) + "instability", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java index 0a1eed40..e216c429 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Intellect.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.events.naturalexpgainevent.NaturalExpGainEvent; @@ -10,7 +9,7 @@ import org.bukkit.event.EventHandler; public final class Intellect extends EcoEnchant { public Intellect() { super( - new EcoEnchantBuilder("intellect", EnchantmentType.SPECIAL) + "intellect", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/LifeSteal.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/LifeSteal.java index 35c3be86..95f6f2d9 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/LifeSteal.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/LifeSteal.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.attribute.Attribute; import org.bukkit.entity.LivingEntity; @@ -9,7 +8,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class LifeSteal extends EcoEnchant { public LifeSteal() { super( - new EcoEnchantBuilder("life_steal", EnchantmentType.SPECIAL) + "life_steal", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Pentashot.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Pentashot.java index 6cf4ae77..bf61159e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Pentashot.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Pentashot.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import org.bukkit.enchantments.Enchantment; @@ -13,7 +12,7 @@ import org.bukkit.util.Vector; public final class Pentashot extends EcoEnchant { public Pentashot() { super( - new EcoEnchantBuilder("pentashot", EnchantmentType.SPECIAL) + "pentashot", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Preservation.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Preservation.java index abfeafd3..02a886d3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Preservation.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Preservation.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.entity.LivingEntity; import org.bukkit.event.entity.EntityDamageEvent; public final class Preservation extends EcoEnchant { public Preservation() { super( - new EcoEnchantBuilder("preservation", EnchantmentType.SPECIAL) + "preservation", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Prosperity.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Prosperity.java index 8bcd2ae6..f27e4dbe 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Prosperity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Prosperity.java @@ -1,12 +1,11 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; public final class Prosperity extends EcoEnchant { public Prosperity() { super( - new EcoEnchantBuilder("prosperity", EnchantmentType.SPECIAL) + "prosperity", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java index 6743fa15..24218d72 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.nms.Cooldown; import org.bukkit.entity.LivingEntity; @@ -10,7 +9,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Razor extends EcoEnchant { public Razor() { super( - new EcoEnchantBuilder("razor", EnchantmentType.SPECIAL) + "razor", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Repairing.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Repairing.java index 47df6c7b..14bd8e65 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Repairing.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Repairing.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.util.DurabilityUtils; @@ -24,7 +23,7 @@ import java.util.Set; public final class Repairing extends EcoEnchant implements EcoRunnable { public Repairing() { super( - new EcoEnchantBuilder("repairing", EnchantmentType.SPECIAL) + "repairing", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java index 26a545ef..5d9e2b32 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Soulbound.java @@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -19,7 +18,7 @@ import java.util.Objects; public final class Soulbound extends EcoEnchant { public Soulbound() { super( - new EcoEnchantBuilder("soulbound", EnchantmentType.SPECIAL) + "soulbound", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Spring.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Spring.java index 4eee2986..5807aae0 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Spring.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Spring.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityDamageEvent; @@ -9,7 +8,7 @@ import org.bukkit.event.player.PlayerMoveEvent; public final class Spring extends EcoEnchant { public Spring() { super( - new EcoEnchantBuilder("spring", EnchantmentType.SPECIAL) + "spring", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Streamlining.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Streamlining.java index 0a6abf1c..5c355181 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Streamlining.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Streamlining.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent; import org.bukkit.entity.Player; public final class Streamlining extends EcoEnchant { public Streamlining() { super( - new EcoEnchantBuilder("streamlining", EnchantmentType.SPECIAL) + "streamlining", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java index bdf4bf52..f5ca7941 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Volatile.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; @@ -13,7 +12,7 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent; public final class Volatile extends EcoEnchant { public Volatile() { super( - new EcoEnchantBuilder("volatile", EnchantmentType.SPECIAL) + "volatile", EnchantmentType.SPECIAL ); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java index 5f340823..88d315fd 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java @@ -3,7 +3,6 @@ package com.willfp.ecoenchants.enchantments.itemtypes; import com.google.common.util.concurrent.AtomicDouble; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.nms.TridentStack; @@ -39,7 +38,7 @@ public abstract class Artifact extends EcoEnchant { } protected Artifact(String key, Prerequisite[] prerequisites) { - super(new EcoEnchantBuilder(key, EnchantmentType.ARTIFACT), prerequisites); + super(key, EnchantmentType.ARTIFACT, prerequisites); if(!Prerequisite.areMet(prerequisites)) { HandlerList.unregisterAll(this); // Prevent events firing