diff --git a/CHANGELOG.md b/CHANGELOG.md index efdb07c11..7584afa68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ - Added faster recipes for crafting dough @Pyritie - Black bronze now has a fluid pipe instead of an item pipe, so the drum has proper containment info @Pyritie - Added recipes to create basic TFC alcohol in the food processor @Pyritie +- Added melting recipes for all the TFC metal dusts @Pyritie +- Added mortar and pestle recipes for soybean and olive paste (#1480) @Pyritie ### Bug fixes - Fixed not being able to craft fine wire in a coiling machine for materials that didn't also have normal wire @Pyritie - Fixed cobalt brass and potin double plates not being obtainable until MV @Pyritie @@ -24,6 +26,7 @@ - Possibly fixed the issue with airplanes and akistor carts not appearing when placing them (#1447) @Pyritie - Fixed not being able to make sea water with TFC salt in a barrel (#1476) @Pyritie - Fixed the electric greenhouse fruit tree recipes making more saplings instead of fruit (#1445) @Pyritie +- Fixed missing firmalife jam food processor recipes (#1478) @Pyritie ### Translations - Ukranian @Furryks diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index a951bee19..0bc1b7873 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -17,7 +17,7 @@ function registerTFCMetalsRecipes(event) { //#endregion - + //#region Фикс рецептов колоколов //#region Из золота @@ -152,17 +152,17 @@ function registerTFCMetalsRecipes(event) { .EUt(4) const TFC_INTERMEDIATE_METALS = - [ - { metal: 'pig_iron', meltTemp: 1535 }, - { metal: 'high_carbon_steel', meltTemp: 1540 }, - { metal: 'high_carbon_black_steel', meltTemp: 1540 }, - { metal: 'high_carbon_red_steel', meltTemp: 1540 }, - { metal: 'high_carbon_blue_steel', meltTemp: 1540 }, - { metal: 'weak_steel', meltTemp: 1540 }, - { metal: 'weak_blue_steel', meltTemp: 1540 }, - { metal: 'weak_red_steel', meltTemp: 1540 }, - { metal: 'unknown', meltTemp: 400 } - ] + [ + { metal: 'pig_iron', meltTemp: 1535 }, + { metal: 'high_carbon_steel', meltTemp: 1540 }, + { metal: 'high_carbon_black_steel', meltTemp: 1540 }, + { metal: 'high_carbon_red_steel', meltTemp: 1540 }, + { metal: 'high_carbon_blue_steel', meltTemp: 1540 }, + { metal: 'weak_steel', meltTemp: 1540 }, + { metal: 'weak_blue_steel', meltTemp: 1540 }, + { metal: 'weak_red_steel', meltTemp: 1540 }, + { metal: 'unknown', meltTemp: 400 } + ] TFC_INTERMEDIATE_METALS.forEach(x => { @@ -297,24 +297,52 @@ function registerTFCMetalsRecipes(event) { ]; global.TFC_STONE_TYPES.forEach(stone => { - deposit_ores.forEach(ore => { - - event.recipes.gtceu.ore_washer(`tfc:ore_washer/water/deposit/${ore}/${stone}`) - .itemInputs(`1x tfc:deposit/${ore}/${stone}`) - .inputFluids("#tfg:clean_water 100") - .circuit(4) - .itemOutputs(`1x tfc:ore/normal_${ore}`) - .duration(400) - .EUt(GTValues.VA[GTValues.LV]) + deposit_ores.forEach(ore => { - event.recipes.gtceu.ore_washer(`tfc:ore_washer/distilled_water/deposit/${ore}/${stone}`) - .itemInputs(`1x tfc:deposit/${ore}/${stone}`) - .inputFluids(Fluid.of('gtceu:distilled_water', 50)) - .circuit(4) - .itemOutputs(`1x tfc:ore/normal_${ore}`) - .duration(200) - .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.ore_washer(`tfc:ore_washer/water/deposit/${ore}/${stone}`) + .itemInputs(`1x tfc:deposit/${ore}/${stone}`) + .inputFluids("#tfg:clean_water 100") + .circuit(4) + .itemOutputs(`1x tfc:ore/normal_${ore}`) + .duration(400) + .EUt(GTValues.VA[GTValues.LV]) + + event.recipes.gtceu.ore_washer(`tfc:ore_washer/distilled_water/deposit/${ore}/${stone}`) + .itemInputs(`1x tfc:deposit/${ore}/${stone}`) + .inputFluids(Fluid.of('gtceu:distilled_water', 50)) + .circuit(4) + .itemOutputs(`1x tfc:ore/normal_${ore}`) + .duration(200) + .EUt(GTValues.VA[GTValues.LV]) + }) }) -}) //#endregion + + // Melting powders + + const METAL_POWDERS = [ + { powder: 'tfc:powder/native_copper', material: GTMaterials.Copper }, + { powder: 'tfc:powder/native_gold', material: GTMaterials.Gold }, + { powder: 'tfc:powder/hematite', material: GTMaterials.Hematite }, + { powder: 'tfc:powder/native_silver', material: GTMaterials.Silver }, + { powder: 'tfc:powder/cassiterite', material: GTMaterials.Cassiterite }, + { powder: 'tfc:powder/bismuthinite', material: GTMaterials.Bismuth }, + { powder: 'tfc:powder/garnierite', material: GTMaterials.Garnierite }, + { powder: 'tfc:powder/malachite', material: GTMaterials.Malachite }, + { powder: 'tfc:powder/magnetite', material: GTMaterials.Magnetite }, + { powder: 'tfc:powder/limonite', material: GTMaterials.YellowLimonite }, + { powder: 'tfc:powder/sphalerite', material: GTMaterials.Sphalerite }, + { powder: 'tfc:powder/tetrahedrite', material: GTMaterials.Tetrahedrite }, + { powder: 'tfc:powder/pyrite', material: GTMaterials.Pyrite } + ] + + METAL_POWDERS.forEach(x => { + const tfcProperty = x.material.getProperty(TFGPropertyKey.TFC_PROPERTY) + + let outputMaterial = (tfcProperty.getOutputMaterial() === null) ? x.material : tfcProperty.getOutputMaterial() + + event.recipes.tfc.heating(x.powder, tfcProperty.getMeltTemp()) + .resultFluid(Fluid.of(outputMaterial.getFluid(), global.calcAmountOfMetalProcessed(36, tfcProperty.getPercentOfMaterial()))) + .id(`tfg:heating/powder/${x.material.getName()}`) + }) } diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 40c7e2dd4..3e30bd8d2 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -517,6 +517,18 @@ function registerTFGFoodRecipes(event) { '#forge:tools/mortars' ]).id(`tfg:mortar/masa_flour`) + event.recipes.tfc.advanced_shapeless_crafting( + TFC.isp.of(`4x firmalife:food/soybean_paste`).copyFood(), [ + TFC.ingredient.notRotten(`firmalife:food/dehydrated_soybeans`), + '#forge:tools/mortars' + ]).id(`tfg:mortar/soybean_paste`) + + event.recipes.tfc.advanced_shapeless_crafting( + TFC.isp.of(`2x tfc:olive_paste`).copyFood(), [ + TFC.ingredient.notRotten(`tfc:food/olive`), + '#forge:tools/mortars' + ]).id(`tfg:mortar/olive_paste`) + processorRecipe('firmalife_masa', 300, 2, { circuit: 3, itemInputs: ["firmalife:food/masa_flour"], @@ -857,6 +869,9 @@ function registerTFGFoodRecipes(event) { .itemOutput('tfg:food/ice_soup') .id('tfg:pot/ice_soup') + event.shapeless('4x tfc:powder/salt', ['#forge:dusts/salt', '#forge:tools/mortars']) + .id(`tfg:mortar/salt`) + //#endregion //#region Heating recipes for new foods