Merge branch 'New-Multis' of https://github.com/GTNewHorizons/GTplusplus into New-Multis

4 files changed, 29 insertions, 10 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index a42d179f65..43bd669829 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -103,6 +103,7 @@ public class GenericChem extends ItemPackage {
 	public static ItemStack mPurpleCatalyst;
 	public static ItemStack mBrownCatalyst;
 	public static ItemStack mPinkCatalyst;
+	public static ItemStack mFormaldehydeCatalyst;
 
 	public static ItemStack mMillingBallAlumina;
 	public static ItemStack mMillingBallSoapstone;
@@ -151,6 +152,7 @@ public class GenericChem extends ItemPackage {
 		mSodiumEthylXanthate = ItemUtils.simpleMetaStack(mGenericChemItem1, 10, 1);
 		mPotassiumEthylXanthate = ItemUtils.simpleMetaStack(mGenericChemItem1, 11, 1);
 		mPotassiumHydroxide = ItemUtils.simpleMetaStack(mGenericChemItem1, 12, 1);
+		mFormaldehydeCatalyst = ItemUtils.simpleMetaStack(mGenericChemItem1, 13, 1);
 
 	}
 
@@ -169,6 +171,7 @@ public class GenericChem extends ItemPackage {
 		ItemUtils.addItemToOreDictionary(mSodiumEthylXanthate, "dustSodiumEthylXanthate");
 		ItemUtils.addItemToOreDictionary(mPotassiumEthylXanthate, "dustPotassiumEthylXanthate");
 		ItemUtils.addItemToOreDictionary(mPotassiumHydroxide, "dustPotassiumHydroxide");
+		ItemUtils.addItemToOreDictionary(mFormaldehydeCatalyst, "catalystFormaldehyde");
 
 	}
 
@@ -289,6 +292,7 @@ public class GenericChem extends ItemPackage {
 		recipeCatalystPurple();
 		recipeCatalystBrown();
 		recipeCatalystPink();
+		recipeCatalystFormaldehyde();
 
 		recipeGrindingBallAlumina();
 		recipeGrindingBallSoapstone();
@@ -773,6 +777,20 @@ public class GenericChem extends ItemPackage {
 				2000);
 
 	}
+	
+	private void recipeCatalystFormaldehyde() {
+		// Assembly Recipe
+		CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {
+				getTierThreeChip(),
+				CI.getEmptyCatalyst(4),
+				ItemUtils.getSimpleStack(RocketFuels.Formaldehyde_Catalyst_Dust, 8)
+		}, 
+				GT_Values.NF, 
+				ItemUtils.getSimpleStack(mFormaldehydeCatalyst, 4),
+				30 * 20, 
+				240);
+
+	}
 
 	private void recipeCadaverineAndPutrescine() {
 
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index b96e0c76ea..c9c5ca98f6 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -54,7 +54,7 @@ public class RocketFuels extends ItemPackage {
 	public static Fluid Monomethylhydrazine_Plus_Nitric_Acid;
 
 	public static Item Ammonium_Nitrate_Dust;
-	public static Item Formaldehyde_Catalyst;
+	public static Item Formaldehyde_Catalyst_Dust;
 	public static ItemStack Formaldehyde_Catalyst_Stack;
 	
 	public RocketFuels() {
@@ -246,7 +246,7 @@ public class RocketFuels extends ItemPackage {
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						CI.getNumberedAdvancedCircuit(21),
-						ItemUtils.getSimpleStack(Formaldehyde_Catalyst, 0),
+						ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0),
 				}, 
 				new FluidStack[] {
 						FluidUtils.getFluidStack("oxygen", 16000),
@@ -273,7 +273,7 @@ public class RocketFuels extends ItemPackage {
 				null,
 				null,
 				null,
-				ItemUtils.getSimpleStack(Formaldehyde_Catalyst, 4), 
+				ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust, 4), 
 				160, 
 				30);
 
@@ -284,7 +284,7 @@ public class RocketFuels extends ItemPackage {
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[] {
 						CI.getNumberedAdvancedCircuit(21),
-						ItemUtils.getSimpleStack(Formaldehyde_Catalyst, 0),
+						ItemUtils.getSimpleStack(GenericChem.mFormaldehydeCatalyst, 0),
 				}, 
 				new FluidStack[] {
 						FluidUtils.getFluidStack("fluid.hydrazine", 2000),
@@ -492,8 +492,8 @@ public class RocketFuels extends ItemPackage {
 
 	@Override
 	public void items() {
-		Formaldehyde_Catalyst = ItemUtils.generateSpecialUseDusts("FormaldehydeCatalyst", "Formaldehyde Catalyst", "Fe16V1", Utils.rgbtoHexValue(25, 5, 25))[0];
-		Formaldehyde_Catalyst_Stack = ItemUtils.getSimpleStack(Formaldehyde_Catalyst);
+		Formaldehyde_Catalyst_Dust = ItemUtils.generateSpecialUseDusts("FormaldehydeCatalyst", "Formaldehyde Catalyst", "Fe16V1", Utils.rgbtoHexValue(25, 5, 25))[0];
+		Formaldehyde_Catalyst_Stack = ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust);
 	}
 
 	@Override
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
index 9a00b49342..c763a1a434 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java
@@ -23,7 +23,7 @@ public class ItemGenericChemBase extends Item {
 
 	final protected IIcon base[];
 	
-	final private int aMetaSize = 13;
+	final private int aMetaSize = 14;
 	
 	/*
 	 * 0 - Red Metal Catalyst //FeCu
@@ -39,6 +39,7 @@ public class ItemGenericChemBase extends Item {
 	 * 10 - Sodium Ethyl Xanthate //CH3CH2ONa + CS2 → CH3CH2OCS2Na
 	 * 11 - Potassium Ethyl Xanthate //CH3CH2OH + CS2 + KOH → CH3CH2OCS2K + H2O
 	 * 12 - Potassium Hydroxide // KOH
+	 * 13 - Formaldehyde Catalyst //Fe16V1
 	 */
 	
 	public ItemGenericChemBase() {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index e96bd3391b..fa685aa93c 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1314,9 +1314,6 @@ public class ItemUtils {
 	}
 
 	public static boolean isCatalyst(ItemStack aStack) {
-		if (GT_Utility.areStacksEqual(aStack, RocketFuels.Formaldehyde_Catalyst_Stack, true)) {
-			return true;
-		}
 		if (GT_Utility.areStacksEqual(aStack, GenericChem.mBlueCatalyst, true)) {
 			return true;
 		}
@@ -1338,6 +1335,9 @@ public class ItemUtils {
 		if (GT_Utility.areStacksEqual(aStack, GenericChem.mPinkCatalyst, true)) {
 			return true;
 		}
+		if (GT_Utility.areStacksEqual(aStack, GenericChem.mFormaldehydeCatalyst, true)) {
+			return true;
+		}
 		if (GT_Utility.areStacksEqual(aStack, AgriculturalChem.mGreenCatalyst, true)) {
 			return true;
 		}