From f2c100538b6e4181b49cb891cebf482bc22f1ef4 Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Fri, 11 Dec 2020 18:34:36 +0000
Subject: [PATCH] Refactored NMS packages

---
 .../ecoenchants/{ => nms}/v1_15_R1/BlockBreak.java |  2 +-
 .../{ => nms}/v1_15_R1/ChatComponent.java          |  2 +-
 .../ecoenchants/{ => nms}/v1_15_R1/Cooldown.java   |  2 +-
 .../{ => nms}/v1_15_R1/OpenInventory.java          |  2 +-
 .../ecoenchants/{ => nms}/v1_15_R1/RepairCost.java |  2 +-
 .../{ => nms}/v1_15_R1/TridentStack.java           |  2 +-
 .../ecoenchants/{ => nms}/v1_16_R1/BlockBreak.java |  2 +-
 .../{ => nms}/v1_16_R1/ChatComponent.java          |  2 +-
 .../ecoenchants/{ => nms}/v1_16_R1/Cooldown.java   |  2 +-
 .../{ => nms}/v1_16_R1/OpenInventory.java          |  2 +-
 .../ecoenchants/{ => nms}/v1_16_R1/RepairCost.java |  2 +-
 .../{ => nms}/v1_16_R1/TridentStack.java           |  2 +-
 .../ecoenchants/{ => nms}/v1_16_R2/BlockBreak.java |  2 +-
 .../{ => nms}/v1_16_R2/ChatComponent.java          |  2 +-
 .../ecoenchants/{ => nms}/v1_16_R2/Cooldown.java   |  2 +-
 .../{ => nms}/v1_16_R2/OpenInventory.java          |  2 +-
 .../ecoenchants/{ => nms}/v1_16_R2/RepairCost.java |  2 +-
 .../{ => nms}/v1_16_R2/TridentStack.java           |  2 +-
 .../ecoenchants/{ => nms}/v1_16_R3/BlockBreak.java |  2 +-
 .../{ => nms}/v1_16_R3/ChatComponent.java          |  2 +-
 .../ecoenchants/{ => nms}/v1_16_R3/Cooldown.java   |  2 +-
 .../{ => nms}/v1_16_R3/OpenInventory.java          |  2 +-
 .../ecoenchants/{ => nms}/v1_16_R3/RepairCost.java |  2 +-
 .../{ => nms}/v1_16_R3/TridentStack.java           |  2 +-
 .../com/willfp/ecoenchants/nms/BlockBreak.java     |  2 +-
 .../com/willfp/ecoenchants/nms/ChatComponent.java  |  2 +-
 .../java/com/willfp/ecoenchants/nms/Cooldown.java  |  2 +-
 .../com/willfp/ecoenchants/nms/OpenInventory.java  |  2 +-
 .../com/willfp/ecoenchants/nms/RepairCost.java     |  2 +-
 .../com/willfp/ecoenchants/nms/TridentStack.java   |  2 +-
 .../willfp/ecoenchants/util/internal/Loader.java   | 14 ++++++++++++++
 31 files changed, 44 insertions(+), 30 deletions(-)
 rename NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_15_R1/BlockBreak.java (91%)
 rename NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_15_R1/ChatComponent.java (82%)
 rename NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_15_R1/Cooldown.java (90%)
 rename NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_15_R1/OpenInventory.java (88%)
 rename NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_15_R1/RepairCost.java (94%)
 rename NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_15_R1/TridentStack.java (92%)
 rename NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R1/BlockBreak.java (91%)
 rename NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R1/ChatComponent.java (98%)
 rename NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R1/Cooldown.java (85%)
 rename NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R1/OpenInventory.java (88%)
 rename NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R1/RepairCost.java (94%)
 rename NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R1/TridentStack.java (92%)
 rename NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R2/BlockBreak.java (91%)
 rename NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R2/ChatComponent.java (98%)
 rename NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R2/Cooldown.java (85%)
 rename NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R2/OpenInventory.java (88%)
 rename NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R2/RepairCost.java (94%)
 rename NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R2/TridentStack.java (92%)
 rename NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R3/BlockBreak.java (91%)
 rename NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R3/ChatComponent.java (98%)
 rename NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R3/Cooldown.java (85%)
 rename NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R3/OpenInventory.java (88%)
 rename NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R3/RepairCost.java (94%)
 rename NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/{ => nms}/v1_16_R3/TridentStack.java (92%)

diff --git a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/BlockBreak.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/BlockBreak.java
similarity index 91%
rename from NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/BlockBreak.java
rename to NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/BlockBreak.java
index f925b914..be1b50fd 100644
--- a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/BlockBreak.java
+++ b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/BlockBreak.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_15_R1;
+package com.willfp.ecoenchants.nms.v1_15_R1;
 
 import com.willfp.ecoenchants.nms.api.BlockBreakWrapper;
 import net.minecraft.server.v1_15_R1.BlockPosition;
diff --git a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/ChatComponent.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/ChatComponent.java
similarity index 82%
rename from NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/ChatComponent.java
rename to NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/ChatComponent.java
index 2c3e9c48..b7d4f9ec 100644
--- a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/ChatComponent.java
+++ b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/ChatComponent.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_15_R1;
+package com.willfp.ecoenchants.nms.v1_15_R1;
 
 import com.willfp.ecoenchants.nms.api.ChatComponentWrapper;
 
diff --git a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Cooldown.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/Cooldown.java
similarity index 90%
rename from NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Cooldown.java
rename to NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/Cooldown.java
index b329cb8a..6cc7b9d0 100644
--- a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Cooldown.java
+++ b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/Cooldown.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_15_R1;
+package com.willfp.ecoenchants.nms.v1_15_R1;
 
 import com.willfp.ecoenchants.nms.api.CooldownWrapper;
 import net.minecraft.server.v1_15_R1.EntityHuman;
diff --git a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/OpenInventory.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/OpenInventory.java
similarity index 88%
rename from NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/OpenInventory.java
rename to NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/OpenInventory.java
index 075912d4..0fbc0188 100644
--- a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/OpenInventory.java
+++ b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/OpenInventory.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_15_R1;
+package com.willfp.ecoenchants.nms.v1_15_R1;
 
 import com.willfp.ecoenchants.nms.api.OpenInventoryWrapper;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
diff --git a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/RepairCost.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/RepairCost.java
similarity index 94%
rename from NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/RepairCost.java
rename to NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/RepairCost.java
index 7dfc61c7..2f6b89d7 100644
--- a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/RepairCost.java
+++ b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/RepairCost.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_15_R1;
+package com.willfp.ecoenchants.nms.v1_15_R1;
 
 import com.willfp.ecoenchants.nms.api.RepairCostWrapper;
 import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
diff --git a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/TridentStack.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/TridentStack.java
similarity index 92%
rename from NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/TridentStack.java
rename to NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/TridentStack.java
index 0ebbd973..1a28aea8 100644
--- a/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/TridentStack.java
+++ b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/nms/v1_15_R1/TridentStack.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_15_R1;
+package com.willfp.ecoenchants.nms.v1_15_R1;
 
 import com.willfp.ecoenchants.nms.api.TridentStackWrapper;
 import net.minecraft.server.v1_15_R1.EntityThrownTrident;
diff --git a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/BlockBreak.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/BlockBreak.java
similarity index 91%
rename from NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/BlockBreak.java
rename to NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/BlockBreak.java
index 70856e74..908bc7e0 100644
--- a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/BlockBreak.java
+++ b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/BlockBreak.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R1;
+package com.willfp.ecoenchants.nms.v1_16_R1;
 
 import com.willfp.ecoenchants.nms.api.BlockBreakWrapper;
 import net.minecraft.server.v1_16_R1.BlockPosition;
diff --git a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/ChatComponent.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/ChatComponent.java
similarity index 98%
rename from NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/ChatComponent.java
rename to NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/ChatComponent.java
index dce5fad0..42544028 100644
--- a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/ChatComponent.java
+++ b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/ChatComponent.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R1;
+package com.willfp.ecoenchants.nms.v1_16_R1;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
diff --git a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/Cooldown.java
similarity index 85%
rename from NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java
rename to NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/Cooldown.java
index 9f8c26ba..03cb1530 100644
--- a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java
+++ b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/Cooldown.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R1;
+package com.willfp.ecoenchants.nms.v1_16_R1;
 
 import com.willfp.ecoenchants.nms.api.CooldownWrapper;
 import org.bukkit.entity.Player;
diff --git a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/OpenInventory.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/OpenInventory.java
similarity index 88%
rename from NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/OpenInventory.java
rename to NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/OpenInventory.java
index f0fc021c..75a08d03 100644
--- a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/OpenInventory.java
+++ b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/OpenInventory.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R1;
+package com.willfp.ecoenchants.nms.v1_16_R1;
 
 import com.willfp.ecoenchants.nms.api.OpenInventoryWrapper;
 import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
diff --git a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/RepairCost.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/RepairCost.java
similarity index 94%
rename from NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/RepairCost.java
rename to NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/RepairCost.java
index 04201cb1..01e02d9c 100644
--- a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/RepairCost.java
+++ b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/RepairCost.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R1;
+package com.willfp.ecoenchants.nms.v1_16_R1;
 
 import com.willfp.ecoenchants.nms.api.RepairCostWrapper;
 import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
diff --git a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/TridentStack.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/TridentStack.java
similarity index 92%
rename from NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/TridentStack.java
rename to NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/TridentStack.java
index afff874a..e7fb04b0 100644
--- a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/TridentStack.java
+++ b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/nms/v1_16_R1/TridentStack.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R1;
+package com.willfp.ecoenchants.nms.v1_16_R1;
 
 import com.willfp.ecoenchants.nms.api.TridentStackWrapper;
 import net.minecraft.server.v1_16_R1.EntityThrownTrident;
diff --git a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/BlockBreak.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/BlockBreak.java
similarity index 91%
rename from NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/BlockBreak.java
rename to NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/BlockBreak.java
index 4f94bfa8..84075549 100644
--- a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/BlockBreak.java
+++ b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/BlockBreak.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R2;
+package com.willfp.ecoenchants.nms.v1_16_R2;
 
 import com.willfp.ecoenchants.nms.api.BlockBreakWrapper;
 import net.minecraft.server.v1_16_R2.BlockPosition;
diff --git a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/ChatComponent.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/ChatComponent.java
similarity index 98%
rename from NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/ChatComponent.java
rename to NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/ChatComponent.java
index 751b1f95..09ae234c 100644
--- a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/ChatComponent.java
+++ b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/ChatComponent.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R2;
+package com.willfp.ecoenchants.nms.v1_16_R2;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
diff --git a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Cooldown.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/Cooldown.java
similarity index 85%
rename from NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Cooldown.java
rename to NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/Cooldown.java
index 709c32b8..42de97f1 100644
--- a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Cooldown.java
+++ b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/Cooldown.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R2;
+package com.willfp.ecoenchants.nms.v1_16_R2;
 
 import com.willfp.ecoenchants.nms.api.CooldownWrapper;
 import org.bukkit.entity.Player;
diff --git a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/OpenInventory.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/OpenInventory.java
similarity index 88%
rename from NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/OpenInventory.java
rename to NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/OpenInventory.java
index 49df5e3e..e3877256 100644
--- a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/OpenInventory.java
+++ b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/OpenInventory.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R2;
+package com.willfp.ecoenchants.nms.v1_16_R2;
 
 import com.willfp.ecoenchants.nms.api.OpenInventoryWrapper;
 import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPlayer;
diff --git a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/RepairCost.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/RepairCost.java
similarity index 94%
rename from NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/RepairCost.java
rename to NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/RepairCost.java
index aa622488..051489d2 100644
--- a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/RepairCost.java
+++ b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/RepairCost.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R2;
+package com.willfp.ecoenchants.nms.v1_16_R2;
 
 import com.willfp.ecoenchants.nms.api.RepairCostWrapper;
 import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
diff --git a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/TridentStack.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/TridentStack.java
similarity index 92%
rename from NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/TridentStack.java
rename to NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/TridentStack.java
index f9aeeb9e..e9f65bdf 100644
--- a/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/TridentStack.java
+++ b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/nms/v1_16_R2/TridentStack.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R2;
+package com.willfp.ecoenchants.nms.v1_16_R2;
 
 import com.willfp.ecoenchants.nms.api.TridentStackWrapper;
 import net.minecraft.server.v1_16_R2.EntityThrownTrident;
diff --git a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/BlockBreak.java b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/BlockBreak.java
similarity index 91%
rename from NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/BlockBreak.java
rename to NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/BlockBreak.java
index 71f69031..f15c9f4c 100644
--- a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/BlockBreak.java
+++ b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/BlockBreak.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R3;
+package com.willfp.ecoenchants.nms.v1_16_R3;
 
 import com.willfp.ecoenchants.nms.api.BlockBreakWrapper;
 import net.minecraft.server.v1_16_R3.BlockPosition;
diff --git a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/ChatComponent.java b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/ChatComponent.java
similarity index 98%
rename from NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/ChatComponent.java
rename to NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/ChatComponent.java
index ae9b17dc..479e273f 100644
--- a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/ChatComponent.java
+++ b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/ChatComponent.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R3;
+package com.willfp.ecoenchants.nms.v1_16_R3;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
diff --git a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/Cooldown.java b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/Cooldown.java
similarity index 85%
rename from NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/Cooldown.java
rename to NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/Cooldown.java
index fda4ba97..429c7cda 100644
--- a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/Cooldown.java
+++ b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/Cooldown.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R3;
+package com.willfp.ecoenchants.nms.v1_16_R3;
 
 import com.willfp.ecoenchants.nms.api.CooldownWrapper;
 import org.bukkit.entity.Player;
diff --git a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/OpenInventory.java b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/OpenInventory.java
similarity index 88%
rename from NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/OpenInventory.java
rename to NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/OpenInventory.java
index 38b70936..1caa92c3 100644
--- a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/OpenInventory.java
+++ b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/OpenInventory.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R3;
+package com.willfp.ecoenchants.nms.v1_16_R3;
 
 import com.willfp.ecoenchants.nms.api.OpenInventoryWrapper;
 import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
diff --git a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/RepairCost.java b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/RepairCost.java
similarity index 94%
rename from NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/RepairCost.java
rename to NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/RepairCost.java
index c4e34d8f..3696dc53 100644
--- a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/RepairCost.java
+++ b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/RepairCost.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R3;
+package com.willfp.ecoenchants.nms.v1_16_R3;
 
 import com.willfp.ecoenchants.nms.api.RepairCostWrapper;
 import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
diff --git a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/TridentStack.java b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/TridentStack.java
similarity index 92%
rename from NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/TridentStack.java
rename to NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/TridentStack.java
index b98435d8..8cc79ac4 100644
--- a/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/v1_16_R3/TridentStack.java
+++ b/NMS/v1_16_R3/src/main/java/com/willfp/ecoenchants/nms/v1_16_R3/TridentStack.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.v1_16_R3;
+package com.willfp.ecoenchants.nms.v1_16_R3;
 
 import com.willfp.ecoenchants.nms.api.TridentStackWrapper;
 import net.minecraft.server.v1_16_R3.EntityThrownTrident;
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/nms/BlockBreak.java b/Plugin/src/main/java/com/willfp/ecoenchants/nms/BlockBreak.java
index b99fdfac..f54b03ed 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/BlockBreak.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/BlockBreak.java
@@ -25,7 +25,7 @@ public class BlockBreak {
 
     static {
         try {
-            final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".BlockBreak");
+            final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".BlockBreak");
             if (BlockBreakWrapper.class.isAssignableFrom(class2)) {
                 blockBreakWrapper = (BlockBreakWrapper) class2.getConstructor().newInstance();
             }
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/nms/ChatComponent.java b/Plugin/src/main/java/com/willfp/ecoenchants/nms/ChatComponent.java
index b1b3117c..3dcc527a 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/ChatComponent.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/ChatComponent.java
@@ -27,7 +27,7 @@ public class ChatComponent {
 
     static {
         try {
-            final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".ChatComponent");
+            final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".ChatComponent");
             if (ChatComponentWrapper.class.isAssignableFrom(class2)) {
                 chatComponentWrapper = (ChatComponentWrapper) class2.getConstructor().newInstance();
             }
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java b/Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java
index 770b02dc..74a96800 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java
@@ -25,7 +25,7 @@ public class Cooldown {
 
     static {
         try {
-            final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".Cooldown");
+            final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".Cooldown");
             if (CooldownWrapper.class.isAssignableFrom(class2)) {
                 cooldown = (CooldownWrapper) class2.getConstructor().newInstance();
             }
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/nms/OpenInventory.java b/Plugin/src/main/java/com/willfp/ecoenchants/nms/OpenInventory.java
index e2e26b4c..e3f0cb3b 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/OpenInventory.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/OpenInventory.java
@@ -24,7 +24,7 @@ public class OpenInventory {
 
     static {
         try {
-            final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".OpenInventory");
+            final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".OpenInventory");
             if (OpenInventoryWrapper.class.isAssignableFrom(class2)) {
                 openInventoryWrapper = (OpenInventoryWrapper) class2.getConstructor().newInstance();
             }
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/nms/RepairCost.java b/Plugin/src/main/java/com/willfp/ecoenchants/nms/RepairCost.java
index c9b99ff2..b86541ed 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/RepairCost.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/RepairCost.java
@@ -35,7 +35,7 @@ public class RepairCost {
 
     static {
         try {
-            final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".RepairCost");
+            final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".RepairCost");
             if (RepairCostWrapper.class.isAssignableFrom(class2)) {
                 repairCostWrapper = (RepairCostWrapper) class2.getConstructor().newInstance();
             }
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java b/Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java
index e4044e72..cdceb93f 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java
@@ -26,7 +26,7 @@ public class TridentStack {
 
     static {
         try {
-            final Class<?> class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".TridentStack");
+            final Class<?> class2 = Class.forName("com.willfp.ecoenchants.nms." + EcoEnchantsPlugin.NMS_VERSION + ".TridentStack");
             if (TridentStackWrapper.class.isAssignableFrom(class2)) {
                 tridentStackWrapper = (TridentStackWrapper) class2.getConstructor().newInstance();
             }
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java
index 9e436810..244cbc0a 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java
@@ -80,6 +80,20 @@ public class Loader {
         Logger.info("");
         Logger.info("==========================================");
 
+        /*
+        Check server version is supported
+         */
+
+        if(!Arrays.asList(
+                "v1_15_R1",
+                "v1_16_R1",
+                "v1_16_R2",
+                "v1_16_R3"
+        ).contains(EcoEnchantsPlugin.NMS_VERSION)) {
+            Logger.error("Your server version (" + EcoEnchantsPlugin.NMS_VERSION + ") is not supported!");
+            Bukkit.getPluginManager().disablePlugin(EcoEnchantsPlugin.getInstance());
+        }
+
         /*
         Load Configs
          */