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

5 files changed, 31 insertions, 73 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 7bbd78d3f5..9e718c8cc2 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -1,10 +1,15 @@
 package gtPlusPlus.core.item.chemistry;
 
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
+
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -30,22 +35,15 @@ public class CoalTar extends ItemPackage {
     public static Fluid Naphthalene;
 
     private static void recipeEthylBenzineFuelsIntoHeavyFuel() {
-        CORE.RA.addChemicalRecipe(
-                ItemUtils.getItemStackOfAmountFromOreDict("cellFuel", 9),
-                ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2),
-                null,
-                FluidUtils.getFluidStack("nitrofuel", 7500),
-                ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 11),
-                100,
-                1000);
-        CORE.RA.addChemicalRecipe(
-                ItemUtils.getItemStackOfAmountFromOreDict("cellBioDiesel", 9),
-                ItemUtils.getItemStackOfAmountFromOreDict("cellEthylbenzene", 2),
-                null,
-                FluidUtils.getFluidStack("nitrofuel", 3000),
-                ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 11),
-                300,
-                1000);
+        GT_Values.RA.stdBuilder().itemInputs(Materials.Fuel.getCells(9))
+                .fluidInputs(FluidUtils.getFluidStack(Ethylbenzene, 2000)).itemOutputs(ItemList.Cell_Empty.get(9L))
+                .fluidOutputs(Materials.NitroFuel.getFluid(7500)).duration(5 * SECONDS).eut(1000).noOptimize()
+                .addTo(UniversalChemical);
+
+        GT_Values.RA.stdBuilder().itemInputs(Materials.BioDiesel.getCells(9))
+                .fluidInputs(FluidUtils.getFluidStack(Ethylbenzene, 4000)).itemOutputs(ItemList.Cell_Empty.get(9L))
+                .fluidOutputs(Materials.NitroFuel.getFluid(6000)).duration(5 * SECONDS).eut(1000).noOptimize()
+                .addTo(UniversalChemical);
     }
 
     public static void recipeCreateEthylene() {
@@ -81,16 +79,9 @@ public class CoalTar extends ItemPackage {
 
     public static void recipeCreateBenzene() {
         // C7H8 + 2H = CH4 + C6H6
-        CORE.RA.addDehydratorRecipe(
-                new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellToluene", 1),
-                        ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 2) },
-                null,
-                null,
-                new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellMethane", 1),
-                        ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 1), Materials.Empty.getCells(1) },
-                new int[] { 10000, 10000, 10000 },
-                20 * 10,
-                90);
+        GT_Values.RA.stdBuilder().itemInputs(Materials.Toluene.getCells(1)).itemOutputs(Materials.Benzene.getCells(1))
+                .fluidInputs(Materials.Hydrogen.getGas(2000)).fluidOutputs(Materials.Methane.getGas(1000))
+                .duration(10 * SECONDS).eut(90).noOptimize().addTo(chemicalDehydratorRecipes);
     }
 
     public static void recipeCreateEthylbenzene() {
@@ -231,13 +222,10 @@ public class CoalTar extends ItemPackage {
 
     private static void recipeNaphthaleneToPhthalicAcid() {
         // SulfuricCoalTarOil
-        GT_Values.RA.addChemicalRecipe(
-                ItemUtils.getItemStackOfAmountFromOreDict("cellNaphthalene", 2),
-                ItemUtils.getItemStackOfAmountFromOreDict("dustLithium", 5),
-                null,
-                Materials.PhthalicAcid.getFluid(2500),
-                ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
-                20 * 16);
+        GT_Values.RA.stdBuilder().itemInputs(Materials.Lithium.getDust(5))
+                .fluidInputs(FluidUtils.getFluidStack(Naphthalene, 2000))
+                .fluidOutputs(Materials.PhthalicAcid.getFluid(2500)).eut(30).duration(16 * SECONDS).noOptimize()
+                .addTo(UniversalChemical);
     }
 
     private static void recipePhthalicAcidToPhthalicAnhydride() {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index c20fe9d522..81de187929 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -7,6 +7,7 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
 import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
 import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
@@ -741,16 +742,10 @@ public class GenericChem extends ItemPackage {
 
     private void recipeLithiumPeroxide() {
         // 2HLiO2 = Li2O2 + H2O2
-        CORE.RA.addDehydratorRecipe(
-                new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 8),
-                        ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1) },
-                null,
-                null,
-                new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 4),
-                        ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1), },
-                new int[] { 10000, 10000 },
-                20 * 100,
-                120);
+        GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 8))
+                .fluidOutputs(FluidUtils.getFluidStack("fluid.hydrogenperoxide", 1000))
+                .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumPeroxide", 4))
+                .duration(100 * SECONDS).eut(120).noOptimize().addTo(chemicalDehydratorRecipes);
     }
 
     private void recipeLithiumHydroperoxide() {
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
index d3705cbb9b..a64dcab0f2 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java
@@ -138,16 +138,6 @@ public class RocketFuels extends ItemPackage {
         GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1))
                 .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidHydrogen", 1)).duration(16 * SECONDS)
                 .eut(TierEU.RECIPE_MV).addTo(vacuumFreezerRecipes);
-
-        CORE.RA.addAdvancedFreezerRecipe(
-                new ItemStack[] {},
-                new FluidStack[] { FluidUtils.getFluidStack("hydrogen", 300) },
-                new FluidStack[] { FluidUtils.getFluidStack(Liquid_Hydrogen, 300) },
-                new ItemStack[] {},
-                new int[] {},
-                20 * 4,
-                540,
-                0);
     }
 
     private static void createHydratedAmmoniumNitrateSlurry() {
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 7d30cba8f0..373238df3b 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1551,20 +1551,6 @@ public class RECIPES_GREGTECH {
 
         // Generate Hydrogen Plasma Recipe
         CORE.RA.addCyclotronRecipe(
-                new ItemStack[] { Particle.getIon("Hydrogen", 0),
-                        ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1) },
-                null,
-                new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON),
-                        Particle.getBaseParticle(Particle.ELECTRON), Particle.getBaseParticle(Particle.UNKNOWN),
-                        Particle.getBaseParticle(Particle.UNKNOWN), Particle.getBaseParticle(Particle.UNKNOWN),
-                        CI.emptyCells(1) },
-                FluidUtils.getFluidStack("plasma.hydrogen", 100),
-                new int[] { 1250, 1250, 1250, 750, 750, 750, 10000 },
-                20 * 60 * 2,
-                (int) MaterialUtils.getVoltageForTier(6),
-                750 * 20);
-
-        CORE.RA.addCyclotronRecipe(
                 new ItemStack[] { CI.getNumberedCircuit(21), Particle.getIon("Hydrogen", 0), },
                 FluidUtils.getFluidStack("hydrogen", 1000),
                 new ItemStack[] { Particle.getBaseParticle(Particle.PROTON), Particle.getBaseParticle(Particle.NEUTRON),
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
index 1678532ac3..ace004653a 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_RareEarthProcessing.java
@@ -8,6 +8,7 @@ import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gtPlusPlus.core.material.MISC_MATERIALS.BRINE;
 import static gtPlusPlus.core.material.MISC_MATERIALS.HYDROGEN_CHLORIDE;
+import static gtPlusPlus.core.material.MISC_MATERIALS.HYDROGEN_CHLORIDE_MIX;
 import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_HIGH;
 import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_LOW;
 import static gtPlusPlus.core.material.MISC_MATERIALS.RARE_EARTH_MID;
@@ -76,12 +77,10 @@ public class RECIPES_RareEarthProcessing {
                 .itemOutputs(ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 2)).duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_HV).addTo(mixerRecipes);
 
-        GT_Values.RA.stdBuilder()
-                .itemInputs(
-                        ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 4),
-                        GregtechItemList.Laser_Lens_WoodsGlass.get(0))
-                .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 4))
-                .duration(30 * SECONDS).eut(TierEU.RECIPE_HV).noOptimize().addTo(laserEngraverRecipes);
+        GT_Values.RA.stdBuilder().itemInputs(GregtechItemList.Laser_Lens_WoodsGlass.get(0))
+                .fluidInputs(HYDROGEN_CHLORIDE_MIX.getFluidStack(4000))
+                .fluidOutputs(HYDROGEN_CHLORIDE.getFluidStack(4000)).duration(30 * SECONDS).eut(TierEU.RECIPE_HV)
+                .noOptimize().addTo(laserEngraverRecipes);
 
         // Set Material Tiers correctly
         ORES.GREENOCKITE.vTier = 1;