Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

fix saving by using bukkit itemstack in znpcs importer

Browse source
This commit is contained in:
Pyrbu 2023-08-28 15:43:02 +02:00
parent 197ffaa50b
commit 98b1d45966
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/ZNpcImporter.java
View file

@ -1,11 +1,9 @@
package lol.pyr.znpcsplus.conversion.znpcs; package lol.pyr.znpcsplus.conversion.znpcs;
import com.github.retrooper.packetevents.protocol.item.ItemStack;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import io.github.retrooper.packetevents.util.SpigotConversionUtil;
import lol.pyr.znpcsplus.api.interaction.InteractionType; import lol.pyr.znpcsplus.api.interaction.InteractionType;
import lol.pyr.znpcsplus.api.skin.SkinDescriptor; import lol.pyr.znpcsplus.api.skin.SkinDescriptor;
import lol.pyr.znpcsplus.config.ConfigManager; 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.platform.bukkit.BukkitAudiences;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.inventory.ItemStack;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@ -116,7 +115,7 @@ public class ZNpcImporter implements DataImporter {
for (Map.Entry<String, String> entry : model.getNpcEquip().entrySet()) { for (Map.Entry<String, String> entry : model.getNpcEquip().entrySet()) {
EntityPropertyImpl<ItemStack> property = propertyRegistry.getByName(entry.getKey(), ItemStack.class); EntityPropertyImpl<ItemStack> property = propertyRegistry.getByName(entry.getKey(), ItemStack.class);
if (property == null) continue; if (property == null) continue;
npc.setProperty(property, SpigotConversionUtil.fromBukkitItemStack(ItemSerializationUtil.itemFromB64(entry.getValue()))); npc.setProperty(property, ItemSerializationUtil.itemFromB64(entry.getValue()));
} }
if (model.getSkinName() != null) { if (model.getSkinName() != null) {

1
plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
View file

@ -54,7 +54,6 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
registerType("look", false); registerType("look", false);
registerType("dinnerbone", 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("helmet", ItemStack.class);
registerType("chestplate", ItemStack.class); registerType("chestplate", ItemStack.class);
registerType("leggings", ItemStack.class); registerType("leggings", ItemStack.class);