From 2cf05c4deaf3a26626853431f725d0ca375ffec3 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 26 Oct 2018 15:46:55 +0100
Subject: + Added 4 new High-Tier Alloys. Lafium, Cinobite, Pikyonite &
 Abyssal. + Added missing Germanium Dust. + Added compatibility for Witchery.
 - Removed portability of Tanks for GTNH, tanks are still portable otherwise.
 $ Fixed calculations for automatic recipe generation, EBF and ABS recipe
 requirements for GT++ Alloys are now significantly increased. $ Fixed missing
 Control Core textures. % Cleaned up some recipe generation. % Improved
 Material.java.

---
 .../gtPlusPlus/core/item/chemistry/CoalTar.java    | 26 +++++++++++++++++-----
 .../core/item/chemistry/RocketFuels.java           |  9 ++------
 2 files changed, 22 insertions(+), 13 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 3da3c18836..eea1aed49f 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -47,23 +47,37 @@ public class CoalTar {
 		Coal_Gas = FluidUtils.generateFluidNonMolten("CoalGas", "Coal Gas", 500, new short[]{48, 48, 48, 100}, null, null);
 		//Ethanol
 		// v - Dehydrate cells to remove water
+		
+		
 		//Create Ethylene
-		Ethylene = FluidUtils.generateFluidNonMolten("Ethylene", "Ethylene", -103, new short[]{255, 255, 255, 100}, null, null);
+		if (!FluidUtils.doesFluidExist("Ethylene")){
+			Ethylene = FluidUtils.generateFluidNonMolten("Ethylene", "Ethylene", -103, new short[]{255, 255, 255, 100}, null, null);
+		}
+		else {
+			Ethylene = FluidUtils.getWildcardFluidStack("Ethylene", 1).getFluid();
+		}
+		
 		//Create Benzene - (Toluene + Hydrogen | 95% Benzene / 5% methane)
-		Benzene = FluidUtils.generateFluidNonMolten("Benzene", "Benzene", 81, new short[]{150, 75, 0, 100}, null, null);
+		if (!FluidUtils.doesFluidExist("NitrousOxide")){
+			Benzene = FluidUtils.generateFluidNonMolten("Benzene", "Benzene", 81, new short[]{150, 75, 0, 100}, null, null);
+		}
+		else {
+			Benzene = FluidUtils.getWildcardFluidStack("Benzene", 1).getFluid();
+		}
+		
 		//Create Ethylbenzene - Ethylbenzene is produced in on a large scale by combining benzene and ethylene in an acid-catalyzed chemical reaction
 		//Use Chemical Reactor
 		Ethylbenzene = FluidUtils.generateFluidNonMolten("Ethylbenzene", "Ethylbenzene", 136, new short[]{255, 255, 255, 100}, null, null);
 		//Create Anthracene
 		Anthracene = FluidUtils.generateFluidNonMolten("Anthracene", "Anthracene", 340, new short[]{255, 255, 255, 100}, null, null);
-		//Toluene		
-		if (FluidUtils.getFluidStack("liquid_toluene", 1) == null){
+		//Toluene
+		if (!FluidUtils.doesFluidExist("Toluene")){
 			Toluene = FluidUtils.generateFluidNonMolten("Toluene", "Toluene", -95, new short[]{140, 70, 20, 100}, null, null);
 		}
 		else {
-			Toluene = FluidUtils.getFluidStack("liquid_toluene", 1000).getFluid();
+			Toluene = FluidUtils.getWildcardFluidStack("Toluene", 1).getFluid();
 			Item itemCellToluene = new BaseItemComponent("Toluene", "Toluene", new short[]{140, 70, 20, 100});
-			MaterialGenerator.addFluidCannerRecipe(ItemUtils.getEmptyCell(), ItemUtils.getSimpleStack(itemCellToluene), FluidUtils.getFluidStack("liquid_toluene", 1000), null);
+			MaterialGenerator.addFluidCannerRecipe(ItemUtils.getEmptyCell(), ItemUtils.getSimpleStack(itemCellToluene), FluidUtils.getFluidStack(Toluene, 1000), null);
 		}
 
 		//Create Coal Tar
diff --git a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index 7b5a90a64e..9bd8a521ab 100644
--- a/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/Java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -67,16 +67,11 @@ 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 && FluidUtils.getFluidStack("nitrousoxide", 1) == null){
+		if (!FluidUtils.doesFluidExist("NitrousOxide")){
 			Nitrous_Oxide = FluidUtils.generateFluidNoPrefix("NitrousOxide", "Nitrous Oxide", -91, new short[]{255, 255, 255, 100});
 		}
 		else {
-			if (FluidUtils.getFluidStack("NitrousOxide", 1) != null ) {
-				Nitrous_Oxide = FluidUtils.getFluidStack("NitrousOxide", 1).getFluid();				
-			}
-			else {
-				Nitrous_Oxide = FluidUtils.getFluidStack("nitrousoxide", 1).getFluid();
-			}
+			Nitrous_Oxide = FluidUtils.getWildcardFluidStack("NitrousOxide", 1).getFluid();
 			if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellNitrousOxide", 1) == null){				
 				new BaseItemComponent("NitrousOxide", "Nitrous Oxide", new short[] {10, 10, 175});
 			}
-- 
cgit