diff --git a/src/main/java/slimeknights/mantle/tileentity/IRetexturedTileEntity.java b/src/main/java/slimeknights/mantle/tileentity/IRetexturedTileEntity.java index 39a3a7b..71fb1cf 100644 --- a/src/main/java/slimeknights/mantle/tileentity/IRetexturedTileEntity.java +++ b/src/main/java/slimeknights/mantle/tileentity/IRetexturedTileEntity.java @@ -3,7 +3,9 @@ package slimeknights.mantle.tileentity; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.model.data.IModelData; +import net.minecraftforge.common.util.Constants.NBT; import slimeknights.mantle.client.model.data.SinglePropertyData; import slimeknights.mantle.util.RetexturedHelper; @@ -52,4 +54,15 @@ public interface IRetexturedTileEntity { } return new SinglePropertyData<>(RetexturedHelper.BLOCK_PROPERTY, block); } + + /** Adds the NBT to the update tag, intended to be called in {@link TileEntity#getUpdateTag()} */ + default void writeTextureToUpdateTag(CompoundNBT nbt) { + String textureName = getTextureName(); + if (!textureName.isEmpty()) { + if (!nbt.contains("ForgeData", NBT.TAG_COMPOUND)) { + nbt.put("ForgeData", new CompoundNBT()); + } + RetexturedHelper.setTexture(nbt.getCompound("ForgeData"), textureName); + } + } } diff --git a/src/main/java/slimeknights/mantle/tileentity/RetexturedTileEntity.java b/src/main/java/slimeknights/mantle/tileentity/RetexturedTileEntity.java index 007c6fd..ba410c0 100644 --- a/src/main/java/slimeknights/mantle/tileentity/RetexturedTileEntity.java +++ b/src/main/java/slimeknights/mantle/tileentity/RetexturedTileEntity.java @@ -1,7 +1,6 @@ package slimeknights.mantle.tileentity; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.LazyValue; import net.minecraftforge.client.model.data.IModelData; @@ -9,7 +8,7 @@ import net.minecraftforge.client.model.data.IModelData; /** * Minimal implementation for {@link IRetexturedTileEntity}, use alongside {@link slimeknights.mantle.block.RetexturedBlock} and {@link slimeknights.mantle.item.RetexturedBlockItem} */ -public class RetexturedTileEntity extends TileEntity implements IRetexturedTileEntity { +public class RetexturedTileEntity extends MantleTileEntity implements IRetexturedTileEntity { /** Lazy value of model data as it will not change after first fetch */ private final LazyValue data = new LazyValue<>(this::getRetexturedModelData); @@ -22,9 +21,16 @@ public class RetexturedTileEntity extends TileEntity implements IRetexturedTileE return data.getValue(); } + @Override + protected boolean shouldSyncOnUpdate() { + return true; + } + @Override public CompoundNBT getUpdateTag() { - // new tag instead of super since default implementation calls the super of writeToNBT - return write(new CompoundNBT()); + // already included in regular NBT as this lives in ForgeData, just copy to the update tag + CompoundNBT nbt = super.getUpdateTag(); + writeTextureToUpdateTag(nbt); + return nbt; } }