+ 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, 28 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
 	 * 
 	 */