From af3454beea06d8ebda843795976b3b3de543de2a Mon Sep 17 00:00:00 2001 From: Serenibyss <10861407+serenibyss@users.noreply.github.com> Date: Sun, 17 Dec 2023 18:43:12 -0600 Subject: [PATCH] Allow electrolyzing more hydrocarbons (#2258) --- .../materials/OrganicChemistryMaterials.java | 6 +- .../recipe/chemistry/SeparationRecipes.java | 124 ++++++++++++------ 2 files changed, 88 insertions(+), 42 deletions(-) diff --git a/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java b/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java index f47c7cc0a42..de2bdf4a703 100644 --- a/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/OrganicChemistryMaterials.java @@ -194,7 +194,6 @@ public static void register() { Chloromethane = new Material.Builder(1024, gregtechId("chloromethane")) .gas() .color(0xC82CA0) - .flags(DISABLE_DECOMPOSITION) .components(Carbon, 1, Hydrogen, 3, Chlorine, 1) .build(); @@ -221,12 +220,14 @@ public static void register() { Propene = new Material.Builder(1028, gregtechId("propene")) .gas() .color(0xFFDD55) + .flags(DISABLE_DECOMPOSITION) .components(Carbon, 3, Hydrogen, 6) .build(); Ethane = new Material.Builder(1029, gregtechId("ethane")) .gas() .color(0xC8C8FF) + .flags(DISABLE_DECOMPOSITION) .components(Carbon, 2, Hydrogen, 6) .build(); @@ -268,7 +269,6 @@ public static void register() { Ethenone = new Material.Builder(1035, gregtechId("ethenone")) .fluid() .color(0x141446) - .flags(DISABLE_DECOMPOSITION) .components(Carbon, 2, Hydrogen, 2, Oxygen, 1) .build(); @@ -331,7 +331,6 @@ public static void register() { AceticAcid = new Material.Builder(1044, gregtechId("acetic_acid")) .liquid(new FluidBuilder().attribute(FluidAttributes.ACID)) .color(0xC8B4A0) - .flags(DISABLE_DECOMPOSITION) .components(Carbon, 2, Hydrogen, 4, Oxygen, 2) .build(); @@ -373,7 +372,6 @@ public static void register() { Acetone = new Material.Builder(1050, gregtechId("acetone")) .fluid() .color(0xAFAFAF) - .flags(DISABLE_DECOMPOSITION) .components(Carbon, 3, Hydrogen, 6, Oxygen, 1) .build(); diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java index 3d51fc11124..fc433308a0d 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java @@ -369,44 +369,6 @@ public static void init() { .output(dust, Carbon, 4) .duration(100).EUt(60).buildAndRegister(); - ELECTROLYZER_RECIPES.recipeBuilder() - .fluidInputs(AceticAcid.getFluid(2000)) - .fluidOutputs(Ethane.getFluid(1000)) - .fluidOutputs(CarbonDioxide.getFluid(2000)) - .fluidOutputs(Hydrogen.getFluid(2000)) - .duration(512).EUt(60).buildAndRegister(); - - ELECTROLYZER_RECIPES.recipeBuilder() - .fluidInputs(Chloromethane.getFluid(2000)) - .fluidOutputs(Ethane.getFluid(1000)) - .fluidOutputs(Chlorine.getFluid(2000)) - .duration(400).EUt(60).buildAndRegister(); - - ELECTROLYZER_RECIPES.recipeBuilder() - .fluidInputs(Acetone.getFluid(2000)) - .output(dust, Carbon, 3) - .fluidOutputs(Propane.getFluid(1000)) - .fluidOutputs(Water.getFluid(2000)) - .duration(480).EUt(60).buildAndRegister(); - - ELECTROLYZER_RECIPES.recipeBuilder() - .fluidInputs(Butane.getFluid(1000)) - .fluidOutputs(Butene.getFluid(1000)) - .fluidOutputs(Hydrogen.getFluid(2000)) - .duration(240).EUt(VA[MV]).buildAndRegister(); - - ELECTROLYZER_RECIPES.recipeBuilder() - .fluidInputs(Butene.getFluid(1000)) - .fluidOutputs(Butadiene.getFluid(1000)) - .fluidOutputs(Hydrogen.getFluid(2000)) - .duration(240).EUt(VA[MV]).buildAndRegister(); - - ELECTROLYZER_RECIPES.recipeBuilder() - .fluidInputs(Propane.getFluid(1000)) - .fluidOutputs(Propene.getFluid(1000)) - .fluidOutputs(Hydrogen.getFluid(2000)) - .duration(640).EUt(VA[MV]).buildAndRegister(); - ELECTROLYZER_RECIPES.recipeBuilder() .input(dust, Diamond) .output(dust, Carbon, 64) @@ -470,6 +432,92 @@ public static void init() { .fluidOutputs(Chlorine.getFluid(1000)) .duration(288).EUt(60).buildAndRegister(); + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Propane.getFluid(1000)) + .output(dust, Carbon, 3) + .fluidOutputs(Hydrogen.getFluid(8000)) + .duration(176).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Butene.getFluid(1000)) + .output(dust, Carbon, 4) + .fluidOutputs(Hydrogen.getFluid(8000)) + .duration(192).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Butane.getFluid(1000)) + .output(dust, Carbon, 4) + .fluidOutputs(Hydrogen.getFluid(10000)) + .duration(224).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Styrene.getFluid(1000)) + .output(dust, Carbon, 8) + .fluidOutputs(Hydrogen.getFluid(8000)) + .duration(384).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Butadiene.getFluid(1000)) + .output(dust, Carbon, 4) + .fluidOutputs(Hydrogen.getFluid(6000)) + .duration(240).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Phenol.getFluid(1000)) + .output(dust, Carbon, 6) + .fluidOutputs(Hydrogen.getFluid(6000)) + .fluidOutputs(Oxygen.getFluid(1000)) + .duration(312).EUt(90).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Ethylene.getFluid(1000)) + .output(dust, Carbon, 2) + .fluidOutputs(Hydrogen.getFluid(4000)) + .duration(96).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Benzene.getFluid(1000)) + .output(dust, Carbon, 6) + .fluidOutputs(Hydrogen.getFluid(6000)) + .duration(288).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Ethanol.getFluid(1000)) + .output(dust, Carbon, 2) + .fluidOutputs(Hydrogen.getFluid(6000)) + .fluidOutputs(Oxygen.getFluid(1000)) + .duration(144).EUt(90).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Toluene.getFluid(1000)) + .output(dust, Carbon, 7) + .fluidOutputs(Hydrogen.getFluid(8000)) + .duration(360).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Dimethylbenzene.getFluid(1000)) + .output(dust, Carbon, 8) + .fluidOutputs(Hydrogen.getFluid(10000)) + .duration(432).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Octane.getFluid(1000)) + .output(dust, Carbon, 8) + .fluidOutputs(Hydrogen.getFluid(18000)) + .duration(624).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Propene.getFluid(1000)) + .output(dust, Carbon, 3) + .fluidOutputs(Hydrogen.getFluid(6000)) + .duration(144).EUt(60).buildAndRegister(); + + ELECTROLYZER_RECIPES.recipeBuilder() + .fluidInputs(Ethane.getFluid(1000)) + .output(dust, Carbon, 2) + .fluidOutputs(Hydrogen.getFluid(6000)) + .duration(128).EUt(60).buildAndRegister(); + // Thermal Centrifuge THERMAL_CENTRIFUGE_RECIPES.recipeBuilder() .inputs(new ItemStack(Blocks.COBBLESTONE, 1, GTValues.W))