+ Added more Dehydrator Recipes.

+ Added new dusts for nuclear fuel production.
$ Fixed OreDictionary not working for some recipes.
$ Changed the Textures on some machines, to now use GT4 overlay textures.

3 files changed, 81 insertions, 13 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index b33a8b747f..a0304727f0 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -132,6 +132,10 @@ public final class ModItems {
 	public static BaseItemBackpack backpack_White;
 	
 	public static Item dustLithiumCarbonate;
+
+	public static Item dustUraniumTetraFluoride;
+	public static Item dustUraniumHexaFluoride;
+	public static Item dustLithiumFluoride;
 	
 	public static ItemBlueprint itemBlueprintBase;
 
@@ -233,7 +237,11 @@ public final class ModItems {
 		
 		
 		dustLithiumCarbonate = UtilsItems.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", Utils.rgbtoHexValue(137, 139, 142))[0];
-
+		
+		//Nuclear Fuel Dusts
+		dustUraniumTetraFluoride = UtilsItems.generateSpecialUseDusts("UraniumTetrafluoride", "Uranium Tetrafluoride", Utils.rgbtoHexValue(17, 179, 42))[0];
+		dustUraniumHexaFluoride = UtilsItems.generateSpecialUseDusts("UraniumHexafluoride", "Uranium Hexafluoride", Utils.rgbtoHexValue(9, 199, 32))[0];
+		dustLithiumFluoride = UtilsItems.generateSpecialUseDusts("LithiumFluoride", "Lithium Fluoride", Utils.rgbtoHexValue(245, 245, 245))[0];
 		
 		
 		boolean gtStyleTools = LoadedMods.Gregtech;
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 6a1e496305..e583e05473 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -131,19 +131,19 @@ public class RECIPES_GREGTECH {
 					30); //EU	
 		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}*/
 		try {
-			
+
 			ItemStack cells = UtilsItems.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", "Empty Fluid Cells", 0, 12);
-			
+
 			if (cells == null){
 				cells = UtilsItems.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 12);
 			}
-			
+
 			ItemStack[] input = {cells, UtilsItems.getItemStackOfAmountFromOreDict("dustLepidolite", 20)};
-			
+
 			CORE.RA.addDehydratorRecipe(
 					input, //Item input (Array, up to 2)
 					FluidUtils.getFluidStack("sulfuricacid", 10000), //Fluid input (slot 1)
-					FluidUtils.getFluidStack("sulfuriclithium", 10000), //Fluid output (slot 1)
+					FluidUtils.getFluidStack("sulfuriclithium", 10000), //Fluid output (slot 2)
 					new ItemStack[]{
 						UtilsItems.getItemStackOfAmountFromOreDict("dustPotassium", 1),
 						UtilsItems.getItemStackOfAmountFromOreDict("dustAluminium", 4),
@@ -152,11 +152,61 @@ public class RECIPES_GREGTECH {
 						UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), //LithiumCarbonate
 					}, //Output Array of Items - Upto 9,
 					new int[]{0},
-					90*20, //Time in ticks
+					75*20, //Time in ticks
+					1000); //EU	
+
+		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+		try {
+
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[]{
+							UtilsItems.getItemStackOfAmountFromOreDict("cellWater", 10)
+					}, //Item input (Array, up to 2)
+					FluidUtils.getFluidStack("uraniumtetrafluoride", 1440), //Fluid input (slot 1)
+					null, //Fluid output (slot 2)
+					new ItemStack[]{
+						UtilsItems.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10),
+						UtilsItems.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10)
+					}, //Output Array of Items - Upto 9,
+					new int[]{0},
+					150*20, //Time in ticks
 					2000); //EU	
 
 		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
-		
+		try {
+
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[]{
+							UtilsItems.getItemStackOfAmountFromOreDict("cellWater", 10)
+					}, //Item input (Array, up to 2)
+					FluidUtils.getFluidStack("uraniumhexafluoride", 1440), //Fluid input (slot 1)
+					null, //Fluid output (slot 2)
+					new ItemStack[]{
+						UtilsItems.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10),
+						UtilsItems.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10)
+					}, //Output Array of Items - Upto 9,
+					new int[]{0},
+					300*20, //Time in ticks
+					4000); //EU	
+
+		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+		try {
+			
+			CORE.RA.addDehydratorRecipe(
+					new ItemStack[]{
+							UtilsItems.getItemStackOfAmountFromOreDict("cropGrape", 1)
+					}, //Item input (Array, up to 2)
+					null, //Fluid input (slot 1)
+					null, //Fluid output (slot 2)
+					new ItemStack[]{
+						UtilsItems.getItemStackOfAmountFromOreDict("foodRaisins", 1)
+					}, //Output Array of Items - Upto 9,
+					new int[]{0},
+					10*20, //Time in ticks
+					8); //EU	
+
+		}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+
 	}
 
 	private static void assemblerRecipes(){
@@ -176,9 +226,9 @@ public class RECIPES_GREGTECH {
 		GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0);
 		GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
 		GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0);
-		
-		
-		
+
+
+
 		//CORE.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
 		GT_Values.RA.addFuel(UtilsItems.getSimpleStack(Items.lava_bucket), null, 32, 2);
 		GT_Values.RA.addFuel(UtilsItems.getIC2Cell(2), null, 32, 2);
@@ -202,6 +252,16 @@ public class RECIPES_GREGTECH {
 				chances,
 				30*20,
 				240);
+		
+		GT_Values.RA.addChemicalBathRecipe(
+				UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 10),
+				FluidUtils.getFluidStack("hydrofluoricacid", 20000),
+				UtilsItems.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5),
+				null,
+				null, 
+				new int[]{},
+				90*20,
+				500);
 	}
 
 
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 2f57dc4c81..5d1a4cc353 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -13,10 +13,10 @@ import net.minecraft.item.ItemStack;
 public class RECIPES_General {
 
 	static ItemStack RECIPE_Paper = UtilsItems.getSimpleStack(Items.paper);
-	static ItemStack RECIPE_LapisDust = UtilsItems.getItemStackOfAmountFromOreDictNoBroken("dustLazurite", 2);
+	static String RECIPE_LapisDust = "dustLazurite";
 	static ItemStack OUTPUT_Blueprint = UtilsItems.getSimpleStack(ModItems.itemBlueprintBase);
 	static ItemStack RECIPE_CraftingTable = UtilsItems.getSimpleStack(Item.getItemFromBlock(Blocks.crafting_table));
-	static ItemStack RECIPE_BronzePlate = UtilsItems.getItemStackOfAmountFromOreDictNoBrokenExcluding("ic2", "plateAnyBronze", 1);
+	static String RECIPE_BronzePlate = "plateAnyBronze";
 	static ItemStack RECIPE_BasicCasingIC2;
 	static ItemStack OUTPUT_Workbench_Bronze = UtilsItems.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockWorkbench));
 	static ItemStack NULL = null;