From c8e15b35fa6060e4c9fd45a61c1837e0289ee000 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sun, 28 Nov 2021 00:26:53 +0000
Subject: Fix a heap of conflicting dehydrator recipes.

---
 src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index 077b397f88..07118b7c7b 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -23,7 +23,11 @@ import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.*;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
+import gtPlusPlus.core.util.minecraft.OreDictUtils;
+import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.agrichem.block.AgrichemFluids;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -502,14 +506,19 @@ public class BioRecipes {
 				120 * 20,
 				60,
 				1);
-
+		
 		CORE.RA.addDehydratorRecipe(
-				CI.emptyCells(1),
-				FluidUtils.getFluidStack(mFermentationBase, 4000),
+				new ItemStack[] {
+						CI.getNumberedBioCircuit(14),
+						CI.emptyCells(1)
+						}, 
+				FluidUtils.getFluidStack(mFermentationBase, 4000), 
+				null, 
 				new ItemStack[] {
 						ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 1),
 						ItemUtils.getItemStackOfAmountFromOreDict("cellAceticAcid", 1)						
 				},
+				new int[] {10000, 10000}, 
 				60 * 20,
 				16);
 
-- 
cgit 


From 43e67b5f97543c2a1ea51b89ed745d0773f94751 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 7 Dec 2021 14:37:22 +0000
Subject: Added more nuclear processing recipes. Removed lots of useless
 nuclear generated items. More NEI improvements. Made Dehydrator and FFPP
 recipe handling more lenient.

---
 src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
index 07118b7c7b..edfd42b5ca 100644
--- a/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
+++ b/src/Java/gtPlusPlus/plugin/agrichem/BioRecipes.java
@@ -132,7 +132,7 @@ public class BioRecipes {
 		mThermalWater = FluidUtils.getFluidStack("ic2hotwater", 1).getFluid();		
 		mAir = FluidUtils.getFluidStack("air", 1).getFluid();		
 		mSulfuricWasteWater = FluidUtils.getFluidStack("sulfuricapatite", 1).getFluid();
-		mAmmonia = MISC_MATERIALS.AMMONIA.getFluid(1).getFluid();
+		mAmmonia = MISC_MATERIALS.AMMONIA.getFluidStack(1).getFluid();
 		mEthylene = FluidUtils.getFluidStack("ethylene", 1).getFluid();
 		mEthanol = FluidUtils.getFluidStack("bioethanol", 1).getFluid();
 		mDilutedSulfuricAcid = FluidUtils.getFluidStack("dilutedsulfuricacid", 1).getFluid();
@@ -144,8 +144,8 @@ public class BioRecipes {
 		mStyrene = FluidUtils.getFluidStack("styrene", 1).getFluid();		
 		mMethanol = FluidUtils.getFluidStack("methanol", 1).getFluid();
 		mLiquidPlastic = FluidUtils.getWildcardFluidStack("plastic", 1).getFluid();
-		mCarbonDioxide = MISC_MATERIALS.CARBON_DIOXIDE.getFluid(1).getFluid();
-		mCarbonMonoxide = MISC_MATERIALS.CARBON_MONOXIDE.getFluid(1).getFluid();
+		mCarbonDioxide = MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(1).getFluid();
+		mCarbonMonoxide = MISC_MATERIALS.CARBON_MONOXIDE.getFluidStack(1).getFluid();
 		mChlorine = FluidUtils.getFluidStack("chlorine", 1).getFluid();
 		mHydrogen = FluidUtils.getFluidStack("hydrogen", 1).getFluid();		
 		mAceticAcid = AgrichemFluids.mAceticAcid;
-- 
cgit