Removed EcoEnchantBuilder

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;
 
-    /**
+    protected EcoEnchant(String key, EcoEnchant.EnchantmentType type) {
-     * Create new EcoEnchant matching builder and prerequisites
+        this(key, type, EcoEnchantsPlugin.class, new Prerequisite[]{});
-     *
+    }
-     * @param builder The {@link EcoEnchantBuilder} for enchantment
-     */
-    protected EcoEnchant(EcoEnchantBuilder builder, Prerequisite[] prerequisites) {
-        super(NamespacedKey.minecraft(builder.key));
 
-        this.type = builder.type;
+    protected EcoEnchant(String key, EcoEnchant.EnchantmentType type, Prerequisite[] prerequisites) {
-        this.permissionName = builder.permission;
+        this(key, type, EcoEnchantsPlugin.class, prerequisites);
-        this.config = builder.config;
+    }
+
+    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
      */

Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchantBuilder.java

@@ -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");
-    }
-}

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
         );
     }
 

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<Player, Integer> players = new HashMap<>();

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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}
         );
     }

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }
 

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
         );
     }