+ Added Radium-226 & Decayed form.

$ Greatly improved tooltip handling on CoreItem & derivatives.

8 files changed, 86 insertions, 64 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index fe090a398d..33215234b9 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -15,8 +15,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.common.compat.COMPAT_Baubles;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.*;
-import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust;
-import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust;
 import gtPlusPlus.core.item.base.foil.BaseItemFoil;
 import gtPlusPlus.core.item.base.foods.BaseItemFood;
 import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
@@ -67,10 +65,10 @@ public final class ModItems {
 
 	public static Item ZZZ_Empty;
 	public static Item AAA_Broken;
+	
+	
 	public static Item itemAlkalusDisk;
-
 	public static Item itemDebugShapeSpawner;
-
 	public static Item itemBaseSpawnEgg;
 
 	//EnderIO
@@ -141,9 +139,6 @@ public final class ModItems {
 	public static MultiPickaxeBase MP_GTMATERIAL;
 	public static MultiSpadeBase MS_GTMATERIAL;
 
-	public static BaseItemDecidust itemBaseDecidust;
-	public static BaseItemCentidust itemBaseCentidust;
-
 	public static ItemStack FluidCell;
 
 	public static BaseItemBackpack backpack_Red;
@@ -181,8 +176,6 @@ public final class ModItems {
 	public static Item dustCalciumCarbonate;
 	public static Item dustLi2CO3CaOH2;
 	public static Item dustLi2BeF4;
-	
-	public static Item dustNeptunium238;
 
 	public static Item dustAer;
 	public static Item dustIgnis;
@@ -197,7 +190,7 @@ public final class ModItems {
 	public static Item shardAqua;
 
 	//Tc Compat for energy crystal recipes
-	public static BaseItemTCShard shardDull;
+	public static Item shardDull;
 
 	//Lighter
 	public static Item itemBasicFireMaker;
@@ -215,20 +208,20 @@ public final class ModItems {
 
 	public static Item dustCalciumSulfate;
 
-	public static BaseItemPlate itemPlateClay;
-	public static BaseItemPlateDouble itemDoublePlateClay;
-
 	public static Item dustFertUN18;
 	public static Item dustFertUN32;
 
 	public static Fluid fluidFLiBeSalt;
 
-	
+
 	//Possibly missing base items that GT may be missing.
+
 	public static Item itemSmallWroughtIronGear;
+	public static Item itemPlateClay;
 	public static Item itemPlateLithium;
 	public static Item itemPlateEuropium;
 	public static Item itemPlateVanadium;
+	public static Item itemDoublePlateClay;
 	public static Item itemDoublePlateEuropium;
 	public static Item itemFoilUranium235;
 
@@ -253,13 +246,18 @@ public final class ModItems {
 
 	public static Item itemModularBauble;
 	public static Item itemCustomBook;
-	
+
 	public static Item itemGrindleTablet;
 	public static Item itemRope;
 	public static Item itemFiber;
 	public static Item itemDragonJar;
 
-	
+	//Unstable Elements & Related Content
+	public static Item dustNeptunium238;
+	public static Item dustDecayedRadium226;
+	public static Item dustRadium226;
+
+
 	static {
 		Logger.INFO("Items!");
 	}
@@ -406,7 +404,9 @@ public final class ModItems {
 			//Plutonium-238 is a very powerful alpha emitter. This makes the plutonium-238 isotope suitable for usage in radioisotope thermoelectric generators (RTGs)
 			//and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power.
 			MaterialGenerator.generateNuclearMaterial(NUCLIDE.getInstance().PLUTONIUM238, false);
-			MaterialGenerator.generateNuclearMaterial(NUCLIDE.getInstance().PLUTONIUM239, false);
+			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null || Utils.getGregtechVersionAsInt() < 50931) {
+				MaterialGenerator.generateNuclearMaterial(NUCLIDE.getInstance().PLUTONIUM239, false);
+			}
 
 			//RTG Fuel Materials
 			MaterialGenerator.generateNuclearMaterial(NUCLIDE.getInstance().STRONTIUM90, false);
@@ -512,7 +512,6 @@ public final class ModItems {
 			//Must be the final Alloy to Generate
 			MaterialGenerator.generate(ALLOY.QUANTUM);
 
-
 			//Ores
 			MaterialGenerator.generateOreMaterial(FLUORIDES.FLUORITE);
 			GTplusplus_Everglades.GenerateOreMaterials();
@@ -574,7 +573,7 @@ public final class ModItems {
 		fluidFLiBeSalt = FluidUtils.generateFluid("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100});
 
 		//LFTR Control Circuit
-		itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Thorium Reactor Control Circuit", AddToCreativeTab.tabMisc, 1, 0, "Helps your LFTR not explode", EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
+		itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Thorium Reactor Control Circuit", AddToCreativeTab.tabMisc, 1, 0,  new String[] {"Helps your LFTR not explode"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null);
 
 
 		//Zirconium
@@ -659,16 +658,22 @@ public final class ModItems {
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleClay", 1) == null){
 			itemDoublePlateClay = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay));
 		}
-		
+
 		//Need this for Mutagenic Frames
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilUranium235", 1) == null){
 			itemFoilUranium235 = new BaseItemFoil(ELEMENT.getInstance().URANIUM235);
 		}
-		
+
 		//A small gear needed for wizardry.
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null){
 			itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron));
 		}
+		
+
+		// A plate of Vanadium.
+		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateVanadium", 1) == null){
+			itemPlateVanadium = new BaseItemPlate(ELEMENT.getInstance().VANADIUM);
+		}
 
 		//A plate of Lithium.
 		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) == null){
@@ -682,9 +687,11 @@ public final class ModItems {
 		if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) && CORE.ConfigSwitches.enableCustom_Pipes){
 			itemDoublePlateEuropium = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Europium));
 		}
-		
-		dustNeptunium238 = new DustDecayable("dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, "Result: Plutonium 238 ("+StringUtils.superscript("238Pu")+")", CORE.GT_Tooltip_Radioactive, NUCLIDE.getInstance().PLUTONIUM238.getDust(1).getItem(), 5);
 
+		dustNeptunium238 = new DustDecayable("dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, new String[] {""+StringUtils.superscript("238Np"), "Result: Plutonium 238 ("+StringUtils.superscript("238Pu")+")"}, NUCLIDE.getInstance().PLUTONIUM238.getDust(1).getItem(), 5);
+		dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts("DecayedRadium226", "Decayed Radium-226", ""+StringUtils.superscript("226Ra"), ELEMENT.getInstance().RADIUM.getRgbAsHex())[0];
+		dustRadium226 = new DustDecayable("dustRadium226", ELEMENT.getInstance().RADIUM.getRgbAsHex(), 90000, new String[] {""+StringUtils.superscript("226Ra"), "Result: Radon 222 ("+StringUtils.superscript("222Rn")+")"}, ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), 5);
+		
 		itemBoilerChassis = new ItemBoilerChassis();
 		itemDehydratorCoilWire = new ItemDehydratorCoilWire();
 		itemDehydratorCoil = new ItemDehydratorCoil();
@@ -693,7 +700,6 @@ public final class ModItems {
 		itemLavaFilter = new ItemLavaFilter();
 
 		itemGrindleTablet = new BaseItemGrindle();
-
 		itemDragonJar = new ItemEntityCatcher();
 
 		//Chemistry
@@ -712,11 +718,6 @@ public final class ModItems {
 		tI = new BaseItemMisc("Dull", new short[]{64,64,64}, 64, MiscTypes.GEM, null);
 		tI = new BaseItemMisc("Forest", new short[]{130,164,96}, 64, MiscTypes.MUSHROOM, new String[]{"You Found this on the ground.", "Definitely not sure if it's worth eating."});
 
-		//Vanadium
-		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateVanadium", 1) == null){
-			itemPlateVanadium = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Vanadium));
-		}
-
 		//Baubles
 		if (LoadedMods.Baubles){
 			tI = new HealthBoostBauble();
@@ -775,9 +776,7 @@ public final class ModItems {
 				ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16);
 				itemPlateVoidMetal = ItemUtils.generateSpecialUsePlate("Void", "Void", new short[]{82, 17, 82}, 0);
 				GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal));
-			} catch (final NullPointerException e){
-				e.getClass();
-			}
+			} catch (final NullPointerException e){}
 
 		}
 		else {
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
index 501b881f9f..90147c9c65 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java
@@ -22,8 +22,7 @@ import gtPlusPlus.core.util.minecraft.NBTUtils;
 
 public class BaseItemTickable extends CoreItem {
 
-	public final String descriptionString;
-	public final String descriptionString2;
+	public final String[] descriptionString;
 	public final int itemColour;
 	public final int maxTicks;
 	public final boolean twoRenderPasses;
@@ -31,18 +30,13 @@ public class BaseItemTickable extends CoreItem {
 	public IIcon[] mIcon = new IIcon[2];
 
 	public BaseItemTickable(boolean twoPass, final String unlocalName, final int colour, final int maxTicks) {
-		this(twoPass, unlocalName, colour, maxTicks, "");
+		this(twoPass, unlocalName, colour, maxTicks, new String[] {});
 	}
 
-	public BaseItemTickable(boolean twoPass, final String unlocalName, final int colour, final int maxTicks, final String Description) {
-		this(twoPass, unlocalName, colour, maxTicks, "", Description);
-	}
-
-	public BaseItemTickable(boolean twoPass, final String unlocalName, final int colour, final int maxTicks, final String Description, final String Description2) {
+	public BaseItemTickable(boolean twoPass, final String unlocalName, final int colour, final int maxTicks, final String[] Description) {
 		super(unlocalName, AddToCreativeTab.tabMisc, 1, 999999999, Description, EnumRarity.epic, EnumChatFormatting.DARK_RED, true, null);
 		this.itemColour = colour;
 		this.descriptionString = Description;
-		this.descriptionString2 = Description2;
 		this.maxTicks = maxTicks;
 		this.twoRenderPasses = twoPass;
 		//setGregtechItemList();
@@ -209,6 +203,9 @@ public class BaseItemTickable extends CoreItem {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
+		if (this.descriptionString.length > 0) {
+			list.add(EnumChatFormatting.GRAY+this.descriptionString[0]);
+		}
 		EnumChatFormatting durability = EnumChatFormatting.GRAY;
 		if (maxTicks-getFilterDamage(stack) > (maxTicks*0.8)){
 			durability = EnumChatFormatting.GRAY;
@@ -227,11 +224,10 @@ public class BaseItemTickable extends CoreItem {
 		}
 		list.add(durability+""+((maxTicks-getFilterDamage(stack))/20)+EnumChatFormatting.GRAY+" seconds until decay");
 
-		if ((this.descriptionString != "") || !this.descriptionString.equals("")){
-			list.add(EnumChatFormatting.GRAY+this.descriptionString);
-		}
-		if ((this.descriptionString2 != "") || !this.descriptionString2.equals("")){
-			list.add(EnumChatFormatting.GRAY+this.descriptionString2);
+		if (this.descriptionString.length > 1) {
+			for (int h=1;h<this.descriptionString.length;h++) {
+				list.add(EnumChatFormatting.GRAY+this.descriptionString[h]);
+			}
 		}
 
 		//super.addInformation(stack, player, list, bool);
diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
index 8aeab4cbd1..6c7f9cf6db 100644
--- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
@@ -23,7 +23,7 @@ public class CoreItem extends Item
 
 	private final EnumRarity rarity;
 	private final EnumChatFormatting descColour;
-	private final String itemDescription;
+	private final String[] itemDescription;
 	protected String itemName;
 	private final boolean hasEffect;
 
@@ -42,7 +42,7 @@ public class CoreItem extends Item
 	//0
 	/*
 	 * Name, Tab - 64 Stack, 0 Dmg
-	 */
+	 */	
 	public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab)
 	{
 		this(unlocalizedName, creativeTab, 64, 0); //Calls 3
@@ -55,7 +55,7 @@ public class CoreItem extends Item
 	 */
 	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final ItemStack OverrideItem)
 	{
-		this(unlocalizedName, creativeTab, 64, 0, "This item will be replaced by another when held by a player, it is old and should not be used in recipes.", EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5
+		this(unlocalizedName, creativeTab, 64, 0, new String[] {"This item will be replaced by another when held by a player, it is old and should not be used in recipes."}, EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5
 	}
 	//0.1
 	/*
@@ -63,7 +63,7 @@ public class CoreItem extends Item
 	 */
 	public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, final ItemStack OverrideItem)
 	{
-		this(unlocalizedName, creativeTab, 64, 0, "This item will be replaced by another when held by a player, it is old and should not be used in recipes.", EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5
+		this(unlocalizedName, creativeTab, 64, 0, new String[] {"This item will be replaced by another when held by a player, it is old and should not be used in recipes."}, EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5
 		this.itemName = displayName;
 	}
 
@@ -79,7 +79,7 @@ public class CoreItem extends Item
 	/*
 	 * Name, Tab, Stack, Description - 0 Dmg
 	 */
-	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final String description)
+	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final String[] description)
 	{
 		this(unlocalizedName, creativeTab, stackSize, 0, description); //Calls 4
 	}
@@ -87,15 +87,21 @@ public class CoreItem extends Item
 	/*
 	 * Name, Tab, Stack, Dmg - Description
 	 */
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, String string) {
+		this(unlocalizedName, creativeTab, stackSize, new String[] {string});
+	}
 	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg)
 	{
-		this(unlocalizedName, creativeTab, stackSize, maxDmg, ""); //Calls 4
+		this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] {}); //Calls 4
 	}
 	//4 //Not Rare + basic tooltip
 	/*
 	 * Name, Tab, Stack, Dmg, Description
 	 */
-	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description)
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String string) {
+		this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] {string});
+	}
+	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String[] description)
 	{
 		this(unlocalizedName, creativeTab, stackSize, maxDmg, description, EnumRarity.common, EnumChatFormatting.GRAY, false, null); //Calls 4.5
 	}
@@ -103,7 +109,7 @@ public class CoreItem extends Item
 	/*
 	 * Name, Tab, Stack, Dmg, Description, Text Colour - Common
 	 */
-	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumChatFormatting colour)
+	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String[] description, final EnumChatFormatting colour)
 	{
 		this(unlocalizedName, creativeTab, stackSize, maxDmg, description, EnumRarity.common, colour, false, null); //Calls 5
 	}
@@ -112,7 +118,10 @@ public class CoreItem extends Item
 	/*
 	 * Name, Tab, Stack, Dmg, Description, Rarity - Gray text
 	 */
-	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumRarity rarity)
+	public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String string, EnumRarity uncommon) {
+		this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] {string}, uncommon);
+	}
+	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String[] description, final EnumRarity rarity)
 	{
 		this(unlocalizedName, creativeTab, stackSize, maxDmg, description, rarity, EnumChatFormatting.GRAY, false, null); //Calls 5
 	}
@@ -121,7 +130,7 @@ public class CoreItem extends Item
 	/*
 	 * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect
 	 */
-	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem)
+	public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String[] description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem)
 	{
 		this.setUnlocalizedName(unlocalizedName);
 		this.setTextureName(CORE.MODID + ":" + unlocalizedName);
@@ -140,7 +149,7 @@ public class CoreItem extends Item
 	/*
 	 * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect
 	 */
-	public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem)
+	public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String[] description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem)
 	{
 		this.setUnlocalizedName(unlocalizedName);
 		this.itemName = displayName;
@@ -154,11 +163,16 @@ public class CoreItem extends Item
 		this.hasEffect = Effect;
 		this.turnsInto = OverrideItem;
 		GameRegistry.registerItem(this, unlocalizedName);
-	}
+	}	
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
+		if (this.itemDescription.length > 0) {
+			for (int u=0;u<this.itemDescription.length;u++) {
+				list.add(this.descColour+this.itemDescription[u]);
+			}
+		}		
 		//list.add(this.descColour+this.itemDescription);
 		//super.addInformation(stack, aPlayer, list, bool);
 	}
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java b/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java
index 5f03e407f3..23b0144231 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java
@@ -28,7 +28,7 @@ public class ItemAreaClear extends CoreItem {
 	public IIcon[] mIcon = new IIcon[1];
 
 	public ItemAreaClear() {
-		super("itemDebugClearing", AddToCreativeTab.tabMachines, 1, 100, EnumChatFormatting.OBFUSCATED+"F A M C Y   N A M E", EnumRarity.rare,
+		super("itemDebugClearing", AddToCreativeTab.tabMachines, 1, 100, new String[] {EnumChatFormatting.OBFUSCATED+"F A M C Y   N A M E"}, EnumRarity.rare,
 				EnumChatFormatting.BOLD, false, null);
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java b/src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java
index a05412f2f7..c34ad9e8d3 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java
@@ -21,7 +21,7 @@ public class ItemLavaFilter extends CoreItem {
 	public IIcon[] mIcon = new IIcon[1];
 	
 	public ItemLavaFilter() {
-		super("itemLavaFilter", AddToCreativeTab.tabMachines, 1, 100, "Lava Filter", EnumRarity.common,
+		super("itemLavaFilter", AddToCreativeTab.tabMachines, 1, 100,  new String[] {"Lava Filter"}, EnumRarity.common,
 				EnumChatFormatting.BLACK, false, null);
 		setGregtechItemList();
 	}
diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java b/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java
index a62592c42b..57cf8986fa 100644
--- a/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java
+++ b/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java
@@ -13,7 +13,7 @@ import gtPlusPlus.core.item.base.CoreItem;
 public class ItemHydrofluoricAcidPotion extends CoreItem {
 
 	public ItemHydrofluoricAcidPotion(String unlocalizedName, String displayName, String description) {
-		super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, description, EnumRarity.uncommon, EnumChatFormatting.GRAY, false, null);
+		super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, new String[] {description}, EnumRarity.uncommon, EnumChatFormatting.GRAY, false, null);
 	}
 	
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java b/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java
index 55b3e421e2..27b35e48d1 100644
--- a/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java
+++ b/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java
@@ -13,7 +13,7 @@ import gtPlusPlus.core.item.base.CoreItem;
 public class ItemSulfuricAcidPotion extends CoreItem {
 
 	public ItemSulfuricAcidPotion(String unlocalizedName, String displayName, String description) {
-		super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, description, EnumRarity.common, EnumChatFormatting.GRAY, false, null);
+		super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, new String[] {description}, EnumRarity.common, EnumChatFormatting.GRAY, false, null);
 	}
 	
 	@Override
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) {