From 407d14f709614a8d54a566c57979984f303992b1 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Sun, 13 Jun 2021 14:36:45 -0500
Subject: [PATCH 1/2] Support 1.17

---
 pom.xml                                                | 10 ++++++++--
 .../com/songoda/ultimatekits/utils/ItemSerializer.java |  8 +++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 87d9686..e4d2d6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,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>shaded</id>
@@ -83,6 +83,12 @@
             </plugin>
         </plugins>
     </build>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <url>https://repository.apache.org/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
     <repositories>
         <repository>
             <id>public</id>
@@ -97,7 +103,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.16.1</version>
+            <version>1.17</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/com/songoda/ultimatekits/utils/ItemSerializer.java b/src/main/java/com/songoda/ultimatekits/utils/ItemSerializer.java
index 22aefd2..9169e55 100644
--- a/src/main/java/com/songoda/ultimatekits/utils/ItemSerializer.java
+++ b/src/main/java/com/songoda/ultimatekits/utils/ItemSerializer.java
@@ -1,5 +1,6 @@
 package com.songoda.ultimatekits.utils;
 
+import com.songoda.core.compatibility.ClassMapping;
 import com.songoda.core.compatibility.ServerVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.inventory.ItemStack;
@@ -38,10 +39,11 @@ public class ItemSerializer {
      */
     static  {
         try {
-            classMojangsonParser = Class.forName(formatNMS("net.minecraft.server.NMS.MojangsonParser"));
-            classItemStack = Class.forName(formatNMS("net.minecraft.server.NMS.ItemStack"));
+            classMojangsonParser = Class.forName(ServerVersion.isServerVersionAtLeast(ServerVersion.V1_17)
+                    ? "net.minecraft.nbt.MojangsonParser" : formatNMS("net.minecraft.server.NMS.MojangsonParser"));
+            classItemStack = ClassMapping.ITEM_STACK.getClazz();
             classCraftItemStack = Class.forName(formatNMS("org.bukkit.craftbukkit.NMS.inventory.CraftItemStack"));
-            classNBTTagCompound = Class.forName(formatNMS("net.minecraft.server.NMS.NBTTagCompound"));
+            classNBTTagCompound = ClassMapping.NBT_TAG_COMPOUND.getClazz();
             classBukkitItemStack = Class.forName("org.bukkit.inventory.ItemStack");
             methodParseString = classMojangsonParser.getMethod("parse", String.class);
 

From 455fcc33a44d99a1ebf1890d05b1cd9eb41eb620 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Sun, 13 Jun 2021 13:48:29 -0500
Subject: [PATCH 2/2] version 2.6.17

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e4d2d6f..5205e52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <groupId>com.songoda</groupId>
     <artifactId>UltimateKits</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>2.6.16</version>
+    <version>2.6.17</version>
     <build>
         <defaultGoal>clean install</defaultGoal>
         <finalName>UltimateKits-${project.version}</finalName>