Yet another round of ra2 conversions (#2006)

* lathe and saplings

* toolhead oreproc recipes

* fluid solidification

* reverse macerating

* autoclave combs

* implosion compressor

* assembler recipes

* assembling line

* slicer recipes

* minor fixes

* attempted cell to fluid fix

* minor fix 2

4 files changed, 43 insertions, 15 deletions

diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
index 662f9725d0..79b87a5e64 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java
@@ -1,7 +1,11 @@
 package gregtech.loaders.postload.recipes;
 
-import static gregtech.api.enums.GT_Values.NI;
-import static gregtech.api.enums.Mods.*;
+import static gregtech.api.enums.Mods.AppliedEnergistics2;
+import static gregtech.api.enums.Mods.ExtraUtilities;
+import static gregtech.api.enums.Mods.GregTech;
+import static gregtech.api.enums.Mods.Thaumcraft;
+import static gregtech.api.enums.Mods.ThaumicTinkerer;
+import static gregtech.api.enums.Mods.TwilightForest;
 import static gregtech.api.util.GT_ModHandler.getModItem;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
@@ -13,7 +17,12 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
-import gregtech.api.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsOreAlum;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
@@ -951,8 +960,7 @@ public class CentrifugeRecipes implements Runnable {
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 5),
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 4),
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 8),
-                    getModItem(ExtraUtilities.ID, "greenscreen", 1L, 0),
-                    NI)
+                    getModItem(ExtraUtilities.ID, "greenscreen", 1L, 0))
                 .noFluidInputs()
                 .noFluidOutputs()
                 .duration(25 * SECONDS + 12 * TICKS)
@@ -968,8 +976,7 @@ public class CentrifugeRecipes implements Runnable {
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 9),
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 11),
                     getModItem(ExtraUtilities.ID, "greenscreen", 1L, 7),
-                    getModItem(ExtraUtilities.ID, "greenscreen", 1L, 15),
-                    NI)
+                    getModItem(ExtraUtilities.ID, "greenscreen", 1L, 15))
                 .noFluidInputs()
                 .noFluidOutputs()
                 .duration(25 * SECONDS + 12 * TICKS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
index b367ab6381..dbcabfcd3f 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
@@ -15,6 +15,7 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_RecipeBuilder;
 import gregtech.api.util.GT_Utility;
 
 public class CropProcessingRecipes implements Runnable {
@@ -131,14 +132,19 @@ public class CropProcessingRecipes implements Runnable {
                 : aMaterialOut.mOreByProducts.get(0)
                     .getMolten(144);
 
-            GT_Values.RA.stdBuilder()
+            GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+            recipeBuilder
                 .itemInputs(
                     GT_Utility.copyAmount(9, tCrop),
                     GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1))
                 .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4))
-                .fluidInputs(Materials.Water.getFluid(1000))
-                .fluidOutputs(fluidOutputChemReactor)
-                .duration(4 * SECONDS + 16 * TICKS)
+                .fluidInputs(Materials.Water.getFluid(1000));
+            if (fluidOutputChemReactor == null) {
+                recipeBuilder.noFluidOutputs();
+            } else {
+                recipeBuilder.fluidOutputs(fluidOutputChemReactor);
+            }
+            recipeBuilder.duration(4 * SECONDS + 16 * TICKS)
                 .eut(24)
                 .addTo(UniversalChemical);
 
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
index 12133467e4..d3c410ee38 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
@@ -11,6 +11,8 @@ import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.GregTech_API;
@@ -48,6 +50,21 @@ public class FluidSolidifierRecipes implements Runnable {
                 .addTo(sFluidSolidficationRecipes);
         }
 
+        {
+            ItemStack flask = ItemList.VOLUMETRIC_FLASK.get(1);
+            NBTTagCompound nbtFlask = new NBTTagCompound();
+            nbtFlask.setInteger("Capacity", 1000);
+            flask.setTagCompound(nbtFlask);
+            GT_Values.RA.stdBuilder()
+                .itemInputs(ItemList.Shape_Mold_Ball.get(0))
+                .itemOutputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3))
+                .fluidInputs(new FluidStack(FluidRegistry.getFluid("molten.borosilicateglass"), 144))
+                .noFluidOutputs()
+                .duration(2 * SECONDS + 4 * TICKS)
+                .eut(TierEU.RECIPE_LV)
+                .addTo(sFluidSolidficationRecipes);
+        }
+
         GT_Values.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Ball.get(0L))
             .itemOutputs(getModItem(Thaumcraft.ID, "ItemResource", 1, 3))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
index 948dea4045..af22cd4933 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
@@ -1,7 +1,5 @@
 package gregtech.loaders.postload.recipes;
 
-import static gregtech.api.enums.GT_Values.NF;
-import static gregtech.api.enums.GT_Values.NI;
 import static gregtech.api.enums.Mods.*;
 import static gregtech.api.util.GT_ModHandler.getModItem;
 import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
@@ -1389,10 +1387,10 @@ public class MixerRecipes implements Runnable {
         // radiation manufacturing
 
         GT_Values.RA.stdBuilder()
-            .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), new ItemStack(Items.glowstone_dust, 9), NI, NI)
+            .itemInputs(GT_ModHandler.getIC2Item("fuelRod", 1), new ItemStack(Items.glowstone_dust, 9))
             .itemOutputs(ItemList.GlowstoneCell.get(1))
             .fluidInputs(Materials.Helium.getGas(250))
-            .fluidOutputs(NF)
+            .noFluidOutputs()
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(16)
             .addTo(sMixerRecipes);