From 3021a8ba65c0ced8f767436e15ecfd943948b5ee Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Tue, 22 Jun 2021 19:57:03 -0400
Subject: [PATCH] Update for 1.17

---
 .idea/compiler.xml                            |  2 +-
 .idea/jarRepositories.xml                     |  5 ++++
 dependency-reduced-pom.xml                    | 17 +++++++----
 pom.xml                                       | 30 +++++++++----------
 .../energeticstorage/utils/Utils.java         |  2 +-
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 9c41e5e..32af5e9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,7 +11,7 @@
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="EnergeticStorage" target="1.8" />
-      <module name="energeticstorage" target="1.8" />
+      <module name="energeticstorage" target="8" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a709c9e..535dcae 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -41,5 +41,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="apache.snapshots" />
+      <option name="name" value="apache.snapshots" />
+      <option name="url" value="https://repository.apache.org/snapshots/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 6021957..3ab5378 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>net.seanomik</groupId>
   <artifactId>energeticstorage</artifactId>
   <name>EnergeticStorage</name>
-  <version>0.4-SNAPSHOT</version>
+  <version>0.7-SNAPSHOT</version>
   <build>
     <defaultGoal>clean package</defaultGoal>
     <resources>
@@ -24,7 +24,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.3.0-SNAPSHOT</version>
         <executions>
           <execution>
             <id>shade</id>
@@ -39,6 +39,7 @@
                   <shadedPattern>de.tr7zw.nbtapi.energeticstorage</shadedPattern>
                 </relocation>
               </relocations>
+              <outputFile>D:\Code\java\spigotPlugins\servers\${server.version}\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
             </configuration>
           </execution>
         </executions>
@@ -59,10 +60,16 @@
       <url>https://repo.codemc.org/repository/maven-public/</url>
     </repository>
     <repository>
-      <id>jitpack.io</id>
-      <url>https://jitpack.io</url>
+      <id>codemc-snapshots</id>
+      <url>https://repo.codemc.io/repository/maven-snapshots/</url>
     </repository>
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache.snapshots</id>
+      <url>https://repository.apache.org/snapshots/</url>
+    </pluginRepository>
+  </pluginRepositories>
   <dependencies>
     <dependency>
       <groupId>org.spigotmc</groupId>
@@ -74,6 +81,6 @@
   <properties>
     <java.version>1.8</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <server.version>1.17</server.version>
   </properties>
 </project>
-
diff --git a/pom.xml b/pom.xml
index a8b34f5..b4923e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.seanomik</groupId>
     <artifactId>energeticstorage</artifactId>
-    <version>0.6.1-SNAPSHOT</version>
+    <version>0.7-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>EnergeticStorage</name>
@@ -14,6 +14,7 @@
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <server.version>1.17</server.version>
     </properties>
 
     <build>
@@ -31,7 +32,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.3.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>shade</id>
@@ -47,18 +48,7 @@
                                 </relocation>
                             </relocations>
 
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.14.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.15.2_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.1_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.2_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.3_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
-                            <outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.5_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_PAPER_1.16.1_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_PAPER_1.16.2_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_PAPER_1.16.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
-
+                            <outputFile>D:\Code\java\spigotPlugins\servers\${server.version}\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
                         </configuration>
                     </execution>
                 </executions>
@@ -72,6 +62,14 @@
         </resources>
     </build>
 
+    <!-- For maven-shade-plugin 3.3.0-SNAPSHOT -->
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <url>https://repository.apache.org/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <repositories>
         <repository>
             <id>spigotmc-repo</id>
@@ -102,12 +100,12 @@
         <dependency>
             <groupId>de.tr7zw</groupId>
             <artifactId>item-nbt-api</artifactId>
-            <version>2.7.1</version>
+            <version>2.8.0</version>
         </dependency>
         <dependency>
             <groupId>net.wesjd</groupId>
             <artifactId>anvilgui</artifactId>
-            <version>1.5.0-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/utils/Utils.java b/src/main/java/net/seanomik/energeticstorage/utils/Utils.java
index 7477e10..193a912 100644
--- a/src/main/java/net/seanomik/energeticstorage/utils/Utils.java
+++ b/src/main/java/net/seanomik/energeticstorage/utils/Utils.java
@@ -136,7 +136,7 @@ public class Utils {
         String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
 
         NBTCompound ownerNBT;
-        if (version.startsWith("v1_16")) {
+        if (blockNBT.hasKey("SkullOwner")) {
             ownerNBT = blockNBT.getCompound("SkullOwner");
         } else {
             ownerNBT = blockNBT.getCompound("Owner");