fix ethanol disappear and add conversion recipe for certain fluid (#247)

4 files changed, 99 insertions, 26 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index 4afeb6ce75..9ae3bcea0e 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -352,11 +352,10 @@ public class GenericChem extends ItemPackage {
 						ELEMENT.getInstance().SODIUM.getDust(1)
 				}, 
 				new FluidStack[] {
-						FluidUtils.getFluidStack(BioRecipes.mEthanol, 1000),
+						Materials.Ethanol.getFluid(1000)
 				}, 
 				new ItemStack[] {
 						ItemUtils.getSimpleStack(mSodiumEthoxide, 9)
-
 				}, 
 				new FluidStack[] {
 						ELEMENT.getInstance().HYDROGEN.getFluidStack(1000)
@@ -366,7 +365,6 @@ public class GenericChem extends ItemPackage {
 				2);
 	}
 
-
 	private void recipePotassiumHydroxide() {
 		//Ca(OH)2 + K2O + CO2 → CaCO3 + 2 KOH
 		CORE.RA.addChemicalPlantRecipe(
@@ -402,7 +400,7 @@ public class GenericChem extends ItemPackage {
 						ItemUtils.getSimpleStack(mPotassiumHydroxide, 3),
 				}, 
 				new FluidStack[] {
-						FluidUtils.getFluidStack(BioRecipes.mEthanol, 1000),
+						Materials.Ethanol.getFluid(1000),
 						FluidUtils.getFluidStack(Carbon_Disulfide, 1000),
 				}, 
 				new ItemStack[] {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index d0c815829a..82d1e9437e 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -84,21 +84,7 @@ public class RocketFuels extends ItemPackage {
 		}
 	}
 
-	public static void createNitrogenTetroxide(){	
-		/*CORE.RA.addDehydratorRecipe(
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 4)
-				}, 
-				FluidUtils.getFluidStack("nitricacid", 2000), 
-				FluidUtils.getFluidStack(Nitrogen_Tetroxide, 450),
-				new ItemStack[]{
-						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAsh", 1),	
-						ItemUtils.getItemStackOfAmountFromOreDict("dustTinyDarkAsh", 1)						
-				},
-				new int[]{100, 50}, 
-				20*16, 
-				500);*/
-
+	public static void createNitrogenTetroxide(){
 		//2HNO3 + Cu = N2O4 + H2O + CuO
 		CORE.RA.addChemicalPlantRecipe(
 				new ItemStack[]{
@@ -142,6 +128,30 @@ public class RocketFuels extends ItemPackage {
 				MaterialUtils.getVoltageForTier(2), 
 				1);
 
+		FluidStack aBartWorksHydrazine = FluidUtils.getWildcardFluidStack("hydrazine", 1000);
+		if (aBartWorksHydrazine != null) {
+			Logger.INFO("Found BW Hydrazine, adding compat recipe.");
+			CORE.RA.addDistilleryRecipe(
+					GT_Utility.getIntegratedCircuit(24),
+					FluidUtils.getFluidStack(Hydrazine, 1000),
+					aBartWorksHydrazine,
+					null,
+					20,
+					8,
+					false
+			);
+
+			CORE.RA.addDistilleryRecipe(
+					GT_Utility.getIntegratedCircuit(24),
+					aBartWorksHydrazine,
+					FluidUtils.getFluidStack(Hydrazine, 1000),
+					null,
+					20,
+					8,
+					false
+			);
+		}
+
 		FluidStack aBartWorksHydrogenPeroxide = FluidUtils.getWildcardFluidStack("Hydrogen Peroxide", 1000);
 		if (aBartWorksHydrogenPeroxide != null) {
 			Logger.INFO("Found BW Hydrogen Peroxide, adding compat recipe.");
@@ -158,12 +168,31 @@ public class RocketFuels extends ItemPackage {
 					}, 
 					new FluidStack[] {
 							FluidUtils.getFluidStack(Hydrazine, 1000),
-
 					},
 					20 * 30, 
 					MaterialUtils.getVoltageForTier(2), 
 					1);
-		}		
+
+			CORE.RA.addDistilleryRecipe(
+					GT_Utility.getIntegratedCircuit(24),
+					FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000),
+					aBartWorksHydrogenPeroxide,
+					null,
+					20,
+					8,
+					false
+			);
+
+			CORE.RA.addDistilleryRecipe(
+					GT_Utility.getIntegratedCircuit(24),
+					aBartWorksHydrogenPeroxide,
+					FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000),
+					null,
+					20,
+					8,
+					false
+			);
+		}
 
 	}
 
@@ -191,6 +220,30 @@ public class RocketFuels extends ItemPackage {
 				240, 
 				2);
 
+		FluidStack aBartWorksMonomethylhydrazine = FluidUtils.getWildcardFluidStack("Monomethylhydrazine", 1000);
+		if (aBartWorksMonomethylhydrazine != null) {
+			Logger.INFO("Found BW Hydrazine, adding compat recipe.");
+			CORE.RA.addDistilleryRecipe(
+					GT_Utility.getIntegratedCircuit(24),
+					FluidUtils.getFluidStack(Monomethylhydrazine, 1000),
+					aBartWorksMonomethylhydrazine,
+					null,
+					20,
+					8,
+					false
+			);
+
+			CORE.RA.addDistilleryRecipe(
+					GT_Utility.getIntegratedCircuit(24),
+					aBartWorksMonomethylhydrazine,
+					FluidUtils.getFluidStack(Monomethylhydrazine, 1000),
+					null,
+					20,
+					8,
+					false
+			);
+		}
+
 	}
 
 	private static void createLOX() {		
@@ -224,7 +277,6 @@ public class RocketFuels extends ItemPackage {
 				20 * 60, 
 				120, 
 				1);
-
 	}
 
 	private static void createAmmoniumNitrateDust() {
@@ -238,7 +290,6 @@ public class RocketFuels extends ItemPackage {
 				new int[] {10000}, 
 				90 * 20,
 				480);
-
 	}
 
 	private static void createFormaldehyde() {		
@@ -263,6 +314,30 @@ public class RocketFuels extends ItemPackage {
 				120, 
 				1);
 
+		FluidStack aBartWorksFormaldehyde = FluidUtils.getWildcardFluidStack("Formaldehyde", 1000);
+		if (aBartWorksFormaldehyde != null) {
+			Logger.INFO("Found BW Formaldehyde, adding compat recipe.");
+			CORE.RA.addDistilleryRecipe(
+					GT_Utility.getIntegratedCircuit(24),
+					FluidUtils.getFluidStack(Formaldehyde, 1000),
+					aBartWorksFormaldehyde,
+					null,
+					20,
+					8,
+					false
+			);
+
+			CORE.RA.addDistilleryRecipe(
+					GT_Utility.getIntegratedCircuit(24),
+					aBartWorksFormaldehyde,
+					FluidUtils.getFluidStack(Formaldehyde, 1000),
+					null,
+					20,
+					8,
+					false
+			);
+		}
+
 	}
 
 	private static void createFormaldehydeCatalyst() {
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index 461ee1ea47..c5402a6a41 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -61,7 +61,7 @@ public class BioRecipes {
 	private static Fluid mCarbonDioxide;
 	private static Fluid mCarbonMonoxide;
 	private static Fluid mEthylene;
-	public static Fluid mEthanol;
+	private static Fluid mEthanol;
 	private static Fluid mChlorine;
 	private static Fluid mHydrogen;
 	private static Fluid mDilutedSulfuricAcid;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
index 14e43b7d1f..ad3594eb11 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java
@@ -115,7 +115,7 @@ public class RecipeLoader_GlueLine {
                         MISC_MATERIALS.CYANOACETIC_ACID.getDust(45)
                 },
                 new FluidStack[] {
-                        FluidUtils.getFluidStack(BioRecipes.mEthanol, 5000)
+                        Materials.Ethanol.getFluid(5000)
                 },
                 new ItemStack[] {
                         MISC_MATERIALS.COPPER_SULFATE_HYDRATED.getDust(11)
@@ -134,7 +134,7 @@ public class RecipeLoader_GlueLine {
                         MISC_MATERIALS.CYANOACETIC_ACID.getDust(9)
                 },
                 new FluidStack[] {
-                        FluidUtils.getFluidStack(BioRecipes.mEthanol, 1000)
+                        Materials.Ethanol.getFluid(1000)
                 },
                 new ItemStack[] {