From c94f928f5e48ce53e0f768296bb14635421454d0 Mon Sep 17 00:00:00 2001 From: Kam Date: Sat, 15 Feb 2025 17:14:40 -0500 Subject: [PATCH] Brush Color Tag --- src/main/java/noppes/npcs/blocks/tiles/TileColorable.java | 6 ++++-- src/main/java/noppes/npcs/blocks/tiles/TileVariant.java | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileColorable.java b/src/main/java/noppes/npcs/blocks/tiles/TileColorable.java index d40f6bf71..2f1d7f978 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileColorable.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileColorable.java @@ -8,18 +8,20 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesUtilServer; import noppes.npcs.items.ItemNpcTool; +import static noppes.npcs.items.ItemNpcTool.BRUSH_COLOR_TAG; + public class TileColorable extends TileVariant { public int color = 0xFFFFFF; public void readFromNBT(NBTTagCompound compound){ super.readFromNBT(compound); - color = compound.getInteger("BrushColor"); + color = compound.getInteger(BRUSH_COLOR_TAG); } public void writeToNBT(NBTTagCompound compound){ super.writeToNBT(compound); - compound.setInteger("BrushColor", color); + compound.setInteger(BRUSH_COLOR_TAG, color); } public void setColor(int color){ diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java b/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java index 9a1d83359..e6c57c968 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java @@ -8,6 +8,8 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import static noppes.npcs.items.ItemNpcTool.BRUSH_COLOR_TAG; + public class TileVariant extends TileEntity { public static int variantVersion = 1; @@ -67,7 +69,7 @@ public class TileVariant extends TileEntity { if(compound.hasKey("BannerColor")){ int bannerColor = compound.getInteger("BannerColor"); if(isColorTile(tileEntity)){ - compound.setInteger("BrushColor", ColorUtil.colorTableInts[bannerColor]); + compound.setInteger(BRUSH_COLOR_TAG, ColorUtil.colorTableInts[bannerColor]); } compound.setInteger("CNPCVariant", bannerColor); fixMade = true;