From 29183be2ec89ee54d748ac6ca64ed67f89f50f90 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Fri, 29 Dec 2017 14:12:35 +1000 Subject: + Add Gadolinium, Samarium, Ytterbium & Lanthanum if they do not exist. + Added new recipe for production of Fluorite. % Some Alloys now use Phosphor instead of Phosphorus. % Changed Ore Block unlocalized name. $ Fixed ore itemblock not showing Chemical Formula. $ Greatly improved radiation handler. $ Fixed old fluorite ore not generating properly. --- .../gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/Java/gtPlusPlus/core/item/base') diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index cb3455f0c5..8a72b4d629 100644 --- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -45,6 +45,10 @@ public class ItemBlockOre extends ItemBlock{ @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if (this.mThisMaterial != null){ + list.add(this.mThisMaterial.vChemicalFormula); + } + //Radioactive? if (this.mThisRadiation > 0){ list.add(CORE.GT_Tooltip_Radioactive); @@ -64,8 +68,14 @@ public class ItemBlockOre extends ItemBlock{ @Override public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { - if (this.mThisRadiation > 0){ - EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.mThisRadiation, world, entityHolding); + if (this.mThisMaterial != null){ + if (this.mThisRadiation > 0){ + if (entityHolding instanceof EntityPlayer){ + if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode){ + EntityUtils.applyRadiationDamageToEntity(iStack.stackSize, this.mThisMaterial.vRadiationLevel, world, entityHolding); + } + } + } } } -- cgit