diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 3620df405..0f45f300b 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -458,6 +458,30 @@ const registerFirmaLifeRecipes = (event) => { event.recipes.create.mixing('4x firmalife:food/hardtack_dough', ['tfc:powder/salt', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]) .id('firmalife:create/mixer/food/hardtack_dough') + // Yeast starter + event.recipes.gtceu.mixer('firmalife:yeast_starter') + .inputFluids(Fluid.of('firmalife:yeast_starter', 100)) + .itemInputs('#tfc:foods/flour') + .outputFluids('firmalife:yeast_starter', 600) + .duration(1200) + .EUt(8) + + event.recipes.create.mixing(Fluid.of('firmalife:yeast_starter', 600), ['#tfc:foods/flour', Fluid.of('firmalife:yeast_starter', 100)]) + .id('firmalife:create/mixer/yeast_starter') + + // Cocoa Powder + event.recipes.gtceu.macerator('firmalife:food/cocoa_powder') + .itemInputs('gtceu:cocoa_dust') + .itemOutputs('4x firmalife:food/cocoa_powder') + .duration(100) + .EUt(2) + + event.recipes.createMilling('4x firmalife:food/cocoa_powder', 'gtceu:cocoa_dust') + .id('firmalife:milling/food/cocoa_dust') + + event.recipes.tfc.quern('4x firmalife:food/cocoa_powder', 'gtceu:cocoa_dust') + .id(`tfg:quern/cocoa_powder`) + // Chocolate Ice Cream event.recipes.gtceu.mixer('firmalife:food/chocolate_ice_cream') .itemInputs('firmalife:food/vanilla_ice_cream') @@ -659,4 +683,4 @@ const registerFirmaLifeRecipes = (event) => { } }); -} \ No newline at end of file +} diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index af4127197..44a1c25cd 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -1286,8 +1286,8 @@ const registerTFCRecipes = (event) => { //#region Рецепты для новых сплавов event.recipes.tfc.alloy('tfg:red_alloy', [ - TFC.alloyPart('tfg:redstone', 0.15, 0.25), - TFC.alloyPart('tfc:copper', 0.75, 0.85) + TFC.alloyPart('tfg:redstone', 0.75, 0.85), + TFC.alloyPart('tfc:copper', 0.15, 0.25) ]).id('tfg:alloy/red_alloy') event.recipes.tfc.alloy('tfg:tin_alloy', [ @@ -1554,6 +1554,26 @@ const registerTFCRecipes = (event) => { //#endregion + //#region metal bars + + const METAL_BARS = [ + "copper", + "bronze", + "black_bronze", + "bismuth_bronze", + "wrought_iron", + "steel", + "black_steel", + "red_steel", + "blue_steel" + ]; + + METAL_BARS.forEach(metal => { + generateCutterRecipe(event, `gtceu:${metal}_plate`, 9, `8x tfc:metal/bars/${metal}`, 100, 16, `${metal}_plate_to_bars`) + }); + + //#endregion + //#endregion //#region Земля @@ -1699,6 +1719,7 @@ const registerTFCRecipes = (event) => { event.recipes.gtceu.assembler(`tfg:tfc/${stone}_loose_to_brick`) .itemInputs(`tfc:rock/loose/${stone}`) .itemOutputs(`tfc:brick/${stone}`) + .circuit(1) .duration(40) .EUt(8) @@ -1788,7 +1809,7 @@ const registerTFCRecipes = (event) => { event.recipes.gtceu.assembler(`${stone}_loose_rocks_to_cobble`) .itemInputs(`4x tfc:rock/loose/${stone}`) - .circuit(0) + .circuit(2) .inputFluids(Fluid.of('gtceu:concrete', 72)) .itemOutputs(`tfc:rock/cobble/${stone}`) .duration(50) diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index e1ae8b45c..9af162975 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -967,6 +967,9 @@ global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ { input: '#forge:dusts/borax', output: '4x tfc:powder/flux', name: 'flux_powder' }, { input: '#forge:dusts/soda_ash', output: '4x tfc:powder/soda_ash', name: 'soda_ash' }, { input: 'minecraft:charcoal', output: '2x tfc:powder/charcoal', name: 'charcoal' }, + { input: 'gtceu:raw_graphite', output: 'gtceu:graphite_dust', name: 'raw_graphite_to_dust' }, + { input: 'gtceu:poor_raw_graphite', output: '5x gtceu:tiny_graphite_dust', name: 'poor_raw_graphite_to_dust' }, + { input: 'gtceu:rich_raw_graphite', output: '2x gtceu:graphite_dust', name: 'rich_graphite_to_dust' }, ]; global.TFC_QUERN_GRAIN_RECIPE_COMPONENTS = [ @@ -1060,4 +1063,4 @@ global.TFC_GREENHOUSE_BERRY_RECIPE_COMPONENTS = [ global.calcAmountOfMetal = (defaultAmount, percents) => { const value = defaultAmount / (100 / percents) return (value % 2 == 0) ? value : Math.round(value) - 1 -} \ No newline at end of file +}