Added Solar Tower & Solar Heater.

Added Potassium Nitrate.
Added Sodium Nitrate.
Added Hot/Cold Solar Salt.
Added recipes for the above.
Added Solar Salt processing to Thermal Boiler.
Re-added Assembly Line MKII, Tesla Tower. (WIP)

2 files changed, 77 insertions, 3 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 3d0e6aebfd..adf93c0f69 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1700,7 +1700,7 @@ public class RECIPES_GREGTECH {
 			GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0);
 		}
 
-		HotFuel.addNewHotFuel(GT_ModHandler.getLava(83), GT_Values.NF,
+		HotFuel.addNewHotFuel(FluidUtils.getLava(83), FluidUtils.getPahoehoeLava(83),
 				new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("nuggetCopper", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("nuggetTin", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("nuggetGold", 1),
@@ -1710,7 +1710,7 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getSimpleStack(Blocks.obsidian) },
 				new int[] { 2000, 1000, 250, 250, 250, 250, 500 }, 0);
 
-		HotFuel.addNewHotFuel(FluidUtils.getFluidStack("ic2pahoehoelava", 83), GT_Values.NF,
+		HotFuel.addNewHotFuel(FluidUtils.getPahoehoeLava(83), GT_Values.NF,
 				new ItemStack[] { 
 						ItemUtils.getItemStackOfAmountFromOreDict("nuggetBronze", 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("nuggetElectrum", 1),
@@ -1718,6 +1718,12 @@ public class RECIPES_GREGTECH {
 						ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTungstate", 1),
 						ItemUtils.getSimpleStack(Blocks.obsidian) },
 				new int[] { 750, 250, 250, 250, 1850 }, 0);
+		
+		HotFuel.addNewHotFuel(
+				MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(1000),
+				MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(1000), 
+				FluidUtils.getSuperHeatedSteam(10000),
+				0);
 
 		/*
 		 * HotFuel.addNewHotFuel( FluidUtils.getFluidStack("ic2hotcoolant",
@@ -1754,6 +1760,21 @@ public class RECIPES_GREGTECH {
 
 	private static void centrifugeRecipes() {
 		
+		GT_Values.RA.addCentrifugeRecipe(
+				CI.getNumberedAdvancedCircuit(2),
+				MISC_MATERIALS.SOLAR_SALT_COLD.getCell(10), 
+				null,
+				null,
+				MISC_MATERIALS.SODIUM_NITRATE.getDust(6),
+				MISC_MATERIALS.POTASSIUM_NITRATE.getDust(4),
+				CI.emptyCells(10), 
+				null, 
+				null, 
+				null, 
+				null,
+				20 * 30, 
+				120);
+		
 	}
 
 	private static void mixerRecipes() {
@@ -1769,6 +1790,19 @@ public class RECIPES_GREGTECH {
 				600, 
 				60);
 		
+		GT_Values.RA.addMixerRecipe(
+				CI.getNumberedAdvancedCircuit(2),
+				CI.emptyCells(10),
+				MISC_MATERIALS.SODIUM_NITRATE.getDust(6), 
+				MISC_MATERIALS.POTASSIUM_NITRATE.getDust(4),
+				null, 
+				null,
+				MISC_MATERIALS.SOLAR_SALT_COLD.getCell(10),
+				20 * 10, 
+				120);
+		
+		
+		
 	}
 
 	private static void chemicalReactorRecipes() {
@@ -1796,7 +1830,26 @@ public class RECIPES_GREGTECH {
 				FluidUtils.getFluidStack("sulfuricacid", 4000),
 				FluidUtils.getFluidStack("sulfuricapatite", 8000),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 8), 
-				20 * 20);
+				20 * 20);		
+
+    	GT_Values.RA.addChemicalRecipe(
+    			Materials.Potassium.getDust(1),
+    			CI.getNumberedAdvancedCircuit(1), 
+    			Materials.NitricAcid.getFluid(1000),
+    			GT_Values.NF, 
+    			MISC_MATERIALS.POTASSIUM_NITRATE.getDust(1), 
+    			100, 
+    			30);    	
+
+    	GT_Values.RA.addChemicalRecipe(
+    			ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 1),
+    			CI.getNumberedAdvancedCircuit(1), 
+    			Materials.NitricAcid.getFluid(1000),
+    			GT_Values.NF, 
+    			MISC_MATERIALS.SODIUM_NITRATE.getDust(1), 
+    			100, 
+    			30);
+		
 
 	}
 
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
index 1c95467770..caafbccf29 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -17,6 +17,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.*;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
@@ -28,6 +29,7 @@ import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
 
 public class RECIPES_General {
 
@@ -110,6 +112,25 @@ public class RECIPES_General {
 
 		}
 
+		if (OreDictionary.doesOreNameExist("dustPotassiumNitrade")) {
+			ItemStack aDustKNO3 = ItemUtils.getItemStackOfAmountFromOreDict("dustPotassiumNitrade", 1);
+			ItemStack aDustGtppKNO3 = MISC_MATERIALS.POTASSIUM_NITRATE.getDust(1);
+			if (RecipeUtils.addShapedRecipe(
+					null, null, null,
+					null, "dustPotassiumNitrade", null,
+					null, null, null,
+					ItemUtils.getSimpleStack(aDustGtppKNO3, 1))) {
+				Logger.INFO("Add conversion recipe (GT Potassium Nitrade -> GT++ Potassium Nitrate)");
+			}
+			if (RecipeUtils.addShapedRecipe(
+					null, null, null,
+					null, "dustPotassiumNitrate", null,
+					null, null, null,
+					ItemUtils.getSimpleStack(aDustKNO3, 1))) {
+				Logger.INFO("Add conversion recipe (GT++ Potassium Nitrate -> GT Potassium Nitrade)");
+			}
+		}
+		
 		//Rainforest oak Sapling
 		if (RecipeUtils.addShapedRecipe(
 				"stickWood", "stickWood", "stickWood",