From 98b1d459668cacc04dc3535a5b397640f03f8f11 Mon Sep 17 00:00:00 2001
From: Pyrbu <pyrmcserver@gmail.com>
Date: Mon, 28 Aug 2023 15:43:02 +0200
Subject: [PATCH] fix saving by using bukkit itemstack in znpcs importer

---
 .../lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java     | 5 ++---
 .../lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java b/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java
index 8ecb963..eef3c72 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java
@@ -1,11 +1,9 @@
 package lol.pyr.znpcsplus.conversion.znpcs;
 
-import com.github.retrooper.packetevents.protocol.item.ItemStack;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import io.github.retrooper.packetevents.util.SpigotConversionUtil;
 import lol.pyr.znpcsplus.api.interaction.InteractionType;
 import lol.pyr.znpcsplus.api.skin.SkinDescriptor;
 import lol.pyr.znpcsplus.config.ConfigManager;
@@ -36,6 +34,7 @@ import lol.pyr.znpcsplus.util.NpcLocation;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.inventory.ItemStack;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -116,7 +115,7 @@ public class ZNpcImporter implements DataImporter {
             for (Map.Entry<String, String> entry : model.getNpcEquip().entrySet()) {
                 EntityPropertyImpl<ItemStack> property = propertyRegistry.getByName(entry.getKey(), ItemStack.class);
                 if (property == null) continue;
-                npc.setProperty(property, SpigotConversionUtil.fromBukkitItemStack(ItemSerializationUtil.itemFromB64(entry.getValue())));
+                npc.setProperty(property, ItemSerializationUtil.itemFromB64(entry.getValue()));
             }
 
             if (model.getSkinName() != null) {
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
index 8e89b46..27c10eb 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
@@ -54,7 +54,6 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
         registerType("look", false);
         registerType("dinnerbone", false);
 
-        // TODO: make all of these bukkit itemstack classes so api users wont have to add packetevents as a dependency
         registerType("helmet", ItemStack.class);
         registerType("chestplate", ItemStack.class);
         registerType("leggings", ItemStack.class);