+ Added a custom recipe handler for the Advanced Combiner.

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

3 files changed, 55 insertions, 32 deletions

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