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

properly import skins that weren't set with a player name

Browse source
This commit is contained in:
Pyrbu 2023-08-05 20:53:10 +02:00
parent 580478173f
commit 31e64a15fe
2 changed files with 16 additions and 0 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

@ -27,8 +27,10 @@ import lol.pyr.znpcsplus.npc.NpcImpl;
import lol.pyr.znpcsplus.npc.NpcTypeRegistryImpl; import lol.pyr.znpcsplus.npc.NpcTypeRegistryImpl;
import lol.pyr.znpcsplus.packets.PacketFactory; import lol.pyr.znpcsplus.packets.PacketFactory;
import lol.pyr.znpcsplus.scheduling.TaskScheduler; import lol.pyr.znpcsplus.scheduling.TaskScheduler;
import lol.pyr.znpcsplus.skin.Skin;
import lol.pyr.znpcsplus.skin.cache.MojangSkinCache; import lol.pyr.znpcsplus.skin.cache.MojangSkinCache;
import lol.pyr.znpcsplus.skin.descriptor.FetchingDescriptor; import lol.pyr.znpcsplus.skin.descriptor.FetchingDescriptor;
import lol.pyr.znpcsplus.skin.descriptor.PrefetchedDescriptor;
import lol.pyr.znpcsplus.util.BungeeConnector; import lol.pyr.znpcsplus.util.BungeeConnector;
import lol.pyr.znpcsplus.util.ItemSerializationUtil; import lol.pyr.znpcsplus.util.ItemSerializationUtil;
import lol.pyr.znpcsplus.util.NpcLocation; import lol.pyr.znpcsplus.util.NpcLocation;
@ -123,6 +125,9 @@ public class ZNpcImporter implements DataImporter {
if (model.getSkinName() != null) { if (model.getSkinName() != null) {
npc.setProperty(propertyRegistry.getByName("skin", SkinDescriptor.class), new FetchingDescriptor(skinCache, model.getSkinName())); npc.setProperty(propertyRegistry.getByName("skin", SkinDescriptor.class), new FetchingDescriptor(skinCache, model.getSkinName()));
} }
else if (model.getSkin() != null && model.getSignature() != null) {
npc.setProperty(propertyRegistry.getByName("skin", SkinDescriptor.class), new PrefetchedDescriptor(new Skin(model.getSkin(), model.getSignature())));
}
NpcEntryImpl entry = new NpcEntryImpl(String.valueOf(model.getId()), npc); NpcEntryImpl entry = new NpcEntryImpl(String.valueOf(model.getId()), npc);
entry.enableEverything(); entry.enableEverything();

11
plugin/src/main/java/lol/pyr/znpcsplus/conversion/znpcs/model/ZNpcsModel.java
View file

@ -10,6 +10,9 @@ public class ZNpcsModel {
private UUID uuid; private UUID uuid;
private double hologramHeight; private double hologramHeight;
private String skinName; private String skinName;
private String skin;
private String signature;
private String glowName; private String glowName;
private ZNpcsLocation location; private ZNpcsLocation location;
private String npcType; private String npcType;
@ -57,4 +60,12 @@ public class ZNpcsModel {
public Map<String, String[]> getCustomizationMap() { public Map<String, String[]> getCustomizationMap() {
return customizationMap; return customizationMap;
} }
public String getSkin() {
return skin;
}
public String getSignature() {
return signature;
}
} }