+ Added Block -> 9 Ingot and Reverse to Extruder recipe generation.

% Tweaked costs of Fluid Melting and Solidifying recipes.
% Changed Assembly Recipe generator. (Now has a factory method for things needing molten fluids)

3 files changed, 95 insertions, 36 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java
index 6e2b90a775..dc22912f0a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java
@@ -4,6 +4,7 @@ import gregtech.api.enums.GT_Values;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.fluid.FluidUtils;
 import gtPlusPlus.core.util.item.ItemUtils;
+import net.minecraft.item.ItemStack;
 
 public class RecipeGen_Assembler  implements Runnable{
 
@@ -28,33 +29,40 @@ public class RecipeGen_Assembler  implements Runnable{
 				60,
 				8);         
 		
-		//Rotor - Soldering Alloy
-		GT_Values.RA.addAssemblerRecipe(
+		//Rotor
+		addAssemblerRecipe(
 				material.getPlate(4),
 				material.getRing(1),
-				FluidUtils.getFluidStack("molten.solderingalloy", 16),
 				material.getRotor(1),
 				240,
-				24);      
-
-		//Rotor - Lead
+				24);          
+		
+	}
+	
+	private static void addAssemblerRecipe(ItemStack input1, ItemStack input2, ItemStack output1, int seconds, int euCost){
 		GT_Values.RA.addAssemblerRecipe(
-				material.getPlate(4),
-				material.getRing(1),
-				FluidUtils.getFluidStack("molten.lead", 48),
-				material.getRotor(1),
-				240,
-				24);      
-
-		//Rotor - Tin
+				input1,
+				input2,
+				FluidUtils.getFluidStack("molten.solderingalloy", 16),
+				output1,
+				seconds,
+				euCost);
 		GT_Values.RA.addAssemblerRecipe(
-				material.getPlate(4),
-				material.getRing(1),
+				input1,
+				input2,
 				FluidUtils.getFluidStack("molten.tin", 32),
-				material.getRotor(1),
-				240,
-				24);      
-		
-	}
+				output1,
+				seconds,
+				euCost);
+		GT_Values.RA.addAssemblerRecipe(
+				input1,
+				input2,
+				FluidUtils.getFluidStack("molten.lead", 48),
+				output1,
+				seconds,
+				euCost);
+		}
+	
+	
 }
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
index f0ebec9c67..ced26598af 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java
@@ -10,11 +10,11 @@ import net.minecraft.item.ItemStack;
 public class RecipeGen_Extruder implements Runnable{
 
 	final Material toGenerate;
-	
+
 	public RecipeGen_Extruder(final Material M){
 		this.toGenerate = M;
 	}
-	
+
 	@Override
 	public void run() {
 		generateRecipes(toGenerate);		
@@ -32,9 +32,36 @@ public class RecipeGen_Extruder implements Runnable{
 		final ItemStack shape_Gear = ItemList.Shape_Extruder_Gear.get(0);
 		final ItemStack shape_Rod = ItemList.Shape_Extruder_Rod.get(0);
 		final ItemStack shape_Bolt = ItemList.Shape_Extruder_Bolt.get(0);
+		final ItemStack shape_Block = ItemList.Shape_Extruder_Block.get(0);
+		final ItemStack shape_Ingot = ItemList.Shape_Extruder_Ingot.get(0);
 
 		Utils.LOG_WARNING("Generating Extruder recipes for "+material.getLocalizedName());
 
+		//Ingot Recipe
+		if (addExtruderRecipe(
+				material.getBlock(1),
+				shape_Ingot,
+				material.getIngot(9),
+				(int) Math.max(material.getMass() * 2L * 1, 1),
+				4 * material.vVoltageMultiplier)){
+			Utils.LOG_WARNING("Extruder Ingot Recipe: "+material.getLocalizedName()+" - Success");
+		}
+		else {
+			Utils.LOG_WARNING("Extruder Ingot Recipe: "+material.getLocalizedName()+" - Failed");			
+		}
+
+		//Block Recipe
+		if (addExtruderRecipe(
+				material.getIngot(9),
+				shape_Block,
+				material.getBlock(1),
+				(int) Math.max(material.getMass() * 2L * 1, 1),
+				8 * material.vVoltageMultiplier)){
+			Utils.LOG_WARNING("Extruder Block Recipe: "+material.getLocalizedName()+" - Success");
+		}
+		else {
+			Utils.LOG_WARNING("Extruder Block Recipe: "+material.getLocalizedName()+" - Failed");			
+		}
 
 		//Plate Recipe
 		if (addExtruderRecipe(
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index 5129a81a67..84c006a90e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -25,6 +25,8 @@ public class RecipeGen_Fluids  implements Runnable{
 	public static void generateRecipes(final Material material, boolean disableOptional){
 				
 		//Melting Shapes to fluid
+		
+		//Dust
 		if (GT_Values.RA.addFluidExtractionRecipe(material.getDust(1), //Input
 				null, //Input 2
 				material.getFluid(144), //Fluid Output
@@ -37,6 +39,8 @@ public class RecipeGen_Fluids  implements Runnable{
 		else {
 			Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");			
 		}	
+		
+		//Ingot
 		if (GT_Values.RA.addFluidExtractionRecipe(material.getIngot(1), //Input
 				null, //Input 2
 				material.getFluid(144), //Fluid Output
@@ -49,6 +53,8 @@ public class RecipeGen_Fluids  implements Runnable{
 		else {
 			Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");			
 		}
+		
+		//Plate
 		if (GT_Values.RA.addFluidExtractionRecipe(material.getPlate(1), //Input
 				null, //Input 2
 				material.getFluid(144), //Fluid Output
@@ -61,6 +67,8 @@ public class RecipeGen_Fluids  implements Runnable{
 		else {
 			Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Failed");			
 		}	
+		
+		//Double Plate
 		if (GT_Values.RA.addFluidExtractionRecipe(material.getPlateDouble(1), //Input
 				null, //Input 2
 				material.getFluid(288), //Fluid Output
@@ -73,23 +81,27 @@ public class RecipeGen_Fluids  implements Runnable{
 		else {
 			Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed");			
 		}
+		
+		//Nugget
 		if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), //Input
 				null, //Input 2
 				material.getFluid(16), //Fluid Output
 				0, //Chance
-				1*20, //Duration
-				16 //Eu Tick
+				16, //Duration
+				8 //Eu Tick
 				)){
 			Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Success");
 		}
 		else {
 			Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");			
 		}
+		
+		//Block
 		if (GT_Values.RA.addFluidExtractionRecipe(material.getBlock(1), //Input
 				null, //Input 2
 				material.getFluid(144*9), //Fluid Output
 				0, //Chance
-				1*20, //Duration
+				288, //Duration
 				16 //Eu Tick
 				)){
 			Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Success");
@@ -98,37 +110,49 @@ public class RecipeGen_Fluids  implements Runnable{
 			Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed");			
 		}
 		
+		
+		
+		
+		
+		
+		
 		//Making Shapes from fluid
+		
+		//Ingot
 		if (GT_Values.RA.addFluidSolidifierRecipe(
 				ItemList.Shape_Mold_Ingot.get(0), //Item Shape		
 				material.getFluid(144), //Fluid Input
 				material.getIngot(1), //output				
-				1*20, //Duration
-				16 //Eu Tick
+				32, //Duration
+				8 //Eu Tick
 				)){
 			Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Success");
 		}
 		else {
 			Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");			
 		}	
+		
+		//Plate
 		if (GT_Values.RA.addFluidSolidifierRecipe(
 				ItemList.Shape_Mold_Plate.get(1), //Item Shape		
 				material.getFluid(144), //Fluid Input
 				material.getPlate(1), //output				
-				1*20, //Duration
-				16 //Eu Tick
+				32, //Duration
+				8 //Eu Tick
 				)){
 			Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Success");
 		}
 		else {
 			Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Failed");			
 		}
+		
+		//Nugget
 		if (GT_Values.RA.addFluidSolidifierRecipe(
 				ItemList.Shape_Mold_Nugget.get(0), //Item Shape		
 				material.getFluid(16), //Fluid Input
 				material.getNugget(1), //output				
-				1*20, //Duration
-				16 //Eu Tick
+				16, //Duration
+				4 //Eu Tick
 				)){
 			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Success");
 		}
@@ -141,13 +165,13 @@ public class RecipeGen_Fluids  implements Runnable{
 				ItemList.Shape_Mold_Gear.get(0), //Item Shape		
 				material.getFluid(576), //Fluid Input
 				material.getGear(1), //output				
-				6*20, //Duration
+				128, //Duration
 				8 //Eu Tick
 				)){
-			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Success");
+			Utils.LOG_WARNING("576l fluid molder for 1 gear Recipe: "+material.getLocalizedName()+" - Success");
 		}
 		else {
-			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");			
+			Utils.LOG_WARNING("576l fluid molder for 1 gear Recipe: "+material.getLocalizedName()+" - Failed");			
 		}
 		
 		//Blocks
@@ -155,7 +179,7 @@ public class RecipeGen_Fluids  implements Runnable{
 				ItemList.Shape_Mold_Block.get(0), //Item Shape		
 				material.getFluid(144*9), //Fluid Input
 				material.getBlock(1), //output				
-				1*20, //Duration
+				288, //Duration
 				16 //Eu Tick
 				)){
 			Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Success");