mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Baubles can now have Phantom Ink.
This commit is contained in:
1 parent
53ddb3620a
commit
c21e607bbd
2 files changed
+23
-1
No files matched your search
@@ -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);
|
||||
|
||||
@@ -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<String> 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);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user