diff options
| author | botn365 <42187820+botn365@users.noreply.github.com> | 2020-01-08 16:48:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 16:48:18 +0100 |
| commit | a3a9d4a5c2e466db33879176626670f2f07b635a (patch) | |
| tree | 8176e79d6be425dc28cc3a612416b832a5bed3c5 /src/Java/gtPlusPlus/core/item | |
| parent | d7c83c3cd1036668c1f520f144c08de444f675a4 (diff) | |
| parent | 6bb3c6872c97b36c84f32bf730eee31206728c74 (diff) | |
| download | GT5-Unofficial-a3a9d4a5c2e466db33879176626670f2f07b635a.tar.gz GT5-Unofficial-a3a9d4a5c2e466db33879176626670f2f07b635a.tar.bz2 GT5-Unofficial-a3a9d4a5c2e466db33879176626670f2f07b635a.zip | |
Merge pull request #7 from alkcorp/master
sync
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/chemistry/GenericChem.java | 23 |
1 files changed, 10 insertions, 13 deletions
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), |