From e5061f9856d45a3b725d31fc1ffbc9d0ba9aa1b9 Mon Sep 17 00:00:00 2001
From: Jakob K <bluefireolymp@gmail.com>
Date: Tue, 15 Jun 2021 16:57:21 +0200
Subject: [PATCH] Update nms and craftbukkit imports

---
 src/main/kotlin/net/axay/kspigot/data/NBTData.kt            | 4 ++--
 src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt      | 6 +++---
 src/main/kotlin/net/axay/kspigot/data/NBTDataType.kt        | 2 +-
 .../net/axay/kspigot/extensions/bukkit/EntityExtensions.kt  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/net/axay/kspigot/data/NBTData.kt b/src/main/kotlin/net/axay/kspigot/data/NBTData.kt
index a395fa2f..e65dae15 100644
--- a/src/main/kotlin/net/axay/kspigot/data/NBTData.kt
+++ b/src/main/kotlin/net/axay/kspigot/data/NBTData.kt
@@ -3,8 +3,8 @@
 package net.axay.kspigot.data
 
 import net.axay.kspigot.annotations.NMS_General
-import net.minecraft.server.v1_16_R3.MojangsonParser
-import net.minecraft.server.v1_16_R3.NBTTagCompound
+import net.minecraft.nbt.MojangsonParser
+import net.minecraft.nbt.NBTTagCompound
 
 @NMS_General
 class NBTData {
diff --git a/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt b/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt
index 61c58bdb..ab93dbd7 100644
--- a/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt
+++ b/src/main/kotlin/net/axay/kspigot/data/NBTDataLoader.kt
@@ -1,9 +1,9 @@
 package net.axay.kspigot.data
 
 import net.axay.kspigot.annotations.NMS_General
-import net.minecraft.server.v1_16_R3.NBTTagCompound
-import org.bukkit.craftbukkit.v1_16_R3.entity.CraftEntity
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack
+import net.minecraft.nbt.NBTTagCompound
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftEntity
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftItemStack
 import org.bukkit.entity.Entity
 import org.bukkit.inventory.ItemStack
 
diff --git a/src/main/kotlin/net/axay/kspigot/data/NBTDataType.kt b/src/main/kotlin/net/axay/kspigot/data/NBTDataType.kt
index 007daa16..e1bb023b 100644
--- a/src/main/kotlin/net/axay/kspigot/data/NBTDataType.kt
+++ b/src/main/kotlin/net/axay/kspigot/data/NBTDataType.kt
@@ -1,7 +1,7 @@
 package net.axay.kspigot.data
 
 import net.axay.kspigot.annotations.NMS_General
-import net.minecraft.server.v1_16_R3.*
+import net.minecraft.nbt.*
 
 @NMS_General
 interface NBTDataType<T> {
diff --git a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt
index 0ba9ee06..5503321d 100644
--- a/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt
+++ b/src/main/kotlin/net/axay/kspigot/extensions/bukkit/EntityExtensions.kt
@@ -9,7 +9,7 @@ import net.md_5.bungee.api.ChatMessageType
 import org.bukkit.Location
 import org.bukkit.Material
 import org.bukkit.attribute.Attribute
-import org.bukkit.craftbukkit.v1_16_R3.CraftWorld
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld
 import org.bukkit.entity.*
 import org.bukkit.inventory.EquipmentSlot
 import org.bukkit.inventory.ItemStack