% Moved Several recipes to the Chemical Plant. Fixes #547.

% Adjusted Some Bio recipes, based on feedback from Discord. (Butanol now has 4.5x better fuel value)
% Added a hard crash into the Chemical Plant recipe handler, to prevent it being handled incorrectly.
$ Fixed Toluene Cell generating under wrong circumstances.

2 files changed, 108 insertions, 34 deletions

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 8eba9668ad..8428328f37 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -6,14 +6,12 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.ModItems;
-import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
@@ -334,8 +332,6 @@ public class CoalTar extends ItemPackage {
 		}
 		else {
 			Toluene = FluidUtils.getWildcardFluidStack("liquid_toluene", 1).getFluid();
-			Item itemCellToluene = new BaseItemComponent("liquid_toluene", "Toluene", new short[]{140, 70, 20, 100});
-			CORE.RA.addFluidCannerRecipe(ItemUtils.getEmptyCell(), ItemUtils.getSimpleStack(itemCellToluene), FluidUtils.getFluidStack(Toluene, 1000), null);
 		}
 
 		//Create Coal Tar
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 83f49cf9b7..35d2066793 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -301,7 +301,7 @@ public class GenericChem extends ItemPackage {
 		}, 
 				GT_Values.NF, 
 				ItemUtils.getSimpleStack(mRedCatalyst, 10),
-				600 * 20, 
+				20 * 20, 
 				30);
 		
 	}
@@ -316,7 +316,7 @@ public class GenericChem extends ItemPackage {
 		}, 
 				GT_Values.NF, 
 				ItemUtils.getSimpleStack(mYellowCatalyst, 10),
-				600 * 20, 
+				60 * 20, 
 				2000);
 		
 	}
@@ -331,7 +331,7 @@ public class GenericChem extends ItemPackage {
 		}, 
 				GT_Values.NF, 
 				ItemUtils.getSimpleStack(mBlueCatalyst, 10),
-				600 * 20, 
+				40 * 20, 
 				500);
 		
 	}
@@ -346,7 +346,7 @@ public class GenericChem extends ItemPackage {
 		}, 
 				GT_Values.NF, 
 				ItemUtils.getSimpleStack(mOrangeCatalyst, 10),
-				600 * 20, 
+				40 * 20, 
 				500);
 		
 	}
@@ -361,7 +361,7 @@ public class GenericChem extends ItemPackage {
 		}, 
 				GT_Values.NF, 
 				ItemUtils.getSimpleStack(mPurpleCatalyst, 10),
-				600 * 20, 
+				120 * 20, 
 				8000);
 		
 	}
@@ -376,7 +376,7 @@ public class GenericChem extends ItemPackage {
 		}, 
 				GT_Values.NF, 
 				ItemUtils.getSimpleStack(mBrownCatalyst, 10),
-				600 * 20, 
+				15 * 20, 
 				30);
 		
 	}
@@ -467,37 +467,76 @@ public class GenericChem extends ItemPackage {
 				}, 
 				new FluidStack[] {
 						FluidUtils.getFluidStack("dilutedsulfuricacid", 3000),
-						FluidUtils.getFluidStack(NitroBenzene, 3000),
+						FluidUtils.getFluidStack(NitroBenzene, 5000),
 				}, 
 				20 * 30, 
-				1000, 
+				500, 
 				3);
 		
 	}
 
-	static void recipe2Ethylanthraquinone() {
-		GT_Values.RA.addChemicalRecipe(
+	private void recipe2Ethylanthraquinone() {
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(4),		
+						ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 4),				
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(CoalTar.Ethylbenzene, 2000),
+				}, 
+				new ItemStack[] {
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Ethylanthraquinone2, 2000+(144*4)),
+				}, 
+				20 * 15, 
+				120, 
+				1);		
+		
+		/*GT_Values.RA.addChemicalRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 4),
 				ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2),
 				null,
 				FluidUtils.getFluidStack("fluid.2ethylanthraquinone", 2000+(144*4)),
 				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
-				20*16);
+				20*16);*/
 	
 	}
 
-	static void recipe2Ethylanthrahydroquinone() {
-		GT_Values.RA.addChemicalRecipe(
+	private void recipe2Ethylanthrahydroquinone() {
+		
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(4),		
+						ItemUtils.getSimpleStack(mOrangeCatalyst, 1),			
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Ethylanthraquinone2, 4000),
+						FluidUtils.getFluidStack("hydrogen", 2000),
+				}, 
+				new ItemStack[] {
+						
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000),
+				}, 
+				20 * 40, 
+				120, 
+				1);	
+		
+		/*GT_Values.RA.addChemicalRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("platePalladium", 0),
 				ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthraquinone", 1),
 				FluidUtils.getFluidStack("hydrogen", 500),
 				FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", 1200),
 				ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1),
-				20*40);
+				20*40);*/
 	
 	}
 
-	static void recipeLithiumPeroxide() {
+	private void recipeLithiumPeroxide() {
 		CORE.RA.addDehydratorRecipe(
 				new ItemStack[]{
 						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 2),
@@ -512,12 +551,32 @@ public class GenericChem extends ItemPackage {
 				},
 				new int[]{10000, 10000, 10000}, 
 				20*100, 
-				240);
+				120);
 	}
 
-	static void recipeLithiumHydroperoxide() {
+	private void recipeLithiumHydroperoxide() {
 		
-		CORE.RA.addChemicalRecipe(
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(4),		
+						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7),
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack("fluid.hydrogenperoxide", 2000),
+				}, 
+				new ItemStack[] {
+						ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 14),						
+				}, 
+				new FluidStack[] {
+						
+				}, 
+				20 * 30, 
+				240, 
+				1);
+		
+		
+		
+		/*CORE.RA.addChemicalRecipe(
 				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7),
 				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1),
 				20,
@@ -526,21 +585,40 @@ public class GenericChem extends ItemPackage {
 				ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 14),
 				CI.emptyCells(1),
 				20*30,
-				240);	
+				240);	*/
 	}
 
-	static void recipeHydrogenPeroxide() {	
+	private void recipeHydrogenPeroxide() {	
 		
-		CORE.RA.addChemicalRecipe(
-				GT_ModHandler.getAirCell(15),
-				ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthrahydroquinone", 5),
-				20,
-				FluidUtils.getFluidStack("fluid.anthracene", 50),
-				FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", 4450),
-				ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 2),
-				CI.emptyCells(18),
-				20*30,
-				240);
+		CORE.RA.addFluidReactorRecipe(
+				new ItemStack[] {
+						CI.getNumberedCircuit(4),
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack("air", 15000),
+						FluidUtils.getFluidStack(Ethylanthrahydroquinone2, 5000),
+						FluidUtils.getFluidStack("fluid.anthracene", 50),
+				}, 
+				new ItemStack[] {					
+				}, 
+				new FluidStack[] {
+						FluidUtils.getFluidStack(Ethylanthraquinone2, 4000),
+						FluidUtils.getFluidStack("fluid.hydrogenperoxide", 2000),						
+				}, 
+				20 * 30, 
+				240, 
+				1);
+		
+		/*		CORE.RA.addChemicalRecipe(
+						GT_ModHandler.getAirCell(15),
+						ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthrahydroquinone", 5),
+						20,
+						FluidUtils.getFluidStack("fluid.anthracene", 50),
+						FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", 4450),
+						ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 2),
+						CI.emptyCells(18),
+						20*30,
+						240);*/
 		
 	}