Fix several recipes (#842)

* chemiplant frontend

* fix missing coke oven recipe

* new cell-less recipes

* fix conflict hydrogen freezing recipe

* fix missing ethylbenzene-to-fuel recipes

2 files changed, 13 insertions, 14 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
index ccb6b76539..04f7c36077 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java
@@ -6,6 +6,7 @@ import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
@@ -293,19 +294,15 @@ public class RecipeLoader_Nuclear {
     private static void dehydratorRecipes() {
 
         // Makes 7-Lithium
-        CORE.RA.addDehydratorRecipe(
-                new ItemStack[] { CI.getNumberedAdvancedCircuit(14),
-                        ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1) },
-                FluidUtils.getFluidStack("sulfuriclithium", 440),
-                null,
-                new ItemStack[] { CI.emptyCells(1), ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3),
+        GT_Values.RA.stdBuilder().itemInputs(CI.getNumberedAdvancedCircuit(14))
+                .fluidInputs(FluidUtils.getFluidStack("sulfuriclithium", 1440))
+                .itemOutputs(
+                        ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3),
                         ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1),
                         ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1),
-                        ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 4) },
-                new int[] { 10000, 10000, 10000, 10000, 10000 },
-                30 * 20,
-                30);
+                        ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 4))
+                .duration(30 * SECONDS).eut(30).addTo(chemicalDehydratorRecipes);
 
         // Makes Lithium Carbonate
         CORE.RA.addDehydratorRecipe(
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 4fafaf25e3..fa3d2f36cc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -34,15 +34,17 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
     @Override
     public boolean addCokeOvenRecipe(final ItemStack aInput1, final ItemStack aInput2, final FluidStack aFluidInput,
             final FluidStack aFluidOutput, final ItemStack aOutput, int aDuration, final int aEUt) {
-        if (aInput1 == null || (aOutput == null || aFluidOutput == null)) {
+        if (aInput1 == null || (aOutput == null && aFluidOutput == null)) {
             Logger.WARNING("Something was null, returning false");
             return false;
         }
-        if ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, aDuration)) <= 0) {
+        if (aOutput != null && (aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, aDuration)) <= 0) {
             Logger.WARNING("Something was null, returning false");
             return false;
         }
-        if ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) <= 0) {
+        if (aFluidOutput != null
+                && (aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration))
+                        <= 0) {
             Logger.WARNING("Something was null, returning false");
             return false;
         }
@@ -857,7 +859,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
     @Override
     public boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
             FluidStack[] aFluidOutputs, int[] aChances, int time, long eu, int aTier) {
-        if (aInputs.length > 4 || aInputFluids.length > 4 || aOutputs.length > 4 || aFluidOutputs.length > 2) {
+        if (aInputs.length > 4 || aInputFluids.length > 4 || aOutputs.length > 6 || aFluidOutputs.length > 3) {
             Logger.INFO("Inputs: " + ItemUtils.getArrayStackNames(aInputs));
             Logger.INFO("Fluid Inputs: " + ItemUtils.getArrayStackNames(aInputFluids));
             Logger.INFO("Outputs: " + ItemUtils.getArrayStackNames(aOutputs));