diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-09-15 03:47:14 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-09-15 03:47:14 +1000 |
| commit | 4fc2ffe7fb21a67f5827e0250ce1dd4f50155579 (patch) | |
| tree | c998ccf21793d80d556e3f7a65d6dbe658409f45 /src/Java/gtPlusPlus/core/item/chemistry | |
| parent | aba0aae854f2f1535e892c4d3a39f2732408febb (diff) | |
| download | GT5-Unofficial-4fc2ffe7fb21a67f5827e0250ce1dd4f50155579.tar.gz GT5-Unofficial-4fc2ffe7fb21a67f5827e0250ce1dd4f50155579.tar.bz2 GT5-Unofficial-4fc2ffe7fb21a67f5827e0250ce1dd4f50155579.zip | |
+ Added support via ASM to OB Sprinklers, which can now support more valid Fertilizers. Extra Types can be registered via SprinklerHandler.java.
% Fix Nos corruption Bug.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/chemistry')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java index 367912f7e8..b886d780a9 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -66,11 +66,19 @@ public class RocketFuels { Nitrous_Oxide = FluidUtils.generateFluidNonMolten("NitrousOxide", "Nitrous Oxide", -91, new short[]{255, 255, 255, 100}, null, null); //Nos - if (FluidUtils.getFluidStack("NitrousOxide", 1) == null){ - Nitrous_Oxide = FluidUtils.generateFluidNonMolten("NitrousOxide", "Nitrous Oxide", -91, new short[]{255, 255, 255, 100}, null, null); + if (FluidUtils.getFluidStack("NitrousOxide", 1) == null && FluidUtils.getFluidStack("nitrousoxide", 1) == null){ + Nitrous_Oxide = FluidUtils.generateFluidNoPrefix("NitrousOxide", "Nitrous Oxide", -91, new short[]{255, 255, 255, 100}); } else { - Nitrous_Oxide = FluidUtils.getFluidStack("NitrousOxide", 1000).getFluid(); + if (FluidUtils.getFluidStack("NitrousOxide", 1) != null ) { + Nitrous_Oxide = FluidUtils.getFluidStack("NitrousOxide", 1).getFluid(); + } + else { + Nitrous_Oxide = FluidUtils.getFluidStack("nitrousoxide", 1).getFluid(); + } + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellNitrousOxide", 1) == null){ + new BaseItemComponent("NitrousOxide", "Nitrous Oxide", new short[] {10, 10, 175}); + } } //Unsymmetrical_Dimethylhydrazine |