$ Fixed some tooltips not displaying correctly.

% Tweaked some recipes, ZrC4 -> ZrF4 now gives 4x less Hydrogen Chloride. Fluorite dust + Sulfuric now takes longer.

7 files changed, 43 insertions, 74 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index a0216771b9..068ac0acf5 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -59,7 +59,7 @@ public class BaseItemComponent extends Item{
 	public String getItemStackDisplayName(ItemStack p_77653_1_) {
 
 		if (componentMaterial != null)
-		return (componentMaterial.getLocalizedName()+componentType.DISPLAY_NAME);
+			return (componentMaterial.getLocalizedName()+componentType.DISPLAY_NAME);
 		return materialName+" Cell";
 	}
 
@@ -75,43 +75,46 @@ public class BaseItemComponent extends Item{
 
 
 			if (componentType == ComponentTypes.DUST){			
-				list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust.");
+				//list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust.");
 			}
 			if (componentType == ComponentTypes.INGOT){			
-				list.add(EnumChatFormatting.GRAY+"A solid ingot of " + materialName + ".");	
+				//list.add(EnumChatFormatting.GRAY+"A solid ingot of " + materialName + ".");	
 				if (materialName != null && materialName != "" && !materialName.equals("") && unlocalName.toLowerCase().contains("ingothot")){
 					list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling..");		
 				}
 			}
 			if (componentType == ComponentTypes.PLATE){			
-				list.add(EnumChatFormatting.GRAY+"A flat plate of " + materialName + ".");	
+				//list.add(EnumChatFormatting.GRAY+"A flat plate of " + materialName + ".");	
 			}
 			if (componentType == ComponentTypes.PLATEDOUBLE){			
-				list.add(EnumChatFormatting.GRAY+"A double plate of " + materialName + ".");	
+				//list.add(EnumChatFormatting.GRAY+"A double plate of " + materialName + ".");	
 			}
 			if (componentType == ComponentTypes.ROD){			
-				list.add(EnumChatFormatting.GRAY+"A 40cm Rod of " + materialName + ".");	
+				//list.add(EnumChatFormatting.GRAY+"A 40cm Rod of " + materialName + ".");	
 			}
 			if (componentType == ComponentTypes.RODLONG){			
-				list.add(EnumChatFormatting.GRAY+"A 80cm Rod of " + materialName + ".");
+				//list.add(EnumChatFormatting.GRAY+"A 80cm Rod of " + materialName + ".");
 			}
 			if (componentType == ComponentTypes.ROTOR){			
-				list.add(EnumChatFormatting.GRAY+"A Rotor made out of " + materialName + ". ");	
+				//list.add(EnumChatFormatting.GRAY+"A Rotor made out of " + materialName + ". ");	
 			}
 			if (componentType == ComponentTypes.BOLT){			
-				list.add(EnumChatFormatting.GRAY+"A small Bolt, constructed from " + materialName + ".");	
+				//list.add(EnumChatFormatting.GRAY+"A small Bolt, constructed from " + materialName + ".");	
 			}
 			if (componentType == ComponentTypes.SCREW){			
-				list.add(EnumChatFormatting.GRAY+"A 8mm Screw, fabricated out of some " + materialName + ".");	
+				//list.add(EnumChatFormatting.GRAY+"A 8mm Screw, fabricated out of some " + materialName + ".");	
 			}
 			if (componentType == ComponentTypes.GEAR){			
-				list.add(EnumChatFormatting.GRAY+"A large Gear, constructed from " + materialName + ".");
+				//list.add(EnumChatFormatting.GRAY+"A large Gear, constructed from " + materialName + ".");
 			}
 			if (componentType == ComponentTypes.RING){			
-				list.add(EnumChatFormatting.GRAY+"A " + materialName + " Ring.");
-			}
-			if (componentMaterial.isRadioactive){
-				list.add(CORE.GT_Tooltip_Radioactive);
+				//list.add(EnumChatFormatting.GRAY+"A " + materialName + " Ring.");
+			}			
+			if (componentMaterial != null){
+				list.add(componentMaterial.vChemicalFormula);
+				if (componentMaterial.isRadioactive){
+					list.add(CORE.GT_Tooltip_Radioactive);
+				}
 			}
 
 		}
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index 69d5363240..2998fbbc74 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -17,7 +17,6 @@ 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 cpw.mods.fml.common.registry.GameRegistry;
 
@@ -100,7 +99,7 @@ public class BaseItemDust extends Item{
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
 		//if (pileType != null && materialName != null && pileType != "" && materialName != "" && !pileType.equals("") && !materialName.equals("")){
-		if (getUnlocalizedName().contains("DustTiny")){
+		/*if (getUnlocalizedName().contains("DustTiny")){
 			list.add(EnumChatFormatting.GRAY+"A tiny pile of " + materialName + " dust.");	
 		}
 		else if (getUnlocalizedName().contains("DustSmall")){
@@ -108,6 +107,9 @@ public class BaseItemDust extends Item{
 		}
 		else {
 			list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust.");
+		}*/
+		if (stack.getDisplayName().equalsIgnoreCase("fluorite")){
+			list.add("Mined from Sandstone and Limestone.");						
 		}
 		if (sRadiation > 0){
 			list.add(CORE.GT_Tooltip_Radioactive);
@@ -115,6 +117,8 @@ public class BaseItemDust extends Item{
 		if (dustInfo != null){
 			list.add(dustInfo.vChemicalFormula);
 		}
+		
+
 		//}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
index eaccd31f30..88e11f7307 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java
@@ -15,7 +15,6 @@ 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 cpw.mods.fml.common.registry.GameRegistry;
 
@@ -89,20 +88,9 @@ public class BaseItemDustUnique extends Item{
 
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
-		//if (pileType != null && materialName != null && pileType != "" && materialName != "" && !pileType.equals("") && !materialName.equals("")){
-		if (getUnlocalizedName().contains("DustTiny")){
-			list.add(EnumChatFormatting.GRAY+"A tiny pile of " + MaterialUtils.subscript(materialName) + " dust.");	
-		}
-		else if (getUnlocalizedName().contains("DustSmall")){
-			list.add(EnumChatFormatting.GRAY+"A small pile of " + MaterialUtils.subscript(materialName) + " dust.");	
-		}
-		else {
-			list.add(EnumChatFormatting.GRAY+"A pile of " + MaterialUtils.subscript(materialName) + " dust.");
-		}
 		if (sRadiation > 0){
 			list.add(CORE.GT_Tooltip_Radioactive);
 		}
-		//}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
index 9a0ef0d097..64beb4de4a 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
@@ -8,14 +8,9 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
 import gtPlusPlus.core.util.math.MathUtils;
-
-import java.util.List;
-
 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 cpw.mods.fml.common.registry.GameRegistry;
 
@@ -56,20 +51,6 @@ public class BaseItemIngot extends Item{
 		return (materialName+ " Ingot");
 	}
 
-	@Override
-	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
-		if (materialName != null && materialName != "" && !materialName.equals("") && !unlocalName.contains("HotIngot")){
-			list.add(EnumChatFormatting.GRAY+"A solid ingot of " + materialName + ".");		
-		}
-		else if (materialName != null && materialName != "" && !materialName.equals("") && unlocalName.toLowerCase().contains("ingothot")){
-			list.add(EnumChatFormatting.GRAY+"Warning: "+EnumChatFormatting.RED+"Very hot! "+EnumChatFormatting.GRAY+" Avoid direct handling..");		
-		}
-		if (sRadiation > 0){
-			list.add(CORE.GT_Tooltip_Radioactive);
-			}
-		super.addInformation(stack, aPlayer, list, bool);
-	}
-
 	public final String getMaterialName() {
 		return materialName;
 	}
diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
index 6b60e7f8d3..096fae94df 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java
@@ -4,14 +4,9 @@ import gregtech.api.enums.GT_Values;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.item.ItemUtils;
-
-import java.util.List;
-
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
 public class BaseItemIngotHot extends BaseItemIngot{
@@ -36,14 +31,6 @@ public class BaseItemIngotHot extends BaseItemIngot{
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
-		if (materialName != null && materialName != "" && !materialName.equals("")){
-			list.add(EnumChatFormatting.GRAY+"A "+EnumChatFormatting.RED+"burning hot"+EnumChatFormatting.GRAY+" ingot of " + materialName + ".");		
-		}
-		super.addInformation(stack, aPlayer, list, bool);
-	}
-
-	@Override
 	public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) {
 		return Utils.rgbtoHexValue(225, 225, 225);
 	}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 62315e1434..1e34a22098 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -1,8 +1,8 @@
 package gtPlusPlus.core.item.base.itemblock;
 
 import gregtech.api.util.GT_OreDictUnificator;
-import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.block.base.BlockBaseModular;
+import gtPlusPlus.core.block.base.BlockBaseOre;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.entity.EntityUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
@@ -21,15 +21,15 @@ public class ItemBlockGtBlock extends ItemBlock{
 	protected final int blockColour;
 	protected final int sRadiation;
 	
-	private boolean isFluorite = false;
+	private final Block thisBlock;	
+	private boolean isOre = false;
 	
 	public ItemBlockGtBlock(Block block) {
 		super(block);
-		
-		if (block == ModBlocks.blockOreFluorite){
-			isFluorite = true;
-		}
-		
+		thisBlock = block;
+		if (block instanceof BlockBaseOre){
+			isOre = true;
+		}		
 		BlockBaseModular baseBlock = (BlockBaseModular) block;
 		this.blockColour = baseBlock.getRenderColor(0);
 		if (block.getLocalizedName().toLowerCase().contains("uranium") || block.getLocalizedName().toLowerCase().contains("plutonium") || block.getLocalizedName().toLowerCase().contains("thorium")){
@@ -50,8 +50,14 @@ public class ItemBlockGtBlock extends ItemBlock{
 			if (sRadiation > 0){
 				list.add(CORE.GT_Tooltip_Radioactive);
 			}			
-			if (isFluorite){
-				list.add("Mined from Sandstone and Limestone.");				
+			if (isOre){
+				if (thisBlock != null){
+					if (thisBlock.getLocalizedName().equalsIgnoreCase("fluorite ore")){
+						list.add("Mined from Sandstone and Limestone.");						
+					}
+				}				
+			}
+			else {
 			}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 4869465601..39e228dd38 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -281,12 +281,12 @@ public class RECIPES_GREGTECH {
 				CORE.RA.addDehydratorRecipe(
 						new ItemStack[]{
 								ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
-								ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 36)
+								ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 9)
 						}, //Item input (Array, up to 2)
 						FluidUtils.getFluidStack("hydrofluoricacid", 9*144), //Fluid input (slot 1)
 						null, //Fluid output (slot 2)
 						new ItemStack[]{
-							ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 36),
+							ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9)
 						}, //Output Array of Items - Upto 9,
 						new int[]{0},
@@ -313,8 +313,8 @@ public class RECIPES_GREGTECH {
 							ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1),
 							ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2)
 						}, //Output Array of Items - Upto 9,
-						new int[]{0, 0, 100, 100, 100, 100},
-						170*20, //Time in ticks
+						new int[]{0, 0, 100, 100, 300, 200},
+						10*60*20, //Time in ticks
 						230); //EU	
 
 			}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}