From 6ac0ce1de39cde85be8dd60eff8276d0849a2d20 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Wed, 14 Mar 2018 21:06:33 +1000 Subject: + Added Radium-226 & Decayed form. $ Greatly improved tooltip handling on CoreItem & derivatives. --- .../gtPlusPlus/core/item/materials/DustDecayable.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/Java/gtPlusPlus/core/item/materials') diff --git a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java index 0fad3de66a..1bfdddf7d8 100644 --- a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java +++ b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java @@ -1,15 +1,19 @@ package gtPlusPlus.core.item.materials; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.item.base.BaseItemTickable; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -18,8 +22,8 @@ public class DustDecayable extends BaseItemTickable { private final Item turnsIntoItem; private final int radLevel; - public DustDecayable(String unlocal, int colour, int maxTicks, String desc1, String desc2, Item turnsInto, int radLevel) { - super(true, unlocal, colour, maxTicks, desc1, desc2); + public DustDecayable(String unlocal, int colour, int maxTicks, String[] desc1, Item turnsInto, int radLevel) { + super(true, unlocal, colour, maxTicks, desc1); this.turnsIntoItem = turnsInto; this.radLevel = radLevel; GT_OreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this)); @@ -33,6 +37,15 @@ public class DustDecayable extends BaseItemTickable { this.mIcon[1] = reg.registerIcon(gt2); } + @SuppressWarnings("unchecked") + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + super.addInformation(stack, player, list, bool); + if (this.radLevel > 0) { + list.add(CORE.GT_Tooltip_Radioactive); + } + } + @Override public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { if (world == null || iStack == null) { -- cgit