Changed composition of Rare Earth I.

Buffed Rare Earth processing lines.
Buffed Industrial HF production and conversion recipes.

4 files changed, 114 insertions, 61 deletions

diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index aaee1cc790..0b93e7dd9c 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -138,8 +138,8 @@ public final class MISC_MATERIALS {
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.NetherQuartz), 1),
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
-					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Cobaltite), 1),
-					new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1)
+					new MaterialStack(ORES.CRYOLITE, 1),
+					new MaterialStack(ELEMENT.getInstance().YTTRIUM, 1)
 			});
 
 	public static final Material RARE_EARTH_MID = new Material(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 5156b938db..39ebb99be9 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1662,19 +1662,35 @@ public class RECIPES_GREGTECH {
 		 * so if you dissolve aparite in sulphuric acid you'll get a mixture of
 		 * SO2, H2O, HF and HCl
 		 */
-		final FluidStack[] apatiteOutput = { FluidUtils.getFluidStack("sulfurousacid", 3800),
-				FluidUtils.getFluidStack("hydrogenchloride", 1000), FluidUtils.getFluidStack("hydrofluoricacid", 400) };
-		GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfuricapatite", 5200), apatiteOutput, null,
-				45 * 20, 256);
+		final FluidStack[] apatiteOutput = { 
+				FluidUtils.getFluidStack("sulfurousacid", 3800),
+				FluidUtils.getFluidStack("hydrogenchloride", 1000), 
+				FluidUtils.getFluidStack("hydrofluoricacid", 400) };
+		GT_Values.RA.addDistillationTowerRecipe(
+				FluidUtils.getFluidStack("sulfuricapatite", 5200),
+				apatiteOutput, null,
+				45 * 20, 
+				120);
 
-		final FluidStack[] sulfurousacidOutput = { FluidUtils.getFluidStack("sulfurdioxide", 500),
+		final FluidStack[] sulfurousacidOutput = { 
+				FluidUtils.getFluidStack("sulfurdioxide", 500),
 				FluidUtils.getFluidStack("water", 500) };
-		GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfurousacid", 1000), sulfurousacidOutput,
-				null, 10 * 20, 60);
+		GT_Values.RA.addDistillationTowerRecipe(
+				FluidUtils.getFluidStack("sulfurousacid", 1000), 
+				sulfurousacidOutput,
+				null, 
+				10 * 20, 
+				60);
 
-		final FluidStack[] sulfurdioxideOutput = { FluidUtils.getFluidStack("oxygen", 144 * 2) };
-		GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("sulfurdioxide", 144 * 3), sulfurdioxideOutput,
-				ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), 5 * 20, 30);
+		final FluidStack[] sulfurdioxideOutput = { 
+				FluidUtils.getFluidStack("oxygen", 2000) 
+				};
+		GT_Values.RA.addDistillationTowerRecipe(
+				FluidUtils.getFluidStack("sulfurdioxide", 144 * 3),
+				sulfurdioxideOutput,
+				ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1),
+				5 * 20, 
+				30);
 	}
 
 	private static void addFuels() {
@@ -1787,8 +1803,8 @@ public class RECIPES_GREGTECH {
 				10 * 20);	
 		
 		GT_Values.RA.addChemicalRecipe(
-				ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16), 
-				null,
+				CI.getNumberedAdvancedCircuit(21),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16),
 				FluidUtils.getFluidStack("sulfuricacid", 144 * 32),
 				FluidUtils.getFluidStack("sulfuricapatite", 144 * 8),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1), 
@@ -1798,12 +1814,12 @@ public class RECIPES_GREGTECH {
 		if (temp_GT5u_SA != null) {
 			//Refine GT HF into GT++ HF
 			GT_Values.RA.addChemicalRecipe(
-					ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2),
+					CI.getNumberedAdvancedCircuit(21),
 					temp_GT5u_SA,
-					null, // Fluid Input
+					FluidUtils.getHydrofluoricAcid(2000), // Fluid Input
 					FluidUtils.getFluidStack("hydrofluoricacid", 6000), // Fluid Output
-					CI.emptyCells(7),
-					2 * 20);
+					CI.emptyCells(5),
+					30 * 20);
 		}
 
 	}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
index 97636e9e65..864d0bcca8 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
@@ -168,34 +168,47 @@ public class RECIPES_RareEarthProcessing {
 		GT_Values.RA.addChemicalBathRecipe(
 				ItemUtils.getSimpleStack(aRareEarth, 3),
 				FluidUtils.getFluidStack(aSulfuric, 1000),
-				RARE_EARTH_LOW.getCrushed(1),
-				RARE_EARTH_LOW.getCrushed(1),
-				RARE_EARTH_LOW.getCrushed(1),
-				new int[] {10000, 10000, 9000}, 
+				RARE_EARTH_LOW.getCrushed(2),
+				RARE_EARTH_LOW.getCrushed(2),
+				RARE_EARTH_LOW.getCrushed(2),
+				new int[] {10000, 10000, 10000}, 
 				20 * 30, 
-				(int) GT_Values.V[1]);
+				MaterialUtils.getVoltageForTier(1));
 
 		// HV Rare Earth
 		GT_Values.RA.addChemicalBathRecipe(
 				ItemUtils.getSimpleStack(aRareEarth, 6),
-				FluidUtils.getFluidStack(aHydrocholric, 3000),
-				RARE_EARTH_MID.getCrushed(2),
-				RARE_EARTH_MID.getCrushed(2),
-				RARE_EARTH_MID.getCrushed(2),
+				FluidUtils.getFluidStack(aHydrocholric, 2000),
+				RARE_EARTH_MID.getCrushed(4),
+				RARE_EARTH_MID.getCrushed(4),
+				RARE_EARTH_MID.getCrushed(4),
 				new int[] {10000, 9000, 8000}, 
-				20 * 60, 
-				(int) GT_Values.V[3]);
+				20 * 30, 
+				MaterialUtils.getVoltageForTier(3));
 
 		// IV Rare Earth
 		GT_Values.RA.addChemicalBathRecipe(
 				ItemUtils.getSimpleStack(aRareEarth, 9),
-				FluidUtils.getFluidStack(aNitric, 6000),
-				RARE_EARTH_HIGH.getCrushed(3),
-				RARE_EARTH_HIGH.getCrushed(3),
-				RARE_EARTH_HIGH.getCrushed(3),
-				new int[] {9000, 8000, 7000}, 
-				20 * 90, 
-				(int) GT_Values.V[5]);
+				FluidUtils.getHydrofluoricAcid(3000),
+				RARE_EARTH_HIGH.getCrushed(6),
+				RARE_EARTH_HIGH.getCrushed(6),
+				RARE_EARTH_HIGH.getCrushed(6),
+				new int[] {10000, 9000, 8000}, 
+				20 * 30, 
+				MaterialUtils.getVoltageForTier(5));
+		
+		if (FluidUtils.doesHydrofluoricAcidGtExist()) {
+			// IV Rare Earth
+			GT_Values.RA.addChemicalBathRecipe(
+					ItemUtils.getSimpleStack(aRareEarth, 9),
+					FluidUtils.getHydrofluoricAcidGT(6000),
+					RARE_EARTH_HIGH.getCrushed(6),
+					RARE_EARTH_HIGH.getCrushed(6),
+					RARE_EARTH_HIGH.getCrushed(6),
+					new int[] {9000, 8000, 7000}, 
+					20 * 30, 
+					MaterialUtils.getVoltageForTier(5));
+		}
 
 
 	}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index a6bd50ff17..d87a669c28 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.core.util.minecraft;
 
+import java.util.HashMap;
+
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -24,7 +26,9 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
 public class FluidUtils {
-
+	
+	private static HashMap<String, Fluid> sFluidCache = new HashMap<String, Fluid>();
+	
 	public static FluidStack getWater(final int amount){
 		return FluidUtils.getFluidStack("water", amount);
 	}
@@ -87,44 +91,64 @@ public class FluidUtils {
 		return FluidUtils.getFluidStack("ic2uumatter", amount);
 	}
 	
-	public static FluidStack getFluidStack(final String fluidName, final int amount){
-		Logger.WARNING("Trying to get a fluid stack of "+fluidName);
-		try {
-			FluidStack x = FluidRegistry.getFluidStack(fluidName, amount);
-			return x != null ? x.copy() : null;
+	public static FluidStack getHydrofluoricAcid(int amount) {
+		return FluidUtils.getFluidStack("hydrofluoricacid", amount);
+	}
+
+	public static Fluid sGregtechHydrofluoricAcid = null;
+	
+	public static FluidStack getHydrofluoricAcidGT(int amount) {
+		if (sGregtechHydrofluoricAcid == null) {
+			FluidStack aGTHF = FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1);
+			sGregtechHydrofluoricAcid = aGTHF != null ? aGTHF.getFluid() : getHydrofluoricAcid(1).getFluid();
 		}
-		catch (final Throwable e){
-			return null;
+		return FluidUtils.getFluidStack(sGregtechHydrofluoricAcid, amount);
+	}
+	
+	public static boolean doesHydrofluoricAcidGtExist() {
+		return sGregtechHydrofluoricAcid != null && sGregtechHydrofluoricAcid != getHydrofluoricAcid(1).getFluid();
+	}
+	
+	private static FluidStack createFluidStack(Fluid aFluid, int aAmount) {
+		if (aFluid != null) {
+			return new FluidStack(aFluid, aAmount);
 		}
-
+		return null;
 	}
-
-	public static FluidStack getFluidStack(final FluidStack vmoltenFluid, final int fluidAmount) {
-		Logger.WARNING("Trying to get a fluid stack of "+vmoltenFluid.getFluid().getName());
-		try {
-			FluidStack x = FluidRegistry.getFluidStack(vmoltenFluid.getFluid().getName(), fluidAmount);
-			return x != null ? x.copy() : null;
+	
+	public static FluidStack getFluidStack(final String aFluidName, final int aAmount){
+		Fluid aFluid = sFluidCache.get(aFluidName);
+		if (aFluid != null) {
+			return createFluidStack(aFluid, aAmount);
 		}
-		catch (final Throwable e){
-			return null;
+		else {
+			Fluid aLookupFluid = FluidRegistry.getFluid(aFluidName);
+			if (aLookupFluid != null) {
+				sFluidCache.put(aFluidName, aLookupFluid);
+				return createFluidStack(aLookupFluid, aAmount);
+			}
 		}
+		return null;
 	}
 
-	public static FluidStack getFluidStack(final Fluid vFluid, final int fluidAmount) {
-		Logger.WARNING("Trying to get a fluid stack of "+vFluid.getName());
-		try {
-			FluidStack x = FluidRegistry.getFluidStack(vFluid.getName(), fluidAmount);
-			return x != null ? x.copy() : null;
+	public static FluidStack getFluidStack(final FluidStack aFluidStack, final int aAmount) {
+		if (aFluidStack == null) {
+			return null;
 		}
-		catch (final Throwable e){
+		return new FluidStack(aFluidStack, aAmount);
+	}
+
+	public static FluidStack getFluidStack(final Fluid aFluid, final int aAmount) {
+		if (aFluid == null) {
 			return null;
 		}
+		return new FluidStack(aFluid, aAmount);
 	}
 
 	public static FluidStack[] getFluidStackArray(final String fluidName, final int amount){
 		Logger.WARNING("Trying to get a fluid stack of "+fluidName);
 		try {
-			final FluidStack[] singleFluid = {FluidRegistry.getFluidStack(fluidName, amount)};
+			final FluidStack[] singleFluid = {getFluidStack(fluidName, amount)};
 			return singleFluid;
 		}
 		catch (final Throwable e){
@@ -136,7 +160,7 @@ public class FluidUtils {
 	public static FluidStack[] getFluidStackArray(final FluidStack fluidName, final int amount){
 		Logger.WARNING("Trying to get a fluid stack of "+fluidName);
 		try {
-			final FluidStack[] singleFluid = {FluidRegistry.getFluidStack(fluidName.getLocalizedName(), amount)};
+			final FluidStack[] singleFluid = {getFluidStack(fluidName, amount)};
 			return singleFluid;
 		}
 		catch (final Throwable e){