From 9ece43f12282600b953f8afb6a25c4d4aa856651 Mon Sep 17 00:00:00 2001 From: Mqrius Date: Thu, 8 Jan 2026 22:27:17 +0100 Subject: [PATCH] Fix dried fruit recipe (#2673) * Fix dried fruit recipe Signed-off-by: Mqrius * Register tags based on constant array --------- Signed-off-by: Mqrius --- kubejs/server_scripts/firmalife/recipes.js | 2 +- kubejs/server_scripts/firmalife/tags.js | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index b90d4b006..78b2347e5 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -1024,7 +1024,7 @@ const registerFirmaLifeRecipes = (event) => { event.recipes.tfc.barrel_sealed(72000) .inputFluid(Fluid.of('minecraft:water', 100)) - .inputItem(TFC.ingredient.hasTrait(Ingredient.of('#tfg:dried_fruit'), "firmalife:dried")) + .inputItem(TFC.ingredient.hasTrait('#tfg:dried_fruit', "firmalife:dried")) .outputFluid(Fluid.of('firmalife:yeast_starter', 100)) .id('firmalife:barrel/yeast_starter') } diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index 0a66fefd9..307bc6230 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -18,12 +18,10 @@ const registerFirmaLifeItemTags = (event) => { event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") // Make our own "dried fruit" tag so we can display something in EMI - used for yeast starter - const fruitArray = Ingredient.of('#tfc:foods/fruits').itemIds.toArray().map(String) - fruitArray.forEach(fruit => { - if (fruit !== 'betterend:shadow_berry_cooked' && fruit !== 'minecraft:popped_chorus_fruit') { - event.add('tfg:dried_fruit', fruit) - } - }) + global.FOOD_FRUIT + .map(fruit => fruit.id) + .filter(fruit => fruit !== 'betterend:shadow_berry_cooked' && fruit !== 'minecraft:popped_chorus_fruit') + .forEach(fruit => event.add('tfg:dried_fruit', fruit)) } const registerFirmaLifeBlockTags = (event) => {