From a93e2aa92384f595dcb5907f5b88a220c6735cf0 Mon Sep 17 00:00:00 2001
From: botn365 <42187820+botn365@users.noreply.github.com>
Date: Wed, 8 Jan 2020 00:12:46 +0100
Subject: ChemPlant & Catalyst Consumption (#598)

% Make some Itemstacks static.
% Higher tier coils speed up ChemPlant.
% Redused catalyst consumption in ChemPlant.
$ Some clean up.
$ Fix that recipes without catalyst wont start.
$ Redone catalyst code for it to better work with parrallel and it not failing recipe after consumed item.
% Formatting/Spelling
% Greatly improved the ChemPlant's Tooltip.
% Tooltip update.
% Made the tooltip a little bit clearer.

Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com>
---
 .../core/item/chemistry/GenericChem.java           | 23 ++++++++++------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/item/chemistry')

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 35d2066793..6e5b47041f 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -106,12 +106,12 @@ public class GenericChem extends ItemPackage {
 
 	private ItemStack mCatalystCarrier;
 	
-	public ItemStack mRedCatalyst;
-	public ItemStack mYellowCatalyst;
-	public ItemStack mBlueCatalyst;
-	public ItemStack mOrangeCatalyst;
-	public ItemStack mPurpleCatalyst;
-	public ItemStack mBrownCatalyst;
+	public static ItemStack mRedCatalyst;
+	public static ItemStack mYellowCatalyst;
+	public static ItemStack mBlueCatalyst;
+	public static ItemStack mOrangeCatalyst;
+	public static ItemStack mPurpleCatalyst;
+	public static ItemStack mBrownCatalyst;
 	
 	
 	public void registerItemStacks() {
@@ -227,14 +227,13 @@ public class GenericChem extends ItemPackage {
 		CORE.RA.addFluidReactorRecipe(
 				new ItemStack[] {
 						getTierTwoChip(),		
-						ItemUtils.getSimpleStack(mBrownCatalyst, 1)
+						ItemUtils.getSimpleStack(mBrownCatalyst, 0)
 				}, 
 				new FluidStack[] {
 						FluidUtils.getFluidStack(Benzene, 2000),
 						FluidUtils.getFluidStack("hydrogen", 10000)
 				}, 
 				new ItemStack[] {
-						ItemUtils.getSimpleStack(mCatalystCarrier, 1)
 						
 				}, 
 				new FluidStack[] {
@@ -251,14 +250,13 @@ public class GenericChem extends ItemPackage {
 		CORE.RA.addFluidReactorRecipe(
 				new ItemStack[] {
 						getTierTwoChip(),		
-						ItemUtils.getSimpleStack(mBlueCatalyst, 1)
+						ItemUtils.getSimpleStack(mBlueCatalyst, 0)
 				}, 
 				new FluidStack[] {
 						FluidUtils.getFluidStack(Cyclohexane, 2000),
 						FluidUtils.getFluidStack("air", 10000)
 				}, 
 				new ItemStack[] {
-						ItemUtils.getSimpleStack(mCatalystCarrier, 1)
 						
 				}, 
 				new FluidStack[] {
@@ -431,14 +429,13 @@ public class GenericChem extends ItemPackage {
 		CORE.RA.addFluidReactorRecipe(
 				new ItemStack[] {
 						getTierThreeChip(),		
-						ItemUtils.getSimpleStack(mBlueCatalyst, 1)
+						ItemUtils.getSimpleStack(mBlueCatalyst, 0)
 				}, 
 				new FluidStack[] {
 						FluidUtils.getFluidStack(NitroBenzene, 2000),
 						FluidUtils.getFluidStack("hydrogen", 10000)
 				}, 
 				new ItemStack[] {
-						ItemUtils.getSimpleStack(mCatalystCarrier, 1)
 						
 				}, 
 				new FluidStack[] {
@@ -510,7 +507,7 @@ public class GenericChem extends ItemPackage {
 		CORE.RA.addFluidReactorRecipe(
 				new ItemStack[] {
 						CI.getNumberedCircuit(4),		
-						ItemUtils.getSimpleStack(mOrangeCatalyst, 1),			
+						ItemUtils.getSimpleStack(mOrangeCatalyst, 0),			
 				}, 
 				new FluidStack[] {
 						FluidUtils.getFluidStack(Ethylanthraquinone2, 4000),
-- 
cgit