+ Added a new Catalyst (Platinum + Rhodium).

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

11 files changed, 171 insertions, 38 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);
+		}
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index a139ec7a4d..541f02cccd 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -457,7 +457,7 @@ public class BioRecipes {
 				ItemUtils.getItemStackOfAmountFromOreDict("screwTin", GTNH ? 6 : 3)
 		}, 
 				GT_Values.NF, 
-				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 1),
+				CI.getEmptyCatalyst(1),
 				300 * 20, 
 				16);
 	}	
@@ -466,12 +466,12 @@ public class BioRecipes {
 		// Assembly Recipe
 		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
 				getBioChip(4),
-				ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier, 10),
+				CI.getEmptyCatalyst(10),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4),
 				ItemUtils.getItemStackOfAmountFromOreDict("dustSilver", 4)
 		}, 
 				GT_Values.NF, 
-				ItemUtils.getSimpleStack(AgriculturalChem.mGreenCatalyst, 10),
+				CI.getGreenCatalyst(10),
 				20 * 20, 
 				30);
 	}
@@ -479,7 +479,7 @@ public class BioRecipes {
 	private static void recipeAceticAcid() {
 
 		/*		GT_Values.RA.addMixerRecipe(
-						ItemUtils.getSimpleStack(AgriculturalChem.mGreenCatalyst, 10),
+						CI.getGreenCatalyst(10),
 						var2,
 						var3, var4,
 						var5, // Fluid in
@@ -491,7 +491,7 @@ public class BioRecipes {
 
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
-						ItemUtils.getSimpleStack(AgriculturalChem.mGreenCatalyst, 0)
+						CI.getGreenCatalyst(0)
 				},
 				new FluidStack[] {
 						FluidUtils.getFluidStack(BioRecipes.mMethanol, 700),
@@ -734,7 +734,7 @@ public class BioRecipes {
 	private static void recipePropionicAcid() {
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
-						ItemUtils.getSimpleStack(AgriculturalChem.mGreenCatalyst, 0)
+						CI.getGreenCatalyst(0)
 				},
 				new FluidStack[] {
 						FluidUtils.getFluidStack(BioRecipes.mEthylene, 500),
@@ -1287,7 +1287,7 @@ public class BioRecipes {
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(19),
-						ItemUtils.getSimpleStack(AgriculturalChem.mGreenCatalyst, 0),
+						CI.getGreenCatalyst(0),
 				},
 				new FluidStack[] {
 						FluidUtils.getFluidStack(BioRecipes.mMethane, 1000),
@@ -1307,7 +1307,7 @@ public class BioRecipes {
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						getBioChip(20),
-						ItemUtils.getSimpleStack(AgriculturalChem.mGreenCatalyst, 0),
+						CI.getGreenCatalyst(0),
 				},
 				new FluidStack[] {
 						FluidUtils.getFluidStack(BioRecipes.mEthylbenzene, 100),
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
index a063d334bf..422a29c34e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.xmod.gregtech.common.items.behaviours;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import codechicken.lib.math.MathHelper;
@@ -63,7 +62,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
 		if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) {			
 			if (aPlayer.isSneaking()) {
 				Logger.INFO("Changing Mode");
-				boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMod");
+				boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
 				Logger.INFO("Is currently in Fireball mode? "+aCurrentMode);
 				boolean aNewMode = Utils.invertBoolean(aCurrentMode);
 				Logger.INFO("Is now set to Fireball mode? "+aNewMode);
@@ -72,7 +71,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
 				PlayerUtils.messagePlayer(aPlayer, "Current Mode: "+EnumChatFormatting.RED+(aNewMode ? "Projectile" : "Fire Starter"));
 			}
 			else {
-				boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMod");
+				boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
 				if (aCurrentMode) {
 					//Shoot Lightning Attack
 					aWorld.playSoundAtEntity(aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F));
@@ -112,16 +111,16 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
 		if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) {			
 			if (aPlayer.isSneaking()) {
 				Logger.INFO("Changing Mode");
-				boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMod");
+				boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
 				Logger.INFO("Is currently in Fireball mode? "+aCurrentMode);
 				boolean aNewMode = Utils.invertBoolean(aCurrentMode);
 				Logger.INFO("Is now set to Fireball mode? "+aNewMode);
-				aStack.getTagCompound().setBoolean("aFireballMod", aNewMode);
+				aStack.getTagCompound().setBoolean("aFireballMode", aNewMode);
 				//NBTUtils.setBoolean(aStack, "aFireballMode", aNewMode);
 				PlayerUtils.messagePlayer(aPlayer, "Current Mode: "+EnumChatFormatting.RED+(aNewMode ? "Projectile" : "Fire Starter"));
 			}
 			else {
-				boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMod");
+				boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
 				if (aCurrentMode) {
 					//Shoot Lightning Attack
 					aWorld.playSoundAtEntity(aPlayer, "random.bow", 0.5F, 0.4F / (CORE.RANDOM.nextFloat() * 0.4F + 0.8F));
@@ -199,11 +198,14 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
 					}
 				}				
 				boolean aCurrentMode; 		
+				if (!NBTUtils.hasTagCompound(aStack)) {
+					NBTUtils.createEmptyTagCompound(aStack);
+				}
 				if (NBTUtils.hasKey(aStack, "aFireballMode")) {
-					aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMod");
+					aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode");
 				}
 				else {
-					aStack.getTagCompound().setBoolean("aFireballMod", false);
+					aStack.getTagCompound().setBoolean("aFireballMode", false);
 					aCurrentMode = false;
 				}				
 				aList.add("Current Mode: "+EnumChatFormatting.RED+(aCurrentMode ? "Projectile" : "Fire Starter"));	
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
index f812eee113..60c0ade62f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
@@ -37,6 +37,7 @@ import gtPlusPlus.core.item.chemistry.AgriculturalChem;
 import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
@@ -996,20 +997,9 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase {
 		if (aItemInputs != null) {
 			for (final ItemStack aInput : aItemInputs) {
 				if (aInput != null) {
-					if (aInput.isItemEqual(GenericChem.mRedCatalyst))
-						return aInput;
-					else if (aInput.isItemEqual(GenericChem.mYellowCatalyst))
-						return aInput;
-					else if (aInput.isItemEqual(GenericChem.mBlueCatalyst))
-						return aInput;
-					else if (aInput.isItemEqual(GenericChem.mOrangeCatalyst))
-						return aInput;
-					else if (aInput.isItemEqual(GenericChem.mPurpleCatalyst))
-						return aInput;
-					else if (aInput.isItemEqual(AgriculturalChem.mGreenCatalyst))
-						return aInput;
-					else if (aInput.isItemEqual(GenericChem.mBrownCatalyst))
+					if (ItemUtils.isCatalyst(aInput)) {
 						return aInput;
+					}
 				}
 			}
 		}
@@ -1023,7 +1013,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase {
 			log("damage catalyst "+damage);
 			if (damage >= getMaxCatalystDurability()) {
 				log("consume catalyst");
-				ItemStack emptyCatalyst = ItemUtils.getSimpleStack(AgriculturalChem.mCatalystCarrier,1);
+				ItemStack emptyCatalyst = CI.getEmptyCatalyst(1);
 				addOutput(emptyCatalyst);
 				setDamage(aStack,0);
 				aStack.stackSize -= 1;
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index d886ce1ed0..6e1b64cc9a 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -3110,3 +3110,6 @@ item.BasicAlgaeItem.3.name=Algae Spore (IV)
 item.BasicAlgaeItem.4.name=Algae Spore (V)
 item.BasicAlgaeItem.5.name=Algae Spore (VI)
 item.BasicAlgaeItem.6.name=Algae Spore (VII)
+
+//Added17/01/20
+item.BasicGenericChemItem.6.name=Pink Metal Catalyst
diff --git a/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/6.png b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/6.png
new file mode 100644
index 0000000000..aa65838418
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/science/general/MetaItem1/6.png