diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c850f6e9..f0719ec42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - Fixed inconsistent recipes for metal bars, now they all use the anvil or stonecutter. Also added recycling for them all @Pyritie - Various quest fixes and improvements @thederpysockdude123 - Added a missing dependency that fixes the rnr roads' crazy acceleration @Pyritie +- Fixed not being able to use aged alcohols to make vinegar (#2519) @Pyritie ### Translation updates - Chinese (simplified) @jmecn - Ukranian @MetEnBouldry diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 4707863f8..f28655422 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -168,7 +168,7 @@ const registerTFCRecipes = (event) => { // Add circuit to gregtech salt water mixer recipe event.remove({ id: 'gtceu:mixer/salt_water' }) generateMixerRecipe(event, ['2x #forge:dusts/salt'], Fluid.of('minecraft:water', 1000), [], 1, Fluid.of('gtceu:salt_water', 1000), 40, 7, 64, 'tfg:gtceu/salt_water') - + event.recipes.tfc.barrel_instant() .inputItem(ChemicalHelper.get(TagPrefix.dust, GTMaterials.Salt, 1)) .inputFluid(Fluid.of('minecraft:water', 1000)) @@ -213,7 +213,7 @@ const registerTFCRecipes = (event) => { .EUt(2) // Brass Mechanism - event.replaceInput({ input: 'tfc:brass_mechanisms' }, 'tfc:brass_mechanisms', 'gtceu:small_brass_gear') + event.replaceInput({ input: 'tfc:brass_mechanisms' }, 'tfc:brass_mechanisms', 'gtceu:small_brass_gear') // Rennet event.recipes.gtceu.fermenter('tfg:fermenter/vegetable_rennet') @@ -262,13 +262,13 @@ const registerTFCRecipes = (event) => { global.TFC_EQUIPMENT_METALS.forEach(material => { event.replaceInput({ id: `tfc:crafting/${material}_horse_armor` }, `tfc:jute_fiber`, `#tfg:burlap_fiber`) }) - + event.recipes.gtceu.centrifuge('tfg:soot') .itemInputs('tfc:soot') .itemOutputs('#forge:dusts/carbon') .duration(20) .EUt(2) - + event.recipes.gtceu.extruder('tfg:wrought_iron_grill_electric_only') .itemInputs('2x #forge:plates/wrought_iron') .notConsumable('tfg:large_casing_extruder_mold') @@ -276,51 +276,56 @@ const registerTFCRecipes = (event) => { .duration(60) .EUt(8) - //Jigabit's stupid acetic acid to vinegar conversion + // acetic acid to vinegar conversion - event.recipes.gtceu.mixer('vinegar_from_acetic_acid') - .inputFluids( - Fluid.of('minecraft:water', 950), - Fluid.of('gtceu:acetic_acid', 50) - ) - .outputFluids( - Fluid.of('tfc:vinegar', 1000) - ) - .circuit(1) - .duration(30) - .EUt(GTValues.VA[GTValues.MV]) + event.recipes.gtceu.mixer('vinegar_from_acetic_acid') + .inputFluids( + Fluid.of('minecraft:water', 950), + Fluid.of('gtceu:acetic_acid', 50) + ) + .outputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .circuit(1) + .duration(30) + .EUt(GTValues.VA[GTValues.MV]) - event.recipes.gtceu.distillery('acetic_acid_from_vinegar') - .inputFluids( - Fluid.of('tfc:vinegar', 1000) - ) - .outputFluids( - Fluid.of('gtceu:acetic_acid', 50) - ) - .circuit(1) - .duration(50) - .EUt(GTValues.VA[GTValues.MV]) + event.recipes.gtceu.distillery('acetic_acid_from_vinegar') + .inputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .outputFluids( + Fluid.of('gtceu:acetic_acid', 50) + ) + .circuit(1) + .duration(50) + .EUt(GTValues.VA[GTValues.MV]) - event.recipes.gtceu.distillery('water_from_vinegar') - .inputFluids( - Fluid.of('tfc:vinegar', 1000) - ) - .outputFluids( - Fluid.of('minecraft:water', 950) - ) - .circuit(2) - .duration(50) - .EUt(GTValues.VA[GTValues.MV]) - - event.recipes.gtceu.distillation_tower('vinegar_distillation') - .inputFluids( - Fluid.of('tfc:vinegar', 1000) - ) - .outputFluids( - Fluid.of('gtceu:acetic_acid', 50), - Fluid.of('minecraft:water', 950) - ) - .duration(80) - .EUt(GTValues.VA[GTValues.MV]) - + event.recipes.gtceu.distillery('water_from_vinegar') + .inputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .outputFluids( + Fluid.of('minecraft:water', 950) + ) + .circuit(2) + .duration(50) + .EUt(GTValues.VA[GTValues.MV]) + + event.recipes.gtceu.distillation_tower('vinegar_distillation') + .inputFluids( + Fluid.of('tfc:vinegar', 1000) + ) + .outputFluids( + Fluid.of('gtceu:acetic_acid', 50), + Fluid.of('minecraft:water', 950) + ) + .duration(80) + .EUt(GTValues.VA[GTValues.MV]) + + // fix alcohol tag for vinegar + event.recipes.tfc.barrel_sealed(8000) + .inputs('#tfc:foods/fruits', TFC.fluidStackIngredient('#tfg:alcohols', 250)) + .outputFluid(Fluid.of('tfc:vinegar', 250)) + .id('tfc:barrel/vinegar') }