From d58dc5d26a58fbde9fb7cc97739592df948ce8f3 Mon Sep 17 00:00:00 2001
From: Olivoz <lucas.sivars@gmail.com>
Date: Fri, 28 Aug 2020 21:22:26 +0200
Subject: [PATCH 1/3] Cleanup gitignore

---
 .gitignore            | 27 +++++++++++++++++++--------
 API/API.iml           | 13 ++++++++++---
 Plugin/plugin.iml     | 23 ++++++++++-------------
 parent.iml            |  3 ---
 v1_15_R1/v1_15_R1.iml | 12 +++++++++---
 v1_16_R1/v1_16_R1.iml | 12 +++++++++---
 v1_16_R2/v1_16_R2.iml | 12 +++++++++---
 7 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index ae56322e..8d9a4331 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,19 @@
-# Project exclude paths
-/API/target/
-/Plugin/target/
-/v1_15_R1/target/
-/v1_16_R1/target/
-/v1_16_R2/target/
-/Plugin/src/main/java/com/willfp/ecoenchants/task/
-/.idea/
+# Java
+*.class
+
+# Eclipse IDE
+.settings/
+bin/
+.classpath
+.project
+
+# IntelliJ IDEA
+.idea/
+*.iml
+
+# Maven
+target/
+dependency-reduced-pom.xml
+
+# Mac OSX
+.DS_Store
\ No newline at end of file
diff --git a/API/API.iml b/API/API.iml
index 63f4fef7..037b2212 100644
--- a/API/API.iml
+++ b/API/API.iml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/Plugin/plugin.iml b/Plugin/plugin.iml
index 3871ed48..a8176037 100644
--- a/Plugin/plugin.iml
+++ b/Plugin/plugin.iml
@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$/../Expansions/src/main/java">
-      <sourceFolder url="file://$MODULE_DIR$/../Expansions/src/main/java" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../Expansions/src/main/resources">
-      <sourceFolder url="file://$MODULE_DIR$/../Expansions/src/main/resources" type="java-resource" />
-    </content>
-    <content url="file://$MODULE_DIR$/../Expansions/src/test/java">
-      <sourceFolder url="file://$MODULE_DIR$/../Expansions/src/test/java" isTestSource="true" />
-    </content>
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="API" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
-    <orderEntry type="library" name="Maven: com.willfp.ecoenchants:API:4.1.0-pre11" level="project" />
+    <orderEntry type="module" module-name="API" />
     <orderEntry type="module" module-name="v1_15_R1" />
     <orderEntry type="module" module-name="v1_16_R1" />
     <orderEntry type="module" module-name="v1_16_R2" />
diff --git a/parent.iml b/parent.iml
index c035f0b0..f409c0ea 100644
--- a/parent.iml
+++ b/parent.iml
@@ -4,9 +4,6 @@
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/v1_15_R1/v1_15_R1.iml b/v1_15_R1/v1_15_R1.iml
index 172eaa90..22003c99 100644
--- a/v1_15_R1/v1_15_R1.iml
+++ b/v1_15_R1/v1_15_R1.iml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="API" />
-    <orderEntry type="library" name="Maven: com.willfp.ecoenchants:API:4.1.0-pre11" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
diff --git a/v1_16_R1/v1_16_R1.iml b/v1_16_R1/v1_16_R1.iml
index 03b34990..e3a0d803 100644
--- a/v1_16_R1/v1_16_R1.iml
+++ b/v1_16_R1/v1_16_R1.iml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="API" />
-    <orderEntry type="library" name="Maven: com.willfp.ecoenchants:API:4.1.0-pre11" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
diff --git a/v1_16_R2/v1_16_R2.iml b/v1_16_R2/v1_16_R2.iml
index 210cbd1a..556dd766 100644
--- a/v1_16_R2/v1_16_R2.iml
+++ b/v1_16_R2/v1_16_R2.iml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="API" />
-    <orderEntry type="library" name="Maven: com.willfp.ecoenchants:API:4.1.0-pre11" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />

From 7b3f33077f481407070d4951ef4c7ebd98a30267 Mon Sep 17 00:00:00 2001
From: Olivoz <lucas.sivars@gmail.com>
Date: Fri, 28 Aug 2020 21:24:03 +0200
Subject: [PATCH 2/3] NMS Relocation

Move all NMS files to their own folder
---
 {v1_15_R1 => NMS/v1_15_R1}/pom.xml            |  0
 .../ecoenchants/v1_15_R1/BlockBreak.java      |  0
 .../willfp/ecoenchants/v1_15_R1/Cooldown.java |  0
 .../v1_15_R1/CraftEnchantWrapper.java         |  0
 .../ecoenchants/v1_15_R1/NMSEnchant.java      |  0
 .../v1_15_R1/NMSEnchantManager.java           |  0
 .../willfp/ecoenchants/v1_15_R1/Target.java   |  0
 .../ecoenchants/v1_15_R1/TridentStack.java    |  0
 {v1_16_R1 => NMS/v1_16_R1}/pom.xml            |  0
 .../ecoenchants/v1_16_R1/BlockBreak.java      |  0
 .../willfp/ecoenchants/v1_16_R1/Cooldown.java |  0
 .../v1_16_R1/CraftEnchantWrapper.java         |  0
 .../ecoenchants/v1_16_R1/NMSEnchant.java      |  0
 .../v1_16_R1/NMSEnchantManager.java           |  0
 .../willfp/ecoenchants/v1_16_R1/Target.java   |  0
 .../ecoenchants/v1_16_R1/TridentStack.java    |  0
 {v1_16_R2 => NMS/v1_16_R2}/pom.xml            |  0
 .../ecoenchants/v1_16_R2/BlockBreak.java      |  0
 .../willfp/ecoenchants/v1_16_R2/Cooldown.java |  0
 .../v1_16_R2/CraftEnchantWrapper.java         |  0
 .../ecoenchants/v1_16_R2/NMSEnchant.java      |  0
 .../v1_16_R2/NMSEnchantManager.java           |  0
 .../willfp/ecoenchants/v1_16_R2/Target.java   |  0
 .../ecoenchants/v1_16_R2/TridentStack.java    |  0
 v1_15_R1/v1_15_R1.iml                         | 30 -------------------
 v1_16_R1/v1_16_R1.iml                         | 30 -------------------
 v1_16_R2/v1_16_R2.iml                         | 30 -------------------
 27 files changed, 90 deletions(-)
 rename {v1_15_R1 => NMS/v1_15_R1}/pom.xml (100%)
 rename {v1_15_R1 => NMS/v1_15_R1}/src/main/java/com/willfp/ecoenchants/v1_15_R1/BlockBreak.java (100%)
 rename {v1_15_R1 => NMS/v1_15_R1}/src/main/java/com/willfp/ecoenchants/v1_15_R1/Cooldown.java (100%)
 rename {v1_15_R1 => NMS/v1_15_R1}/src/main/java/com/willfp/ecoenchants/v1_15_R1/CraftEnchantWrapper.java (100%)
 rename {v1_15_R1 => NMS/v1_15_R1}/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchant.java (100%)
 rename {v1_15_R1 => NMS/v1_15_R1}/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchantManager.java (100%)
 rename {v1_15_R1 => NMS/v1_15_R1}/src/main/java/com/willfp/ecoenchants/v1_15_R1/Target.java (100%)
 rename {v1_15_R1 => NMS/v1_15_R1}/src/main/java/com/willfp/ecoenchants/v1_15_R1/TridentStack.java (100%)
 rename {v1_16_R1 => NMS/v1_16_R1}/pom.xml (100%)
 rename {v1_16_R1 => NMS/v1_16_R1}/src/main/java/com/willfp/ecoenchants/v1_16_R1/BlockBreak.java (100%)
 rename {v1_16_R1 => NMS/v1_16_R1}/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java (100%)
 rename {v1_16_R1 => NMS/v1_16_R1}/src/main/java/com/willfp/ecoenchants/v1_16_R1/CraftEnchantWrapper.java (100%)
 rename {v1_16_R1 => NMS/v1_16_R1}/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchant.java (100%)
 rename {v1_16_R1 => NMS/v1_16_R1}/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchantManager.java (100%)
 rename {v1_16_R1 => NMS/v1_16_R1}/src/main/java/com/willfp/ecoenchants/v1_16_R1/Target.java (100%)
 rename {v1_16_R1 => NMS/v1_16_R1}/src/main/java/com/willfp/ecoenchants/v1_16_R1/TridentStack.java (100%)
 rename {v1_16_R2 => NMS/v1_16_R2}/pom.xml (100%)
 rename {v1_16_R2 => NMS/v1_16_R2}/src/main/java/com/willfp/ecoenchants/v1_16_R2/BlockBreak.java (100%)
 rename {v1_16_R2 => NMS/v1_16_R2}/src/main/java/com/willfp/ecoenchants/v1_16_R2/Cooldown.java (100%)
 rename {v1_16_R2 => NMS/v1_16_R2}/src/main/java/com/willfp/ecoenchants/v1_16_R2/CraftEnchantWrapper.java (100%)
 rename {v1_16_R2 => NMS/v1_16_R2}/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchant.java (100%)
 rename {v1_16_R2 => NMS/v1_16_R2}/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchantManager.java (100%)
 rename {v1_16_R2 => NMS/v1_16_R2}/src/main/java/com/willfp/ecoenchants/v1_16_R2/Target.java (100%)
 rename {v1_16_R2 => NMS/v1_16_R2}/src/main/java/com/willfp/ecoenchants/v1_16_R2/TridentStack.java (100%)
 delete mode 100644 v1_15_R1/v1_15_R1.iml
 delete mode 100644 v1_16_R1/v1_16_R1.iml
 delete mode 100644 v1_16_R2/v1_16_R2.iml

diff --git a/v1_15_R1/pom.xml b/NMS/v1_15_R1/pom.xml
similarity index 100%
rename from v1_15_R1/pom.xml
rename to NMS/v1_15_R1/pom.xml
diff --git a/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/v1_15_R1/BlockBreak.java
similarity index 100%
rename from 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/v1_15_R1/BlockBreak.java
diff --git a/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/v1_15_R1/Cooldown.java
similarity index 100%
rename from 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/v1_15_R1/Cooldown.java
diff --git a/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/CraftEnchantWrapper.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/CraftEnchantWrapper.java
similarity index 100%
rename from v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/CraftEnchantWrapper.java
rename to NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/CraftEnchantWrapper.java
diff --git a/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchant.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchant.java
similarity index 100%
rename from v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchant.java
rename to NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchant.java
diff --git a/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchantManager.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchantManager.java
similarity index 100%
rename from v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchantManager.java
rename to NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/NMSEnchantManager.java
diff --git a/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
similarity index 100%
rename from v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Target.java
rename to NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Target.java
diff --git a/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/v1_15_R1/TridentStack.java
similarity index 100%
rename from 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/v1_15_R1/TridentStack.java
diff --git a/v1_16_R1/pom.xml b/NMS/v1_16_R1/pom.xml
similarity index 100%
rename from v1_16_R1/pom.xml
rename to NMS/v1_16_R1/pom.xml
diff --git a/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/v1_16_R1/BlockBreak.java
similarity index 100%
rename from 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/v1_16_R1/BlockBreak.java
diff --git a/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/v1_16_R1/Cooldown.java
similarity index 100%
rename from 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/v1_16_R1/Cooldown.java
diff --git a/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/CraftEnchantWrapper.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/CraftEnchantWrapper.java
similarity index 100%
rename from v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/CraftEnchantWrapper.java
rename to NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/CraftEnchantWrapper.java
diff --git a/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchant.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchant.java
similarity index 100%
rename from v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchant.java
rename to NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchant.java
diff --git a/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchantManager.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchantManager.java
similarity index 100%
rename from v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchantManager.java
rename to NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/NMSEnchantManager.java
diff --git a/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
similarity index 100%
rename from v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Target.java
rename to NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Target.java
diff --git a/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/v1_16_R1/TridentStack.java
similarity index 100%
rename from 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/v1_16_R1/TridentStack.java
diff --git a/v1_16_R2/pom.xml b/NMS/v1_16_R2/pom.xml
similarity index 100%
rename from v1_16_R2/pom.xml
rename to NMS/v1_16_R2/pom.xml
diff --git a/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/v1_16_R2/BlockBreak.java
similarity index 100%
rename from 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/v1_16_R2/BlockBreak.java
diff --git a/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/v1_16_R2/Cooldown.java
similarity index 100%
rename from 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/v1_16_R2/Cooldown.java
diff --git a/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/CraftEnchantWrapper.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/CraftEnchantWrapper.java
similarity index 100%
rename from v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/CraftEnchantWrapper.java
rename to NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/CraftEnchantWrapper.java
diff --git a/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchant.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchant.java
similarity index 100%
rename from v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchant.java
rename to NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchant.java
diff --git a/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchantManager.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchantManager.java
similarity index 100%
rename from v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchantManager.java
rename to NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/NMSEnchantManager.java
diff --git a/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
similarity index 100%
rename from v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Target.java
rename to NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Target.java
diff --git a/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/v1_16_R2/TridentStack.java
similarity index 100%
rename from 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/v1_16_R2/TridentStack.java
diff --git a/v1_15_R1/v1_15_R1.iml b/v1_15_R1/v1_15_R1.iml
deleted file mode 100644
index 22003c99..00000000
--- a/v1_15_R1/v1_15_R1.iml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>SPIGOT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="API" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.15-R0.1-SNAPSHOT" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/v1_16_R1/v1_16_R1.iml b/v1_16_R1/v1_16_R1.iml
deleted file mode 100644
index e3a0d803..00000000
--- a/v1_16_R1/v1_16_R1.iml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>SPIGOT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="API" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.16.1-R0.1-SNAPSHOT" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/v1_16_R2/v1_16_R2.iml b/v1_16_R2/v1_16_R2.iml
deleted file mode 100644
index 556dd766..00000000
--- a/v1_16_R2/v1_16_R2.iml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>SPIGOT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="API" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.16.2-R0.1-SNAPSHOT" level="project" />
-  </component>
-</module>
\ No newline at end of file

From 984059a84e2b04a249b719be7bf8930c69cf658b Mon Sep 17 00:00:00 2001
From: Olivoz <lucas.sivars@gmail.com>
Date: Fri, 28 Aug 2020 23:23:14 +0200
Subject: [PATCH 3/3] Pom changes

Minor changes for the POMs.
Now Minimizing jar.
Untested if this will cause issues. Doubt this is the case
---
 API/pom.xml          |  6 ------
 NMS/v1_15_R1/pom.xml |  7 ++-----
 NMS/v1_16_R1/pom.xml |  7 ++-----
 NMS/v1_16_R2/pom.xml |  7 ++-----
 Plugin/pom.xml       | 31 +++++++++++++++++++++++++++----
 pom.xml              | 17 ++++++-----------
 6 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/API/pom.xml b/API/pom.xml
index 79e09fa2..f2be6757 100644
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -10,15 +10,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <artifactId>API</artifactId>
     <name>EcoEnchants API</name>
-    <packaging>jar</packaging>
 
-    <version>${project.parent.version}</version>
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
diff --git a/NMS/v1_15_R1/pom.xml b/NMS/v1_15_R1/pom.xml
index 1a7def3c..4618a5ca 100644
--- a/NMS/v1_15_R1/pom.xml
+++ b/NMS/v1_15_R1/pom.xml
@@ -6,21 +6,18 @@
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
         <version>4.1.0-pre11</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>v1_15_R1</artifactId>
 
-    <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.willfp.ecoenchants</groupId>
             <artifactId>API</artifactId>
             <version>${project.parent.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
diff --git a/NMS/v1_16_R1/pom.xml b/NMS/v1_16_R1/pom.xml
index ed31ee4f..47c30ac8 100644
--- a/NMS/v1_16_R1/pom.xml
+++ b/NMS/v1_16_R1/pom.xml
@@ -6,21 +6,18 @@
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
         <version>4.1.0-pre11</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>v1_16_R1</artifactId>
 
-    <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.willfp.ecoenchants</groupId>
             <artifactId>API</artifactId>
             <version>${project.parent.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
diff --git a/NMS/v1_16_R2/pom.xml b/NMS/v1_16_R2/pom.xml
index 209a9efd..28d68f42 100644
--- a/NMS/v1_16_R2/pom.xml
+++ b/NMS/v1_16_R2/pom.xml
@@ -6,21 +6,18 @@
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
         <version>4.1.0-pre11</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>v1_16_R2</artifactId>
 
-    <properties>
-        <main.basedir>${project.parent.basedir}</main.basedir>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.willfp.ecoenchants</groupId>
             <artifactId>API</artifactId>
             <version>${project.parent.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
diff --git a/Plugin/pom.xml b/Plugin/pom.xml
index 947fab65..0ca924c9 100644
--- a/Plugin/pom.xml
+++ b/Plugin/pom.xml
@@ -21,7 +21,6 @@
     </properties>
 
     <build>
-        <defaultGoal>clean package install</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -35,7 +34,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -43,6 +42,28 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <artifactSet>
+                                <excludes>org.codehaus.plexus:plexus-utils</excludes>
+                            </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.jetbrains.annotations</pattern>
+                                    <shadedPattern>com.willfp.ecoenchants.shaded.annotations</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.apache.maven</pattern>
+                                    <shadedPattern>com.willfp.ecoenchants.shaded.maven</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <minimizeJar>true</minimizeJar>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                         </configuration>
                     </execution>
@@ -70,7 +91,7 @@
                 <executions>
                     <execution>
                         <id>install-external-non-maven1-jar</id>
-                        <phase>clean</phase>
+                        <phase>compile</phase>
                         <configuration>
                             <repositoryLayout>default</repositoryLayout>
                             <groupId>n3kas.ae</groupId>
@@ -86,7 +107,7 @@
                     </execution>
                     <execution>
                         <id>install-external-non-maven2-jar</id>
-                        <phase>clean</phase>
+                        <phase>compile</phase>
                         <configuration>
                             <repositoryLayout>default</repositoryLayout>
                             <groupId>me.vagdedes</groupId>
@@ -153,12 +174,14 @@
             <artifactId>worldguard-bukkit</artifactId>
             <version>7.0.4-SNAPSHOT</version>
             <scope>provided</scope>
+            <!--
             <exclusions>
                 <exclusion>
                     <groupId>com.destroystokyo.paper</groupId>
                     <artifactId>paper-api</artifactId>
                 </exclusion>
             </exclusions>
+            -->
         </dependency>
         <dependency>
             <groupId>com.github.TechFortress</groupId>
diff --git a/pom.xml b/pom.xml
index 12abefb4..930654af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,11 +11,11 @@
     <name>EcoEnchants Parent</name>
 
     <modules>
-        <module>Plugin</module>
-        <module>v1_15_R1</module>
         <module>API</module>
-        <module>v1_16_R1</module>
-        <module>v1_16_R2</module>
+        <module>NMS/v1_15_R1</module>
+        <module>NMS/v1_16_R1</module>
+        <module>NMS/v1_16_R2</module>
+		<module>Plugin</module>
     </modules>
 
     <properties>
@@ -28,10 +28,6 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
-        <repository>
-            <id>maven-central</id>
-            <url>https://repo1.maven.org/maven2/</url>
-        </repository>
         <repository>
             <id>CodeMC</id>
             <url>https://repo.codemc.org/repository/maven-public</url>
@@ -68,9 +64,8 @@
 
 
     <build>
-        <defaultGoal>clean package install</defaultGoal>
-        <finalName>${project.name} v${project.parent.version}</finalName>
-        <sourceDirectory>src/main/java</sourceDirectory>
+        <finalName>${project.name} v${project.version}</finalName>
+        <defaultGoal>clean install</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>