+ Added new recipe for HG-1223.

$ Fixed generation of mixer recipes, which will now use circuits if the length < 4.
$ Properly disabled the advanced mixer, after a futile previous attempt.

3 files changed, 62 insertions, 38 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 3a0d033725..ba65ef0c97 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -42,7 +42,7 @@ public class RECIPES_GREGTECH {
 		chemicalReactorRecipes();
 		dehydratorRecipes();
 		blastFurnaceRecipes();
-		lftrRecipes();
+		//lftrRecipes();
 		fissionFuelRecipes();
 		autoclaveRecipes();
 		compressorRecipes();
@@ -52,7 +52,7 @@ public class RECIPES_GREGTECH {
 		benderRecipes();
 		cyclotronRecipes();
 		blastSmelterRecipes();
-		advancedMixerRecipes();
+		//advancedMixerRecipes();
 		sifterRecipes();
 		electroMagneticSeperatorRecipes();
 		extruderRecipes();
@@ -774,6 +774,16 @@ public class RECIPES_GREGTECH {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null,
 				FluidUtils.getFluidStack("hydrofluoricacid", 144 * 5),
 				FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144 * 5), null, 3000, 500);
+		GT_Values.RA.addMixerRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3),
+				null,
+				ALLOY.HG1223.getFluid(144*16), 
+				CI.emptyCells(1),
+				30 * 20,
+				500);
 	}
 
 	private static void chemicalReactorRecipes() {
@@ -1066,12 +1076,15 @@ public class RECIPES_GREGTECH {
 
 	private static void advancedMixerRecipes() {
 		// HgBa2Ca2Cu3O8
-		CORE.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1),
+		CORE.RA.addMixerRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2),
-				ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3), FluidUtils.getFluidStack("oxygen", 8000),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3),
+				FluidUtils.getFluidStack("oxygen", 8000),
 				null, CI.emptyCells(1), ALLOY.HG1223.getDust(16), null, null,
-				30 * 20, 500);
+				30 * 20, 500);	
+		
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index 1b392a5d10..52a3c914b6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -145,14 +145,25 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 					Logger.WARNING(ItemUtils.getArrayStackNames(inputStacks));
 
 					//Get us four ItemStacks to input into the mixer
-					ItemStack input1, input2, input3, input4;
-					input1 = (inputStacks.length >= 1) ? (input1 = (inputStacks[0] == null) ? null : inputStacks[0]) : null;
-					input2 = (inputStacks.length >= 2) ? (input2 = (inputStacks[1] == null) ? null : inputStacks[1]) : null;
-					input3 = (inputStacks.length >= 3) ? (input3 = (inputStacks[2] == null) ? null : inputStacks[2]) : null;
-					input4 = (inputStacks.length >= 4) ? (input4 = (inputStacks[3] == null) ? null : inputStacks[3]) : null;
+					ItemStack[] input = new ItemStack[4];
+					
+					/*input[0] = (inputStacks.length >= 1) ? ((inputStacks[0] == null) ? null : inputStacks[0]) : null;
+					input[1] = (inputStacks.length >= 2) ? ((inputStacks[1] == null) ? null : inputStacks[1]) : null;
+					input[2] = (inputStacks.length >= 3) ? ((inputStacks[2] == null) ? null : inputStacks[2]) : null;
+					input[3] = (inputStacks.length >= 4) ? ((inputStacks[3] == null) ? null : inputStacks[3]) : null;
+					*/
+					
+					for (int g = 0; g<4; g++) {						
+						if(inputStacks.length > g) {
+							input[g] = inputStacks[g] != null ? inputStacks[g] : null;							
+						}
+						else {
+							input[g] = CI.getNumberedCircuit(g+10);
+							break;
+						}												
+					}					
 
 					//Add mixer Recipe
-
 					FluidStack oxygen = GT_Values.NF;
 					if (material.getComposites() != null){
 						for (final MaterialStack x : material.getComposites()){
@@ -160,7 +171,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 								if (x != null){
 									if (x.getStackMaterial() != null){
 										if (x.getStackMaterial().getDust(1) == null){
-											if (x.getStackMaterial().getState() == MaterialState.GAS){
+											if (x.getStackMaterial().getState() == MaterialState.GAS || x.getStackMaterial().getState() == MaterialState.LIQUID || x.getStackMaterial().getState() == MaterialState.PURE_LIQUID){
 												oxygen = x.getStackMaterial().getFluid(1000);
 											}
 										}
@@ -173,8 +184,8 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
 
 					//Add mixer Recipe
 					if (GT_Values.RA.addMixerRecipe(
-							input1, input2,
-							input3, input4,
+							input[0], input[1],
+							input[2], input[3],
 							oxygen,
 							null,
 							outputStacks,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
index 5db800d82a..e34f480b0e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
@@ -48,82 +48,82 @@ public class GregtechAdvancedMixer {
 	private static void run1(){
 		GregtechItemList.Machine_Advanced_LV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.01",
 				"Basic Combiner", 1, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1,
-				"MixerAdvanced.png", "", false, false, 0, "MIXER",
-				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+				"MixerAdvanced.png", "", false, false, 0, "MIXER", null
+				/*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 						ItemList.Machine_LV_Mixer, Character.valueOf('E'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/).getStackForm(1L));
 		GregtechItemList.Machine_Advanced_MV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.02",
 				"Advanced Combiner I", 2, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1,
-				"MixerAdvanced.png", "", false, false, 0, "MIXER",
-				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+				"MixerAdvanced.png", "", false, false, 0, "MIXER", null
+				/*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 						ItemList.Machine_MV_Mixer, Character.valueOf('E'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/).getStackForm(1L));
 		GregtechItemList.Machine_Advanced_HV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.03",
 				"Advanced Combiner II", 3, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1,
-				"MixerAdvanced.png", "", false, false, 0, "MIXER",
-				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+				"MixerAdvanced.png", "", false, false, 0, "MIXER", null
+				/*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 						ItemList.Machine_HV_Mixer, Character.valueOf('E'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/).getStackForm(1L));
 		GregtechItemList.Machine_Advanced_EV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.04",
 				"Super Combiner I", 4, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1,
-				"MixerAdvanced.png", "", false, false, 0, "MIXER",
-				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+				"MixerAdvanced.png", "", false, false, 0, "MIXER", null
+				/*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 						ItemList.Machine_EV_Mixer, Character.valueOf('E'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/).getStackForm(1L));
 		GregtechItemList.Machine_Advanced_IV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.05",
 				"Super Combiner II", 5, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1,
-				"MixerAdvanced.png", "", false, false, 0, "MIXER",
-				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+				"MixerAdvanced.png", "", false, false, 0, "MIXER", null
+				/*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 						ItemList.Machine_IV_Mixer, Character.valueOf('E'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
 						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/).getStackForm(1L));
 
 		if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
 			try {
 				GregtechItemList.Machine_Advanced_LuV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.06",
 						"Mega Combiner I", 6, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1,
-						"MixerAdvanced.png", "", false, false, 0, "MIXER",
-						new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						"MixerAdvanced.png", "", false, false, 0, "MIXER", null
+						/*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 								//ItemList.Machine_LuV_Mixer, Character.valueOf('E'),
 								ItemList.valueOf("Machine_LuV_Mixer"), Character.valueOf('E'),
 								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
 								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
 								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/).getStackForm(1L));
 				GregtechItemList.Machine_Advanced_ZPM_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.07",
 						"Mega Combiner II", 7, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1,
-						"MixerAdvanced.png", "", false, false, 0, "MIXER",
-						new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						"MixerAdvanced.png", "", false, false, 0, "MIXER", null
+						/*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 								//ItemList.Machine_ZPM_Mixer, Character.valueOf('E'),
 								ItemList.valueOf("Machine_ZPM_Mixer"), Character.valueOf('E'),
 								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
 								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
 								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/).getStackForm(1L));
 				GregtechItemList.Machine_Advanced_UV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(mID++, "advancedmachine.mixer.tier.08",
 						"Ultra Combiner I", 8, "Indeed, It does blend!", map, 4, 4, 32000, 0, 1,
-						"MixerAdvanced.png", "", false, false, 0, "MIXER",
-						new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
+						"MixerAdvanced.png", "", false, false, 0, "MIXER", null
+						/*new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 								//ItemList.Machine_UV_Mixer, Character.valueOf('E'),
 								ItemList.valueOf("Machine_UV_Mixer"), Character.valueOf('E'),
 								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('R'),
 								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, Character.valueOf('C'),
 								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, Character.valueOf('G'),
-								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
+								GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }*/).getStackForm(1L));
 			}
 			catch (Throwable t){}
 		}