+ Added Lithium Carbonate recipes.

+ Added some fluid textures.
% Changed names to be mixes on some fluids.

4 files changed, 53 insertions, 14 deletions

diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
index 67b1b2d0e3..f9a3e369ce 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
@@ -116,28 +116,54 @@ public class RECIPES_GREGTECH {
 
 		try {
 
+			//Makes Lithium Carbonate
 			CORE.RA.addDehydratorRecipe(
-					UtilsItems.getItemStackOfAmountFromOreDict("dustSteel", 8), //Item input (slot 1)
-					FluidUtils.getFluidStack("oxygen", 1000), //Fluid Input
-					new ItemStack[]{UtilsItems.getItemStackOfAmountFromOreDict("dustDiamond", 1)}, //Output Array of Items - Upto 9
+					FluidUtils.getFluidStack("sulfuriclithium", 1000), //Item input (slot 1)
+					null, //Fluid Input
+					new ItemStack[]{
+						UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1),
+						UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1),
+						UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1)
+						}, //Output Array of Items - Upto 9
+					10*20, //Time in ticks
+					30); //EU	
+		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+		try {
+
+			CORE.RA.addDehydratorRecipe(
+					UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 1), //Item input (slot 1)
+					FluidUtils.getFluidStack("sulfuriclithium", 1000), //Fluid Input
+					new ItemStack[]{
+						UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1),
+						UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1),
+						UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1)
+						}, //Output Array of Items - Upto 9
 					10*20, //Time in ticks
 					30); //EU	
 		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
 		try {
 			CORE.RA.addDehydratorRecipe(
-					UtilsItems.getItemStackOfAmountFromOreDict("dustSteel", 8), //Item input (slot 1)
-					UtilsItems.getItemStackOfAmountFromOreDict("dustRedstone", 8), //Item input (slot 2)
-					new ItemStack[]{UtilsItems.getItemStackOfAmountFromOreDict("dustDiamond", 1)}, //Output Array of Items - Upto 9
+					UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 1), //Item input (slot 1)
+					UtilsItems.getItemStackOfAmountFromOreDict("cellWater", 1), //Item input (slot 2)
+					new ItemStack[]{
+						UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1),
+						UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1),
+						UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1)
+						}, //Output Array of Items - Upto 9
 					10*20, //Time in ticks
 					30); //EU	
 		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
 		try {
 			CORE.RA.addDehydratorRecipe(
-					UtilsItems.getItemStackOfAmountFromOreDict("dustSteel", 8),
-					UtilsItems.getItemStackOfAmountFromOreDict("dustRedstone", 8),
-					FluidUtils.getFluidStack("oxygen", 1000),
-					new ItemStack[]{UtilsItems.getItemStackOfAmountFromOreDict("dustDiamond", 1)}, //Output Array of Items - Upto 9
-					FluidUtils.getFluidStack("lava", 1000),
+					UtilsItems.getItemStackOfAmountFromOreDict("cellEmpty", 1),
+					null,
+					FluidUtils.getFluidStack("sulfuriclithium", 1000),
+					new ItemStack[]{
+						UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1),
+						UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1),
+						UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1)
+						}, //Output Array of Items - Upto 9
+					FluidUtils.getFluidStack("water", 1000),
 					10*20, //Time in ticks
 					30); //EU	
 
diff --git a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 32d370d4b1..06c6dc42e6 100644
--- a/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/miscutil/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -46,6 +46,7 @@ public interface IGregtech_RecipeAdder {
 	 * @return true if the Recipe got added, otherwise false.
      */
     
+	public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);
     public boolean addDehydratorRecipe(ItemStack aInput, FluidStack aFluid, ItemStack[] aOutputItems, int aDuration, int aEUt);
     public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, ItemStack[] aOutputItems, int aDuration, int aEUt);
     public boolean addDehydratorRecipe(ItemStack aItemA, ItemStack aItemB, FluidStack aFluid, ItemStack[] aOutputItems, FluidStack aOutputFluid, int aDuration, int aEUt);
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index caa1994f2e..2357c5baa0 100644
--- a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -56,7 +56,7 @@ public class GregtechFluidHandler {
 			Meta_GT_Proxy.addFluid("sulfurousAcid", "Sulfurous Acid", GT_Materials.SulfurousAcid, 4, 75, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfurousAcid, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
 			generateIC2FluidCell("SulfurousAcid");
 
-			Meta_GT_Proxy.addFluid("sulfuricApatite", "Sulfuric Apatite", GT_Materials.SulfuricApatite, 4, 500, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
+			Meta_GT_Proxy.addFluid("sulfuricApatite", "Sulfuric Apatite Mix", GT_Materials.SulfuricApatite, 4, 500, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricApatite, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
 			generateIC2FluidCell("SulfuricApatite");
 
 			Meta_GT_Proxy.addFluid("uraniumHexafluoride", "Uranium Hexafluoride", GT_Materials.UraniumHexaFluoride, 4, 200, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.UraniumHexaFluoride, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
@@ -84,7 +84,7 @@ public class GregtechFluidHandler {
 			}
 			
 
-			Meta_GT_Proxy.addFluid("sulfuricLithium", "Sulfuric Lithium", GT_Materials.SulfuricLithium, 4, 280, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
+			Meta_GT_Proxy.addFluid("sulfuricLithium", "Sulfuric Lithium Mix", GT_Materials.SulfuricLithium, 4, 280, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.SulfuricLithium, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
 			generateIC2FluidCell("SulfuricLithium");
 
 			Meta_GT_Proxy.addFluid("lithiumHydroxide", "Lithium Hydroxide", GT_Materials.LithiumHydroxide, 4, 500, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.LithiumHydroxide, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
diff --git a/src/Java/miscutil/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/miscutil/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 7f7acac784..a2242f0f55 100644
--- a/src/Java/miscutil/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/miscutil/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -176,6 +176,18 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
         RECIPEHANDLER_Dehydrator.debug5(aInput, null, aFluid, null, aOutput, aDuration, aEUt);
         return true;
     }
-
+	
+	@Override
+	public boolean addDehydratorRecipe(FluidStack aFluid, FluidStack aOutputFluid, ItemStack[] aOutputItems, int aDuration, int aEUt){
+    if ((aFluid == null) || (aOutputFluid == null || aOutputItems == null)) {
+        return false;
+    }
+    if ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aFluid.getUnlocalizedName(), aDuration)) <= 0) {
+        return false;
+    }
+    Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, null, aOutputItems.clone(), null, new FluidStack[]{aFluid}, new FluidStack[]{aOutputFluid}, aDuration, aEUt, 0);
+    RECIPEHANDLER_Dehydrator.debug5(null, null, aFluid, aOutputFluid, aOutputItems, aDuration, aEUt);
+    return true;
+}
 
 }