+ Added a new Catalyst (Platinum + Rhodium).

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

6 files changed, 146 insertions, 8 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 48fe145b68..49d3303688 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -87,7 +87,7 @@ public class GenericChem extends ItemPackage {
 
 	// Phenol Byproducts
 	public Item PhenolicResins; //https://en.wikipedia.org/wiki/Phenol_formaldehyde_resin
-	public ItemGenericChemBase mGenericChemItem1;
+	public static ItemGenericChemBase mGenericChemItem1;
 
 
 
@@ -112,6 +112,7 @@ public class GenericChem extends ItemPackage {
 	public static ItemStack mOrangeCatalyst;
 	public static ItemStack mPurpleCatalyst;
 	public static ItemStack mBrownCatalyst;
+	public static ItemStack mPinkCatalyst;
 	
 	
 	public void registerItemStacks() {
@@ -124,6 +125,7 @@ public class GenericChem extends ItemPackage {
 		mOrangeCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 3, 1);
 		mPurpleCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 4, 1);
 		mBrownCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 5, 1);
+		mPinkCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 6, 1);
 		
 	}
 	
@@ -135,6 +137,7 @@ public class GenericChem extends ItemPackage {
 		ItemUtils.addItemToOreDictionary(mOrangeCatalyst, "catalystVanadiumPalladium");
 		ItemUtils.addItemToOreDictionary(mPurpleCatalyst, "catalystIridiumRuthenium");
 		ItemUtils.addItemToOreDictionary(mBrownCatalyst, "catalystNickelAluminium");
+		ItemUtils.addItemToOreDictionary(mPinkCatalyst, "catalystPlatinumRhodium");
 		
 	}
 
@@ -206,6 +209,7 @@ public class GenericChem extends ItemPackage {
 		recipeCatalystOrange();
 		recipeCatalystPurple();
 		recipeCatalystBrown();
+		recipeCatalystPink();
 		
 		recipeNitroBenzene();
 		recipeAniline();
@@ -293,7 +297,7 @@ public class GenericChem extends ItemPackage {
 		// Assembly Recipe
 		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 				getTierOneChip(),
-				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				CI.getEmptyCatalyst(10),
 				ELEMENT.getInstance().IRON.getDust(2),
 				ELEMENT.getInstance().COPPER.getDust(2),
 		}, 
@@ -308,7 +312,7 @@ public class GenericChem extends ItemPackage {
 		// Assembly Recipe
 		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 				getTierThreeChip(),
-				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				CI.getEmptyCatalyst(10),
 				ELEMENT.getInstance().TUNGSTEN.getDust(4),
 				ELEMENT.getInstance().NICKEL.getDust(4),
 		}, 
@@ -323,7 +327,7 @@ public class GenericChem extends ItemPackage {
 		// Assembly Recipe
 		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 				getTierTwoChip(),
-				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				CI.getEmptyCatalyst(10),
 				ELEMENT.getInstance().COBALT.getDust(3),
 				ELEMENT.getInstance().TITANIUM.getDust(3),
 		}, 
@@ -338,7 +342,7 @@ public class GenericChem extends ItemPackage {
 		// Assembly Recipe
 		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 				getTierTwoChip(),
-				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				CI.getEmptyCatalyst(10),
 				ELEMENT.getInstance().VANADIUM.getDust(5),
 				ELEMENT.getInstance().PALLADIUM.getDust(5),
 		}, 
@@ -353,7 +357,7 @@ public class GenericChem extends ItemPackage {
 		// Assembly Recipe
 		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 				getTierFourChip(),
-				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				CI.getEmptyCatalyst(10),
 				ELEMENT.getInstance().IRIDIUM.getDust(6),
 				ELEMENT.getInstance().RUTHENIUM.getDust(6),
 		}, 
@@ -368,7 +372,7 @@ public class GenericChem extends ItemPackage {
 		// Assembly Recipe
 		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 				getTierOneChip(),
-				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				CI.getEmptyCatalyst(10),
 				ELEMENT.getInstance().NICKEL.getDust(4),
 				ELEMENT.getInstance().ALUMINIUM.getDust(4),
 		}, 
@@ -379,6 +383,21 @@ public class GenericChem extends ItemPackage {
 		
 	}
 
+	private void recipeCatalystPink() {
+		// Assembly Recipe
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				getTierThreeChip(),
+				CI.getEmptyCatalyst(10),
+				ELEMENT.getInstance().PLATINUM.getDust(4),
+				ELEMENT.getInstance().RHODIUM.getDust(4),
+		}, 
+				GT_Values.NF, 
+				ItemUtils.getSimpleStack(mPinkCatalyst, 10),
+				30 * 20, 
+				2000);
+		
+	}
+
 	private void recipeCadaverineAndPutrescine() {
 		
 		// Basic Recipe
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
index 8a003ec7aa..208fecd57c 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
@@ -19,7 +19,7 @@ public class ItemGenericChemBase extends Item {
 
 	final protected IIcon base[];
 	
-	final private int aMetaSize = 6;
+	final private int aMetaSize = 7;
 	
 	/*
 	 * 0 - Red Metal Catalyst //FeCu
@@ -28,6 +28,7 @@ public class ItemGenericChemBase extends Item {
 	 * 3 - Orange Metal Catalyst //Vanadium Pd
 	 * 4 - Purple Metal Catalyst //IrIdium Ruthenium
 	 * 5 - Brown Metal Catalyst //NiAl
+	 * 6 - Pink Metal Catalyst //PtRh
 	 * 
 	 */
 	
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);
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 9f5f374108..2ed4532d18 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1337,6 +1337,9 @@ public class ItemUtils {
 		if (GT_Utility.areStacksEqual(aStack, GenericChem.mYellowCatalyst, true)) {
 			return true;
 		}
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) {
+			return true;
+		}
 		if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) {
 			return true;
 		}
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java
index 66abbded15..b0623d429d 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/NBTUtils.java
@@ -464,4 +464,15 @@ public class NBTUtils {
 		return ReflectionUtils.setField(aEntity, "customEntityData", aTag);
 	}
 
+	public static boolean hasTagCompound(ItemStack aStack) {
+		return aStack.hasTagCompound();
+	}
+	
+	public static void createEmptyTagCompound(ItemStack aStack) {
+		if (!hasTagCompound(aStack)) {
+			NBTTagCompound aTag = new NBTTagCompound();
+			aStack.setTagCompound(aTag);
+		}
+	}
+
 }