+ Added a custom recipe handler for the Advanced Combiner.

+ Added a Combined recipe for the HG-1223 Super Conductor.
% Slight tweak to material generator.

7 files changed, 125 insertions, 48 deletions

diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java
index a8ce381907..b63a259f9c 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/Recipe_GT.java
@@ -265,6 +265,10 @@ public class Recipe_GT extends GT_Recipe{
 		//Cyclotron recipe map
 		public static final GT_Recipe_Map sCyclotronRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(200), "gt.recipe.cyclotron", "COMET - Compact Cyclotron", null, RES_PATH_GUI + "basicmachines/BlastSmelter", 1, 1, 1, 0, 1, E, 1, E, true, true);
 
+		//Advanced Mixer
+		public static final GT_Recipe_Map sAdvancedMixerRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(1000), "gt.recipe.advanced.mixer",
+				"Advanced Material Combiner", null, "gregtech:textures/gui/basicmachines/MixerAdvanced", 4, 4, 1, 0, 2, "", 1, "", true, true);
+		
 		
 		/**
 		 * HashMap of Recipes based on their Items
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 99998d588b..7527a5d149 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -446,7 +446,7 @@ public final class ModItems {
 			MaterialGenerator.generate(ALLOY.LEAGRISIUM);
 			
 			//Super Conductor
-			MaterialGenerator.generate(ALLOY.HG1223, false);
+			MaterialGenerator.generate(ALLOY.HG1223, false, false);
 			
 
 			//Must be the final Alloy to Generate
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 02045368c8..0b6848846b 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -96,8 +96,8 @@ public class MaterialGenerator {
 				} else {
 					Item temp;
 					if (generateEverything == true){
-					Block tempBlock;
-					tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
+						Block tempBlock;
+						tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
 					}
 					temp = new BaseItemIngot(matInfo);
 					temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation);
@@ -110,8 +110,10 @@ public class MaterialGenerator {
 			}
 			else if (matInfo.getState() == MaterialState.LIQUID){
 				Item temp;
-				Block tempBlock;
-				tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
+				if (generateEverything == true){
+					Block tempBlock;
+					tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
+				}
 				temp = new BaseItemIngot(matInfo);
 				temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation);
 				temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation);
@@ -128,7 +130,9 @@ public class MaterialGenerator {
 			//Add A jillion Recipes - old code
 			RecipeGen_AlloySmelter.generateRecipes(matInfo);
 			RecipeGen_Assembler.generateRecipes(matInfo);
-			RecipeGen_BlastSmelter.generateARecipe(matInfo);
+			if (generateBlastSmelterRecipes){
+				RecipeGen_BlastSmelter.generateARecipe(matInfo);
+			}
 			RecipeGen_DustGeneration.generateRecipes(matInfo);
 			RecipeGen_Extruder.generateRecipes(matInfo);
 			RecipeGen_Fluids.generateRecipes(matInfo);
@@ -177,34 +181,34 @@ public class MaterialGenerator {
 	@SuppressWarnings("unused")
 	public static void generateNuclearMaterial(final Material matInfo, final boolean generatePlates){
 		try {
-		final String unlocalizedName = matInfo.getUnlocalizedName();
-		final String materialName = matInfo.getLocalizedName();
-		final short[] C = matInfo.getRGBA();
-		final int Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
+			final String unlocalizedName = matInfo.getUnlocalizedName();
+			final String materialName = matInfo.getLocalizedName();
+			final short[] C = matInfo.getRGBA();
+			final int Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
 
-		int sRadiation = 0;
-		if (matInfo.vRadiationLevel != 0){
-			sRadiation = matInfo.vRadiationLevel;
-		}
+			int sRadiation = 0;
+			if (matInfo.vRadiationLevel != 0){
+				sRadiation = matInfo.vRadiationLevel;
+			}
 
-		Item temp;
-		Block tempBlock;
-
-		tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
-		temp = new BaseItemIngot(matInfo);
-		temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", 3, sRadiation);
-		temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", 2, sRadiation);
-		temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", 1, sRadiation);
-		temp = new BaseItemNugget(matInfo);
-		temp = new BaseItemPlate(matInfo);
-		temp = new BaseItemPlateDouble(matInfo);
-
-		RecipeGen_Plates.generateRecipes(matInfo);
-		RecipeGen_Extruder.generateRecipes(matInfo);
-		RecipeGen_ShapedCrafting.generateRecipes(matInfo);
-		RecipeGen_Fluids.generateRecipes(matInfo);
-		RecipeGen_Assembler.generateRecipes(matInfo);
-		RecipeGen_DustGeneration.generateRecipes(matInfo, true);
+			Item temp;
+			Block tempBlock;
+
+			tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
+			temp = new BaseItemIngot(matInfo);
+			temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", 3, sRadiation);
+			temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", 2, sRadiation);
+			temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", 1, sRadiation);
+			temp = new BaseItemNugget(matInfo);
+			temp = new BaseItemPlate(matInfo);
+			temp = new BaseItemPlateDouble(matInfo);
+
+			RecipeGen_Plates.generateRecipes(matInfo);
+			RecipeGen_Extruder.generateRecipes(matInfo);
+			RecipeGen_ShapedCrafting.generateRecipes(matInfo);
+			RecipeGen_Fluids.generateRecipes(matInfo);
+			RecipeGen_Assembler.generateRecipes(matInfo);
+			RecipeGen_DustGeneration.generateRecipes(matInfo, true);
 		} catch (Throwable t){
 			Utils.LOG_INFO(""+matInfo.getLocalizedName()+" failed to generate.");
 		}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index f627d28c00..24c1bd4855 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -7,6 +7,7 @@ import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.nuclear.NUCLIDE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
@@ -50,6 +51,7 @@ public class RECIPES_GREGTECH {
 		benderRecipes();
 		cyclotronRecipes();
 		blastSmelterRecipes();
+		advancedMixerRecipes();
 		addFuels();
 	}	
 
@@ -948,5 +950,22 @@ public class RECIPES_GREGTECH {
 				2040, 
 				500*20);		
 	}
+	
+	private static void advancedMixerRecipes(){
+		//HgBa2Ca2Cu3O8
+		CORE.RA.addMixerRecipe(
+				ItemUtils.getItemStackOfAmountFromOreDict("cellMercury", 1),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustBarium", 2),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustCalcium", 2),
+				ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 3),
+				FluidUtils.getFluidStack("oxygen", 8000),
+				null,
+				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1),
+				ALLOY.HG1223.getDust(16),
+				null,
+				null,
+				30*20,
+				500);
+	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index 3a889fbf36..842f518674 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -120,5 +120,9 @@ public interface IGregtech_RecipeAdder {
 	
 	public boolean addCyclotronRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs,
 			FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue);
+	
+	public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4,
+			FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aDuration, int aEUt);
+		
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index c372335155..795d1762ba 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -375,5 +375,23 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
 		}
 		return false;
 	}
+	
+	public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4,
+			FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aDuration, int aEUt) {
+		if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) {
+			return false;
+		}
+		if ((aOutput1 != null) && ((aDuration = GregTech_API.sRecipeFile.get("advancedmixer", aOutput1, aDuration)) <= 0)) {
+			return false;
+		}
+		if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("advancedmixer",
+				aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
+			return false;
+		}
+		Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.addRecipe(true, new ItemStack[] { aInput1, aInput2, aInput3, aInput4 },
+				new ItemStack[] { aOutput1, aOutput2, aOutput3, aOutput4 }, null, null, new FluidStack[] { aFluidInput },
+				new FluidStack[] { aFluidOutput }, aDuration, aEUt, 0);
+		return true;
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
index a09a9674de..e169a3c0e0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedMixer.java
@@ -1,8 +1,13 @@
 package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
+import java.util.Collection;
+
 import gregtech.api.enums.ItemList;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe;
 import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gregtech.api.util.Recipe_GT;
+import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 
 public class GregtechAdvancedMixer {
@@ -10,82 +15,105 @@ public class GregtechAdvancedMixer {
 	private static int mID = 851;
 	
 	public static void run(){
+		generateMixerRecipeMap();
 		run1();
 	}
 	
+	private static boolean generateMixerRecipeMap(){
+		if (Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() == 0){
+			GT_Recipe_Map oldMap = GT_Recipe.GT_Recipe_Map.sMixerRecipes;
+			GT_Recipe_Map map = Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes;
+			final Collection<GT_Recipe> x = oldMap.mRecipeList;
+			Utils.LOG_INFO("Generating " + map.mUnlocalizedName + " Recipes.");
+			for (final GT_Recipe g : x) {
+				Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.add(g);
+			}
+			
+			if (Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes.mRecipeList.size() > 0){
+				return true;
+			}
+			else {
+				Utils.LOG_INFO("Failed to generate "+ map.mUnlocalizedName +" recipes.");
+				return false;
+			}
+			
+		}		
+		return true;
+	}
+	
 	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!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"Basic Combiner", 1, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
 				"MixerAdvanced.png", "", false, false, 0, "MIXER",
 				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.GLASS }).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!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"Advanced Combiner I", 2, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
 				"MixerAdvanced.png", "", false, false, 0, "MIXER",
 				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.GLASS }).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!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"Advanced Combiner II", 3, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
 				"MixerAdvanced.png", "", false, false, 0, "MIXER",
 				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.GLASS }).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!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"Super Combiner I", 4, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
 				"MixerAdvanced.png", "", false, false, 0, "MIXER",
 				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.GLASS }).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!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"Super Combiner II", 5, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
 				"MixerAdvanced.png", "", false, false, 0, "MIXER",
 				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.GLASS }).getStackForm(1L));
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
 		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!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"Mega Combiner I", 6, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
 				"MixerAdvanced.png", "", false, false, 0, "MIXER",
 				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 						ItemList.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.GLASS }).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!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"Mega Combiner II", 7, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
 				"MixerAdvanced.png", "", false, false, 0, "MIXER",
 				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 						ItemList.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.GLASS }).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!", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 4, 32000, 0, 1,
+				"Ultra Combiner I", 8, "Indeed, It does blend!", Recipe_GT.Gregtech_Recipe_Map.sAdvancedMixerRecipes, 4, 4, 32000, 0, 1,
 				"MixerAdvanced.png", "", false, false, 0, "MIXER",
 				new Object[] { "GRG", "GEG", "CMC", Character.valueOf('M'),
 						ItemList.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.GLASS }).getStackForm(1L));
+						GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE }).getStackForm(1L));
 	}
 	
 }