From a86ab2b84db7f05d3d6268e7b7cb91c0b4e81436 Mon Sep 17 00:00:00 2001 From: Goodbird Date: Mon, 19 Feb 2024 20:37:38 +0300 Subject: [PATCH] Linked the custom tint data class to the DataDisplay --- src/main/java/noppes/npcs/DataDisplay.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/noppes/npcs/DataDisplay.java b/src/main/java/noppes/npcs/DataDisplay.java index ca5b640dd..2c977d3f4 100644 --- a/src/main/java/noppes/npcs/DataDisplay.java +++ b/src/main/java/noppes/npcs/DataDisplay.java @@ -11,6 +11,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.StringUtils; import noppes.npcs.config.ConfigMain; import noppes.npcs.controllers.data.AnimationData; +import noppes.npcs.controllers.data.CustomTintData; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.data.DataSkinOverlays; @@ -61,12 +62,15 @@ public class DataDisplay { //0 - Yes, 1 - No, 2 - Only NPCs, 3 - Only Players, 4 - NPCs and Players public int collidesWith = 1; + public CustomTintData customTintData; + public DataDisplay(EntityNPCInterface npc){ this.npc = npc; markovGeneratorId = new Random().nextInt(CustomNpcs.MARKOV_GENERATOR.length-1); skinOverlayData = new DataSkinOverlays(npc); name = getRandomName(); animationData = new AnimationData(this); + customTintData = new CustomTintData(); } public String getRandomName() { @@ -89,6 +93,8 @@ public class DataDisplay { nbttagcompound = animationData.writeToNBT(nbttagcompound); + nbttagcompound = customTintData.writeToNBT(nbttagcompound); + if (this.playerProfile != null) { NBTTagCompound nbttagcompound1 = new NBTTagCompound(); @@ -166,6 +172,8 @@ public class DataDisplay { animationData.readFromNBT(nbttagcompound); + customTintData.readFromNBT(nbttagcompound); + modelSize = ValueUtil.clamp(nbttagcompound.getInteger("Size"), 1, Integer.MAX_VALUE); if(modelSize > ConfigMain.NpcSizeLimit) modelSize = ConfigMain.NpcSizeLimit;