+ Added a new texture for the Fire Maker.

+ Added a unique NEI GUI for the LFTR.
$ Fixed a spelling error in the LFTR NEI page.
+ Added a recipe for the Fire Maker.
% Changed recipes using uraniumtetrafluoride & uraniumthexafluoride, they now use molten.uraniumtetrafluoride and molten.uraniumhexafluoride.
% Changed the texture of molten.fluids.

4 files changed, 56 insertions, 46 deletions

diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java
index 5d74130f16..bb72418ee1 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/Recipe_GT.java
@@ -239,7 +239,7 @@ public class Recipe_GT extends GT_Recipe{
 		public static final GT_Recipe_Map sAlloyBlastSmelterRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.alloyblastsmelter", "Alloy Blast Smelter", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 9, 1, 1, 0, 1, E, 1, E, true, true);
 		
 		//LFTR recipes
-		public static final GT_Recipe_Map sLiquidFluorineThoriumReactorRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.lftr", "Liquid Fluorine Thorium Reactor", null, RES_PATH_GUI + "basicmachines/Default", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true);
+		public static final GT_Recipe_Map sLiquidFluorineThoriumReactorRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.lftr", "Liquid Fluoride Thorium Reactor", null, RES_PATH_GUI + "basicmachines/LFTR", 0, 0, 0, 2, 1, "Start: ", 1, " EU", true, true);
 		
 		/**
 		 * HashMap of Recipes based on their Items
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java b/src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java
index b785c57869..a7a1526277 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemBasicFirestarter.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.item.general;
 import gtPlusPlus.core.block.general.FirePit;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.player.PlayerUtils;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,7 +15,7 @@ public class ItemBasicFirestarter extends CoreItem {
 
 	public ItemBasicFirestarter() {
 		super("itemSimpleFiremaker", AddToCreativeTab.tabTools, 1, 5, "Can probably make you a fire");		
-		this.setTextureName("flint_and_steel");
+		this.setTextureName(CORE.MODID+":"+"itemFireStarter");
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 6e2e4bde11..a489c2d136 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -166,7 +166,7 @@ public class RECIPES_GREGTECH {
 					new ItemStack[]{
 							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
 					}, //Item input (Array, up to 2)
-					FluidUtils.getFluidStack("uraniumtetrafluoride", 1440), //Fluid input (slot 1)
+					FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440), //Fluid input (slot 1)
 					null, //Fluid output (slot 2)
 					new ItemStack[]{
 						ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10),
@@ -183,7 +183,7 @@ public class RECIPES_GREGTECH {
 					new ItemStack[]{
 							ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10)
 					}, //Item input (Array, up to 2)
-					FluidUtils.getFluidStack("uraniumhexafluoride", 1440), //Fluid input (slot 1)
+					FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1440), //Fluid input (slot 1)
 					null, //Fluid output (slot 2)
 					new ItemStack[]{
 						ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10),
@@ -276,13 +276,13 @@ public class RECIPES_GREGTECH {
 	
 	private static void lftrRecipes(){
 		try {		
-			//Fli2BeF4 + Uranium233 TetraFluoride = Uranium233
-			/*CORE.RA.addLFTRRecipe(
-					FluidUtils.getFluidStack("uraniumtetrafluoride", 200), //Fluid input (slot 1)
-					FluidUtils.getFluidStack("molten.li2bef4", 1000), //Fluid output (slot 2)
-					FluidUtils.getFluidStack("molten.uranium233", 500), //Output Array of Items - Upto 9,
-					16000*20, //Time in ticks
-					4000); //EU	*/
+			//Fli2BeF4 + Thorium TetraFluoride = Uranium233
+			CORE.RA.addLFTRRecipe(
+					FluidUtils.getFluidStack("thoriumtetrafluoride", 400), //Fluid input (slot 1)
+					FluidUtils.getFluidStack("molten.li2bef4", 1200), //Fluid output (slot 2)
+					FluidUtils.getFluidStack("molten.uranium233", 750), //Output Array of Items - Upto 9,
+					12000*20, //Time in ticks
+					3500); //EU	
 			
 			
 			//Fli2BeF4 + Uranium235 = 1x Uranium233
@@ -295,7 +295,7 @@ public class RECIPES_GREGTECH {
 			
 			//Fli2BeF4 + Uranium233 TetraFluoride = Uranium233
 			CORE.RA.addLFTRRecipe(
-					FluidUtils.getFluidStack("uraniumtetrafluoride", 200), //Fluid input (slot 1)
+					FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 200), //Fluid input (slot 1)
 					FluidUtils.getFluidStack("molten.li2bef4", 1000), //Fluid output (slot 2)
 					FluidUtils.getFluidStack("molten.uranium233", 500), //Output Array of Items - Upto 9,
 					16000*20, //Time in ticks
@@ -401,8 +401,8 @@ public class RECIPES_GREGTECH {
 	
 	private static void mixerRecipes(){
 		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60);
-		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("uraniumtetrafluoride", 144*3), null, 3000, 500);
-		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("uraniumtetrafluoride", 720), FluidUtils.getFluidStack("uraniumhexafluoride", 288), null, 5000, 2000);
+		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144*3), null, 3000, 500);
+		GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 720), FluidUtils.getFluidStack("molten.uraniumhexafluoride", 288), null, 5000, 2000);
 	}
 	
 	private static void chemicalReactorRecipes(){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
index 17fa4ef93d..0393dc4e46 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Tools.java
@@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 public class RECIPES_Tools {
-	
+
 	//Outputs
 	public static ItemStack RECIPE_StaballoyPickaxe = new ItemStack(ModItems.itemStaballoyPickaxe);
 	public static ItemStack RECIPE_StaballoyAxe = new ItemStack(ModItems.itemStaballoyAxe);
@@ -20,29 +20,30 @@ public class RECIPES_Tools {
 	//public static ItemStack RECIPE_StaballoyIngot = new ItemStack(ModItems.itemIngotStaballoy);
 	public static ItemStack RECIPE_SandStone = new ItemStack(Blocks.sandstone, 2);
 	public static ItemStack RECIPE_Sand = new ItemStack(Blocks.sand, 4);
-	
+	public static ItemStack RECIPE_FireStarter = ItemUtils.getSimpleStack(ModItems.itemBasicFireMaker);
+
 	public static ItemStack RECIPE_DivisionSigil;
-	
+
 	//MC Items
 	public static Item Apple = Items.apple;
-	
+
 	//MC Blocks
 	public static Block CobbleStone = Blocks.cobblestone;
 	public static Block Dirt = Blocks.dirt;
 	public static Block Sand = Blocks.sand;
 	public static Block Gravel = Blocks.gravel;
 	public static Block Sandstone = Blocks.sandstone;
-	
+
 	//null
 	public static String empty = " ";
-	
+
 	//Batteries
 	public static String batteryBasic = "batteryBasic";
 	public static String batteryAdvanced = "batteryAdvanced";
 	public static String batteryElite = "batteryElite";
 	public static String batteryMaster = "batteryMaster";
 	public static String batteryUltimate = "batteryUltimate";
-	
+
 	//Circuits
 	public static String circuitPrimitive = "circuitPrimitive";
 	public static String circuitBasic = "circuitBasic";
@@ -51,7 +52,7 @@ public class RECIPES_Tools {
 	public static String circuitElite = "circuitElite";
 	public static String circuitMaster = "circuitMaster";
 	public static String circuitUltimate = "circuitUltimate";
-	
+
 	//Cables
 	public static String cableGt01Electrum = "cableGt01Electrum";
 	public static String cableGt02Electrum = "cableGt02Electrum";
@@ -61,8 +62,9 @@ public class RECIPES_Tools {
 	public static String cableGt02Copper = "cableGt02Copper";
 	public static String cableGt01AnnealedCopper = "cableGt01AnnealedCopper";
 	public static String cableGt02AnnealedCopper = "cableGt02AnnealedCopper";
-	
+
 	//Rods
+	public static String stickWood = "stickWood";
 	public static String stickStaballoy= "stickStaballoy";
 	public static String stickTitanium= "stickTitanium";
 	public static String stickIron= "stickIron";
@@ -75,7 +77,7 @@ public class RECIPES_Tools {
 	public static String stickInvar= "stickInvar";
 	public static String stickElectrum= "stickElectrum";
 	public static String stickElectricalSteel= "stickElectricalSteel";
-	
+
 	//Plates
 	public static String plateStaballoy= "plateStaballoy";
 	public static String plateTitanium= "plateTitanium";
@@ -89,7 +91,7 @@ public class RECIPES_Tools {
 	public static String plateInvar= "plateInvar";
 	public static String plateElectrum= "plateElectrum";
 	public static String plateElectricalSteel= "plateElectricalSteel";
-	
+
 	//Ingots
 	public static String ingotStaballoy= "ingotStaballoy";
 	public static String ingotTitanium= "ingotTitanium";
@@ -104,7 +106,7 @@ public class RECIPES_Tools {
 	public static String ingotElectrum= "ingotElectrum";
 	public static String ingotUranium= "ingotUranium";
 	public static String ingotElectricalSteel= "ingotElectricalSteel";
-	
+
 	//Crafting Tools
 	public static String craftingToolHardHammer = "craftingToolHardHammer";
 	public static String craftingToolSoftHammer = "craftingToolSoftHammer";
@@ -115,21 +117,21 @@ public class RECIPES_Tools {
 	public static String craftingToolCrowbar = "craftingToolCrowbar";
 	public static String craftingToolKnife = "craftingToolKnife";
 	public static String craftingToolScrewdriver = "craftingToolScrewdriver";
-	
+
 	public static ItemStack sandHammer = new ItemStack (ModItems.itemSandstoneHammer, 1, OreDictionary.WILDCARD_VALUE);
 	public static String craftingToolSandHammer = "craftingToolSandHammer";
-	
+
 	public static ItemStack personalCloakingDevice = ItemUtils.getSimpleStack(ModItems.itemPersonalCloakingDevice);
 	public static String plateDoubleNiChrome = "plateDoubleNichrome";
 	public static String plateIridiumAlloy = "plateAlloyIridium";
-	
+
 	public static final void RECIPES_LOAD(){		
-		
-			
-			run();
-		
+
+
+		run();
+
 	}
-	
+
 	private static void run(){
 		//Staballoy Pickaxe
 		RecipeUtils.recipeBuilder(
@@ -137,14 +139,14 @@ public class RECIPES_Tools {
 				craftingToolFile, stickTungsten, craftingToolHardHammer,
 				craftingToolWrench, stickTungsten, craftingToolHardHammer,
 				RECIPE_StaballoyPickaxe);
-		
+
 		//Staballoy Axe
 		RecipeUtils.recipeBuilder(
 				plateStaballoy, ingotStaballoy, craftingToolHardHammer,
 				plateStaballoy, stickTungsten, craftingToolHardHammer,
 				craftingToolFile, stickTungsten, craftingToolWrench,
 				RECIPE_StaballoyAxe);
-		
+
 		//Cobble to Sand
 		RecipeUtils.recipeBuilder(
 				CobbleStone, CobbleStone, CobbleStone,
@@ -153,13 +155,13 @@ public class RECIPES_Tools {
 				RECIPE_Sand);
 
 		if (LoadedMods.Baubles){
-		//Cloaking Device
-		RecipeUtils.recipeBuilder(
-				plateDoubleNiChrome, plateIridiumAlloy, plateDoubleNiChrome,
-				plateIridiumAlloy, batteryUltimate, plateIridiumAlloy,
-				plateDoubleNiChrome, plateIridiumAlloy, plateDoubleNiChrome,
-				personalCloakingDevice);
-		
+			//Cloaking Device
+			RecipeUtils.recipeBuilder(
+					plateDoubleNiChrome, plateIridiumAlloy, plateDoubleNiChrome,
+					plateIridiumAlloy, batteryUltimate, plateIridiumAlloy,
+					plateDoubleNiChrome, plateIridiumAlloy, plateDoubleNiChrome,
+					personalCloakingDevice);
+
 		}
 		//Sand to Sandstone
 		RecipeUtils.recipeBuilder(
@@ -167,14 +169,21 @@ public class RECIPES_Tools {
 				Sand, sandHammer, Sand,
 				Sand, Sand, Sand,
 				RECIPE_SandStone);
-		
+
 		//Sandstone Hammer
 		RecipeUtils.recipeBuilder(
 				plateElectrum, ingotElectrum, plateElectrum,
 				craftingToolScrewdriver, stickBronze, craftingToolHardHammer,
 				null, stickSteel, null,
 				RECIPE_SandstoneHammer);	
-		
+
+		//Basic Firemaker
+		RecipeUtils.recipeBuilder(
+				"cropWheat", "cropWheat", "cropWheat",
+				ItemUtils.getSimpleStack(Items.string), stickWood, ItemUtils.getSimpleStack(Items.string),
+				"cropWheat", "cropWheat", "cropWheat",
+				RECIPE_FireStarter);
+
 	}
-	
+
 }