diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index c35779ef6..da24989e3 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -519,9 +519,60 @@ const registerFirmaLifeRecipes = (event) => { global.TFC_GRAINS.forEach(grain => { event.recipes.firmalife.mixing_bowl() - .ingredients([`tfc:food/${grain}_flour`, `#tfc:sweetener`], Fluid.of('firmalife:yeast_starter', 200)) + .ingredients([ + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), + `#tfc:sweetener`], + Fluid.of('firmalife:yeast_starter', 200)) .outputItem(`4x firmalife:food/${grain}_dough`) - .copyOldestFood() - .id(`tfg:mixing_bowl/ + .id(`tfg:mixing_bowl/${grain}_dough`) + + event.recipes.firmalife.mixing_bowl() + .ingredients([ + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), + '#tfc:sweetener', + '#tfc:sweetener'], + Fluid.of('firmalife:yeast_starter', 400)) + .outputItem(`8x firmalife:food/${grain}_dough`) + .id(`tfg:mixing_bowl/${grain}_dough_2`) + + event.recipes.firmalife.mixing_bowl() + .ingredients([ + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`)], + Fluid.of('minecraft:water', 100)) + .outputItem(`2x tfc:food/${grain}_dough`) + .id(`tfg:mixing_bowl/${grain}_flatbread_dough`) + + event.recipes.firmalife.mixing_bowl() + .ingredients([ + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`)], + Fluid.of('minecraft:water', 200)) + .outputItem(`4x tfc:food/${grain}_dough`) + .id(`tfg:mixing_bowl/${grain}_flatbread_dough_2`) + + event.recipes.firmalife.mixing_bowl() + .ingredients([ + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`)], + Fluid.of('minecraft:water', 300)) + .outputItem(`6x tfc:food/${grain}_dough`) + .id(`tfg:mixing_bowl/${grain}_flatbread_dough_3`) + + event.recipes.firmalife.mixing_bowl() + .ingredients([ + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`), + TFC.ingredient.notRotten(`tfc:food/${grain}_flour`)], + Fluid.of('minecraft:water', 400)) + .outputItem(`6x tfc:food/${grain}_dough`) + .id(`tfg:mixing_bowl/${grain}_flatbread_dough_4`) }) + + event.recipes.firmalife.mixing_bowl() + .itemIngredients([TFC.ingredient.notRotten('firmalife:food/vanilla_ice_cream'), TFC.ingredient.notRotten('firmalife:food/chocolate_chip_cookie_dough')]) + .outputItem('2x firmalife:food/cookie_dough_ice_cream') + .id('firmalife:mixing_bowl/cookie_dough_ice_cream') } diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index f3298c792..1de8bba46 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -558,16 +558,14 @@ function registerTFGFoodRecipes(event) { processorRecipe("pizza_dough_olive_oil", 300, 16, { itemInputs: ['firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt'], itemOutputs: ['4x firmalife:food/pizza_dough'], - fluidInputs: [Fluid.of('tfc:olive_oil', 1000)], itemOutputProvider: TFC.isp.of("4x firmalife:food/pizza_dough").copyOldestFood() }) processorRecipe("pizza_dough_soybean_oil", 300, 16, { itemInputs: ['firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt'], itemOutputs: ['4x firmalife:food/pizza_dough'], - fluidInputs: [Fluid.of('firmalife:soybean_oil', 1000)], itemOutputProvider: TFC.isp.of("4x firmalife:food/pizza_dough").copyOldestFood() - }) + }).inputFluids(JsonIO.of({ amount: 100, value: { tag: "firmalife:oils" }})) processorRecipe("vanilla_ice_cream", 300, 16, { itemInputs: ['firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla'], @@ -591,7 +589,7 @@ function registerTFGFoodRecipes(event) { processorRecipe("cookie_dough_ice_cream", 300, 16, { itemInputs: [`firmalife:food/vanilla_ice_cream`, `firmalife:food/chocolate_chip_cookie_dough`], - itemOutputs: [`firmalife:food/cookie_dough_ice_cream`], + itemOutputs: [`2x firmalife:food/cookie_dough_ice_cream`], itemOutputProvider: TFC.isp.of("firmalife:food/cookie_dough_ice_cream").resetFood() }) @@ -629,7 +627,7 @@ function registerTFGFoodRecipes(event) { }) processorRecipe("chocolate_chip_cookie_dough", 300, 16, { - itemInputs: ['4x firmalife:food/cookie_dough', '#firmalife:chocolate_blends'], + itemInputs: ['4x firmalife:food/cookie_dough', '#firmalife:foods/chocolate'], itemOutputs: ['4x firmalife:food/chocolate_chip_cookie_dough'], itemOutputProvider: TFC.isp.of('4x firmalife:food/chocolate_chip_cookie_dough').copyOldestFood() })