diff --git a/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/MixinDataDisplay.java b/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/MixinDataDisplay.java new file mode 100644 index 0000000..43e75f4 --- /dev/null +++ b/src/main/java/com/goodbird/cnpcgeckoaddon/mixin/MixinDataDisplay.java @@ -0,0 +1,40 @@ +package com.goodbird.cnpcgeckoaddon.mixin; + +import com.goodbird.cnpcgeckoaddon.data.CustomModelData; +import com.goodbird.cnpcgeckoaddon.entity.EntityCustomModel; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.DataDisplay; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityNPCInterface; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(DataDisplay.class) +public class MixinDataDisplay { + + @Shadow public EntityNPCInterface npc; + @Unique + private final CustomModelData customNPC_Gecko_Addon$customModelData = new CustomModelData(); + + @Inject(method = "writeToNBT", at = @At("HEAD")) + public void writeToNBT(NBTTagCompound nbttagcompound, CallbackInfoReturnable cir) { + if(customNPC_Gecko_Addon$hasCustomModel()) + customNPC_Gecko_Addon$customModelData.writeToNBT(nbttagcompound); + } + + @Inject(method = "readToNBT", at = @At("HEAD")) + public void readFromNBT(NBTTagCompound nbttagcompound, CallbackInfo ci){ + customNPC_Gecko_Addon$customModelData.readFromNBT(nbttagcompound); + } + + @Unique + public boolean customNPC_Gecko_Addon$hasCustomModel() { + return (npc instanceof EntityCustomNpc) && ((EntityCustomNpc) npc).modelData.getEntity(npc) != null && + ((EntityCustomNpc) npc).modelData.getEntity(npc) instanceof EntityCustomModel; + } +} diff --git a/src/main/resources/mixins.cnpcgeckoaddon.json b/src/main/resources/mixins.cnpcgeckoaddon.json index 366cb87..ebe5a18 100644 --- a/src/main/resources/mixins.cnpcgeckoaddon.json +++ b/src/main/resources/mixins.cnpcgeckoaddon.json @@ -5,7 +5,9 @@ "refmap": "mixins.cnpcgeckoaddon.refmap.json", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8", - "mixins": [], + "mixins": [ + "MixinDataDisplay" + ], "client": [ "MixinRenderNPCInterface" ],