+ Added a new Catalyst (Platinum + Rhodium).

+ Added simple functions to CI for obtaining catalysts.
% Improved Catalyst handling across the board.
$ Fixed Pyromatic 'mode' handling.

2 files changed, 104 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 2f3e27ff66..f1676689e7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -17,6 +17,7 @@ import gregtech.api.util.ThermalFuel;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.item.chemistry.IonParticles;
 import gtPlusPlus.core.item.chemistry.RocketFuels;
@@ -39,6 +40,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
 import gtPlusPlus.everglades.dimension.Dimension_Everglades;
+import gtPlusPlus.plugin.agrichem.BioRecipes;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -91,6 +93,7 @@ public class RECIPES_GREGTECH {
 		latheRecipes();
 		vacuumFreezerRecipes();
 		fluidheaterRecipes();
+		chemplantRecipes();
 
 
 		/**
@@ -107,6 +110,30 @@ public class RECIPES_GREGTECH {
 		addFuels();
 	}
 
+	private static void chemplantRecipes() {
+
+		// Advanced method for Nitric Acid Production
+		/*		CORE.RA.addChemicalPlantRecipe(
+						new ItemStack[] {
+								CI.getNumberedBioCircuit(17),
+								CI.getPinkCatalyst(0),
+						},
+						new FluidStack[] {
+								FluidUtils.getLava(10000),
+								FluidUtils.getDistilledWater(5000)
+						},
+						new ItemStack[] {
+								
+						},
+						new FluidStack[] {
+								FluidUtils.getFluidStack("nitricacid", 2000),					
+						},
+						10 * 20,
+						480,
+						3);*/
+		
+	}
+
 	private static void fluidheaterRecipes() {
 		GT_Values.RA.addFluidHeaterRecipe(CI.getNumberedCircuit(20), FluidUtils.getWater(1000), FluidUtils.getHotWater(1000), 30, 30);
 
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index f2b67bfe68..1d3d386da3 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -7,6 +7,7 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.chemistry.AgriculturalChem;
+import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
@@ -1280,4 +1281,80 @@ public class CI {
 		return aTransParts[aTier].get(aAmount);
 	}
 
+	public static ItemStack getEmptyCatalyst(int aAmount) {
+		return ItemUtils.simpleMetaStack(AgriculturalChem.mAgrichemItem1, 13, aAmount);
+	}
+
+	/**
+	 * Aluminium + Silver Catalyst
+	 * @param aAmount - Stacksize
+	 * @return - A Catalyst stack of given size
+	 */
+	public static ItemStack getGreenCatalyst(int aAmount) {
+		return ItemUtils.simpleMetaStack(AgriculturalChem.mAgrichemItem1, 14, aAmount);
+	}
+	
+	/**
+	 * Iron + Copper Catalyst
+	 * @param aAmount - Stacksize
+	 * @return - A Catalyst stack of given size
+	 */
+	public static ItemStack getRedCatalyst(int aAmount) {
+		return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 0, aAmount);
+	}
+	
+	/**
+	 * Tungsten + Nickel Catalyst
+	 * @param aAmount - Stacksize
+	 * @return - A Catalyst stack of given size
+	 */
+	public static ItemStack getYellowCatalyst(int aAmount) {
+		return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 1, aAmount);
+	}
+	
+	/**
+	 * Cobalt + Titanium Catalyst
+	 * @param aAmount - Stacksize
+	 * @return - A Catalyst stack of given size
+	 */
+	public static ItemStack getBlueCatalyst(int aAmount) {
+		return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 2, aAmount);
+	}
+	
+	/**
+	 * Vanadium + Palladium Catalyst
+	 * @param aAmount - Stacksize
+	 * @return - A Catalyst stack of given size
+	 */
+	public static ItemStack getOrangeCatalyst(int aAmount) {
+		return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 3, aAmount);
+	}
+	
+	/**
+	 * Iridium + Ruthenium Catalyst
+	 * @param aAmount - Stacksize
+	 * @return - A Catalyst stack of given size
+	 */
+	public static ItemStack getPurpleCatalyst(int aAmount) {
+		return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 4, aAmount);
+	}
+	
+	/**
+	 * Aluminium + Nickel Catalyst
+	 * @param aAmount - Stacksize
+	 * @return - A Catalyst stack of given size
+	 */
+	public static ItemStack getBrownCatalyst(int aAmount) {
+		return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 5, aAmount);
+	}
+	
+	/**
+	 * Platinum + Rhodium Catalyst
+	 * @param aAmount - Stacksize
+	 * @return - A Catalyst stack of given size
+	 */
+	public static ItemStack getPinkCatalyst(int aAmount) {
+		return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 6, aAmount);
+	}
+
 }