diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 0d17f69ca..f222821a1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -26,6 +26,7 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IBaubleRender; +import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.item.IBaubleRender.RenderType; import vazkii.botania.api.item.ICosmeticAttachable; @@ -74,6 +75,12 @@ public final class BaubleRenderHandler { if(stack != null) { Item item = stack.getItem(); + if(item instanceof IPhantomInkable) { + IPhantomInkable inkable = (IPhantomInkable) item; + if(inkable.hasPhantomInk(stack)) + continue; + } + if(item instanceof ICosmeticAttachable) { ICosmeticAttachable attachable = (ICosmeticAttachable) item; ItemStack cosmetic = attachable.getCosmeticItem(stack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 7ddd3b54e..ae4aa7c9c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -21,6 +21,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.api.item.ICosmeticAttachable; +import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; @@ -32,12 +33,13 @@ import baubles.common.lib.PlayerHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable { +public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable { private static final String TAG_HASHCODE = "playerHashcode"; private static final String TAG_BAUBLE_UUID_MOST = "baubleUUIDMost"; private static final String TAG_BAUBLE_UUID_LEAST = "baubleUUIDLeast"; private static final String TAG_COSMETIC_ITEM = "cosmeticItem"; + private static final String TAG_PHANTOM_INK = "phantomInk"; public ItemBauble(String name) { super(); @@ -97,6 +99,9 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt ItemStack cosmetic = getCosmeticItem(par1ItemStack); if(cosmetic != null) addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.hasCosmetic"), cosmetic.getDisplayName()), par3List); + + if(hasPhantomInk(par1ItemStack)) + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), par3List); } void addStringToTooltip(String s, List tooltip) { @@ -193,5 +198,15 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt public static void setLastPlayerHashcode(ItemStack stack, int hash) { ItemNBTHelper.setInt(stack, TAG_HASHCODE, hash); } + + @Override + public boolean hasPhantomInk(ItemStack stack) { + return ItemNBTHelper.getBoolean(stack, TAG_PHANTOM_INK, false); + } + + @Override + public void setPhantomInk(ItemStack stack, boolean ink) { + ItemNBTHelper.setBoolean(stack, TAG_PHANTOM_INK, ink); + } }