diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index ed85fc027..94dc73cd9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -37,10 +37,15 @@ public class TileMod extends TileEntity implements ITickable { return ret; } + @Nonnull + @Override + public final NBTTagCompound getUpdateTag() { + return writeToNBT(new NBTTagCompound()); + } + @Override public void readFromNBT(NBTTagCompound par1nbtTagCompound) { super.readFromNBT(par1nbtTagCompound); - readCustomNBT(par1nbtTagCompound); } @@ -53,10 +58,8 @@ public class TileMod extends TileEntity implements ITickable { } @Override - public SPacketUpdateTileEntity getUpdatePacket() { - NBTTagCompound nbttagcompound = new NBTTagCompound(); - writeCustomNBT(nbttagcompound); - return new SPacketUpdateTileEntity(pos, -999, nbttagcompound); + public final SPacketUpdateTileEntity getUpdatePacket() { + return new SPacketUpdateTileEntity(pos, -999, getUpdateTag()); } @Override diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 1fa3d4ce0..0945cfeb4 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -27,9 +27,6 @@ public class Item16Colors extends ItemMod implements IColorable { @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par1ItemStack.getItemDamage() >= EnumDyeColor.values().length) - return 0xFFFFFF; - return EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()).getMapColor().colorValue; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index d32df0770..e45d26be7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -91,10 +91,6 @@ public class ItemSignalFlare extends ItemMod implements IColorable { if(par2 == 0) return 0xFFFFFF; - int colorv = getColor(par1ItemStack); - if(colorv >= EnumDyeColor.values().length || colorv < 0) - return 0xFFFFFF; - return EnumDyeColor.byMetadata(getColor(par1ItemStack)).getMapColor().colorValue; }