From 0523ff9a0291392735566a4c06490e1b8a92eb69 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 19 Jul 2025 19:43:09 +0100 Subject: [PATCH] fix mushroom conflicting recipes --- kubejs/server_scripts/gregtech/recipes.js | 11 ++++++----- kubejs/server_scripts/gregtech/recipes.removes.js | 2 ++ kubejs/server_scripts/minecraft/recipes.js | 2 -- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4e0e3aff4..57b3e6e82 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -174,28 +174,29 @@ const registerGTCEURecipes = (event) => { event.recipes.gtceu.compressor('plant_ball_from_tfc_seeds') .itemInputs('8x #tfc:seeds') .itemOutputs('gtceu:plant_ball') - .circuit(1) .duration(300) .EUt(2) + let food = Ingredient.of('#tfc:foods') + .subtract('minecraft:brown_mushroom') + .subtract('minecraft:red_mushroom') + .withCount(8) + event.recipes.gtceu.compressor('plant_ball_from_tfc_food') - .itemInputs('8x #tfc:foods') + .itemInputs(food) .itemOutputs('gtceu:plant_ball') - .circuit(1) .duration(300) .EUt(2) event.recipes.gtceu.compressor('plant_ball_from_tfc_plants') .itemInputs('8x #tfc:plants') .itemOutputs('gtceu:plant_ball') - .circuit(1) .duration(300) .EUt(2) event.recipes.gtceu.compressor('plant_ball_from_tfc_corals') .itemInputs('8x #tfc:corals') .itemOutputs('gtceu:plant_ball') - .circuit(1) .duration(300) .EUt(2) diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index c432be725..8ff529cb0 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -661,6 +661,8 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:compressor/compress_certus_quartz_to_raw_ore_block' }) event.remove({ id: 'gtceu:compressor/glowstone' }) + event.remove({ id: 'gtceu:compressor/plant_ball_from_red_mushroom' }) + event.remove({ id: 'gtceu:compressor/plant_ball_from_brown_mushroom' }) event.remove({ id: 'gtceu:forming_press/form_purpur_slab_into_pillar' }) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 40853c1a7..2e6e0c8e3 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1005,7 +1005,6 @@ const registerMinecraftRecipes = (event) => { event.recipes.gtceu.compressor('tfg:red_mushroom') .itemInputs('4x minecraft:red_mushroom') .itemOutputs('minecraft:red_mushroom_block') - .circuit(2) .duration(20) .EUt(GTValues.VA[GTValues.ULV]) @@ -1013,7 +1012,6 @@ const registerMinecraftRecipes = (event) => { .itemInputs('4x minecraft:brown_mushroom') .itemOutputs('minecraft:brown_mushroom_block') .duration(20) - .circuit(2) .EUt(GTValues.VA[GTValues.ULV]) event.recipes.gtceu.chemical_bath('tfg:red_mushroom_to_shroomlight')