+ Added a factory production method of producing HF from Fluorite dust.

+ Added a custom tooltip for Fluorite ore blocks, to depict where they are obtained from. (Sandstone and Limestone)
+ Added Calcium Sulfate if Gypsum does not exist, if it does, also oredicts Gypsum as dustCalciumSulfate.

3 files changed, 44 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 97fcf1b51f..b212263d45 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -180,6 +180,8 @@ public final class ModItems {
 	public static Item dustLiFBeF2ZrF4U235;
 	public static Item dustLiFBeF2ThF4UF4;
 
+	private static Item dustCalciumSulfate;
+
 
 
 	//@SuppressWarnings("unused")
@@ -387,6 +389,13 @@ public final class ModItems {
 		}
 		dustCalciumHydroxide = ItemUtils.generateSpecialUseDusts("CalciumHydroxide", "Hydrated Lime", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_hydroxide
 		dustCalciumCarbonate = ItemUtils.generateSpecialUseDusts("CalciumCarbonate", "Calcium Carbonate", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
+		if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1) == null || ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustCalciumSulfate", 1) == null){
+			dustCalciumSulfate = ItemUtils.generateSpecialUseDusts("Gypsum", "Calcium Sulfate (Gypsum)", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_sulfate
+			GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getSimpleStack(dustCalciumSulfate));
+			}	
+		else {
+			GT_OreDictUnificator.registerOre("dustCalciumSulfate", ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGypsum", 1));
+		}
 		dustLi2CO3CaOH2 = ItemUtils.generateSpecialUseDusts("Li2CO3CaOH2", "Li2CO3 + Ca(OH)2 Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
 
 		//FLiBe Fuel Compounds
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
index 8bf5346084..62315e1434 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java
@@ -1,6 +1,7 @@
 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.lib.CORE;
 import gtPlusPlus.core.util.entity.EntityUtils;
@@ -20,8 +21,15 @@ public class ItemBlockGtBlock extends ItemBlock{
 	protected final int blockColour;
 	protected final int sRadiation;
 	
+	private boolean isFluorite = false;
+	
 	public ItemBlockGtBlock(Block block) {
 		super(block);
+		
+		if (block == ModBlocks.blockOreFluorite){
+			isFluorite = 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")){
@@ -41,6 +49,9 @@ public class ItemBlockGtBlock extends ItemBlock{
 	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
 			if (sRadiation > 0){
 				list.add(CORE.GT_Tooltip_Radioactive);
+			}			
+			if (isFluorite){
+				list.add("Mined from Sandstone and Limestone.");				
 			}
 		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 73bd5538a4..4869465601 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -294,6 +294,30 @@ public class RECIPES_GREGTECH {
 						500); //EU	
 
 			}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+			
+			//CaF2 + H2SO4 → CaSO4(solid) + 2 HF
+			try {
+				
+				CORE.RA.addDehydratorRecipe(
+						new ItemStack[]{
+								ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37),
+								ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 16)
+						}, //Item input (Array, up to 2)
+						FluidUtils.getFluidStack("sulfuricacid", 56*144), //Fluid input (slot 1)
+						null, //Fluid output (slot 2)
+						new ItemStack[]{
+							ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30),
+							ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 1),
+							ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2),
+							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
+						230); //EU	
+
+			}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
 		}
 		
 	}