diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-11-28 00:26:53 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-11-28 00:26:53 +0000 |
| commit | c8e15b35fa6060e4c9fd45a61c1837e0289ee000 (patch) | |
| tree | 9fa04a91f86966ed9fe14a9508ceb20778f9646e /src/Java/gtPlusPlus/core/item/chemistry | |
| parent | ff6555028a9961167a37887b03a140cc099f4207 (diff) | |
| download | GT5-Unofficial-c8e15b35fa6060e4c9fd45a61c1837e0289ee000.tar.gz GT5-Unofficial-c8e15b35fa6060e4c9fd45a61c1837e0289ee000.tar.bz2 GT5-Unofficial-c8e15b35fa6060e4c9fd45a61c1837e0289ee000.zip | |
Fix a heap of conflicting dehydrator recipes.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/chemistry')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java | 45 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java | 4 |
2 files changed, 31 insertions, 18 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java index badd318414..ca9053dacb 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -53,27 +53,35 @@ public class CoalTar extends ItemPackage { FluidStack bioEth1 = FluidUtils.getFluidStack("fluid.bioethanol", 2000); FluidStack bioEth2 = FluidUtils.getFluidStack("bioethanol", 2000); - if (bioEth1 != null){ + if (bioEth1 != null){ CORE.RA.addDehydratorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), - bioEth1, + new ItemStack[] { + CI.getNumberedBioCircuit(17), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) + }, + bioEth1, + FluidUtils.getWater(1000), new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1) - }, - 120*20, + }, + new int[] {10000}, + 120 * 20, 80); } if (bioEth2 != null){ CORE.RA.addDehydratorRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), - bioEth2, + new ItemStack[] { + CI.getNumberedBioCircuit(18), + ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) + }, + bioEth2, + FluidUtils.getWater(1000), new ItemStack[]{ - ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1) - }, - 120*20, + }, + new int[] {10000}, + 120 * 20, 80); } } @@ -241,16 +249,19 @@ public class CoalTar extends ItemPackage { } - private static void recipePhthalicAcidToPhthalicAnhydride() { + private static void recipePhthalicAcidToPhthalicAnhydride() { CORE.RA.addDehydratorRecipe( - ItemUtils.getGregtechCircuit(6), - FluidUtils.getFluidStack("fluid.phthalicacid", 144), + new ItemStack[] { + CI.getNumberedBioCircuit(15) + }, + FluidUtils.getFluidStack("fluid.phthalicacid", 144), + null, new ItemStack[]{ ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 1) - }, - 60*20, + }, + new int[] {10000}, + 60 * 20, 120); - } @Override diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 66f20e0079..094cb59cb7 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -209,7 +209,9 @@ public class RocketFuels extends ItemPackage { new ItemStack[] {CI.getNumberedCircuit(8)}, FluidUtils.getFluidStack(Hydrated_Ammonium_Nitrate_Slurry, 8*144), FluidUtils.getWater(2000), - new ItemStack[] {ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8)}, + new ItemStack[] { + ItemUtils.getSimpleStack(Ammonium_Nitrate_Dust, 8) + }, new int[] {10000}, 90 * 20, 480); |