From 18a2c3c993e3a61adf6d6c769ed2cf3483c499ac Mon Sep 17 00:00:00 2001
From: Tim <timstewartj@gmail.com>
Date: Sat, 11 Dec 2021 11:28:27 -0800
Subject: [PATCH 1/2] update to 1.18

---
 dependency-reduced-pom.xml                    | 14 +++++++++--
 pom.xml                                       | 24 +++++++++++++++----
 .../energeticstorage/tasks/HopperTask.java    |  3 ++-
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 5a02ce9..da057dc 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -59,6 +59,10 @@
       <id>codemc-repo</id>
       <url>https://repo.codemc.org/repository/maven-public/</url>
     </repository>
+    <repository>
+      <id>minecraft-repo</id>
+      <url>https://libraries.minecraft.net/</url>
+    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -69,8 +73,14 @@
   <dependencies>
     <dependency>
       <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
-      <version>1.14-R0.1-SNAPSHOT</version>
+      <artifactId>spigot-api</artifactId>
+      <version>1.18.1-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.15.2-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 35f0a6f..b5405f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,26 +88,37 @@
             <id>codemc-snapshots</id>
             <url>https://repo.codemc.io/repository/maven-snapshots/</url>
         </repository>-->
+        <repository>
+            <id>minecraft-repo</id>
+            <url>https://libraries.minecraft.net/</url>
+            <layout>default</layout>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.14-R0.1-SNAPSHOT</version>
+            <artifactId>spigot-api</artifactId>
+            <version>1.18.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>1.15.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>de.tr7zw</groupId>
             <artifactId>item-nbt-api</artifactId>
-            <version>2.8.0</version>
+            <version>2.9.0-SNAPSHOT</version>
         </dependency>
         <!-- This is currently compiled by myself with some fixes for anything older than Java 16.
         Its compiled from SeanOMik/AnvilGUI on github -->
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
+            <version>1.5.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -124,5 +135,10 @@
             <artifactId>annotations</artifactId>
             <version>13.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>authlib</artifactId>
+            <version>1.5.21</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/net/seanomik/energeticstorage/tasks/HopperTask.java b/src/main/java/net/seanomik/energeticstorage/tasks/HopperTask.java
index 40e9ee4..69766ac 100644
--- a/src/main/java/net/seanomik/energeticstorage/tasks/HopperTask.java
+++ b/src/main/java/net/seanomik/energeticstorage/tasks/HopperTask.java
@@ -8,10 +8,11 @@ import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.libs.jline.internal.Nullable;
+// import org.bukkit.craftbukkit.libs.jline.internal.Nullable;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 

From 5b8adfcc12b4a363178dab3f9700a71447e3fbc5 Mon Sep 17 00:00:00 2001
From: Tim <timstewartj@gmail.com>
Date: Sat, 11 Dec 2021 11:38:41 -0800
Subject: [PATCH 2/2] clean up

---
 dependency-reduced-pom.xml                                | 6 ------
 pom.xml                                                   | 8 +-------
 .../net/seanomik/energeticstorage/tasks/HopperTask.java   | 1 -
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index da057dc..37aab48 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -77,12 +77,6 @@
       <version>1.18.1-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.15.2-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
   <properties>
     <java.version>1.8</java.version>
diff --git a/pom.xml b/pom.xml
index b5405f2..5a3a972 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,12 +102,6 @@
             <version>1.18.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>de.tr7zw</groupId>
             <artifactId>item-nbt-api</artifactId>
@@ -118,7 +112,7 @@
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.5.3-SNAPSHOT</version>
+            <version>1.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
diff --git a/src/main/java/net/seanomik/energeticstorage/tasks/HopperTask.java b/src/main/java/net/seanomik/energeticstorage/tasks/HopperTask.java
index 69766ac..ee215ca 100644
--- a/src/main/java/net/seanomik/energeticstorage/tasks/HopperTask.java
+++ b/src/main/java/net/seanomik/energeticstorage/tasks/HopperTask.java
@@ -8,7 +8,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-// import org.bukkit.craftbukkit.libs.jline.internal.Nullable;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;