diff --git a/CHANGELOG.md b/CHANGELOG.md index 996191b22..c4e73c764 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Fixed mechanical mixers requiring an alloy that needed that tier of mixer @Pyritie - Finally fixed all the issues with upgrading the toolbelt - now you can safely dye and undye, upgrade with and without tools inside it, etc (#368) @Pyritie - Fixed a dupe with certus quartz @Pyritie +- Moved the golden apple recipe over to the food processor so it respects food expiry data @Pyritie ## [0.10.9] - 10-08-2025 ### Changes diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 800a59dcf..92108d98c 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -288,34 +288,6 @@ const registerMinecraftRecipes = (event) => { //#endregion - //#region Выход: Золотое яблоко - - event.recipes.gtceu.chemical_reactor('golden_apple') - .itemInputs('tfc:food/green_apple', '8x #forge:ingots/gold') - .itemOutputs('minecraft:golden_apple') - .duration(50) - .EUt(30) - - event.recipes.gtceu.large_chemical_reactor('golden_apple') - .itemInputs('tfc:food/green_apple', '8x #forge:ingots/gold') - .itemOutputs('minecraft:golden_apple') - .duration(50) - .EUt(30) - - event.recipes.gtceu.chemical_reactor('golden_apple_1') - .itemInputs('tfc:food/red_apple', '8x #forge:ingots/gold') - .itemOutputs('minecraft:golden_apple') - .duration(50) - .EUt(30) - - event.recipes.gtceu.large_chemical_reactor('golden_apple_1') - .itemInputs('tfc:food/red_apple', '8x #forge:ingots/gold') - .itemOutputs('minecraft:golden_apple') - .duration(50) - .EUt(30) - - //#endregion - //#region Выход: Компаратор // Компаратор diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 09075ca13..071822eec 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -880,6 +880,23 @@ function registerTFGFoodRecipes(event) { .id(`tfg:mortar/salt`) //#endregion + + //#region Выход: Золотое яблоко + + processorRecipe('golden_apple_from_red', 30 * 20, GTValues.VA[GTValues.HV], { + itemInputs: ['tfc:food/red_apple'], + fluidInputs: [Fluid.of('gtceu:gold', 144 * 8)], + itemOutputs: ['minecraft:golden_apple'], + circuit: 5 + }) + processorRecipe('golden_apple_from_green', 30 * 20, GTValues.VA[GTValues.HV], { + itemInputs: ['tfc:food/green_apple'], + fluidInputs: [Fluid.of('gtceu:gold', 144 * 8)], + itemOutputs: ['minecraft:golden_apple'], + circuit: 5 + }) + + //#endregion //#region New foods