diff --git a/API/pom.xml b/API/pom.xml
index 6cfba2a1..2eb4b862 100644
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -5,7 +5,7 @@
parent
com.willfp.ecoenchants
- 4.1.0-pre20
+ 5.0.0-beta1
4.0.0
diff --git a/API/src/main/java/com/willfp/ecoenchants/API/TargetWrapper.java b/API/src/main/java/com/willfp/ecoenchants/API/TargetWrapper.java
deleted file mode 100644
index 92ac700a..00000000
--- a/API/src/main/java/com/willfp/ecoenchants/API/TargetWrapper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.willfp.ecoenchants.API;
-
-import org.bukkit.Material;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public interface TargetWrapper {
- Set TOOL = new HashSet<>();
- Set ROD = new HashSet<>();
- Set ARMOR = new HashSet<>();
- Set ALL = new HashSet<>();
- Set AXE = new HashSet<>();
- Set BOOK = new HashSet<>();
- Set PICKAXE = new HashSet<>();
- Set HOE = new HashSet<>();
- Set SHOVEL = new HashSet<>();
- Set SWORD = new HashSet<>();
- Set HELMET = new HashSet<>();
- Set CHESTPLATE = new HashSet<>();
- Set LEGGINGS = new HashSet<>();
- Set BOOTS = new HashSet<>();
- Set ELYTRA = new HashSet<>();
- Set BOW = new HashSet<>();
- Set CROSSBOW = new HashSet<>();
- Set SHEARS = new HashSet<>();
- Set TRIDENT = new HashSet<>();
- Set SHIELD = new HashSet<>();
-}
\ No newline at end of file
diff --git a/NMS/v1_15_R1/pom.xml b/NMS/v1_15_R1/pom.xml
index 08e8621a..b27439f8 100644
--- a/NMS/v1_15_R1/pom.xml
+++ b/NMS/v1_15_R1/pom.xml
@@ -5,7 +5,7 @@
parent
com.willfp.ecoenchants
- 4.1.0-pre20
+ 5.0.0-beta1
../../pom.xml
4.0.0
diff --git a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Target.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Target.java
deleted file mode 100644
index 6bef5af3..00000000
--- a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Target.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.willfp.ecoenchants.v1_15_R1;
-
-import com.willfp.ecoenchants.API.TargetWrapper;
-import org.bukkit.Material;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class Target implements TargetWrapper {
-
- public final Set AXE = new HashSet() {{
- TargetWrapper.AXE.add(Material.WOODEN_AXE);
- TargetWrapper.AXE.add(Material.STONE_AXE);
- TargetWrapper.AXE.add(Material.IRON_AXE);
- TargetWrapper.AXE.add(Material.GOLDEN_AXE);
- TargetWrapper.AXE.add(Material.DIAMOND_AXE);
- }};
-
- public final Set BOOK = new HashSet() {{
- TargetWrapper.BOOK.add(Material.BOOK);
- TargetWrapper.BOOK.add(Material.ENCHANTED_BOOK);
- }};
-
- public final Set PICKAXE = new HashSet() {{
- TargetWrapper.PICKAXE.add(Material.WOODEN_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.STONE_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.IRON_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.GOLDEN_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.DIAMOND_PICKAXE);
- }};
-
- public final Set HOE = new HashSet() {{
- TargetWrapper.HOE.add(Material.WOODEN_HOE);
- TargetWrapper.HOE.add(Material.STONE_HOE);
- TargetWrapper.HOE.add(Material.IRON_HOE);
- TargetWrapper.HOE.add(Material.GOLDEN_HOE);
- TargetWrapper.HOE.add(Material.DIAMOND_HOE);
- }};
-
- public final Set SHOVEL = new HashSet() {{
- TargetWrapper.SHOVEL.add(Material.WOODEN_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.STONE_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.IRON_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.GOLDEN_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.DIAMOND_SHOVEL);
- }};
-
- public final Set SWORD = new HashSet() {{
- TargetWrapper.SWORD.add(Material.WOODEN_SWORD);
- TargetWrapper.SWORD.add(Material.STONE_SWORD);
- TargetWrapper.SWORD.add(Material.IRON_SWORD);
- TargetWrapper.SWORD.add(Material.GOLDEN_SWORD);
- TargetWrapper.SWORD.add(Material.DIAMOND_SWORD);
- }};
-
- public final Set HELMET = new HashSet() {{
- TargetWrapper.HELMET.add(Material.TURTLE_HELMET);
- TargetWrapper.HELMET.add(Material.LEATHER_HELMET);
- TargetWrapper.HELMET.add(Material.CHAINMAIL_HELMET);
- TargetWrapper.HELMET.add(Material.IRON_HELMET);
- TargetWrapper.HELMET.add(Material.GOLDEN_HELMET);
- TargetWrapper.HELMET.add(Material.DIAMOND_HELMET);
- }};
-
- public final Set CHESTPLATE = new HashSet() {{
- TargetWrapper.CHESTPLATE.add(Material.LEATHER_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.CHAINMAIL_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.IRON_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.GOLDEN_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.DIAMOND_CHESTPLATE);
- }};
-
- public final Set LEGGINGS = new HashSet() {{
- TargetWrapper.LEGGINGS.add(Material.LEATHER_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.CHAINMAIL_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.IRON_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.GOLDEN_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.DIAMOND_LEGGINGS);
- }};
-
- public final Set BOOTS = new HashSet() {{
- TargetWrapper.BOOTS.add(Material.LEATHER_BOOTS);
- TargetWrapper.BOOTS.add(Material.CHAINMAIL_BOOTS);
- TargetWrapper.BOOTS.add(Material.IRON_BOOTS);
- TargetWrapper.BOOTS.add(Material.GOLDEN_BOOTS);
- TargetWrapper.BOOTS.add(Material.DIAMOND_BOOTS);
- }};
-
- public final Set ELYTRA = new HashSet() {{
- TargetWrapper.ELYTRA.add(Material.ELYTRA);
- }};
-
- public final Set BOW = new HashSet() {{
- TargetWrapper.BOW.add(Material.BOW);
- }};
-
- public final Set CROSSBOW = new HashSet() {{
- TargetWrapper.CROSSBOW.add(Material.CROSSBOW);
- }};
-
- public final Set SHEARS = new HashSet() {{
- TargetWrapper.SHEARS.add(Material.SHEARS);
- }};
-
- public final Set TRIDENT = new HashSet() {{
- TargetWrapper.TRIDENT.add(Material.TRIDENT);
- }};
-
- public final Set SHIELD = new HashSet() {{
- TargetWrapper.SHIELD.add(Material.SHIELD);
- }};
-
- public final Set ROD = new HashSet() {{
- TargetWrapper.ROD.add(Material.FISHING_ROD);
- }};
-
-
- public final Set TOOL = new HashSet() {{
- TargetWrapper.TOOL.addAll(TargetWrapper.AXE);
- TargetWrapper.TOOL.addAll(TargetWrapper.PICKAXE);
- TargetWrapper.TOOL.addAll(TargetWrapper.SHOVEL);
- TargetWrapper.TOOL.addAll(TargetWrapper.HOE);
- TargetWrapper.TOOL.addAll(TargetWrapper.SHEARS);
- }};
-
- public final Set ARMOR = new HashSet() {{
- TargetWrapper.ARMOR.addAll(TargetWrapper.HELMET);
- TargetWrapper.ARMOR.addAll(TargetWrapper.CHESTPLATE);
- TargetWrapper.ARMOR.addAll(TargetWrapper.LEGGINGS);
- TargetWrapper.ARMOR.addAll(TargetWrapper.BOOTS);
- }};
-
- public final Set ALL = new HashSet() {{
- TargetWrapper.ALL.addAll(TargetWrapper.TOOL);
- TargetWrapper.ALL.addAll(TargetWrapper.ARMOR);
- TargetWrapper.ALL.addAll(TargetWrapper.TRIDENT);
- TargetWrapper.ALL.addAll(TargetWrapper.SHIELD);
- TargetWrapper.ALL.addAll(TargetWrapper.BOW);
- TargetWrapper.ALL.addAll(TargetWrapper.CROSSBOW);
- TargetWrapper.ALL.addAll(TargetWrapper.ROD);
- TargetWrapper.ALL.addAll(TargetWrapper.BOOK);
- TargetWrapper.ALL.addAll(TargetWrapper.SWORD);
- TargetWrapper.ALL.addAll(TargetWrapper.ELYTRA);
- }};
-
- public Target() {
-
- }
-}
diff --git a/NMS/v1_16_R1/pom.xml b/NMS/v1_16_R1/pom.xml
index 0e5bcccb..ec5209a0 100644
--- a/NMS/v1_16_R1/pom.xml
+++ b/NMS/v1_16_R1/pom.xml
@@ -5,7 +5,7 @@
parent
com.willfp.ecoenchants
- 4.1.0-pre20
+ 5.0.0-beta1
../../pom.xml
4.0.0
diff --git a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Target.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Target.java
deleted file mode 100644
index 2d765e84..00000000
--- a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Target.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.willfp.ecoenchants.v1_16_R1;
-
-import com.willfp.ecoenchants.API.TargetWrapper;
-import org.bukkit.Material;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class Target implements TargetWrapper {
-
- public final Set AXE = new HashSet() {{
- TargetWrapper.AXE.add(Material.WOODEN_AXE);
- TargetWrapper.AXE.add(Material.STONE_AXE);
- TargetWrapper.AXE.add(Material.IRON_AXE);
- TargetWrapper.AXE.add(Material.GOLDEN_AXE);
- TargetWrapper.AXE.add(Material.DIAMOND_AXE);
- TargetWrapper.AXE.add(Material.NETHERITE_AXE);
- }};
-
- public final Set BOOK = new HashSet() {{
- TargetWrapper.BOOK.add(Material.BOOK);
- TargetWrapper.BOOK.add(Material.ENCHANTED_BOOK);
- }};
-
- public final Set PICKAXE = new HashSet() {{
- TargetWrapper.PICKAXE.add(Material.WOODEN_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.STONE_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.IRON_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.GOLDEN_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.DIAMOND_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.NETHERITE_PICKAXE);
- }};
-
- public final Set HOE = new HashSet() {{
- TargetWrapper.HOE.add(Material.WOODEN_HOE);
- TargetWrapper.HOE.add(Material.STONE_HOE);
- TargetWrapper.HOE.add(Material.IRON_HOE);
- TargetWrapper.HOE.add(Material.GOLDEN_HOE);
- TargetWrapper.HOE.add(Material.DIAMOND_HOE);
- TargetWrapper.HOE.add(Material.NETHERITE_HOE);
- }};
-
- public final Set SHOVEL = new HashSet() {{
- TargetWrapper.SHOVEL.add(Material.WOODEN_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.STONE_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.IRON_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.GOLDEN_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.DIAMOND_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.NETHERITE_SHOVEL);
- }};
-
- public final Set SWORD = new HashSet() {{
- TargetWrapper.SWORD.add(Material.WOODEN_SWORD);
- TargetWrapper.SWORD.add(Material.STONE_SWORD);
- TargetWrapper.SWORD.add(Material.IRON_SWORD);
- TargetWrapper.SWORD.add(Material.GOLDEN_SWORD);
- TargetWrapper.SWORD.add(Material.DIAMOND_SWORD);
- TargetWrapper.SWORD.add(Material.NETHERITE_SWORD);
- }};
-
- public final Set HELMET = new HashSet() {{
- TargetWrapper.HELMET.add(Material.TURTLE_HELMET);
- TargetWrapper.HELMET.add(Material.LEATHER_HELMET);
- TargetWrapper.HELMET.add(Material.CHAINMAIL_HELMET);
- TargetWrapper.HELMET.add(Material.IRON_HELMET);
- TargetWrapper.HELMET.add(Material.GOLDEN_HELMET);
- TargetWrapper.HELMET.add(Material.DIAMOND_HELMET);
- TargetWrapper.HELMET.add(Material.NETHERITE_HELMET);
- }};
-
- public final Set CHESTPLATE = new HashSet() {{
- TargetWrapper.CHESTPLATE.add(Material.LEATHER_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.CHAINMAIL_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.IRON_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.GOLDEN_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.DIAMOND_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.NETHERITE_CHESTPLATE);
- }};
-
- public final Set LEGGINGS = new HashSet() {{
- TargetWrapper.LEGGINGS.add(Material.LEATHER_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.CHAINMAIL_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.IRON_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.GOLDEN_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.DIAMOND_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.NETHERITE_LEGGINGS);
- }};
-
- public final Set BOOTS = new HashSet() {{
- TargetWrapper.BOOTS.add(Material.LEATHER_BOOTS);
- TargetWrapper.BOOTS.add(Material.CHAINMAIL_BOOTS);
- TargetWrapper.BOOTS.add(Material.IRON_BOOTS);
- TargetWrapper.BOOTS.add(Material.GOLDEN_BOOTS);
- TargetWrapper.BOOTS.add(Material.DIAMOND_BOOTS);
- TargetWrapper.BOOTS.add(Material.NETHERITE_BOOTS);
- }};
-
- public final Set ELYTRA = new HashSet() {{
- TargetWrapper.ELYTRA.add(Material.ELYTRA);
- }};
-
- public final Set BOW = new HashSet() {{
- TargetWrapper.BOW.add(Material.BOW);
- }};
-
- public final Set CROSSBOW = new HashSet() {{
- TargetWrapper.CROSSBOW.add(Material.CROSSBOW);
- }};
-
- public final Set SHEARS = new HashSet() {{
- TargetWrapper.SHEARS.add(Material.SHEARS);
- }};
-
- public final Set TRIDENT = new HashSet() {{
- TargetWrapper.TRIDENT.add(Material.TRIDENT);
- }};
-
- public final Set SHIELD = new HashSet() {{
- TargetWrapper.SHIELD.add(Material.SHIELD);
- }};
-
- public final Set ROD = new HashSet() {{
- TargetWrapper.ROD.add(Material.FISHING_ROD);
- }};
-
-
- public final Set TOOL = new HashSet() {{
- TargetWrapper.TOOL.addAll(TargetWrapper.AXE);
- TargetWrapper.TOOL.addAll(TargetWrapper.PICKAXE);
- TargetWrapper.TOOL.addAll(TargetWrapper.SHOVEL);
- TargetWrapper.TOOL.addAll(TargetWrapper.HOE);
- TargetWrapper.TOOL.addAll(TargetWrapper.SHEARS);
- }};
-
- public final Set ARMOR = new HashSet() {{
- TargetWrapper.ARMOR.addAll(TargetWrapper.HELMET);
- TargetWrapper.ARMOR.addAll(TargetWrapper.CHESTPLATE);
- TargetWrapper.ARMOR.addAll(TargetWrapper.LEGGINGS);
- TargetWrapper.ARMOR.addAll(TargetWrapper.BOOTS);
- }};
-
- public final Set ALL = new HashSet() {{
- TargetWrapper.ALL.addAll(TargetWrapper.TOOL);
- TargetWrapper.ALL.addAll(TargetWrapper.ARMOR);
- TargetWrapper.ALL.addAll(TargetWrapper.TRIDENT);
- TargetWrapper.ALL.addAll(TargetWrapper.SHIELD);
- TargetWrapper.ALL.addAll(TargetWrapper.BOW);
- TargetWrapper.ALL.addAll(TargetWrapper.CROSSBOW);
- TargetWrapper.ALL.addAll(TargetWrapper.ROD);
- TargetWrapper.ALL.addAll(TargetWrapper.BOOK);
- TargetWrapper.ALL.addAll(TargetWrapper.SWORD);
- TargetWrapper.ALL.addAll(TargetWrapper.ELYTRA);
- }};
-
- public Target() {
-
- }
-}
diff --git a/NMS/v1_16_R2/pom.xml b/NMS/v1_16_R2/pom.xml
index 7f1ca7f0..f8209b39 100644
--- a/NMS/v1_16_R2/pom.xml
+++ b/NMS/v1_16_R2/pom.xml
@@ -5,7 +5,7 @@
parent
com.willfp.ecoenchants
- 4.1.0-pre20
+ 5.0.0-beta1
../../pom.xml
4.0.0
diff --git a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Target.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Target.java
deleted file mode 100644
index bf1cbe19..00000000
--- a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Target.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.willfp.ecoenchants.v1_16_R2;
-
-import com.willfp.ecoenchants.API.TargetWrapper;
-import org.bukkit.Material;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class Target implements TargetWrapper {
-
- public final Set AXE = new HashSet() {{
- TargetWrapper.AXE.add(Material.WOODEN_AXE);
- TargetWrapper.AXE.add(Material.STONE_AXE);
- TargetWrapper.AXE.add(Material.IRON_AXE);
- TargetWrapper.AXE.add(Material.GOLDEN_AXE);
- TargetWrapper.AXE.add(Material.DIAMOND_AXE);
- TargetWrapper.AXE.add(Material.NETHERITE_AXE);
- }};
-
- public final Set BOOK = new HashSet() {{
- TargetWrapper.BOOK.add(Material.BOOK);
- TargetWrapper.BOOK.add(Material.ENCHANTED_BOOK);
- }};
-
- public final Set PICKAXE = new HashSet() {{
- TargetWrapper.PICKAXE.add(Material.WOODEN_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.STONE_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.IRON_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.GOLDEN_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.DIAMOND_PICKAXE);
- TargetWrapper.PICKAXE.add(Material.NETHERITE_PICKAXE);
- }};
-
- public final Set HOE = new HashSet() {{
- TargetWrapper.HOE.add(Material.WOODEN_HOE);
- TargetWrapper.HOE.add(Material.STONE_HOE);
- TargetWrapper.HOE.add(Material.IRON_HOE);
- TargetWrapper.HOE.add(Material.GOLDEN_HOE);
- TargetWrapper.HOE.add(Material.DIAMOND_HOE);
- TargetWrapper.HOE.add(Material.NETHERITE_HOE);
- }};
-
- public final Set SHOVEL = new HashSet() {{
- TargetWrapper.SHOVEL.add(Material.WOODEN_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.STONE_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.IRON_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.GOLDEN_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.DIAMOND_SHOVEL);
- TargetWrapper.SHOVEL.add(Material.NETHERITE_SHOVEL);
- }};
-
- public final Set SWORD = new HashSet() {{
- TargetWrapper.SWORD.add(Material.WOODEN_SWORD);
- TargetWrapper.SWORD.add(Material.STONE_SWORD);
- TargetWrapper.SWORD.add(Material.IRON_SWORD);
- TargetWrapper.SWORD.add(Material.GOLDEN_SWORD);
- TargetWrapper.SWORD.add(Material.DIAMOND_SWORD);
- TargetWrapper.SWORD.add(Material.NETHERITE_SWORD);
- }};
-
- public final Set HELMET = new HashSet() {{
- TargetWrapper.HELMET.add(Material.TURTLE_HELMET);
- TargetWrapper.HELMET.add(Material.LEATHER_HELMET);
- TargetWrapper.HELMET.add(Material.CHAINMAIL_HELMET);
- TargetWrapper.HELMET.add(Material.IRON_HELMET);
- TargetWrapper.HELMET.add(Material.GOLDEN_HELMET);
- TargetWrapper.HELMET.add(Material.DIAMOND_HELMET);
- TargetWrapper.HELMET.add(Material.NETHERITE_HELMET);
- }};
-
- public final Set CHESTPLATE = new HashSet() {{
- TargetWrapper.CHESTPLATE.add(Material.LEATHER_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.CHAINMAIL_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.IRON_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.GOLDEN_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.DIAMOND_CHESTPLATE);
- TargetWrapper.CHESTPLATE.add(Material.NETHERITE_CHESTPLATE);
- }};
-
- public final Set LEGGINGS = new HashSet() {{
- TargetWrapper.LEGGINGS.add(Material.LEATHER_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.CHAINMAIL_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.IRON_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.GOLDEN_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.DIAMOND_LEGGINGS);
- TargetWrapper.LEGGINGS.add(Material.NETHERITE_LEGGINGS);
- }};
-
- public final Set BOOTS = new HashSet() {{
- TargetWrapper.BOOTS.add(Material.LEATHER_BOOTS);
- TargetWrapper.BOOTS.add(Material.CHAINMAIL_BOOTS);
- TargetWrapper.BOOTS.add(Material.IRON_BOOTS);
- TargetWrapper.BOOTS.add(Material.GOLDEN_BOOTS);
- TargetWrapper.BOOTS.add(Material.DIAMOND_BOOTS);
- TargetWrapper.BOOTS.add(Material.NETHERITE_BOOTS);
- }};
-
- public final Set ELYTRA = new HashSet() {{
- TargetWrapper.ELYTRA.add(Material.ELYTRA);
- }};
-
- public final Set BOW = new HashSet() {{
- TargetWrapper.BOW.add(Material.BOW);
- }};
-
- public final Set CROSSBOW = new HashSet() {{
- TargetWrapper.CROSSBOW.add(Material.CROSSBOW);
- }};
-
- public final Set SHEARS = new HashSet() {{
- TargetWrapper.SHEARS.add(Material.SHEARS);
- }};
-
- public final Set TRIDENT = new HashSet() {{
- TargetWrapper.TRIDENT.add(Material.TRIDENT);
- }};
-
- public final Set SHIELD = new HashSet() {{
- TargetWrapper.SHIELD.add(Material.SHIELD);
- }};
-
- public final Set ROD = new HashSet() {{
- TargetWrapper.ROD.add(Material.FISHING_ROD);
- }};
-
-
- public final Set TOOL = new HashSet() {{
- TargetWrapper.TOOL.addAll(TargetWrapper.AXE);
- TargetWrapper.TOOL.addAll(TargetWrapper.PICKAXE);
- TargetWrapper.TOOL.addAll(TargetWrapper.SHOVEL);
- TargetWrapper.TOOL.addAll(TargetWrapper.HOE);
- TargetWrapper.TOOL.addAll(TargetWrapper.SHEARS);
- }};
-
- public final Set ARMOR = new HashSet() {{
- TargetWrapper.ARMOR.addAll(TargetWrapper.HELMET);
- TargetWrapper.ARMOR.addAll(TargetWrapper.CHESTPLATE);
- TargetWrapper.ARMOR.addAll(TargetWrapper.LEGGINGS);
- TargetWrapper.ARMOR.addAll(TargetWrapper.BOOTS);
- }};
-
- public final Set ALL = new HashSet() {{
- TargetWrapper.ALL.addAll(TargetWrapper.TOOL);
- TargetWrapper.ALL.addAll(TargetWrapper.ARMOR);
- TargetWrapper.ALL.addAll(TargetWrapper.TRIDENT);
- TargetWrapper.ALL.addAll(TargetWrapper.SHIELD);
- TargetWrapper.ALL.addAll(TargetWrapper.BOW);
- TargetWrapper.ALL.addAll(TargetWrapper.CROSSBOW);
- TargetWrapper.ALL.addAll(TargetWrapper.ROD);
- TargetWrapper.ALL.addAll(TargetWrapper.BOOK);
- TargetWrapper.ALL.addAll(TargetWrapper.SWORD);
- TargetWrapper.ALL.addAll(TargetWrapper.ELYTRA);
- }};
-
- public Target() {
-
- }
-}
diff --git a/Plugin/pom.xml b/Plugin/pom.xml
index 697785c4..39de4c57 100644
--- a/Plugin/pom.xml
+++ b/Plugin/pom.xml
@@ -7,7 +7,7 @@
parent
com.willfp.ecoenchants
- 4.1.0-pre20
+ 5.0.0-beta1
plugin
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java b/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java
index 0a37b578..0e3521ae 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java
@@ -18,6 +18,7 @@ public class EcoEnchantsPlugin extends JavaPlugin {
public static final HashMap configVersions = new HashMap() {{
put("config", 4.1);
put("lang", 4.01);
+ put("target", 1.0);
}};
/**
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/anvil/AnvilMerge.java b/Plugin/src/main/java/com/willfp/ecoenchants/anvil/AnvilMerge.java
index 185bb990..becacc61 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/anvil/AnvilMerge.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/anvil/AnvilMerge.java
@@ -3,7 +3,6 @@ package com.willfp.ecoenchants.anvil;
import com.willfp.ecoenchants.config.ConfigManager;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.Pair;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcoreload.java b/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcoreload.java
index b1e53e0c..1afc0325 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcoreload.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcoreload.java
@@ -38,7 +38,7 @@ public class CommandEcoreload implements CommandExecutor {
HandlerList.unregisterAll(ecoEnchant);
Bukkit.getScheduler().runTaskLater(EcoEnchantsPlugin.getInstance(), () -> {
- if(!ecoEnchant.isDisabled()) {
+ if(!ecoEnchant.isEnabled()) {
Bukkit.getPluginManager().registerEvents(ecoEnchant, EcoEnchantsPlugin.getInstance());
}
}, 1);
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/ConfigManager.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/ConfigManager.java
index 4764d1b2..c7c043bd 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/config/ConfigManager.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/ConfigManager.java
@@ -3,6 +3,7 @@ package com.willfp.ecoenchants.config;
import com.willfp.ecoenchants.config.configs.Config;
import com.willfp.ecoenchants.config.configs.EnchantmentConfig;
import com.willfp.ecoenchants.config.configs.Lang;
+import com.willfp.ecoenchants.config.configs.Target;
import java.util.HashSet;
import java.util.Set;
@@ -10,6 +11,7 @@ import java.util.Set;
public class ConfigManager {
private static final Lang LANG = new Lang();
private static final Config CONFIG = new Config();
+ private static final Target TARGET = new Target();
private static final Set enchantmentConfigs = new HashSet<>();
/**
@@ -19,6 +21,7 @@ public class ConfigManager {
public static void updateConfigs() {
LANG.reload();
CONFIG.reload();
+ TARGET.reload();
updateEnchantmentConfigs();
}
@@ -69,4 +72,12 @@ public class ConfigManager {
public static Config getConfig() {
return CONFIG;
}
+
+ /**
+ * Get target.yml
+ * @return target.yml
+ */
+ public static Target getTarget() {
+ return TARGET;
+ }
}
\ No newline at end of file
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java
index fb368198..10b1e182 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java
@@ -2,7 +2,9 @@ package com.willfp.ecoenchants.config.configs;
import com.willfp.ecoenchants.config.EnchantmentYamlConfig;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
+import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.EnchantmentRarity;
+import com.willfp.ecoenchants.enchantments.EnchantmentTarget;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.enchantments.Enchantment;
@@ -83,14 +85,13 @@ public class EnchantmentConfig extends EnchantmentYamlConfig {
return EnchantmentRarity.getByName(rarityName);
}
- public Set getTarget(Set initialTarget) {
- List targetName = config.getStringList("general-config.target");
- if(targetName == null || targetName.isEmpty()) return initialTarget;
+ public Set getTargets() {
+ List targetNames = config.getStringList(EcoEnchants.GENERAL_LOCATION + "targets");
+ if(targetNames == null || targetNames.isEmpty()) return new HashSet<>();
+ Set targets = new HashSet<>();
- Set targets = new HashSet<>();
- targetName.forEach((s -> {
- Material mat = Material.getMaterial(s.toUpperCase());
- targets.add(mat);
+ targetNames.forEach((s -> {
+ targets.add(EnchantmentTarget.getByName(s));
}));
return targets;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java
new file mode 100644
index 00000000..4069ab8b
--- /dev/null
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java
@@ -0,0 +1,32 @@
+package com.willfp.ecoenchants.config.configs;
+
+import com.willfp.ecoenchants.config.YamlConfig;
+import com.willfp.ecoenchants.enchantments.EnchantmentTarget;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Wrapper for config.yml
+ */
+public class Target extends YamlConfig {
+ public Target() {
+ super("target");
+ }
+
+ public Set getTargets() {
+ return config.getConfigurationSection("targets").getKeys(false);
+ }
+
+ public Set getTargetMaterials(String target) {
+ Set materials = new HashSet<>();
+ config.getStringList("targets." + target).forEach((materialName) -> {
+ materials.add(Material.getMaterial(materialName.toUpperCase()));
+ });
+
+ return materials;
+ }
+}
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
index beeb8091..0cb9c02e 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.EcoEnchantsPlugin;
import com.willfp.ecoenchants.config.ConfigManager;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.apache.commons.lang.WordUtils;
import org.bukkit.ChatColor;
@@ -201,7 +200,7 @@ public class EnchantDisplay {
name = enchantment.getName();
description = EcoEnchants.getFromEnchantment(enchantment).getDescription();
description.replaceAll(line -> descriptionColor + line);
- if(EcoEnchants.getFromEnchantment(enchantment).isDisabled()) forRemoval.add(enchantment);
+ if(EcoEnchants.getFromEnchantment(enchantment).isEnabled()) forRemoval.add(enchantment);
} else {
name = ConfigManager.getLang().getString("vanilla." + enchantment.getKey().getKey() + ".name");
description = Arrays.asList(WordUtils.wrap(ConfigManager.getLang().getString("vanilla." + enchantment.getKey().getKey() + ".description"), ConfigManager.getConfig().getInt("lore.describe.wrap"), "\n", false).split("\\r?\\n"));
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/Artifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/Artifact.java
index 44f710eb..51ce1043 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/Artifact.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/Artifact.java
@@ -3,7 +3,6 @@ package com.willfp.ecoenchants.enchantments;
import com.google.common.util.concurrent.AtomicDouble;
import com.willfp.ecoenchants.EcoEnchantsPlugin;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Location;
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 f98af56b..8e9c2560 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
@@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments;
import com.willfp.ecoenchants.config.ConfigManager;
import com.willfp.ecoenchants.config.configs.EnchantmentConfig;
-import com.willfp.ecoenchants.nms.Target;
import org.apache.commons.lang.WordUtils;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
@@ -18,7 +17,6 @@ import java.util.*;
public abstract class EcoEnchant extends Enchantment implements Listener {
private String name;
private String description;
- private Set target;
private final String permissionName;
private final EnchantmentType type;
@@ -32,8 +30,9 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
private int maxLvl;
private Set conflicts;
private EnchantmentRarity rarity;
+ private Set target;
- private boolean disabled;
+ private boolean enabled;
/**
* Create new EcoEnchant matching builder
@@ -45,7 +44,6 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
this.type = builder.type;
this.name = builder.name;
- this.target = builder.target;
this.permissionName = builder.permission;
this.configVersion = builder.configVersion;
this.config = builder.config;
@@ -67,8 +65,9 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
maxLvl = config.getInt(EcoEnchants.GENERAL_LOCATION + "maximum-level", 1);
name = config.getString("name");
description = config.getString("description");
- target = config.getTarget(target);
- disabled = config.getBool("disabled", false);
+ target.clear();
+ config.getTargets().forEach(enchantmentTarget -> target.addAll(enchantmentTarget.getMaterials()));
+ enabled = config.getBool("enabled", true);
this.register();
}
@@ -131,11 +130,11 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
}
/**
- * Get if enchantment is disabled
- * @return If disabled
+ * Get if enchantment is enabled
+ * @return If enabled
*/
- public boolean isDisabled() {
- return this.disabled;
+ public boolean isEnabled() {
+ return this.enabled;
}
/**
@@ -204,7 +203,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
}
/**
- * Get the {@link Target} of enchantment
+ * Get the target of enchantment
* @return Set of enchantable items
*/
public Set getTarget() {
@@ -307,7 +306,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener {
*/
@Override
public boolean canEnchantItem(ItemStack itemStack) {
- return target.contains(itemStack.getType()) || Target.Applicable.BOOK.getMaterials().contains(itemStack.getType());
+ return target.contains(itemStack.getType()) || itemStack.getType().equals(Material.BOOK) || itemStack.getType().equals(Material.ENCHANTED_BOOK);
}
/**
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchantBuilder.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchantBuilder.java
index e78e40ca..8e1be75c 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchantBuilder.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchantBuilder.java
@@ -3,19 +3,13 @@ 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.nms.Target;
-import org.bukkit.Material;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
import java.util.regex.Pattern;
public class EcoEnchantBuilder {
public final String name;
public final String key;
public final String permission;
- public final Set target;
public double configVersion;
public final EnchantmentConfig config;
public Class> plugin;
@@ -27,38 +21,10 @@ public class EcoEnchantBuilder {
*
* @param key The enchantment key name
* @param type The enchantment type
- * @param applicable The materials that the enchantment can be applied to
* @param version The config version
*/
- public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Target.Applicable applicable, double version) {
- this(key, type, new Target.Applicable[]{applicable}, version);
- }
-
- /**
- * Creates new EcoEnchantBuilder
- * Use for extensions
- *
- * @param key The enchantment key name
- * @param type The enchantment type
- * @param applicable The materials that the enchantment can be applied to
- * @param version The config version
- * @param plugin The main class of extension
- */
- public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Target.Applicable applicable, double version, Class> plugin) {
- this(key, type, new Target.Applicable[]{applicable}, version, plugin);
- }
-
- /**
- * Creates new EcoEnchantBuilder
- * Only used by base enchantments, do not use for extensions.
- *
- * @param key The enchantment key name
- * @param type The enchantment type
- * @param applicable The materials that the enchantment can be applied to
- * @param version The config version
- */
- public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Target.Applicable[] applicable, double version) {
- this(key, type, applicable, version, EcoEnchantsPlugin.class);
+ public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, double version) {
+ this(key, type, version, EcoEnchantsPlugin.class);
}
/**
@@ -67,54 +33,14 @@ public class EcoEnchantBuilder {
*
* @param key The enchantment key name
* @param type The enchantment type
- * @param applicable The materials that the enchantment can be applied to
* @param version The config version
* @param plugin The main class of extension
*/
- public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Target.Applicable[] applicable, double version, Class> plugin) {
+ public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, double version, 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("_","");
- Set target = new HashSet<>();
- Arrays.asList(applicable).forEach((applicable1 -> {
- target.addAll(applicable1.getMaterials());
- }));
-
- this.target = target;
-
- this.type = type;
-
- this.plugin = plugin;
-
- this.configVersion = version;
-
- ConfigManager.addEnchantmentConfig(new EnchantmentConfig(permission, configVersion, plugin, this.type));
- this.config = ConfigManager.getEnchantmentConfig(permission);
-
- this.name = config.getString("name");
- }
-
- /**
- * Creates new EcoEnchantBuilder for Extension
- * Use for extensions
- *
- * @param key The enchantment key name
- * @param type The enchantment type
- * @param target The materials that the enchantment can be applied to
- * @param version The config version
- * @param plugin The main class of extension
- *
- * @deprecated Use {@link Target.Applicable} instead
- */
- @Deprecated
- public EcoEnchantBuilder(String key, EcoEnchant.EnchantmentType type, Set target, double version, 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.target = target;
-
this.type = type;
this.plugin = plugin;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EnchantmentTarget.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EnchantmentTarget.java
new file mode 100644
index 00000000..ba66bbcc
--- /dev/null
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EnchantmentTarget.java
@@ -0,0 +1,98 @@
+package com.willfp.ecoenchants.enchantments;
+
+import com.willfp.ecoenchants.config.ConfigManager;
+import org.bukkit.Material;
+
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * Class for storing all enchantment rarities
+ */
+public class EnchantmentTarget {
+ private static final Set targets = new HashSet<>();
+ public static final Set ALL = new HashSet<>();
+
+ private final String name;
+ private final Set materials;
+
+ /**
+ * Create new EnchantmentRarity
+ * @param name The name of the rarity
+ * @paran materials The items for the target
+ */
+ public EnchantmentTarget(String name, Set materials) {
+ this(name, materials, false);
+ }
+
+ /**
+ * Create new EnchantmentRarity
+ * @param name The name of the rarity
+ * @paran materials The items for the target
+ * @param noRegister Dont register internally
+ */
+ public EnchantmentTarget(String name, Set materials, boolean noRegister) {
+ Optional matching = targets.stream().filter(rarity -> rarity.getName().equalsIgnoreCase(name)).findFirst();
+ matching.ifPresent(targets::remove);
+ matching.ifPresent(enchantmentTarget -> ALL.removeAll(enchantmentTarget.getMaterials()));
+
+ this.name = name;
+ this.materials = materials;
+
+ if(!noRegister) {
+ targets.add(this);
+ ALL.addAll(materials);
+ }
+ }
+
+ /**
+ * Get the name of the rarity
+ * @return The name
+ */
+ public String getName() {
+ return this.name;
+ }
+
+ /**
+ * Get the materials of the rarity
+ * @return The materials
+ */
+ public Set getMaterials() {
+ return this.materials;
+ }
+
+ /**
+ * Get EnchantmentTarget matching name
+ * @param name The name to search for
+ * @return The matching EnchantmentTarget, or null if not found
+ */
+ public static EnchantmentTarget getByName(String name) {
+ if(name.equalsIgnoreCase("all")) return new EnchantmentTarget("all", EnchantmentTarget.ALL, true);
+
+ Optional matching = targets.stream().filter(rarity -> rarity.getName().equalsIgnoreCase(name)).findFirst();
+ return matching.orElse(null);
+ }
+
+ /**
+ * Update all targets
+ * Called on /ecoreload
+ */
+ public static void update() {
+ Set targetNames = ConfigManager.getTarget().getTargets();
+ targetNames.forEach((target) -> {
+ String name = target;
+ Set materials = ConfigManager.getTarget().getTargetMaterials(target);
+
+ new EnchantmentTarget(name, materials);
+ });
+ }
+
+ /**
+ * Get all rarities
+ * @return A set of all rarities
+ */
+ public static Set getAll() {
+ return targets;
+ }
+}
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 b923fbf7..cea46b02 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 b4455dd8..39cfbcdf 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.EcoRunnable;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.VectorUtils;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Monster;
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 9d955984..6a0deb76 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.EcoRunnable;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.ItemDurability;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.Repairable;
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 4388e0a2..404702e0 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerItemDamageEvent;
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 c229998b..5ede697c 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Monster;
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 1fde919b..28ba48f1 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.FoodLevelChangeEvent;
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 8f4001ea..1823c093 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
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 fe3821cb..206cf8b3 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 e58cf854..6840c4cf 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
@@ -2,7 +2,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.curse;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
-import com.willfp.ecoenchants.nms.Target;
+
public class PermanenceCurse extends EcoEnchant {
public PermanenceCurse() {
super(
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 fce77b23..37ba42d7 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
@@ -4,9 +4,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
-import org.bukkit.entity.Creeper;
import org.bukkit.entity.Monster;
import org.bukkit.entity.Trident;
import org.bukkit.event.EventHandler;
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 91483c8c..ef53687e 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.ItemDurability;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 aa15f0a0..d682eddc 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 bb23b63f..60841bc2 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
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 c7811c08..92b882c2 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
@@ -4,10 +4,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Player;
import org.bukkit.entity.Spider;
import org.bukkit.entity.Trident;
import org.bukkit.event.EventHandler;
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 2ca4ef1d..1be0e73b 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 81d89685..f43b21c3 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
@@ -5,10 +5,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
import org.bukkit.entity.Trident;
import org.bukkit.event.EventHandler;
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 be06f08e..4a6bdd2c 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.queue.DropQueue;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Material;
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 e9a3972c..ca707b2f 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
@@ -8,7 +8,6 @@ import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.BlockBreak;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 6e48b904..0dcadef4 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
@@ -7,7 +7,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 3b0eba03..377d1b8a 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
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 654f45a7..b57424d4 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 aea362cf..4bc71725 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Boss;
import org.bukkit.entity.ElderGuardian;
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 beaefa92..817419ac 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Sound;
import org.bukkit.SoundCategory;
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 ef9fecb8..1825fd11 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Monster;
import org.bukkit.entity.Player;
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 5de94939..b743369d 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 aaa21297..52b3de46 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 08c121c8..48585ca0 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
@@ -7,7 +7,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Bukkit;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 7f28facd..d44e9e91 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
@@ -3,7 +3,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.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
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 2d845c4b..0933abbd 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
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 fca46322..db71e2f4 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.ItemDurability;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
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 ea9ec503..272b5ad9 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 3948eac7..c85a2822 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 1d328801..b217ee4c 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 0645a33b..405a4122 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
@@ -3,7 +3,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.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
import org.bukkit.entity.Tameable;
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 a7b6207a..42e93608 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 ecbda83f..dedd381d 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Creeper;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 f6859e9a..9383faa8 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 38306788..3b0c0a93 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 8b5ca1ce..7f1a648d 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 24c4e7f8..9da8ae70 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 3d1f2790..99d9ee70 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 9155e856..1d6b9463 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
@@ -8,7 +8,6 @@ import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.BlockBreak;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.VectorUtils;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
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 2d1748d6..18cdc2a4 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 06d3f21e..c708af83 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.Lightning;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
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 75fa3b9f..52cbd266 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 30c3d205..a05d2010 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 1d6fef50..58961aa2 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.World;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
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 d0a8f6f5..391e0d20 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 47a8e9b3..f27f3a14 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 06b76b06..bbcfc419 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.LivingEntity;
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 61c838bd..75666efd 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 17162ad0..ec47e91a 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.ItemDurability;
import com.willfp.ecoenchants.util.VectorShapes;
import org.bukkit.Location;
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 5bbed7d7..36afa33c 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
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 20a456eb..9412f5af 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 2d07b549..366201a5 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 9a3da8f1..7cb10ede 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 0f1ff104..a0e43115 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 cff2fa02..9dcbc3b5 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.EcoRunnable;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Monster;
public class Forcefield extends EcoEnchant implements EcoRunnable {
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 edac4cc8..e4847c28 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 19d77ba6..0bb81d47 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Bukkit;
import org.bukkit.entity.LivingEntity;
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 69b42bd7..d647877a 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.VectorUtils;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.*;
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 cf336196..85d281c3 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 85290b59..6ddd018f 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Material;
import org.bukkit.entity.Player;
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 18026776..3ebed5aa 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 918bb88b..d2f09c52 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.ItemDurability;
import org.bukkit.Material;
import org.bukkit.entity.Player;
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 066d3a41..960b1f65 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.ItemDurability;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 e92b8c2a..69770b4b 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
@@ -4,10 +4,8 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.World;
-import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
import org.bukkit.entity.Trident;
import org.bukkit.event.EventHandler;
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 247382e3..8ffe79d3 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 9a61d40d..09a492f5 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 45b9954a..08b91a3f 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
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 e664d09e..7f0772bb 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 bb8ba4de..76136026 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Material;
import org.bukkit.block.Block;
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 a0a04a9a..fbd45418 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 6cc1d593..4aedffe4 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
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 bb934b3c..7d3e74e2 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Bukkit;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 e45da442..3ef84d77 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.queue.DropQueue;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
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 c5f3a106..15402163 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
@@ -3,7 +3,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.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 56f14a2d..5973a11b 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.VectorUtils;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.*;
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 2976ae7b..9f9acf75 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 2fbae79a..83708965 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 1f82ccc8..afa9d33a 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 7b0f40bd..798056e2 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageEvent;
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 b383e69a..66d5cbbc 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
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 5108cdd8..7ec82be5 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 f4545234..9459aa29 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
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 14d05032..e9bbc98a 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
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 21541981..7248c8c9 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 ee1777d3..7dfeb11f 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
@@ -8,7 +8,6 @@ import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.BlockBreak;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.BlockUtils;
import org.bukkit.Bukkit;
import org.bukkit.Material;
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 146b6fe4..e1900463 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
@@ -7,7 +7,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.VectorShapes;
import org.bukkit.Bukkit;
import org.bukkit.Location;
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 0e5ff51a..84ef2a36 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.EcoRunnable;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.VectorUtils;
import org.bukkit.entity.Entity;
import org.bukkit.entity.ExperienceOrb;
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 2528f939..01c2a0ed 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Bukkit;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
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 2e736131..59d99bf2 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
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 a1205d7b..585f259a 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.queue.DropQueue;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Material;
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 35751926..30c85167 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 4b5be55f..c63b1dcd 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.World;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
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 f68a0a81..fee65652 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 5cbe6767..23534e3f 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Location;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
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 b1e7767f..32020d93 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
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 24803842..c480b5c3 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
@@ -4,10 +4,8 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.entity.Creeper;
-import org.bukkit.entity.Spider;
import org.bukkit.entity.Trident;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 f7d8191b..8b70c4ed 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Horse;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 18d49fd3..5e41767d 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 0f41e5cd..77153c42 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
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 4bbfc4f8..a095086e 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 b07ed515..ea52bbf7 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
@@ -4,9 +4,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
-import org.bukkit.entity.Monster;
import org.bukkit.entity.Skeleton;
import org.bukkit.entity.Trident;
import org.bukkit.entity.Zombie;
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 996e5ec6..b553f345 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
@@ -3,7 +3,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.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.entity.Tameable;
import org.bukkit.event.EventHandler;
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 f276c220..88fc4002 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 7fe89a5d..4b5afd1a 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
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 226070fb..736d4f1a 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 6f5a79b2..22d7870e 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
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 5b227584..a776c6ae 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.VectorUtils;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.*;
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 bb5db829..bda76018 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 a3afd10d..c1fcfc8f 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 8694bab1..69fe6676 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageEvent;
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 c9dc0153..e70a79f5 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityRegainHealthEvent;
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 419783e1..71e37851 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.data.Ageable;
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 21cacd7e..78262c20 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 d4dc165a..9f377548 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 e5064ca5..136001c6 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 1ec1915b..baec1913 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
@@ -4,11 +4,8 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Creeper;
-import org.bukkit.entity.Monster;
-import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 987940f2..d846f6dc 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.Bukkit;
import org.bukkit.entity.AbstractArrow;
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 d975774c..3e8c84bc 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 1aa2ae0a..7e4c36bb 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
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 61c0ae96..ccb4ef31 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
@@ -4,11 +4,8 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Monster;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Spider;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 c0d34d75..5b0a948d 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.ItemDurability;
import org.bukkit.Bukkit;
import org.bukkit.entity.Entity;
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 482f6340..be157b68 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import com.willfp.ecoenchants.queue.DropQueue;
import com.willfp.ecoenchants.util.NumberUtils;
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 a67cbbb5..2cefa8da 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 a4c994cc..a3c0dce8 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.Bukkit;
import org.bukkit.entity.*;
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 69180fca..9271a06f 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 fc8ed389..a2d6fce1 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 86127dd6..c781abec 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.queue.DropQueue;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.GameMode;
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 fe010105..f13b2a3d 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 9c4f1203..290fe49a 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.ItemDurability;
import org.bukkit.Bukkit;
import org.bukkit.enchantments.Enchantment;
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 59ffe525..4b53e7ef 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 30cb3e42..9ca2cca0 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 b752e0e0..cc8c214f 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 6dc18388..efc6fa13 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.events.entitydeathbyentity.EntityDeathByEntityEvent;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import com.willfp.ecoenchants.queue.DropQueue;
import org.bukkit.GameMode;
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 c13de18d..c3f8debd 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.Lightning;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
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 d349ff7b..52f4ec86 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 c1d4a45f..9028a24c 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Bukkit;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 ea917bb8..3a2228ee 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 da03a2c0..e3a5484d 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.queue.DropQueue;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.GameMode;
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 bf14cb12..88d713c9 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.AbstractArrow;
import org.bukkit.entity.Arrow;
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 66d9c048..1b65fc66 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 6781a2b3..1560de3a 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
@@ -8,7 +8,6 @@ import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.BlockBreak;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.BlockUtils;
import org.bukkit.Bukkit;
import org.bukkit.Material;
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 01f91aa0..a224d46f 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
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 7dd7b63b..21f85991 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.World;
import org.bukkit.entity.Player;
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 c2b86d6d..65141e0d 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
@@ -4,9 +4,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Material;
-import org.bukkit.World;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@@ -15,7 +13,6 @@ import org.bukkit.inventory.EntityEquipment;
import org.bukkit.inventory.ItemStack;
import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicInteger;
public class Voltage extends EcoEnchant {
public Voltage() {
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 54b664a9..2b919c13 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 2e06913e..a589b9df 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
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 cbe972cc..b2f062d2 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Bukkit;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 111d1ac0..bf4d3f92 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.events.naturalexpgainevent.NaturalExpGainEvent;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
public class Wisdom extends EcoEnchant {
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 5fe50d80..7d599ef6 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;
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 02285284..54f70e42 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.Lightning;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Arrow;
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 f3690b48..b5881b0d 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
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 e3ce7d62..87b6e72b 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 1027c826..31650676 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 17e911a4..58f49f3f 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.Lightning;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.LivingEntity;
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 28c1e607..a3b91d61 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
@@ -7,7 +7,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Bukkit;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 1a822a90..9c4b7f12 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 bee49a48..f0c71e04 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.BlockBreakEvent;
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 10214dd7..54d17970 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 2f49d6e3..069506e2 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDeathEvent;
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 73725d7f..9a28a572 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 2f07815e..43021c88 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerItemDamageEvent;
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 76559a21..87fa5864 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
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 54dbb7a9..1efe8db4 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.events.naturalexpgainevent.NaturalExpGainEvent;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
public class Intellect extends EcoEnchant {
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 995ee21d..2514acc2 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.attribute.Attribute;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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 7a4fa855..dcc7834f 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.AbstractArrow;
import org.bukkit.entity.Arrow;
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 2b84d92f..cf88c61e 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
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageEvent;
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 5be567c3..64111c05 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
@@ -2,7 +2,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.special;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
-import com.willfp.ecoenchants.nms.Target;
+
public class Prosperity extends EcoEnchant {
public Prosperity() {
super(
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 1454fd0b..b795037e 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
@@ -5,7 +5,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 25e7122a..36242972 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.EcoRunnable;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.ItemDurability;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.Repairable;
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 8a189905..a5d543f9 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.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
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 01e2e31d..b8f1b41c 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
@@ -4,7 +4,6 @@ import com.google.common.collect.Sets;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
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 2edf18c9..46a33364 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent;
-import com.willfp.ecoenchants.nms.Target;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.scheduler.BukkitRunnable;
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 30b073ea..0db4c2de 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
@@ -6,7 +6,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Location;
import org.bukkit.entity.LivingEntity;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/checks/EnchantChecks.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/checks/EnchantChecks.java
index ffc41fc6..d216cbc6 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/checks/EnchantChecks.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/checks/EnchantChecks.java
@@ -1,6 +1,5 @@
package com.willfp.ecoenchants.enchantments.util.checks;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.ItemDurability;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/listeners/EnchantingListeners.java b/Plugin/src/main/java/com/willfp/ecoenchants/listeners/EnchantingListeners.java
index d60f1710..aaafdd58 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/listeners/EnchantingListeners.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/listeners/EnchantingListeners.java
@@ -4,7 +4,6 @@ import com.willfp.ecoenchants.EcoEnchantsPlugin;
import com.willfp.ecoenchants.config.ConfigManager;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
@@ -81,7 +80,7 @@ public class EnchantingListeners implements Listener {
continue;
if (enchantment.getRarity().getMinimumLevel() > cost)
continue;
- if(enchantment.isDisabled())
+ if(enchantment.isEnabled())
continue;
if (!enchantment.canGetFromTable())
continue;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/listeners/VillagerListeners.java b/Plugin/src/main/java/com/willfp/ecoenchants/listeners/VillagerListeners.java
index 3d0e7b9e..237918f1 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/listeners/VillagerListeners.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/listeners/VillagerListeners.java
@@ -3,7 +3,6 @@ package com.willfp.ecoenchants.listeners;
import com.willfp.ecoenchants.config.ConfigManager;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Material;
import org.bukkit.event.EventHandler;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
index a2d33290..40225f16 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
@@ -35,7 +35,6 @@ import com.willfp.ecoenchants.listeners.VillagerListeners;
import com.willfp.ecoenchants.naturalloot.LootPopulator;
import com.willfp.ecoenchants.nms.BlockBreak;
import com.willfp.ecoenchants.nms.Cooldown;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.nms.TridentStack;
import com.willfp.ecoenchants.util.UpdateChecker;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -195,14 +194,6 @@ public class Loader {
Bukkit.getLogger().info("Loading NMS APIs...");
- if(!Target.Applicable.ALL.getMaterials().isEmpty()) {
- Bukkit.getLogger().info("Targets: §aSUCCESS");
- } else {
- Bukkit.getLogger().info("Targets: §cFAILURE");
- Bukkit.getLogger().severe("§cAborting...");
- Bukkit.getPluginManager().disablePlugin(EcoEnchantsPlugin.getInstance());
- }
-
if(Cooldown.init()) {
Bukkit.getLogger().info("Cooldown: §aSUCCESS");
} else {
@@ -355,7 +346,7 @@ public class Loader {
Bukkit.getLogger().info("Registering Enchantment Listeners...");
EcoEnchants.getAll().forEach((ecoEnchant -> {
- if(!ecoEnchant.isDisabled()) {
+ if(!ecoEnchant.isEnabled()) {
Bukkit.getPluginManager().registerEvents(ecoEnchant, EcoEnchantsPlugin.getInstance());
}
}));
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/naturalloot/LootPopulator.java b/Plugin/src/main/java/com/willfp/ecoenchants/naturalloot/LootPopulator.java
index acabb472..bd8e837e 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/naturalloot/LootPopulator.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/naturalloot/LootPopulator.java
@@ -3,7 +3,6 @@ package com.willfp.ecoenchants.naturalloot;
import com.willfp.ecoenchants.config.ConfigManager;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
-import com.willfp.ecoenchants.nms.Target;
import com.willfp.ecoenchants.util.NumberUtils;
import org.bukkit.Chunk;
import org.bukkit.Material;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/nms/Target.java b/Plugin/src/main/java/com/willfp/ecoenchants/nms/Target.java
deleted file mode 100644
index ee9fbd18..00000000
--- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/Target.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.willfp.ecoenchants.nms;
-
-
-import com.willfp.ecoenchants.API.TargetWrapper;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-
-import java.util.Set;
-
-public class Target {
- private static TargetWrapper target;
-
- static {
- String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
- try {
- final Class> class2 = Class.forName("com.willfp.ecoenchants." + version + ".Target");
- if (TargetWrapper.class.isAssignableFrom(class2)) {
- target = (TargetWrapper) class2.getConstructor().newInstance();
- }
- } catch (Exception e) {
- Bukkit.getLogger().info(e.getCause() + "");
- e.printStackTrace();
- target = null;
- }
- }
-
- public enum Applicable {
- TOOL(target.TOOL),
- ARMOR(target.ARMOR),
- ALL(target.ALL),
- AXE(target.AXE),
- BOOK(target.BOOK),
- PICKAXE(target.PICKAXE),
- HOE(target.HOE),
- SHOVEL(target.SHOVEL),
- SWORD(target.SWORD),
- HELMET(target.HELMET),
- CHESTPLATE(target.CHESTPLATE),
- LEGGINGS(target.LEGGINGS),
- BOOTS(target.BOOTS),
- ELYTRA(target.ELYTRA),
- BOW(target.BOW),
- CROSSBOW(target.CROSSBOW),
- SHEARS(target.SHEARS),
- TRIDENT(target.TRIDENT),
- SHIELD(target.SHIELD),
- ROD(target.ROD);
-
- private final Set materials;
-
- Applicable(Set materials) {
- this.materials = materials;
- }
-
- public Set getMaterials() {
- return this.materials;
- }
- }
-}
diff --git a/Plugin/src/main/resources/config.yml b/Plugin/src/main/resources/config.yml
index 505d2304..cc1003e0 100644
--- a/Plugin/src/main/resources/config.yml
+++ b/Plugin/src/main/resources/config.yml
@@ -3,7 +3,7 @@
# by Auxilor
#
-config-version: 4.1 # Don't edit this.
+config-version: 5.0 # Don't edit this.
anvil:
allow-unsafe-levels: false # Allow unsafe enchantments like Sharpness 6 by combining 2 Sharp 5.
diff --git a/Plugin/src/main/resources/enchants/artifact/cloudsartifact.yml b/Plugin/src/main/resources/enchants/artifact/cloudsartifact.yml
index 0b8712e5..bd6ad6e4 100644
--- a/Plugin/src/main/resources/enchants/artifact/cloudsartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/cloudsartifact.yml
@@ -2,7 +2,7 @@
# Clouds Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Clouds Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/damageartifact.yml b/Plugin/src/main/resources/enchants/artifact/damageartifact.yml
index c8ad2221..de897496 100644
--- a/Plugin/src/main/resources/enchants/artifact/damageartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/damageartifact.yml
@@ -2,7 +2,7 @@
# Damage Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Damage Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/dragonartifact.yml b/Plugin/src/main/resources/enchants/artifact/dragonartifact.yml
index a74e8e3c..e72258bf 100644
--- a/Plugin/src/main/resources/enchants/artifact/dragonartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/dragonartifact.yml
@@ -2,7 +2,7 @@
# Dragon Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Dragon Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/dustartifact.yml b/Plugin/src/main/resources/enchants/artifact/dustartifact.yml
index 4a5565c9..e8ed895f 100644
--- a/Plugin/src/main/resources/enchants/artifact/dustartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/dustartifact.yml
@@ -2,7 +2,7 @@
# Dust Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Dust Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/emeraldartifact.yml b/Plugin/src/main/resources/enchants/artifact/emeraldartifact.yml
index 1c9a0bed..d97a844b 100644
--- a/Plugin/src/main/resources/enchants/artifact/emeraldartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/emeraldartifact.yml
@@ -2,7 +2,7 @@
# Emerald Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Emerald Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/enchantmentartifact.yml b/Plugin/src/main/resources/enchants/artifact/enchantmentartifact.yml
index 7b4c49f5..8d5151fb 100644
--- a/Plugin/src/main/resources/enchants/artifact/enchantmentartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/enchantmentartifact.yml
@@ -2,7 +2,7 @@
# Enchantment Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Enchantment Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/endartifact.yml b/Plugin/src/main/resources/enchants/artifact/endartifact.yml
index 2e99183a..5341fb3f 100644
--- a/Plugin/src/main/resources/enchants/artifact/endartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/endartifact.yml
@@ -2,7 +2,7 @@
# End Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "End Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/fireartifact.yml b/Plugin/src/main/resources/enchants/artifact/fireartifact.yml
index dbf37f7f..50d1519a 100644
--- a/Plugin/src/main/resources/enchants/artifact/fireartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/fireartifact.yml
@@ -2,7 +2,7 @@
# Fire Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Fire Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/heartartifact.yml b/Plugin/src/main/resources/enchants/artifact/heartartifact.yml
index 306ac89c..5567bc26 100644
--- a/Plugin/src/main/resources/enchants/artifact/heartartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/heartartifact.yml
@@ -2,7 +2,7 @@
# Heart Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Heart Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/honeyartifact.yml b/Plugin/src/main/resources/enchants/artifact/honeyartifact.yml
index ab49ffdb..7f55920b 100644
--- a/Plugin/src/main/resources/enchants/artifact/honeyartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/honeyartifact.yml
@@ -2,7 +2,7 @@
# Honey Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Honey Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/inkartifact.yml b/Plugin/src/main/resources/enchants/artifact/inkartifact.yml
index 4da01179..d49b13cf 100644
--- a/Plugin/src/main/resources/enchants/artifact/inkartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/inkartifact.yml
@@ -2,7 +2,7 @@
# Ink Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Ink Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/lavaartifact.yml b/Plugin/src/main/resources/enchants/artifact/lavaartifact.yml
index b57d01b5..43a69250 100644
--- a/Plugin/src/main/resources/enchants/artifact/lavaartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/lavaartifact.yml
@@ -2,7 +2,7 @@
# Lava Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Lava Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/limeartifact.yml b/Plugin/src/main/resources/enchants/artifact/limeartifact.yml
index a1693950..ddda0e10 100644
--- a/Plugin/src/main/resources/enchants/artifact/limeartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/limeartifact.yml
@@ -2,7 +2,7 @@
# Lime Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Lime Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/magicartifact.yml b/Plugin/src/main/resources/enchants/artifact/magicartifact.yml
index e46bf678..e24b8ada 100644
--- a/Plugin/src/main/resources/enchants/artifact/magicartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/magicartifact.yml
@@ -2,7 +2,7 @@
# Magic Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Magic Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/magmaartifact.yml b/Plugin/src/main/resources/enchants/artifact/magmaartifact.yml
index 6b51d50d..16256aba 100644
--- a/Plugin/src/main/resources/enchants/artifact/magmaartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/magmaartifact.yml
@@ -2,7 +2,7 @@
# Magma Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Magma Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/musicartifact.yml b/Plugin/src/main/resources/enchants/artifact/musicartifact.yml
index ce4ba25f..68dabf42 100644
--- a/Plugin/src/main/resources/enchants/artifact/musicartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/musicartifact.yml
@@ -2,7 +2,7 @@
# Music Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Music Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/netherartifact.yml b/Plugin/src/main/resources/enchants/artifact/netherartifact.yml
index eed2ce64..11822d15 100644
--- a/Plugin/src/main/resources/enchants/artifact/netherartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/netherartifact.yml
@@ -2,7 +2,7 @@
# Nether Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Nether Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/redstoneartifact.yml b/Plugin/src/main/resources/enchants/artifact/redstoneartifact.yml
index 70937588..5c8a7642 100644
--- a/Plugin/src/main/resources/enchants/artifact/redstoneartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/redstoneartifact.yml
@@ -2,7 +2,7 @@
# Redstone Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Redstone Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/smokeartifact.yml b/Plugin/src/main/resources/enchants/artifact/smokeartifact.yml
index 4e931262..d73cd4ee 100644
--- a/Plugin/src/main/resources/enchants/artifact/smokeartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/smokeartifact.yml
@@ -2,7 +2,7 @@
# Smoke Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Smoke Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/snowartifact.yml b/Plugin/src/main/resources/enchants/artifact/snowartifact.yml
index ebe5144e..46382a3f 100644
--- a/Plugin/src/main/resources/enchants/artifact/snowartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/snowartifact.yml
@@ -2,7 +2,7 @@
# Snow Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Snow Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/sparkleartifact.yml b/Plugin/src/main/resources/enchants/artifact/sparkleartifact.yml
index 301629c6..048fc164 100644
--- a/Plugin/src/main/resources/enchants/artifact/sparkleartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/sparkleartifact.yml
@@ -2,7 +2,7 @@
# Sparkle Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Sparkle Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/totemartifact.yml b/Plugin/src/main/resources/enchants/artifact/totemartifact.yml
index 19f4dbf1..dd4a4d43 100644
--- a/Plugin/src/main/resources/enchants/artifact/totemartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/totemartifact.yml
@@ -2,7 +2,7 @@
# Totem Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Totem Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/waterartifact.yml b/Plugin/src/main/resources/enchants/artifact/waterartifact.yml
index 8c0217b1..797ac795 100644
--- a/Plugin/src/main/resources/enchants/artifact/waterartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/waterartifact.yml
@@ -2,7 +2,7 @@
# Water Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Water Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/witchartifact.yml b/Plugin/src/main/resources/enchants/artifact/witchartifact.yml
index bb199fa3..ad013bdd 100644
--- a/Plugin/src/main/resources/enchants/artifact/witchartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/witchartifact.yml
@@ -2,7 +2,7 @@
# Witch Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Witch Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/artifact/zapartifact.yml b/Plugin/src/main/resources/enchants/artifact/zapartifact.yml
index eb6e29f6..50abf2df 100644
--- a/Plugin/src/main/resources/enchants/artifact/zapartifact.yml
+++ b/Plugin/src/main/resources/enchants/artifact/zapartifact.yml
@@ -2,7 +2,7 @@
# Zap Artifact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Zap Artifact"
@@ -15,6 +15,14 @@ obtaining:
rarity: epic
general-config:
+ targets:
+ - pickaxe
+ - sword
+ - axe
+ - elytra
+ - bow
+ - crossbow
+ - trident
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/curse/breaklessnesscurse.yml b/Plugin/src/main/resources/enchants/curse/breaklessnesscurse.yml
index c3ae2099..c35e5ebe 100644
--- a/Plugin/src/main/resources/enchants/curse/breaklessnesscurse.yml
+++ b/Plugin/src/main/resources/enchants/curse/breaklessnesscurse.yml
@@ -2,7 +2,7 @@
# Curse of Breaklessness EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Curse of Breaklessness"
@@ -15,6 +15,11 @@ obtaining:
rarity: legendary
general-config:
+ targets:
+ - pickaxe
+ - axe
+ - hoe
+ - shovel
grindstoneable: true
conflicts: []
diff --git a/Plugin/src/main/resources/enchants/curse/callingcurse.yml b/Plugin/src/main/resources/enchants/curse/callingcurse.yml
index 974be06a..da702454 100644
--- a/Plugin/src/main/resources/enchants/curse/callingcurse.yml
+++ b/Plugin/src/main/resources/enchants/curse/callingcurse.yml
@@ -2,7 +2,7 @@
# Curse of Calling EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Curse of Calling"
@@ -15,6 +15,11 @@ obtaining:
rarity: legendary
general-config:
+ targets:
+ - helmet
+ - chestplate
+ - leggings
+ - boots
grindstoneable: false
conflicts:
- mending
diff --git a/Plugin/src/main/resources/enchants/curse/decaycurse.yml b/Plugin/src/main/resources/enchants/curse/decaycurse.yml
index 055086d0..6263c7da 100644
--- a/Plugin/src/main/resources/enchants/curse/decaycurse.yml
+++ b/Plugin/src/main/resources/enchants/curse/decaycurse.yml
@@ -2,7 +2,7 @@
# Curse of Decay EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Curse of Decay"
@@ -15,6 +15,8 @@ obtaining:
rarity: legendary
general-config:
+ targets:
+ - all
grindstoneable: true
conflicts:
- mending
diff --git a/Plugin/src/main/resources/enchants/curse/fragilitycurse.yml b/Plugin/src/main/resources/enchants/curse/fragilitycurse.yml
index fa216a43..7c0fe7b9 100644
--- a/Plugin/src/main/resources/enchants/curse/fragilitycurse.yml
+++ b/Plugin/src/main/resources/enchants/curse/fragilitycurse.yml
@@ -2,7 +2,7 @@
# Curse of Fragility EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Curse of Fragility"
@@ -15,6 +15,8 @@ obtaining:
rarity: legendary
general-config:
+ targets:
+ - all
grindstoneable: false
conflicts:
- unbreaking
diff --git a/Plugin/src/main/resources/enchants/curse/harmlessnesscurse.yml b/Plugin/src/main/resources/enchants/curse/harmlessnesscurse.yml
index 44de7d02..f9a929b9 100644
--- a/Plugin/src/main/resources/enchants/curse/harmlessnesscurse.yml
+++ b/Plugin/src/main/resources/enchants/curse/harmlessnesscurse.yml
@@ -2,7 +2,7 @@
# Curse of Harmlessness EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Curse of Harmlessness"
diff --git a/Plugin/src/main/resources/enchants/curse/hungercurse.yml b/Plugin/src/main/resources/enchants/curse/hungercurse.yml
index 80f3f3d0..11d95b65 100644
--- a/Plugin/src/main/resources/enchants/curse/hungercurse.yml
+++ b/Plugin/src/main/resources/enchants/curse/hungercurse.yml
@@ -2,7 +2,7 @@
# Curse of Hunger EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Curse of Hunger"
diff --git a/Plugin/src/main/resources/enchants/curse/inaccuracycurse.yml b/Plugin/src/main/resources/enchants/curse/inaccuracycurse.yml
index d518cd44..d8b3a9cf 100644
--- a/Plugin/src/main/resources/enchants/curse/inaccuracycurse.yml
+++ b/Plugin/src/main/resources/enchants/curse/inaccuracycurse.yml
@@ -2,7 +2,7 @@
# Curse of Inaccuracy EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Curse of Inaccuracy"
diff --git a/Plugin/src/main/resources/enchants/curse/misfortunecurse.yml b/Plugin/src/main/resources/enchants/curse/misfortunecurse.yml
index 08098d95..08f17789 100644
--- a/Plugin/src/main/resources/enchants/curse/misfortunecurse.yml
+++ b/Plugin/src/main/resources/enchants/curse/misfortunecurse.yml
@@ -2,7 +2,7 @@
# Curse of Misfortune EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Curse of Misfortune"
diff --git a/Plugin/src/main/resources/enchants/curse/permanencecurse.yml b/Plugin/src/main/resources/enchants/curse/permanencecurse.yml
index 944177fb..b966a36c 100644
--- a/Plugin/src/main/resources/enchants/curse/permanencecurse.yml
+++ b/Plugin/src/main/resources/enchants/curse/permanencecurse.yml
@@ -2,7 +2,7 @@
# Curse of Permanence EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Curse of Permanence"
diff --git a/Plugin/src/main/resources/enchants/normal/abattoir.yml b/Plugin/src/main/resources/enchants/normal/abattoir.yml
index 30feb2cf..c86a3316 100644
--- a/Plugin/src/main/resources/enchants/normal/abattoir.yml
+++ b/Plugin/src/main/resources/enchants/normal/abattoir.yml
@@ -2,7 +2,7 @@
# Abattoir EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Abattoir"
diff --git a/Plugin/src/main/resources/enchants/normal/abrasion.yml b/Plugin/src/main/resources/enchants/normal/abrasion.yml
index c142513c..0de1eda1 100644
--- a/Plugin/src/main/resources/enchants/normal/abrasion.yml
+++ b/Plugin/src/main/resources/enchants/normal/abrasion.yml
@@ -2,7 +2,7 @@
# Abrasion EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Abrasion"
diff --git a/Plugin/src/main/resources/enchants/normal/aerial.yml b/Plugin/src/main/resources/enchants/normal/aerial.yml
index a2320446..f38c834a 100644
--- a/Plugin/src/main/resources/enchants/normal/aerial.yml
+++ b/Plugin/src/main/resources/enchants/normal/aerial.yml
@@ -2,7 +2,7 @@
# Aerial EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Aerial"
diff --git a/Plugin/src/main/resources/enchants/normal/aquatic.yml b/Plugin/src/main/resources/enchants/normal/aquatic.yml
index 6048298c..a6852b85 100644
--- a/Plugin/src/main/resources/enchants/normal/aquatic.yml
+++ b/Plugin/src/main/resources/enchants/normal/aquatic.yml
@@ -2,7 +2,7 @@
# Aquatic EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Aquatic"
diff --git a/Plugin/src/main/resources/enchants/normal/arachnid.yml b/Plugin/src/main/resources/enchants/normal/arachnid.yml
index 689c6e17..dab556d7 100644
--- a/Plugin/src/main/resources/enchants/normal/arachnid.yml
+++ b/Plugin/src/main/resources/enchants/normal/arachnid.yml
@@ -2,7 +2,7 @@
# Arachnid EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Arachnid"
diff --git a/Plugin/src/main/resources/enchants/normal/arcanic.yml b/Plugin/src/main/resources/enchants/normal/arcanic.yml
index 54a12be9..4a8e388b 100644
--- a/Plugin/src/main/resources/enchants/normal/arcanic.yml
+++ b/Plugin/src/main/resources/enchants/normal/arcanic.yml
@@ -2,7 +2,7 @@
# Arcanic EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Arcanic"
diff --git a/Plugin/src/main/resources/enchants/normal/atmospheric.yml b/Plugin/src/main/resources/enchants/normal/atmospheric.yml
index c490488c..f68744c7 100644
--- a/Plugin/src/main/resources/enchants/normal/atmospheric.yml
+++ b/Plugin/src/main/resources/enchants/normal/atmospheric.yml
@@ -2,7 +2,7 @@
# Atmospheric EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Atmospheric"
diff --git a/Plugin/src/main/resources/enchants/normal/beheading.yml b/Plugin/src/main/resources/enchants/normal/beheading.yml
index e4ae5001..74279921 100644
--- a/Plugin/src/main/resources/enchants/normal/beheading.yml
+++ b/Plugin/src/main/resources/enchants/normal/beheading.yml
@@ -2,7 +2,7 @@
# Beheading EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Beheading"
diff --git a/Plugin/src/main/resources/enchants/normal/blastmining.yml b/Plugin/src/main/resources/enchants/normal/blastmining.yml
index 4d460b77..72e8c347 100644
--- a/Plugin/src/main/resources/enchants/normal/blastmining.yml
+++ b/Plugin/src/main/resources/enchants/normal/blastmining.yml
@@ -2,7 +2,7 @@
# Blast Mining EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Blast Mining"
diff --git a/Plugin/src/main/resources/enchants/normal/bleed.yml b/Plugin/src/main/resources/enchants/normal/bleed.yml
index 10a5fafc..fc06b311 100644
--- a/Plugin/src/main/resources/enchants/normal/bleed.yml
+++ b/Plugin/src/main/resources/enchants/normal/bleed.yml
@@ -2,7 +2,7 @@
# Bleed EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Bleed"
diff --git a/Plugin/src/main/resources/enchants/normal/blind.yml b/Plugin/src/main/resources/enchants/normal/blind.yml
index f0c1d897..ce2ad3d5 100644
--- a/Plugin/src/main/resources/enchants/normal/blind.yml
+++ b/Plugin/src/main/resources/enchants/normal/blind.yml
@@ -2,7 +2,7 @@
# Blind EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Blind"
diff --git a/Plugin/src/main/resources/enchants/normal/blockbreather.yml b/Plugin/src/main/resources/enchants/normal/blockbreather.yml
index e23f0093..d82174ee 100644
--- a/Plugin/src/main/resources/enchants/normal/blockbreather.yml
+++ b/Plugin/src/main/resources/enchants/normal/blockbreather.yml
@@ -2,7 +2,7 @@
# Block Breather EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Block Breather"
diff --git a/Plugin/src/main/resources/enchants/normal/bosshunter.yml b/Plugin/src/main/resources/enchants/normal/bosshunter.yml
index f201b012..b8eeb595 100644
--- a/Plugin/src/main/resources/enchants/normal/bosshunter.yml
+++ b/Plugin/src/main/resources/enchants/normal/bosshunter.yml
@@ -2,7 +2,7 @@
# Boss Hunter EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Boss Hunter"
diff --git a/Plugin/src/main/resources/enchants/normal/buckshot.yml b/Plugin/src/main/resources/enchants/normal/buckshot.yml
index 47489fac..d1030ad6 100644
--- a/Plugin/src/main/resources/enchants/normal/buckshot.yml
+++ b/Plugin/src/main/resources/enchants/normal/buckshot.yml
@@ -2,7 +2,7 @@
# Buckshot EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Buckshot"
diff --git a/Plugin/src/main/resources/enchants/normal/butchering.yml b/Plugin/src/main/resources/enchants/normal/butchering.yml
index 7f4dcb3b..0dcb2160 100644
--- a/Plugin/src/main/resources/enchants/normal/butchering.yml
+++ b/Plugin/src/main/resources/enchants/normal/butchering.yml
@@ -2,7 +2,7 @@
# Butchering EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Butchering"
diff --git a/Plugin/src/main/resources/enchants/normal/cerebral.yml b/Plugin/src/main/resources/enchants/normal/cerebral.yml
index a4f8ad99..ed47c0fc 100644
--- a/Plugin/src/main/resources/enchants/normal/cerebral.yml
+++ b/Plugin/src/main/resources/enchants/normal/cerebral.yml
@@ -2,7 +2,7 @@
# Cerebral EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Cerebral"
diff --git a/Plugin/src/main/resources/enchants/normal/chopless.yml b/Plugin/src/main/resources/enchants/normal/chopless.yml
index b20c73bf..95566988 100644
--- a/Plugin/src/main/resources/enchants/normal/chopless.yml
+++ b/Plugin/src/main/resources/enchants/normal/chopless.yml
@@ -2,7 +2,7 @@
# Chopless EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Chopless"
diff --git a/Plugin/src/main/resources/enchants/normal/cleave.yml b/Plugin/src/main/resources/enchants/normal/cleave.yml
index a693f332..3837fbd3 100644
--- a/Plugin/src/main/resources/enchants/normal/cleave.yml
+++ b/Plugin/src/main/resources/enchants/normal/cleave.yml
@@ -2,7 +2,7 @@
# Cleave EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Cleave"
diff --git a/Plugin/src/main/resources/enchants/normal/collateral.yml b/Plugin/src/main/resources/enchants/normal/collateral.yml
index 5eaf2ae1..c59da5f6 100644
--- a/Plugin/src/main/resources/enchants/normal/collateral.yml
+++ b/Plugin/src/main/resources/enchants/normal/collateral.yml
@@ -2,7 +2,7 @@
# Collateral EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Collateral"
diff --git a/Plugin/src/main/resources/enchants/normal/conclude.yml b/Plugin/src/main/resources/enchants/normal/conclude.yml
index d96ccd9b..b0df120a 100644
--- a/Plugin/src/main/resources/enchants/normal/conclude.yml
+++ b/Plugin/src/main/resources/enchants/normal/conclude.yml
@@ -2,7 +2,7 @@
# Conclude EcoEnchant
#
-config-version: 4.1 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Conclude"
diff --git a/Plugin/src/main/resources/enchants/normal/corrosive.yml b/Plugin/src/main/resources/enchants/normal/corrosive.yml
index 2fa640c3..d61caf81 100644
--- a/Plugin/src/main/resources/enchants/normal/corrosive.yml
+++ b/Plugin/src/main/resources/enchants/normal/corrosive.yml
@@ -2,7 +2,7 @@
# Corrosive EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Corrosive"
diff --git a/Plugin/src/main/resources/enchants/normal/cranial.yml b/Plugin/src/main/resources/enchants/normal/cranial.yml
index 4aaf9ef6..c6709d1d 100644
--- a/Plugin/src/main/resources/enchants/normal/cranial.yml
+++ b/Plugin/src/main/resources/enchants/normal/cranial.yml
@@ -2,7 +2,7 @@
# Cranial EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Cranial"
diff --git a/Plugin/src/main/resources/enchants/normal/criticals.yml b/Plugin/src/main/resources/enchants/normal/criticals.yml
index fc4318e4..635bd15d 100644
--- a/Plugin/src/main/resources/enchants/normal/criticals.yml
+++ b/Plugin/src/main/resources/enchants/normal/criticals.yml
@@ -2,7 +2,7 @@
# Criticals EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Criticals"
diff --git a/Plugin/src/main/resources/enchants/normal/cubism.yml b/Plugin/src/main/resources/enchants/normal/cubism.yml
index 8e42bb31..b6be1a75 100644
--- a/Plugin/src/main/resources/enchants/normal/cubism.yml
+++ b/Plugin/src/main/resources/enchants/normal/cubism.yml
@@ -2,7 +2,7 @@
# Cubism EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Cubism"
diff --git a/Plugin/src/main/resources/enchants/normal/defender.yml b/Plugin/src/main/resources/enchants/normal/defender.yml
index 9f5349b5..7f15304e 100644
--- a/Plugin/src/main/resources/enchants/normal/defender.yml
+++ b/Plugin/src/main/resources/enchants/normal/defender.yml
@@ -2,7 +2,7 @@
# Defender EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Defender"
diff --git a/Plugin/src/main/resources/enchants/normal/deflection.yml b/Plugin/src/main/resources/enchants/normal/deflection.yml
index ba391199..32828587 100644
--- a/Plugin/src/main/resources/enchants/normal/deflection.yml
+++ b/Plugin/src/main/resources/enchants/normal/deflection.yml
@@ -2,7 +2,7 @@
# Deflection EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Deflection"
diff --git a/Plugin/src/main/resources/enchants/normal/defusion.yml b/Plugin/src/main/resources/enchants/normal/defusion.yml
index eab53614..b950840b 100644
--- a/Plugin/src/main/resources/enchants/normal/defusion.yml
+++ b/Plugin/src/main/resources/enchants/normal/defusion.yml
@@ -2,7 +2,7 @@
# Defusion EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Defusion"
diff --git a/Plugin/src/main/resources/enchants/normal/dexterous.yml b/Plugin/src/main/resources/enchants/normal/dexterous.yml
index 465690ab..407857e7 100644
--- a/Plugin/src/main/resources/enchants/normal/dexterous.yml
+++ b/Plugin/src/main/resources/enchants/normal/dexterous.yml
@@ -2,7 +2,7 @@
# Dexterous EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Dexterous"
diff --git a/Plugin/src/main/resources/enchants/normal/disable.yml b/Plugin/src/main/resources/enchants/normal/disable.yml
index 3a3b3079..77ab0794 100644
--- a/Plugin/src/main/resources/enchants/normal/disable.yml
+++ b/Plugin/src/main/resources/enchants/normal/disable.yml
@@ -2,7 +2,7 @@
# Disable EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Disable"
diff --git a/Plugin/src/main/resources/enchants/normal/disappear.yml b/Plugin/src/main/resources/enchants/normal/disappear.yml
index a3cadd34..e16fdd9c 100644
--- a/Plugin/src/main/resources/enchants/normal/disappear.yml
+++ b/Plugin/src/main/resources/enchants/normal/disappear.yml
@@ -2,7 +2,7 @@
# Disappear EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Disappear"
diff --git a/Plugin/src/main/resources/enchants/normal/diurnal.yml b/Plugin/src/main/resources/enchants/normal/diurnal.yml
index 19f2765e..634dddcc 100644
--- a/Plugin/src/main/resources/enchants/normal/diurnal.yml
+++ b/Plugin/src/main/resources/enchants/normal/diurnal.yml
@@ -2,7 +2,7 @@
# Diurnal EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Diurnal"
diff --git a/Plugin/src/main/resources/enchants/normal/diverse.yml b/Plugin/src/main/resources/enchants/normal/diverse.yml
index af07c76c..efd3e512 100644
--- a/Plugin/src/main/resources/enchants/normal/diverse.yml
+++ b/Plugin/src/main/resources/enchants/normal/diverse.yml
@@ -2,7 +2,7 @@
# Diverse EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Diverse"
diff --git a/Plugin/src/main/resources/enchants/normal/drill.yml b/Plugin/src/main/resources/enchants/normal/drill.yml
index 93fa73ba..3b904054 100644
--- a/Plugin/src/main/resources/enchants/normal/drill.yml
+++ b/Plugin/src/main/resources/enchants/normal/drill.yml
@@ -2,7 +2,7 @@
# Drill EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Drill"
diff --git a/Plugin/src/main/resources/enchants/normal/dullness.yml b/Plugin/src/main/resources/enchants/normal/dullness.yml
index 7835df31..76267d4f 100644
--- a/Plugin/src/main/resources/enchants/normal/dullness.yml
+++ b/Plugin/src/main/resources/enchants/normal/dullness.yml
@@ -2,7 +2,7 @@
# Dullness EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Dullness"
diff --git a/Plugin/src/main/resources/enchants/normal/electroshock.yml b/Plugin/src/main/resources/enchants/normal/electroshock.yml
index 72fee686..dd095803 100644
--- a/Plugin/src/main/resources/enchants/normal/electroshock.yml
+++ b/Plugin/src/main/resources/enchants/normal/electroshock.yml
@@ -2,7 +2,7 @@
# Electroshock EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Electroshock"
diff --git a/Plugin/src/main/resources/enchants/normal/enderism.yml b/Plugin/src/main/resources/enchants/normal/enderism.yml
index 8011c8b4..f8b5d9b6 100644
--- a/Plugin/src/main/resources/enchants/normal/enderism.yml
+++ b/Plugin/src/main/resources/enchants/normal/enderism.yml
@@ -2,7 +2,7 @@
# Enderism EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Enderism"
diff --git a/Plugin/src/main/resources/enchants/normal/enderslayer.yml b/Plugin/src/main/resources/enchants/normal/enderslayer.yml
index ab694551..f0172490 100644
--- a/Plugin/src/main/resources/enchants/normal/enderslayer.yml
+++ b/Plugin/src/main/resources/enchants/normal/enderslayer.yml
@@ -2,7 +2,7 @@
# Ender Slayer EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Ender Slayer"
diff --git a/Plugin/src/main/resources/enchants/normal/endinfusion.yml b/Plugin/src/main/resources/enchants/normal/endinfusion.yml
index bd1a0337..59121483 100644
--- a/Plugin/src/main/resources/enchants/normal/endinfusion.yml
+++ b/Plugin/src/main/resources/enchants/normal/endinfusion.yml
@@ -2,7 +2,7 @@
# End Infusion EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "End Infusion"
diff --git a/Plugin/src/main/resources/enchants/normal/evasion.yml b/Plugin/src/main/resources/enchants/normal/evasion.yml
index 2f6af96c..eac467d3 100644
--- a/Plugin/src/main/resources/enchants/normal/evasion.yml
+++ b/Plugin/src/main/resources/enchants/normal/evasion.yml
@@ -2,7 +2,7 @@
# Evasion EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Evasion"
diff --git a/Plugin/src/main/resources/enchants/normal/extinguishing.yml b/Plugin/src/main/resources/enchants/normal/extinguishing.yml
index a0fe825e..27c0cbe6 100644
--- a/Plugin/src/main/resources/enchants/normal/extinguishing.yml
+++ b/Plugin/src/main/resources/enchants/normal/extinguishing.yml
@@ -2,7 +2,7 @@
# Extinguishing EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Extinguishing"
diff --git a/Plugin/src/main/resources/enchants/normal/extract.yml b/Plugin/src/main/resources/enchants/normal/extract.yml
index c606cf79..28bb939e 100644
--- a/Plugin/src/main/resources/enchants/normal/extract.yml
+++ b/Plugin/src/main/resources/enchants/normal/extract.yml
@@ -2,7 +2,7 @@
# Extract EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Extract"
diff --git a/Plugin/src/main/resources/enchants/normal/famine.yml b/Plugin/src/main/resources/enchants/normal/famine.yml
index 5edf5155..dcdad995 100644
--- a/Plugin/src/main/resources/enchants/normal/famine.yml
+++ b/Plugin/src/main/resources/enchants/normal/famine.yml
@@ -2,7 +2,7 @@
# Famine EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Famine"
diff --git a/Plugin/src/main/resources/enchants/normal/farmhand.yml b/Plugin/src/main/resources/enchants/normal/farmhand.yml
index 7bb8ea8d..ca47aa0d 100644
--- a/Plugin/src/main/resources/enchants/normal/farmhand.yml
+++ b/Plugin/src/main/resources/enchants/normal/farmhand.yml
@@ -2,7 +2,7 @@
# Farmhand EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Farmhand"
diff --git a/Plugin/src/main/resources/enchants/normal/finality.yml b/Plugin/src/main/resources/enchants/normal/finality.yml
index f38a0cd4..5113f72d 100644
--- a/Plugin/src/main/resources/enchants/normal/finality.yml
+++ b/Plugin/src/main/resources/enchants/normal/finality.yml
@@ -2,7 +2,7 @@
# Finality EcoEnchant
#
-config-version: 4.1 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Finality"
diff --git a/Plugin/src/main/resources/enchants/normal/finishing.yml b/Plugin/src/main/resources/enchants/normal/finishing.yml
index ba55c88c..9bf683e0 100644
--- a/Plugin/src/main/resources/enchants/normal/finishing.yml
+++ b/Plugin/src/main/resources/enchants/normal/finishing.yml
@@ -2,7 +2,7 @@
# Finishing EcoEnchant
#
-config-version: 4.1 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Finishing"
diff --git a/Plugin/src/main/resources/enchants/normal/fireaffinity.yml b/Plugin/src/main/resources/enchants/normal/fireaffinity.yml
index cc10ab12..65f02bd9 100644
--- a/Plugin/src/main/resources/enchants/normal/fireaffinity.yml
+++ b/Plugin/src/main/resources/enchants/normal/fireaffinity.yml
@@ -2,7 +2,7 @@
# Fire Affinity EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Fire Affinity"
diff --git a/Plugin/src/main/resources/enchants/normal/firststrike.yml b/Plugin/src/main/resources/enchants/normal/firststrike.yml
index 7264979c..e6d01f7d 100644
--- a/Plugin/src/main/resources/enchants/normal/firststrike.yml
+++ b/Plugin/src/main/resources/enchants/normal/firststrike.yml
@@ -2,7 +2,7 @@
# First Strike EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "First Strike"
diff --git a/Plugin/src/main/resources/enchants/normal/flinch.yml b/Plugin/src/main/resources/enchants/normal/flinch.yml
index 9d8db113..d4756ade 100644
--- a/Plugin/src/main/resources/enchants/normal/flinch.yml
+++ b/Plugin/src/main/resources/enchants/normal/flinch.yml
@@ -2,7 +2,7 @@
# Flinch EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Flinch"
diff --git a/Plugin/src/main/resources/enchants/normal/forcefield.yml b/Plugin/src/main/resources/enchants/normal/forcefield.yml
index 04bc560d..ec658434 100644
--- a/Plugin/src/main/resources/enchants/normal/forcefield.yml
+++ b/Plugin/src/main/resources/enchants/normal/forcefield.yml
@@ -2,7 +2,7 @@
# Forcefield EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Forcefield"
diff --git a/Plugin/src/main/resources/enchants/normal/freerunner.yml b/Plugin/src/main/resources/enchants/normal/freerunner.yml
index 2550efc0..e3a189a3 100644
--- a/Plugin/src/main/resources/enchants/normal/freerunner.yml
+++ b/Plugin/src/main/resources/enchants/normal/freerunner.yml
@@ -2,7 +2,7 @@
# Freerunner EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Freerunner"
diff --git a/Plugin/src/main/resources/enchants/normal/frozen.yml b/Plugin/src/main/resources/enchants/normal/frozen.yml
index 51020f1c..e5138777 100644
--- a/Plugin/src/main/resources/enchants/normal/frozen.yml
+++ b/Plugin/src/main/resources/enchants/normal/frozen.yml
@@ -2,7 +2,7 @@
# Frozen EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Frozen"
diff --git a/Plugin/src/main/resources/enchants/normal/fury.yml b/Plugin/src/main/resources/enchants/normal/fury.yml
index de2c85eb..96c11962 100644
--- a/Plugin/src/main/resources/enchants/normal/fury.yml
+++ b/Plugin/src/main/resources/enchants/normal/fury.yml
@@ -2,7 +2,7 @@
# Fury EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Fury"
diff --git a/Plugin/src/main/resources/enchants/normal/goliath.yml b/Plugin/src/main/resources/enchants/normal/goliath.yml
index 4c4e3900..d9185b67 100644
--- a/Plugin/src/main/resources/enchants/normal/goliath.yml
+++ b/Plugin/src/main/resources/enchants/normal/goliath.yml
@@ -2,7 +2,7 @@
# Goliath EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Goliath"
diff --git a/Plugin/src/main/resources/enchants/normal/graceful.yml b/Plugin/src/main/resources/enchants/normal/graceful.yml
index 3ef5cd58..95bd4bb8 100644
--- a/Plugin/src/main/resources/enchants/normal/graceful.yml
+++ b/Plugin/src/main/resources/enchants/normal/graceful.yml
@@ -2,7 +2,7 @@
# Graceful EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Graceful"
diff --git a/Plugin/src/main/resources/enchants/normal/grapple.yml b/Plugin/src/main/resources/enchants/normal/grapple.yml
index bceb655b..e65bc442 100644
--- a/Plugin/src/main/resources/enchants/normal/grapple.yml
+++ b/Plugin/src/main/resources/enchants/normal/grapple.yml
@@ -2,7 +2,7 @@
# Grapple EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Grapple"
diff --git a/Plugin/src/main/resources/enchants/normal/greenthumb.yml b/Plugin/src/main/resources/enchants/normal/greenthumb.yml
index a813fd1d..b67bc098 100644
--- a/Plugin/src/main/resources/enchants/normal/greenthumb.yml
+++ b/Plugin/src/main/resources/enchants/normal/greenthumb.yml
@@ -2,7 +2,7 @@
# Green Thumb EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Green Thumb"
diff --git a/Plugin/src/main/resources/enchants/normal/grit.yml b/Plugin/src/main/resources/enchants/normal/grit.yml
index 9ea68c88..43a59776 100644
--- a/Plugin/src/main/resources/enchants/normal/grit.yml
+++ b/Plugin/src/main/resources/enchants/normal/grit.yml
@@ -2,7 +2,7 @@
# Grit EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Grit"
diff --git a/Plugin/src/main/resources/enchants/normal/hellish.yml b/Plugin/src/main/resources/enchants/normal/hellish.yml
index eea2a1f7..ca979b86 100644
--- a/Plugin/src/main/resources/enchants/normal/hellish.yml
+++ b/Plugin/src/main/resources/enchants/normal/hellish.yml
@@ -2,7 +2,7 @@
# Hellish EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Hellish"
diff --git a/Plugin/src/main/resources/enchants/normal/hook.yml b/Plugin/src/main/resources/enchants/normal/hook.yml
index 40f609dc..173fc008 100644
--- a/Plugin/src/main/resources/enchants/normal/hook.yml
+++ b/Plugin/src/main/resources/enchants/normal/hook.yml
@@ -2,7 +2,7 @@
# Hook EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Hook"
diff --git a/Plugin/src/main/resources/enchants/normal/horde.yml b/Plugin/src/main/resources/enchants/normal/horde.yml
index 4030fcad..611b1533 100644
--- a/Plugin/src/main/resources/enchants/normal/horde.yml
+++ b/Plugin/src/main/resources/enchants/normal/horde.yml
@@ -2,7 +2,7 @@
# Horde EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Horde"
diff --git a/Plugin/src/main/resources/enchants/normal/iceshot.yml b/Plugin/src/main/resources/enchants/normal/iceshot.yml
index 0f0aeae4..0b717c2f 100644
--- a/Plugin/src/main/resources/enchants/normal/iceshot.yml
+++ b/Plugin/src/main/resources/enchants/normal/iceshot.yml
@@ -2,7 +2,7 @@
# Ice Shot EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Ice Shot"
diff --git a/Plugin/src/main/resources/enchants/normal/identify.yml b/Plugin/src/main/resources/enchants/normal/identify.yml
index 3789da3a..0612b27c 100644
--- a/Plugin/src/main/resources/enchants/normal/identify.yml
+++ b/Plugin/src/main/resources/enchants/normal/identify.yml
@@ -2,7 +2,7 @@
# Identify EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Identify"
diff --git a/Plugin/src/main/resources/enchants/normal/ignite.yml b/Plugin/src/main/resources/enchants/normal/ignite.yml
index f1090946..a068c2c2 100644
--- a/Plugin/src/main/resources/enchants/normal/ignite.yml
+++ b/Plugin/src/main/resources/enchants/normal/ignite.yml
@@ -2,7 +2,7 @@
# Ignite EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Ignite"
diff --git a/Plugin/src/main/resources/enchants/normal/illusionaspect.yml b/Plugin/src/main/resources/enchants/normal/illusionaspect.yml
index 55396e85..97a0a343 100644
--- a/Plugin/src/main/resources/enchants/normal/illusionaspect.yml
+++ b/Plugin/src/main/resources/enchants/normal/illusionaspect.yml
@@ -2,7 +2,7 @@
# Illusion Aspect EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Illusion Aspect"
diff --git a/Plugin/src/main/resources/enchants/normal/impact.yml b/Plugin/src/main/resources/enchants/normal/impact.yml
index 14cb9fe6..9a7ef5ef 100644
--- a/Plugin/src/main/resources/enchants/normal/impact.yml
+++ b/Plugin/src/main/resources/enchants/normal/impact.yml
@@ -2,7 +2,7 @@
# Impact EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Impact"
diff --git a/Plugin/src/main/resources/enchants/normal/incandescence.yml b/Plugin/src/main/resources/enchants/normal/incandescence.yml
index f00e63c8..b735dff9 100644
--- a/Plugin/src/main/resources/enchants/normal/incandescence.yml
+++ b/Plugin/src/main/resources/enchants/normal/incandescence.yml
@@ -2,7 +2,7 @@
# Incandescence EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Incandescence"
diff --git a/Plugin/src/main/resources/enchants/normal/infernaltouch.yml b/Plugin/src/main/resources/enchants/normal/infernaltouch.yml
index 512114d5..ea9c94fe 100644
--- a/Plugin/src/main/resources/enchants/normal/infernaltouch.yml
+++ b/Plugin/src/main/resources/enchants/normal/infernaltouch.yml
@@ -2,7 +2,7 @@
# Infernal Touch EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Infernal Touch"
diff --git a/Plugin/src/main/resources/enchants/normal/inferno.yml b/Plugin/src/main/resources/enchants/normal/inferno.yml
index cd651033..007623f6 100644
--- a/Plugin/src/main/resources/enchants/normal/inferno.yml
+++ b/Plugin/src/main/resources/enchants/normal/inferno.yml
@@ -2,7 +2,7 @@
# Infernal EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Inferno"
diff --git a/Plugin/src/main/resources/enchants/normal/infuriate.yml b/Plugin/src/main/resources/enchants/normal/infuriate.yml
index d97c10e2..07adc0f8 100644
--- a/Plugin/src/main/resources/enchants/normal/infuriate.yml
+++ b/Plugin/src/main/resources/enchants/normal/infuriate.yml
@@ -2,7 +2,7 @@
# Infuriate EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Infuriate"
diff --git a/Plugin/src/main/resources/enchants/normal/insecticide.yml b/Plugin/src/main/resources/enchants/normal/insecticide.yml
index 0280ce8a..7841f605 100644
--- a/Plugin/src/main/resources/enchants/normal/insecticide.yml
+++ b/Plugin/src/main/resources/enchants/normal/insecticide.yml
@@ -2,7 +2,7 @@
# Insecticide EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Insecticide"
diff --git a/Plugin/src/main/resources/enchants/normal/instantaneous.yml b/Plugin/src/main/resources/enchants/normal/instantaneous.yml
index 7db36378..91afdb1a 100644
--- a/Plugin/src/main/resources/enchants/normal/instantaneous.yml
+++ b/Plugin/src/main/resources/enchants/normal/instantaneous.yml
@@ -2,7 +2,7 @@
# Instantaneous EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Instantaneous"
diff --git a/Plugin/src/main/resources/enchants/normal/invigoration.yml b/Plugin/src/main/resources/enchants/normal/invigoration.yml
index fddca397..b02a9354 100644
--- a/Plugin/src/main/resources/enchants/normal/invigoration.yml
+++ b/Plugin/src/main/resources/enchants/normal/invigoration.yml
@@ -2,7 +2,7 @@
# Invigoration EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Invigoration"
diff --git a/Plugin/src/main/resources/enchants/normal/kinetic.yml b/Plugin/src/main/resources/enchants/normal/kinetic.yml
index 9cab53a4..405864c7 100644
--- a/Plugin/src/main/resources/enchants/normal/kinetic.yml
+++ b/Plugin/src/main/resources/enchants/normal/kinetic.yml
@@ -2,7 +2,7 @@
# Kinetic EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Kinetic"
diff --git a/Plugin/src/main/resources/enchants/normal/launch.yml b/Plugin/src/main/resources/enchants/normal/launch.yml
index d5f6b62f..286e6359 100644
--- a/Plugin/src/main/resources/enchants/normal/launch.yml
+++ b/Plugin/src/main/resources/enchants/normal/launch.yml
@@ -2,7 +2,7 @@
# Launch EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Launch"
diff --git a/Plugin/src/main/resources/enchants/normal/leeching.yml b/Plugin/src/main/resources/enchants/normal/leeching.yml
index b0073e47..0654808f 100644
--- a/Plugin/src/main/resources/enchants/normal/leeching.yml
+++ b/Plugin/src/main/resources/enchants/normal/leeching.yml
@@ -2,7 +2,7 @@
# Leeching EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Leeching"
diff --git a/Plugin/src/main/resources/enchants/normal/lesion.yml b/Plugin/src/main/resources/enchants/normal/lesion.yml
index 19369c4d..4ec87f01 100644
--- a/Plugin/src/main/resources/enchants/normal/lesion.yml
+++ b/Plugin/src/main/resources/enchants/normal/lesion.yml
@@ -2,7 +2,7 @@
# Lesion EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Lesion"
diff --git a/Plugin/src/main/resources/enchants/normal/levitate.yml b/Plugin/src/main/resources/enchants/normal/levitate.yml
index 570af0e9..24197350 100644
--- a/Plugin/src/main/resources/enchants/normal/levitate.yml
+++ b/Plugin/src/main/resources/enchants/normal/levitate.yml
@@ -2,7 +2,7 @@
# Levitate EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Levitate"
diff --git a/Plugin/src/main/resources/enchants/normal/liquidshot.yml b/Plugin/src/main/resources/enchants/normal/liquidshot.yml
index 9a57fe31..843bb7b7 100644
--- a/Plugin/src/main/resources/enchants/normal/liquidshot.yml
+++ b/Plugin/src/main/resources/enchants/normal/liquidshot.yml
@@ -2,7 +2,7 @@
# Liquid Shot EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Liquid Shot"
diff --git a/Plugin/src/main/resources/enchants/normal/lumberjack.yml b/Plugin/src/main/resources/enchants/normal/lumberjack.yml
index 694c2dae..b0f7e2bd 100644
--- a/Plugin/src/main/resources/enchants/normal/lumberjack.yml
+++ b/Plugin/src/main/resources/enchants/normal/lumberjack.yml
@@ -2,7 +2,7 @@
# Lumberjack EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Lumberjack"
diff --git a/Plugin/src/main/resources/enchants/normal/magmawalker.yml b/Plugin/src/main/resources/enchants/normal/magmawalker.yml
index 5b667afa..1f53f2f8 100644
--- a/Plugin/src/main/resources/enchants/normal/magmawalker.yml
+++ b/Plugin/src/main/resources/enchants/normal/magmawalker.yml
@@ -2,7 +2,7 @@
# Magma Walker EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Magma Walker"
diff --git a/Plugin/src/main/resources/enchants/normal/magnetic.yml b/Plugin/src/main/resources/enchants/normal/magnetic.yml
index 108e3cea..dae7c391 100644
--- a/Plugin/src/main/resources/enchants/normal/magnetic.yml
+++ b/Plugin/src/main/resources/enchants/normal/magnetic.yml
@@ -2,7 +2,7 @@
# Magnetic EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Magnetic"
diff --git a/Plugin/src/main/resources/enchants/normal/marking.yml b/Plugin/src/main/resources/enchants/normal/marking.yml
index 4806b942..ce13bbee 100644
--- a/Plugin/src/main/resources/enchants/normal/marking.yml
+++ b/Plugin/src/main/resources/enchants/normal/marking.yml
@@ -2,7 +2,7 @@
# Marking EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Marking"
diff --git a/Plugin/src/main/resources/enchants/normal/marksman.yml b/Plugin/src/main/resources/enchants/normal/marksman.yml
index f49421d5..01c44745 100644
--- a/Plugin/src/main/resources/enchants/normal/marksman.yml
+++ b/Plugin/src/main/resources/enchants/normal/marksman.yml
@@ -2,7 +2,7 @@
# Marksman EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Marksman"
diff --git a/Plugin/src/main/resources/enchants/normal/necrotic.yml b/Plugin/src/main/resources/enchants/normal/necrotic.yml
index 20648176..8463bdf2 100644
--- a/Plugin/src/main/resources/enchants/normal/necrotic.yml
+++ b/Plugin/src/main/resources/enchants/normal/necrotic.yml
@@ -2,7 +2,7 @@
# Necrotic EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Necrotic"
diff --git a/Plugin/src/main/resources/enchants/normal/netheric.yml b/Plugin/src/main/resources/enchants/normal/netheric.yml
index 80790d00..22ad4ad5 100644
--- a/Plugin/src/main/resources/enchants/normal/netheric.yml
+++ b/Plugin/src/main/resources/enchants/normal/netheric.yml
@@ -2,7 +2,7 @@
# Netheric EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Netheric"
diff --git a/Plugin/src/main/resources/enchants/normal/netherinfusion.yml b/Plugin/src/main/resources/enchants/normal/netherinfusion.yml
index f4342da4..c845a7a7 100644
--- a/Plugin/src/main/resources/enchants/normal/netherinfusion.yml
+++ b/Plugin/src/main/resources/enchants/normal/netherinfusion.yml
@@ -2,7 +2,7 @@
# Nether Infusion EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Nether Infusion"
diff --git a/Plugin/src/main/resources/enchants/normal/nocturnal.yml b/Plugin/src/main/resources/enchants/normal/nocturnal.yml
index ab080bdb..7461f2fb 100644
--- a/Plugin/src/main/resources/enchants/normal/nocturnal.yml
+++ b/Plugin/src/main/resources/enchants/normal/nocturnal.yml
@@ -2,7 +2,7 @@
# Nocturnal EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Nocturnal"
diff --git a/Plugin/src/main/resources/enchants/normal/optics.yml b/Plugin/src/main/resources/enchants/normal/optics.yml
index eb6e77b3..708f55fc 100644
--- a/Plugin/src/main/resources/enchants/normal/optics.yml
+++ b/Plugin/src/main/resources/enchants/normal/optics.yml
@@ -2,7 +2,7 @@
# Optics EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Optics"
diff --git a/Plugin/src/main/resources/enchants/normal/oxygenate.yml b/Plugin/src/main/resources/enchants/normal/oxygenate.yml
index 181c1d9e..acc9c647 100644
--- a/Plugin/src/main/resources/enchants/normal/oxygenate.yml
+++ b/Plugin/src/main/resources/enchants/normal/oxygenate.yml
@@ -2,7 +2,7 @@
# Oxygenate EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Oxygenate"
diff --git a/Plugin/src/main/resources/enchants/normal/pacify.yml b/Plugin/src/main/resources/enchants/normal/pacify.yml
index 69be6e17..a5b37cee 100644
--- a/Plugin/src/main/resources/enchants/normal/pacify.yml
+++ b/Plugin/src/main/resources/enchants/normal/pacify.yml
@@ -2,7 +2,7 @@
# Pacify EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Pacify"
diff --git a/Plugin/src/main/resources/enchants/normal/paladin.yml b/Plugin/src/main/resources/enchants/normal/paladin.yml
index 75c8c735..0fad1820 100644
--- a/Plugin/src/main/resources/enchants/normal/paladin.yml
+++ b/Plugin/src/main/resources/enchants/normal/paladin.yml
@@ -2,7 +2,7 @@
# Paladin EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Paladin"
diff --git a/Plugin/src/main/resources/enchants/normal/paralyze.yml b/Plugin/src/main/resources/enchants/normal/paralyze.yml
index 0825d564..2e0858b9 100644
--- a/Plugin/src/main/resources/enchants/normal/paralyze.yml
+++ b/Plugin/src/main/resources/enchants/normal/paralyze.yml
@@ -2,7 +2,7 @@
# Paralyze EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Paralyze"
diff --git a/Plugin/src/main/resources/enchants/normal/parasitic.yml b/Plugin/src/main/resources/enchants/normal/parasitic.yml
index 2a8499b2..0057e537 100644
--- a/Plugin/src/main/resources/enchants/normal/parasitic.yml
+++ b/Plugin/src/main/resources/enchants/normal/parasitic.yml
@@ -2,7 +2,7 @@
# Parasitic EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Parasitic"
diff --git a/Plugin/src/main/resources/enchants/normal/parry.yml b/Plugin/src/main/resources/enchants/normal/parry.yml
index 5f302372..d0fefb35 100644
--- a/Plugin/src/main/resources/enchants/normal/parry.yml
+++ b/Plugin/src/main/resources/enchants/normal/parry.yml
@@ -2,7 +2,7 @@
# Parry EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Parry"
diff --git a/Plugin/src/main/resources/enchants/normal/phantasm.yml b/Plugin/src/main/resources/enchants/normal/phantasm.yml
index 30ee1f6e..1cdb424d 100644
--- a/Plugin/src/main/resources/enchants/normal/phantasm.yml
+++ b/Plugin/src/main/resources/enchants/normal/phantasm.yml
@@ -2,7 +2,7 @@
# Phantasm EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Phantasm"
diff --git a/Plugin/src/main/resources/enchants/normal/protector.yml b/Plugin/src/main/resources/enchants/normal/protector.yml
index 5a18cc61..28fed07c 100644
--- a/Plugin/src/main/resources/enchants/normal/protector.yml
+++ b/Plugin/src/main/resources/enchants/normal/protector.yml
@@ -2,7 +2,7 @@
# Protector EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Protector"
diff --git a/Plugin/src/main/resources/enchants/normal/proximity.yml b/Plugin/src/main/resources/enchants/normal/proximity.yml
index 53b9ff7d..8fbf0fed 100644
--- a/Plugin/src/main/resources/enchants/normal/proximity.yml
+++ b/Plugin/src/main/resources/enchants/normal/proximity.yml
@@ -2,7 +2,7 @@
# Proximity EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Proximity"
diff --git a/Plugin/src/main/resources/enchants/normal/puncture.yml b/Plugin/src/main/resources/enchants/normal/puncture.yml
index f2b6f3f5..3ca17ded 100644
--- a/Plugin/src/main/resources/enchants/normal/puncture.yml
+++ b/Plugin/src/main/resources/enchants/normal/puncture.yml
@@ -2,7 +2,7 @@
# Puncture EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Puncture"
diff --git a/Plugin/src/main/resources/enchants/normal/quadrilateralism.yml b/Plugin/src/main/resources/enchants/normal/quadrilateralism.yml
index 9ac30ac4..9a366964 100644
--- a/Plugin/src/main/resources/enchants/normal/quadrilateralism.yml
+++ b/Plugin/src/main/resources/enchants/normal/quadrilateralism.yml
@@ -2,7 +2,7 @@
# Quadrilateralism EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Quadrilateralism"
diff --git a/Plugin/src/main/resources/enchants/normal/radiance.yml b/Plugin/src/main/resources/enchants/normal/radiance.yml
index 6cbee055..f9b3ed8e 100644
--- a/Plugin/src/main/resources/enchants/normal/radiance.yml
+++ b/Plugin/src/main/resources/enchants/normal/radiance.yml
@@ -2,7 +2,7 @@
# Radiance EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Radiance"
diff --git a/Plugin/src/main/resources/enchants/normal/rage.yml b/Plugin/src/main/resources/enchants/normal/rage.yml
index 96555af1..d39fdaf3 100644
--- a/Plugin/src/main/resources/enchants/normal/rage.yml
+++ b/Plugin/src/main/resources/enchants/normal/rage.yml
@@ -2,7 +2,7 @@
# Rage EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Rage"
diff --git a/Plugin/src/main/resources/enchants/normal/rapid.yml b/Plugin/src/main/resources/enchants/normal/rapid.yml
index 6f9f87cb..222b276f 100644
--- a/Plugin/src/main/resources/enchants/normal/rapid.yml
+++ b/Plugin/src/main/resources/enchants/normal/rapid.yml
@@ -2,7 +2,7 @@
# Rapid EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Rapid"
diff --git a/Plugin/src/main/resources/enchants/normal/reel.yml b/Plugin/src/main/resources/enchants/normal/reel.yml
index dbb1fa31..accde655 100644
--- a/Plugin/src/main/resources/enchants/normal/reel.yml
+++ b/Plugin/src/main/resources/enchants/normal/reel.yml
@@ -2,7 +2,7 @@
# Reel EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Reel"
diff --git a/Plugin/src/main/resources/enchants/normal/reinforcement.yml b/Plugin/src/main/resources/enchants/normal/reinforcement.yml
index d7c1daf0..b4b67854 100644
--- a/Plugin/src/main/resources/enchants/normal/reinforcement.yml
+++ b/Plugin/src/main/resources/enchants/normal/reinforcement.yml
@@ -2,7 +2,7 @@
# Reinforcement EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Reinforcement"
diff --git a/Plugin/src/main/resources/enchants/normal/rejuvenation.yml b/Plugin/src/main/resources/enchants/normal/rejuvenation.yml
index 8964d896..1a4eb3d2 100644
--- a/Plugin/src/main/resources/enchants/normal/rejuvenation.yml
+++ b/Plugin/src/main/resources/enchants/normal/rejuvenation.yml
@@ -2,7 +2,7 @@
# Rejuvenation EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Rejuvenation"
diff --git a/Plugin/src/main/resources/enchants/normal/replenish.yml b/Plugin/src/main/resources/enchants/normal/replenish.yml
index d84bc22f..5de1585d 100644
--- a/Plugin/src/main/resources/enchants/normal/replenish.yml
+++ b/Plugin/src/main/resources/enchants/normal/replenish.yml
@@ -2,7 +2,7 @@
# Replenish EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Replenish"
diff --git a/Plugin/src/main/resources/enchants/normal/revenant.yml b/Plugin/src/main/resources/enchants/normal/revenant.yml
index 0d6338af..dffee68c 100644
--- a/Plugin/src/main/resources/enchants/normal/revenant.yml
+++ b/Plugin/src/main/resources/enchants/normal/revenant.yml
@@ -2,7 +2,7 @@
# Revenant EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Revenant"
diff --git a/Plugin/src/main/resources/enchants/normal/sating.yml b/Plugin/src/main/resources/enchants/normal/sating.yml
index e5d6b563..0248e4a9 100644
--- a/Plugin/src/main/resources/enchants/normal/sating.yml
+++ b/Plugin/src/main/resources/enchants/normal/sating.yml
@@ -2,7 +2,7 @@
# Sating EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Sating"
diff --git a/Plugin/src/main/resources/enchants/normal/serrated.yml b/Plugin/src/main/resources/enchants/normal/serrated.yml
index e10b4e77..0ab7e56b 100644
--- a/Plugin/src/main/resources/enchants/normal/serrated.yml
+++ b/Plugin/src/main/resources/enchants/normal/serrated.yml
@@ -2,7 +2,7 @@
# Serrated EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Serrated"
diff --git a/Plugin/src/main/resources/enchants/normal/settle.yml b/Plugin/src/main/resources/enchants/normal/settle.yml
index ebfae863..a28875f4 100644
--- a/Plugin/src/main/resources/enchants/normal/settle.yml
+++ b/Plugin/src/main/resources/enchants/normal/settle.yml
@@ -2,7 +2,7 @@
# Settle EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Settle"
diff --git a/Plugin/src/main/resources/enchants/normal/shockwave.yml b/Plugin/src/main/resources/enchants/normal/shockwave.yml
index 169b2011..2b44412d 100644
--- a/Plugin/src/main/resources/enchants/normal/shockwave.yml
+++ b/Plugin/src/main/resources/enchants/normal/shockwave.yml
@@ -2,7 +2,7 @@
# Shockwave EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Shockwave"
diff --git a/Plugin/src/main/resources/enchants/normal/shotassist.yml b/Plugin/src/main/resources/enchants/normal/shotassist.yml
index d252d281..d7d09736 100644
--- a/Plugin/src/main/resources/enchants/normal/shotassist.yml
+++ b/Plugin/src/main/resources/enchants/normal/shotassist.yml
@@ -2,7 +2,7 @@
# Shot Assist EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Shot Assist"
diff --git a/Plugin/src/main/resources/enchants/normal/sickening.yml b/Plugin/src/main/resources/enchants/normal/sickening.yml
index f284e190..04fd6424 100644
--- a/Plugin/src/main/resources/enchants/normal/sickening.yml
+++ b/Plugin/src/main/resources/enchants/normal/sickening.yml
@@ -2,7 +2,7 @@
# Sickening EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Sickening"
diff --git a/Plugin/src/main/resources/enchants/normal/slaughter.yml b/Plugin/src/main/resources/enchants/normal/slaughter.yml
index 423460a0..654a9244 100644
--- a/Plugin/src/main/resources/enchants/normal/slaughter.yml
+++ b/Plugin/src/main/resources/enchants/normal/slaughter.yml
@@ -2,7 +2,7 @@
# Slaughter EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Slaughter"
diff --git a/Plugin/src/main/resources/enchants/normal/slicing.yml b/Plugin/src/main/resources/enchants/normal/slicing.yml
index c40ea63a..4ef1ee55 100644
--- a/Plugin/src/main/resources/enchants/normal/slicing.yml
+++ b/Plugin/src/main/resources/enchants/normal/slicing.yml
@@ -2,7 +2,7 @@
# Slicing EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Slicing"
diff --git a/Plugin/src/main/resources/enchants/normal/spearfishing.yml b/Plugin/src/main/resources/enchants/normal/spearfishing.yml
index 08fb89d1..1f375172 100644
--- a/Plugin/src/main/resources/enchants/normal/spearfishing.yml
+++ b/Plugin/src/main/resources/enchants/normal/spearfishing.yml
@@ -2,7 +2,7 @@
# Spearfishing EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Spearfishing"
diff --git a/Plugin/src/main/resources/enchants/normal/spiked.yml b/Plugin/src/main/resources/enchants/normal/spiked.yml
index d4495ada..0daa70f1 100644
--- a/Plugin/src/main/resources/enchants/normal/spiked.yml
+++ b/Plugin/src/main/resources/enchants/normal/spiked.yml
@@ -2,7 +2,7 @@
# Spiked EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Spiked"
diff --git a/Plugin/src/main/resources/enchants/normal/splash.yml b/Plugin/src/main/resources/enchants/normal/splash.yml
index 97b38f21..fe2e2ade 100644
--- a/Plugin/src/main/resources/enchants/normal/splash.yml
+++ b/Plugin/src/main/resources/enchants/normal/splash.yml
@@ -2,7 +2,7 @@
# Splash EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Splash"
diff --git a/Plugin/src/main/resources/enchants/normal/stab.yml b/Plugin/src/main/resources/enchants/normal/stab.yml
index 99f41af3..826aac71 100644
--- a/Plugin/src/main/resources/enchants/normal/stab.yml
+++ b/Plugin/src/main/resources/enchants/normal/stab.yml
@@ -2,7 +2,7 @@
# Stab EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Stab"
diff --git a/Plugin/src/main/resources/enchants/normal/stamina.yml b/Plugin/src/main/resources/enchants/normal/stamina.yml
index 066156b6..28ffc7a4 100644
--- a/Plugin/src/main/resources/enchants/normal/stamina.yml
+++ b/Plugin/src/main/resources/enchants/normal/stamina.yml
@@ -2,7 +2,7 @@
# Stamina EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Stamina"
diff --git a/Plugin/src/main/resources/enchants/normal/stoneswitcher.yml b/Plugin/src/main/resources/enchants/normal/stoneswitcher.yml
index 51e5b3a6..408850fe 100644
--- a/Plugin/src/main/resources/enchants/normal/stoneswitcher.yml
+++ b/Plugin/src/main/resources/enchants/normal/stoneswitcher.yml
@@ -2,7 +2,7 @@
# Stone Switcher EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Stone Switcher"
diff --git a/Plugin/src/main/resources/enchants/normal/strayaspect.yml b/Plugin/src/main/resources/enchants/normal/strayaspect.yml
index aad709e7..57b806b7 100644
--- a/Plugin/src/main/resources/enchants/normal/strayaspect.yml
+++ b/Plugin/src/main/resources/enchants/normal/strayaspect.yml
@@ -2,7 +2,7 @@
# Stray Aspect EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Stray Aspect"
diff --git a/Plugin/src/main/resources/enchants/normal/succession.yml b/Plugin/src/main/resources/enchants/normal/succession.yml
index cdafd785..a9c2e5e0 100644
--- a/Plugin/src/main/resources/enchants/normal/succession.yml
+++ b/Plugin/src/main/resources/enchants/normal/succession.yml
@@ -2,7 +2,7 @@
# Succession EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Succession"
diff --git a/Plugin/src/main/resources/enchants/normal/supercritical.yml b/Plugin/src/main/resources/enchants/normal/supercritical.yml
index 160d8b2c..ef3d3681 100644
--- a/Plugin/src/main/resources/enchants/normal/supercritical.yml
+++ b/Plugin/src/main/resources/enchants/normal/supercritical.yml
@@ -2,7 +2,7 @@
# Supercritical EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Supercritical"
diff --git a/Plugin/src/main/resources/enchants/normal/sycophant.yml b/Plugin/src/main/resources/enchants/normal/sycophant.yml
index 361ca9d7..8bc5c938 100644
--- a/Plugin/src/main/resources/enchants/normal/sycophant.yml
+++ b/Plugin/src/main/resources/enchants/normal/sycophant.yml
@@ -2,7 +2,7 @@
# Sycophant EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Sycophant"
diff --git a/Plugin/src/main/resources/enchants/normal/tectonic.yml b/Plugin/src/main/resources/enchants/normal/tectonic.yml
index a8639272..f914608b 100644
--- a/Plugin/src/main/resources/enchants/normal/tectonic.yml
+++ b/Plugin/src/main/resources/enchants/normal/tectonic.yml
@@ -2,7 +2,7 @@
# Tectonic EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Tectonic"
diff --git a/Plugin/src/main/resources/enchants/normal/telekinesis.yml b/Plugin/src/main/resources/enchants/normal/telekinesis.yml
index 8f5d234d..d13eaa49 100644
--- a/Plugin/src/main/resources/enchants/normal/telekinesis.yml
+++ b/Plugin/src/main/resources/enchants/normal/telekinesis.yml
@@ -2,7 +2,7 @@
# Telekinesis EcoEnchant
#
-config-version: 4.12 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Telekinesis"
diff --git a/Plugin/src/main/resources/enchants/normal/thor.yml b/Plugin/src/main/resources/enchants/normal/thor.yml
index 83b67ea9..7df3c817 100644
--- a/Plugin/src/main/resources/enchants/normal/thor.yml
+++ b/Plugin/src/main/resources/enchants/normal/thor.yml
@@ -2,7 +2,7 @@
# Thor EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Thor"
diff --git a/Plugin/src/main/resources/enchants/normal/thrive.yml b/Plugin/src/main/resources/enchants/normal/thrive.yml
index 952cfe94..df41e427 100644
--- a/Plugin/src/main/resources/enchants/normal/thrive.yml
+++ b/Plugin/src/main/resources/enchants/normal/thrive.yml
@@ -2,7 +2,7 @@
# Thrive EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Thrive"
diff --git a/Plugin/src/main/resources/enchants/normal/tornado.yml b/Plugin/src/main/resources/enchants/normal/tornado.yml
index 8993ddd6..d953796b 100644
--- a/Plugin/src/main/resources/enchants/normal/tornado.yml
+++ b/Plugin/src/main/resources/enchants/normal/tornado.yml
@@ -2,7 +2,7 @@
# Tornado EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Tornado"
diff --git a/Plugin/src/main/resources/enchants/normal/toxic.yml b/Plugin/src/main/resources/enchants/normal/toxic.yml
index 62938a1a..71c52e5f 100644
--- a/Plugin/src/main/resources/enchants/normal/toxic.yml
+++ b/Plugin/src/main/resources/enchants/normal/toxic.yml
@@ -2,7 +2,7 @@
# Toxic EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Toxic"
diff --git a/Plugin/src/main/resources/enchants/normal/transfuse.yml b/Plugin/src/main/resources/enchants/normal/transfuse.yml
index d465d12e..dea633e0 100644
--- a/Plugin/src/main/resources/enchants/normal/transfuse.yml
+++ b/Plugin/src/main/resources/enchants/normal/transfuse.yml
@@ -2,7 +2,7 @@
# Transfuse EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Transfuse"
diff --git a/Plugin/src/main/resources/enchants/normal/tripleshot.yml b/Plugin/src/main/resources/enchants/normal/tripleshot.yml
index ebd8e16c..3ab65f81 100644
--- a/Plugin/src/main/resources/enchants/normal/tripleshot.yml
+++ b/Plugin/src/main/resources/enchants/normal/tripleshot.yml
@@ -2,7 +2,7 @@
# Tripleshot EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Tripleshot"
diff --git a/Plugin/src/main/resources/enchants/normal/vampireaspect.yml b/Plugin/src/main/resources/enchants/normal/vampireaspect.yml
index b74d2f83..bde64424 100644
--- a/Plugin/src/main/resources/enchants/normal/vampireaspect.yml
+++ b/Plugin/src/main/resources/enchants/normal/vampireaspect.yml
@@ -2,7 +2,7 @@
# Vampire Aspect EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Vampire Aspect"
diff --git a/Plugin/src/main/resources/enchants/normal/vein.yml b/Plugin/src/main/resources/enchants/normal/vein.yml
index fb01f5d0..e5978869 100644
--- a/Plugin/src/main/resources/enchants/normal/vein.yml
+++ b/Plugin/src/main/resources/enchants/normal/vein.yml
@@ -2,7 +2,7 @@
# Vein EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Vein"
diff --git a/Plugin/src/main/resources/enchants/normal/venom.yml b/Plugin/src/main/resources/enchants/normal/venom.yml
index aed56463..b4744932 100644
--- a/Plugin/src/main/resources/enchants/normal/venom.yml
+++ b/Plugin/src/main/resources/enchants/normal/venom.yml
@@ -2,7 +2,7 @@
# Venom EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Venom"
diff --git a/Plugin/src/main/resources/enchants/normal/voidaffinity.yml b/Plugin/src/main/resources/enchants/normal/voidaffinity.yml
index 35a63f34..9e8b9c86 100644
--- a/Plugin/src/main/resources/enchants/normal/voidaffinity.yml
+++ b/Plugin/src/main/resources/enchants/normal/voidaffinity.yml
@@ -2,7 +2,7 @@
# Void Affinity EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Void Affinity"
diff --git a/Plugin/src/main/resources/enchants/normal/voltage.yml b/Plugin/src/main/resources/enchants/normal/voltage.yml
index d571db52..62c65370 100644
--- a/Plugin/src/main/resources/enchants/normal/voltage.yml
+++ b/Plugin/src/main/resources/enchants/normal/voltage.yml
@@ -2,7 +2,7 @@
# Voltage EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Voltage"
diff --git a/Plugin/src/main/resources/enchants/normal/wateraffinity.yml b/Plugin/src/main/resources/enchants/normal/wateraffinity.yml
index 0906b015..b1412dac 100644
--- a/Plugin/src/main/resources/enchants/normal/wateraffinity.yml
+++ b/Plugin/src/main/resources/enchants/normal/wateraffinity.yml
@@ -2,7 +2,7 @@
# Water Affinity EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Water Affinity"
diff --git a/Plugin/src/main/resources/enchants/normal/wateraspect.yml b/Plugin/src/main/resources/enchants/normal/wateraspect.yml
index 7eddd9f3..b932441a 100644
--- a/Plugin/src/main/resources/enchants/normal/wateraspect.yml
+++ b/Plugin/src/main/resources/enchants/normal/wateraspect.yml
@@ -2,7 +2,7 @@
# Water Aspect EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Water Aspect"
diff --git a/Plugin/src/main/resources/enchants/normal/weakening.yml b/Plugin/src/main/resources/enchants/normal/weakening.yml
index de62a7e6..9274e975 100644
--- a/Plugin/src/main/resources/enchants/normal/weakening.yml
+++ b/Plugin/src/main/resources/enchants/normal/weakening.yml
@@ -2,7 +2,7 @@
# Weakening EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Weakening"
diff --git a/Plugin/src/main/resources/enchants/normal/wisdom.yml b/Plugin/src/main/resources/enchants/normal/wisdom.yml
index 39b04f7d..4a1940eb 100644
--- a/Plugin/src/main/resources/enchants/normal/wisdom.yml
+++ b/Plugin/src/main/resources/enchants/normal/wisdom.yml
@@ -2,7 +2,7 @@
# Wisdom EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Wisdom"
diff --git a/Plugin/src/main/resources/enchants/normal/wound.yml b/Plugin/src/main/resources/enchants/normal/wound.yml
index d72e847f..e0639249 100644
--- a/Plugin/src/main/resources/enchants/normal/wound.yml
+++ b/Plugin/src/main/resources/enchants/normal/wound.yml
@@ -2,7 +2,7 @@
# Wound EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Wound"
diff --git a/Plugin/src/main/resources/enchants/normal/zeus.yml b/Plugin/src/main/resources/enchants/normal/zeus.yml
index dd467a09..9c402f11 100644
--- a/Plugin/src/main/resources/enchants/normal/zeus.yml
+++ b/Plugin/src/main/resources/enchants/normal/zeus.yml
@@ -2,7 +2,7 @@
# Zeus EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Zeus"
diff --git a/Plugin/src/main/resources/enchants/special/aiming.yml b/Plugin/src/main/resources/enchants/special/aiming.yml
index b7369de3..008f2825 100644
--- a/Plugin/src/main/resources/enchants/special/aiming.yml
+++ b/Plugin/src/main/resources/enchants/special/aiming.yml
@@ -2,7 +2,7 @@
# Aiming EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Aiming"
diff --git a/Plugin/src/main/resources/enchants/special/annihilate.yml b/Plugin/src/main/resources/enchants/special/annihilate.yml
index 18513683..4f111dee 100644
--- a/Plugin/src/main/resources/enchants/special/annihilate.yml
+++ b/Plugin/src/main/resources/enchants/special/annihilate.yml
@@ -2,7 +2,7 @@
# Annihilate EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Annihilate"
diff --git a/Plugin/src/main/resources/enchants/special/bladed.yml b/Plugin/src/main/resources/enchants/special/bladed.yml
index 2ba711c4..c633ce21 100644
--- a/Plugin/src/main/resources/enchants/special/bladed.yml
+++ b/Plugin/src/main/resources/enchants/special/bladed.yml
@@ -2,7 +2,7 @@
# Bladed EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Bladed"
diff --git a/Plugin/src/main/resources/enchants/special/bolt.yml b/Plugin/src/main/resources/enchants/special/bolt.yml
index acd02a2b..b0d48d2c 100644
--- a/Plugin/src/main/resources/enchants/special/bolt.yml
+++ b/Plugin/src/main/resources/enchants/special/bolt.yml
@@ -2,7 +2,7 @@
# Bolt EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Bolt"
diff --git a/Plugin/src/main/resources/enchants/special/carve.yml b/Plugin/src/main/resources/enchants/special/carve.yml
index dacc5813..96f7c1da 100644
--- a/Plugin/src/main/resources/enchants/special/carve.yml
+++ b/Plugin/src/main/resources/enchants/special/carve.yml
@@ -2,7 +2,7 @@
# Carve EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Carve"
diff --git a/Plugin/src/main/resources/enchants/special/confusion.yml b/Plugin/src/main/resources/enchants/special/confusion.yml
index 2851d750..44ef0b83 100644
--- a/Plugin/src/main/resources/enchants/special/confusion.yml
+++ b/Plugin/src/main/resources/enchants/special/confusion.yml
@@ -2,7 +2,7 @@
# Confusion EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Confusion"
diff --git a/Plugin/src/main/resources/enchants/special/energizing.yml b/Plugin/src/main/resources/enchants/special/energizing.yml
index 456554d7..eec295b6 100644
--- a/Plugin/src/main/resources/enchants/special/energizing.yml
+++ b/Plugin/src/main/resources/enchants/special/energizing.yml
@@ -2,7 +2,7 @@
# Energizing EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Energizing"
diff --git a/Plugin/src/main/resources/enchants/special/force.yml b/Plugin/src/main/resources/enchants/special/force.yml
index 90848fb5..7d5e741b 100644
--- a/Plugin/src/main/resources/enchants/special/force.yml
+++ b/Plugin/src/main/resources/enchants/special/force.yml
@@ -2,7 +2,7 @@
# Force EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Force"
diff --git a/Plugin/src/main/resources/enchants/special/frenzy.yml b/Plugin/src/main/resources/enchants/special/frenzy.yml
index a9b02da5..8b0d9720 100644
--- a/Plugin/src/main/resources/enchants/special/frenzy.yml
+++ b/Plugin/src/main/resources/enchants/special/frenzy.yml
@@ -2,7 +2,7 @@
# Frenzy EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Frenzy"
diff --git a/Plugin/src/main/resources/enchants/special/harpoon.yml b/Plugin/src/main/resources/enchants/special/harpoon.yml
index 3a0958e8..6d84d4ee 100644
--- a/Plugin/src/main/resources/enchants/special/harpoon.yml
+++ b/Plugin/src/main/resources/enchants/special/harpoon.yml
@@ -2,7 +2,7 @@
# Harpoon EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Harpoon"
diff --git a/Plugin/src/main/resources/enchants/special/indestructibility.yml b/Plugin/src/main/resources/enchants/special/indestructibility.yml
index ee508d73..cc175fd6 100644
--- a/Plugin/src/main/resources/enchants/special/indestructibility.yml
+++ b/Plugin/src/main/resources/enchants/special/indestructibility.yml
@@ -2,7 +2,7 @@
# Indestructibility EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Indestructibility"
diff --git a/Plugin/src/main/resources/enchants/special/instability.yml b/Plugin/src/main/resources/enchants/special/instability.yml
index 1c397e20..940d6866 100644
--- a/Plugin/src/main/resources/enchants/special/instability.yml
+++ b/Plugin/src/main/resources/enchants/special/instability.yml
@@ -2,7 +2,7 @@
# Instability EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Instability"
diff --git a/Plugin/src/main/resources/enchants/special/intellect.yml b/Plugin/src/main/resources/enchants/special/intellect.yml
index 5e5840bd..082d313e 100644
--- a/Plugin/src/main/resources/enchants/special/intellect.yml
+++ b/Plugin/src/main/resources/enchants/special/intellect.yml
@@ -2,7 +2,7 @@
# Intellect EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Intellect"
diff --git a/Plugin/src/main/resources/enchants/special/lifesteal.yml b/Plugin/src/main/resources/enchants/special/lifesteal.yml
index 4665d10d..f3722bcd 100644
--- a/Plugin/src/main/resources/enchants/special/lifesteal.yml
+++ b/Plugin/src/main/resources/enchants/special/lifesteal.yml
@@ -2,7 +2,7 @@
# Life Steal EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Life Steal"
diff --git a/Plugin/src/main/resources/enchants/special/pentashot.yml b/Plugin/src/main/resources/enchants/special/pentashot.yml
index fdac2331..a0c7d471 100644
--- a/Plugin/src/main/resources/enchants/special/pentashot.yml
+++ b/Plugin/src/main/resources/enchants/special/pentashot.yml
@@ -2,7 +2,7 @@
# Pentashot EcoEnchant
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Pentashot"
diff --git a/Plugin/src/main/resources/enchants/special/preservation.yml b/Plugin/src/main/resources/enchants/special/preservation.yml
index 7c8f3ad8..a8fa77a7 100644
--- a/Plugin/src/main/resources/enchants/special/preservation.yml
+++ b/Plugin/src/main/resources/enchants/special/preservation.yml
@@ -2,7 +2,7 @@
# Preservation EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Preservation"
diff --git a/Plugin/src/main/resources/enchants/special/prosperity.yml b/Plugin/src/main/resources/enchants/special/prosperity.yml
index 14509228..66e235db 100644
--- a/Plugin/src/main/resources/enchants/special/prosperity.yml
+++ b/Plugin/src/main/resources/enchants/special/prosperity.yml
@@ -2,7 +2,7 @@
# Prosperity EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Prosperity"
diff --git a/Plugin/src/main/resources/enchants/special/razor.yml b/Plugin/src/main/resources/enchants/special/razor.yml
index a63efb15..e6213cf5 100644
--- a/Plugin/src/main/resources/enchants/special/razor.yml
+++ b/Plugin/src/main/resources/enchants/special/razor.yml
@@ -2,7 +2,7 @@
# Razor EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Razor"
diff --git a/Plugin/src/main/resources/enchants/special/repairing.yml b/Plugin/src/main/resources/enchants/special/repairing.yml
index ba4ba37c..8d6c2a26 100644
--- a/Plugin/src/main/resources/enchants/special/repairing.yml
+++ b/Plugin/src/main/resources/enchants/special/repairing.yml
@@ -2,7 +2,7 @@
# Repairing EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Repairing"
diff --git a/Plugin/src/main/resources/enchants/special/soulbound.yml b/Plugin/src/main/resources/enchants/special/soulbound.yml
index 4851b0ca..a5e06cf5 100644
--- a/Plugin/src/main/resources/enchants/special/soulbound.yml
+++ b/Plugin/src/main/resources/enchants/special/soulbound.yml
@@ -2,7 +2,7 @@
# Soulbound EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Soulbound"
diff --git a/Plugin/src/main/resources/enchants/special/spring.yml b/Plugin/src/main/resources/enchants/special/spring.yml
index 63e97216..ad8bfc5b 100644
--- a/Plugin/src/main/resources/enchants/special/spring.yml
+++ b/Plugin/src/main/resources/enchants/special/spring.yml
@@ -2,7 +2,7 @@
# Spring EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Spring"
diff --git a/Plugin/src/main/resources/enchants/special/streamlining.yml b/Plugin/src/main/resources/enchants/special/streamlining.yml
index 9227eef9..db6aaa75 100644
--- a/Plugin/src/main/resources/enchants/special/streamlining.yml
+++ b/Plugin/src/main/resources/enchants/special/streamlining.yml
@@ -2,7 +2,7 @@
# Streamlining EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Streamlining"
diff --git a/Plugin/src/main/resources/enchants/special/volatile.yml b/Plugin/src/main/resources/enchants/special/volatile.yml
index f95be517..366741d6 100644
--- a/Plugin/src/main/resources/enchants/special/volatile.yml
+++ b/Plugin/src/main/resources/enchants/special/volatile.yml
@@ -2,7 +2,7 @@
# Volatile EcoEnchant
#
-config-version: 4.0 # Don't edit this.
+config-version: 5.0 # Don't edit this.
name: "Volatile"
diff --git a/Plugin/src/main/resources/lang.yml b/Plugin/src/main/resources/lang.yml
index 6148e0fc..b3b75d16 100644
--- a/Plugin/src/main/resources/lang.yml
+++ b/Plugin/src/main/resources/lang.yml
@@ -3,7 +3,7 @@
# by Auxilor
#
-config-version: 4.01 # Don't edit this.
+config-version: 5.0 # Don't edit this.
messages:
prefix: "&f[&aEcoEnchants&f] "
diff --git a/Plugin/src/main/resources/target.yml b/Plugin/src/main/resources/target.yml
new file mode 100644
index 00000000..a4fba36c
--- /dev/null
+++ b/Plugin/src/main/resources/target.yml
@@ -0,0 +1,101 @@
+config-version: 1.0
+
+targets:
+ axe:
+ - wooden_axe
+ - stone_axe
+ - iron_axe
+ - golden_axe
+ - diamond_axe
+ - netherite_axe
+
+ book:
+ - book
+ - enchanted_book
+
+ pickaxe:
+ - wooden_pickaxe
+ - stone_pickaxe
+ - iron_pickaxe
+ - golden_pickaxe
+ - diamond_pickaxe
+ - netherite_pickaxe
+
+ hoe:
+ - wooden_hoe
+ - stone_hoe
+ - iron_hoe
+ - golden_hoe
+ - diamond_hoe
+ - netherite_hoe
+
+ shovel:
+ - wooden_shovel
+ - stone_shovel
+ - iron_shovel
+ - golden_shovel
+ - diamond_shovel
+ - netherite_shovel
+
+ sword:
+ - wooden_sword
+ - stone_sword
+ - iron_shovel
+ - golden_shovel
+ - diamond_shovel
+ - netherite_shovel
+
+ helmet:
+ - turtle_helmet
+ - leather_helmet
+ - chainmail_helmet
+ - iron_helmet
+ - golden_helmet
+ - diamond_helmet
+ - netherite_helmet
+
+ chestplate:
+ - leather_chestplate
+ - chainmail_chestplate
+ - iron_chestplate
+ - golden_chestplate
+ - diamond_chestplate
+ - netherite_chestplate
+
+ leggings:
+ - leather_leggings
+ - chainmail_leggings
+ - iron_leggings
+ - golden_leggings
+ - diamond_leggings
+ - netherite_leggings
+
+ boots:
+ - leather_boots
+ - chainmail_boots
+ - iron_boots
+ - golden_boots
+ - diamond_boots
+ - netherite_boots
+
+ elytra:
+ - elytra
+
+ bow:
+ - bow
+
+ crossbow:
+ - crossbow
+
+ shears:
+ - shears
+
+ trident:
+ - trident
+
+ shield:
+ - shield
+
+ rod:
+ - fishing_rod
+
diff --git a/pom.xml b/pom.xml
index 9a9f46bc..8bb7da75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.willfp.ecoenchants
parent
- 4.1.0-pre20
+ 5.0.0-beta1
pom
EcoEnchants Parent