From fea61a382d388e48ff2a0b3fd17c8ff5a035de1d Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Mon, 12 Oct 2020 18:45:24 +0100
Subject: [PATCH] Refactored modules

---
 .../willfp/ecoenchants/{ => nms}/API/BlockBreakWrapper.java | 2 +-
 .../willfp/ecoenchants/{ => nms}/API/CooldownWrapper.java   | 2 +-
 .../ecoenchants/{ => nms}/API/TridentStackWrapper.java      | 2 +-
 NMS/v1_15_R1/pom.xml                                        | 6 ++++++
 .../java/com/willfp/ecoenchants/v1_15_R1/BlockBreak.java    | 2 +-
 .../main/java/com/willfp/ecoenchants/v1_15_R1/Cooldown.java | 2 +-
 .../java/com/willfp/ecoenchants/v1_15_R1/TridentStack.java  | 2 +-
 NMS/v1_16_R1/pom.xml                                        | 6 ++++++
 .../java/com/willfp/ecoenchants/v1_16_R1/BlockBreak.java    | 2 +-
 .../main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java | 2 +-
 .../java/com/willfp/ecoenchants/v1_16_R1/TridentStack.java  | 2 +-
 NMS/v1_16_R2/pom.xml                                        | 6 ++++++
 .../java/com/willfp/ecoenchants/v1_16_R2/BlockBreak.java    | 2 +-
 .../main/java/com/willfp/ecoenchants/v1_16_R2/Cooldown.java | 2 +-
 .../java/com/willfp/ecoenchants/v1_16_R2/TridentStack.java  | 2 +-
 .../main/java/com/willfp/ecoenchants/nms/BlockBreak.java    | 2 +-
 .../src/main/java/com/willfp/ecoenchants/nms/Cooldown.java  | 2 +-
 .../main/java/com/willfp/ecoenchants/nms/TridentStack.java  | 2 +-
 18 files changed, 33 insertions(+), 15 deletions(-)
 rename API/src/main/java/com/willfp/ecoenchants/{ => nms}/API/BlockBreakWrapper.java (79%)
 rename API/src/main/java/com/willfp/ecoenchants/{ => nms}/API/CooldownWrapper.java (74%)
 rename API/src/main/java/com/willfp/ecoenchants/{ => nms}/API/TridentStackWrapper.java (80%)

diff --git a/API/src/main/java/com/willfp/ecoenchants/API/BlockBreakWrapper.java b/API/src/main/java/com/willfp/ecoenchants/nms/API/BlockBreakWrapper.java
similarity index 79%
rename from API/src/main/java/com/willfp/ecoenchants/API/BlockBreakWrapper.java
rename to API/src/main/java/com/willfp/ecoenchants/nms/API/BlockBreakWrapper.java
index d99f0da4..561aa81d 100644
--- a/API/src/main/java/com/willfp/ecoenchants/API/BlockBreakWrapper.java
+++ b/API/src/main/java/com/willfp/ecoenchants/nms/API/BlockBreakWrapper.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.API;
+package com.willfp.ecoenchants.nms.API;
 
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
diff --git a/API/src/main/java/com/willfp/ecoenchants/API/CooldownWrapper.java b/API/src/main/java/com/willfp/ecoenchants/nms/API/CooldownWrapper.java
similarity index 74%
rename from API/src/main/java/com/willfp/ecoenchants/API/CooldownWrapper.java
rename to API/src/main/java/com/willfp/ecoenchants/nms/API/CooldownWrapper.java
index 7ae09dd8..48f23635 100644
--- a/API/src/main/java/com/willfp/ecoenchants/API/CooldownWrapper.java
+++ b/API/src/main/java/com/willfp/ecoenchants/nms/API/CooldownWrapper.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.API;
+package com.willfp.ecoenchants.nms.API;
 
 import org.bukkit.entity.Player;
 
diff --git a/API/src/main/java/com/willfp/ecoenchants/API/TridentStackWrapper.java b/API/src/main/java/com/willfp/ecoenchants/nms/API/TridentStackWrapper.java
similarity index 80%
rename from API/src/main/java/com/willfp/ecoenchants/API/TridentStackWrapper.java
rename to API/src/main/java/com/willfp/ecoenchants/nms/API/TridentStackWrapper.java
index c9730900..d84e588c 100644
--- a/API/src/main/java/com/willfp/ecoenchants/API/TridentStackWrapper.java
+++ b/API/src/main/java/com/willfp/ecoenchants/nms/API/TridentStackWrapper.java
@@ -1,4 +1,4 @@
-package com.willfp.ecoenchants.API;
+package com.willfp.ecoenchants.nms.API;
 
 import org.bukkit.entity.Trident;
 import org.bukkit.inventory.ItemStack;
diff --git a/NMS/v1_15_R1/pom.xml b/NMS/v1_15_R1/pom.xml
index 46a9b218..bdc811d3 100644
--- a/NMS/v1_15_R1/pom.xml
+++ b/NMS/v1_15_R1/pom.xml
@@ -25,5 +25,11 @@
             <version>1.15.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.willfp.ecoenchants</groupId>
+            <artifactId>Interfacing</artifactId>
+            <version>5.0.0-beta25</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
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/v1_15_R1/BlockBreak.java
index aec6ebb1..b9311e59 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/v1_15_R1/BlockBreak.java
@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.v1_15_R1;
 
-import com.willfp.ecoenchants.API.BlockBreakWrapper;
+import com.willfp.ecoenchants.nms.API.BlockBreakWrapper;
 import net.minecraft.server.v1_15_R1.BlockPosition;
 import org.bukkit.block.Block;
 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/Cooldown.java b/NMS/v1_15_R1/src/main/java/com/willfp/ecoenchants/v1_15_R1/Cooldown.java
index ef226faa..369fd232 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/v1_15_R1/Cooldown.java
@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.v1_15_R1;
 
-import com.willfp.ecoenchants.API.CooldownWrapper;
+import com.willfp.ecoenchants.nms.API.CooldownWrapper;
 import net.minecraft.server.v1_15_R1.EntityHuman;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
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/v1_15_R1/TridentStack.java
index 855f71a3..04835c13 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/v1_15_R1/TridentStack.java
@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.v1_15_R1;
 
-import com.willfp.ecoenchants.API.TridentStackWrapper;
+import com.willfp.ecoenchants.nms.API.TridentStackWrapper;
 import net.minecraft.server.v1_15_R1.EntityThrownTrident;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftTrident;
 import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
diff --git a/NMS/v1_16_R1/pom.xml b/NMS/v1_16_R1/pom.xml
index 54ea000b..a27a3c9a 100644
--- a/NMS/v1_16_R1/pom.xml
+++ b/NMS/v1_16_R1/pom.xml
@@ -25,5 +25,11 @@
             <version>1.16.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.willfp.ecoenchants</groupId>
+            <artifactId>Interfacing</artifactId>
+            <version>5.0.0-beta25</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
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/v1_16_R1/BlockBreak.java
index fb1e6311..6158fb82 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/v1_16_R1/BlockBreak.java
@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.v1_16_R1;
 
-import com.willfp.ecoenchants.API.BlockBreakWrapper;
+import com.willfp.ecoenchants.nms.API.BlockBreakWrapper;
 import net.minecraft.server.v1_16_R1.BlockPosition;
 import org.bukkit.block.Block;
 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/Cooldown.java b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java
index bbeed521..ff48e706 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/v1_16_R1/Cooldown.java
@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.v1_16_R1;
 
-import com.willfp.ecoenchants.API.CooldownWrapper;
+import com.willfp.ecoenchants.nms.API.CooldownWrapper;
 import org.bukkit.entity.Player;
 
 public class Cooldown implements CooldownWrapper {
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/v1_16_R1/TridentStack.java
index 1aea3eee..8c0ee96e 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/v1_16_R1/TridentStack.java
@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.v1_16_R1;
 
-import com.willfp.ecoenchants.API.TridentStackWrapper;
+import com.willfp.ecoenchants.nms.API.TridentStackWrapper;
 import net.minecraft.server.v1_16_R1.EntityThrownTrident;
 import org.bukkit.craftbukkit.v1_16_R1.entity.CraftTrident;
 import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
diff --git a/NMS/v1_16_R2/pom.xml b/NMS/v1_16_R2/pom.xml
index 26e755b1..bcb40f78 100644
--- a/NMS/v1_16_R2/pom.xml
+++ b/NMS/v1_16_R2/pom.xml
@@ -25,5 +25,11 @@
             <version>1.16.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.willfp.ecoenchants</groupId>
+            <artifactId>Interfacing</artifactId>
+            <version>5.0.0-beta25</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
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/v1_16_R2/BlockBreak.java
index 19416eda..d06d7550 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/v1_16_R2/BlockBreak.java
@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.v1_16_R2;
 
-import com.willfp.ecoenchants.API.BlockBreakWrapper;
+import com.willfp.ecoenchants.nms.API.BlockBreakWrapper;
 import net.minecraft.server.v1_16_R2.BlockPosition;
 import org.bukkit.block.Block;
 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/Cooldown.java b/NMS/v1_16_R2/src/main/java/com/willfp/ecoenchants/v1_16_R2/Cooldown.java
index 78474e01..a37febc8 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/v1_16_R2/Cooldown.java
@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.v1_16_R2;
 
-import com.willfp.ecoenchants.API.CooldownWrapper;
+import com.willfp.ecoenchants.nms.API.CooldownWrapper;
 import org.bukkit.entity.Player;
 
 public class Cooldown implements CooldownWrapper {
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/v1_16_R2/TridentStack.java
index 43f5d8c4..dc9a5981 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/v1_16_R2/TridentStack.java
@@ -1,6 +1,6 @@
 package com.willfp.ecoenchants.v1_16_R2;
 
-import com.willfp.ecoenchants.API.TridentStackWrapper;
+import com.willfp.ecoenchants.nms.API.TridentStackWrapper;
 import net.minecraft.server.v1_16_R2.EntityThrownTrident;
 import org.bukkit.craftbukkit.v1_16_R2.entity.CraftTrident;
 import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
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 63181e4a..175e7405 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/BlockBreak.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/BlockBreak.java
@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.nms;
 
 
-import com.willfp.ecoenchants.API.BlockBreakWrapper;
+import com.willfp.ecoenchants.nms.API.BlockBreakWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
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 d5028177..062910fd 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java
@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.nms;
 
 
-import com.willfp.ecoenchants.API.CooldownWrapper;
+import com.willfp.ecoenchants.nms.API.CooldownWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
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 3f83345d..a135fc17 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java
@@ -1,7 +1,7 @@
 package com.willfp.ecoenchants.nms;
 
 
-import com.willfp.ecoenchants.API.TridentStackWrapper;
+import com.willfp.ecoenchants.nms.API.TridentStackWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Trident;
 import org.bukkit.inventory.ItemStack;