From 4fc2ffe7fb21a67f5827e0250ce1dd4f50155579 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sat, 15 Sep 2018 03:47:14 +1000
Subject: + 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.

---
 src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java | 14 +++++++++++---
 src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java  |  9 ++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

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

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		
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
index 225d453694..e4f2008aac 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java
@@ -39,7 +39,8 @@ public class FluidUtils {
 	public static FluidStack getFluidStack(final String fluidName, final int amount){
 		Logger.WARNING("Trying to get a fluid stack of "+fluidName);
 		try {
-			return FluidRegistry.getFluidStack(fluidName, amount).copy();
+			FluidStack x = FluidRegistry.getFluidStack(fluidName, amount);
+			return x != null ? x.copy() : null;
 		}
 		catch (final Throwable e){
 			return null;
@@ -50,7 +51,8 @@ public class FluidUtils {
 	public static FluidStack getFluidStack(final FluidStack vmoltenFluid, final int fluidAmount) {
 		Logger.WARNING("Trying to get a fluid stack of "+vmoltenFluid.getFluid().getName());
 		try {
-			return FluidRegistry.getFluidStack(vmoltenFluid.getFluid().getName(), fluidAmount).copy();
+			FluidStack x = FluidRegistry.getFluidStack(vmoltenFluid.getFluid().getName(), fluidAmount);
+			return x != null ? x.copy() : null;
 		}
 		catch (final Throwable e){
 			return null;
@@ -60,7 +62,8 @@ public class FluidUtils {
 	public static FluidStack getFluidStack(final Fluid vFluid, final int fluidAmount) {
 		Logger.WARNING("Trying to get a fluid stack of "+vFluid.getName());
 		try {
-			return FluidRegistry.getFluidStack(vFluid.getName(), fluidAmount).copy();
+			FluidStack x = FluidRegistry.getFluidStack(vFluid.getName(), fluidAmount);
+			return x != null ? x.copy() : null;
 		}
 		catch (final Throwable e){
 			return null;
-- 
cgit