From 27692fdf408f1578d450840a7a63fbef89dfa814 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 29 Jun 2025 20:36:25 +0100 Subject: [PATCH] now only the recipes that use 8 inputs actually use 8 fertiliser --- kubejs/server_scripts/firmalife/recipes.js | 4 ++-- kubejs/server_scripts/gregtech/utility.js | 4 ++-- kubejs/server_scripts/tfc/recipes.js | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index f41be475b..586c15306 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -436,12 +436,12 @@ const registerFirmaLifeRecipes = (event) => { // Семена фруктов global.FIRMALIFE_GREENHOUSE_FRUIT_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, 'minecraft:overworld') + generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, 'minecraft:overworld', 1) }) // Семена ягод global.FIRMALIFE_GREENHOUSE_BERRY_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null) + generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null, 1) }) //#endregion diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index 2ac9b0f83..0d496e492 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -23,7 +23,7 @@ const generateCutterRecipe = (event, input, output, duration, EUt, id) => { .EUt(EUt) } -const generateGreenHouseRecipe = (event, input, fluid_amount, output, id, dimension) => { +const generateGreenHouseRecipe = (event, input, fluid_amount, output, id, dimension, fertiliser_count) => { // Без удобрения let r = event.recipes.gtceu.greenhouse(id) @@ -42,7 +42,7 @@ const generateGreenHouseRecipe = (event, input, fluid_amount, output, id, dimens // С удобрением r = event.recipes.gtceu.greenhouse(`${id}_fertilized`) .itemInputs(input) - .itemInputs('8x gtceu:fertilizer') + .itemInputs(Item.of('gtceu:fertilizer', fertiliser_count)) .circuit(2) .inputFluids(Fluid.of('minecraft:water', fluid_amount)) .itemOutputs(output) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index f1a9945fc..e16f66f62 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -56,26 +56,26 @@ const registerTFCRecipes = (event) => { // Дерево global.TFC_WOOD_TYPES.forEach(wood => { - generateGreenHouseRecipe(event, `8x tfc:wood/sapling/${wood}`, 16000, `64x tfc:wood/log/${wood}`, `tfg:greenhouse/${wood}`, 'minecraft:overworld') + generateGreenHouseRecipe(event, `8x tfc:wood/sapling/${wood}`, 16000, `64x tfc:wood/log/${wood}`, `tfg:greenhouse/${wood}`, 'minecraft:overworld', 8) }) global.AFC_SAPLINGS.forEach(x => { - generateGreenHouseRecipe(event, `8x afc:wood/sapling/${x.sapling}`, 16000, `64x ${x.log}`, `tfg:greenhouse/${x.sapling}`, 'minecraft:overworld') + generateGreenHouseRecipe(event, `8x afc:wood/sapling/${x.sapling}`, 16000, `64x ${x.log}`, `tfg:greenhouse/${x.sapling}`, 'minecraft:overworld', 8) }) // Семена фруктов global.TFC_GREENHOUSE_FRUIT_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, 'minecraft:overworld') + generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, 'minecraft:overworld', 1) }) // Семена овощей global.TFC_GREENHOUSE_VEGETABLE_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null) + generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null, 1) }) // Семена ягод global.TFC_GREENHOUSE_BERRY_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null) + generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null, 1) }) // Растения @@ -83,7 +83,7 @@ const registerTFCRecipes = (event) => { const itemId = element.id; const recipeId = `greenhouse_${itemId.replace(':', '_')}`; - generateGreenHouseRecipe(event, itemId, 8000, `8x ${itemId}`, recipeId, null); + generateGreenHouseRecipe(event, itemId, 8000, `8x ${itemId}`, recipeId, null, 1); }); //#endregion