diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 7ae4d967e..c35779ef6 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -37,6 +37,8 @@ const registerFirmaLifeRecipes = (event) => { event.remove({ id: 'firmalife:heating/metal/stainless_steel_block_slab' }) event.remove({ id: 'firmalife:heating/metal/stainless_steel_block_stairs' }) + event.remove({ id: /^firmalife:crafting\/.*_dough/ }) + //#endregion // Декрафт Jag Lid @@ -501,12 +503,25 @@ const registerFirmaLifeRecipes = (event) => { event.recipes.firmalife.mixing_bowl() .itemIngredients(['#tfg:wood_dusts', 'tfc:glue']) .outputItem('tfg:chipboard_composite') + .id('tfg:mixing_bowl/chipboard_composite_glue') event.recipes.firmalife.mixing_bowl() .itemIngredients(['#tfg:wood_dusts', 'gtceu:sticky_resin']) .outputItem('tfg:chipboard_composite') + .id('tfg:mixing_bowl/chipboard_composite_resin') event.recipes.firmalife.mixing_bowl() .itemIngredients(['#tfg:wood_dusts', '#forge:wax']) .outputItem('tfg:chipboard_composite') + .id('tfg:mixing_bowl/chipboard_composite_wax') + + // Dough + + global.TFC_GRAINS.forEach(grain => { + event.recipes.firmalife.mixing_bowl() + .ingredients([`tfc:food/${grain}_flour`, `#tfc:sweetener`], Fluid.of('firmalife:yeast_starter', 200)) + .outputItem(`4x firmalife:food/${grain}_dough`) + .copyOldestFood() + .id(`tfg:mixing_bowl/ + }) } diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 63b1d27c4..f23a2c7fb 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -629,7 +629,7 @@ const registerGTCEURecipes = (event) => { // #endregion // #region Add all glass colors to macerator/hammer - event.remove({ id: "gtceu:macerator/macerate_glass" }); + removeMaceratorRecipe(event, 'macerate_glass'); event.recipes.gtceu.macerator("gtceu:macerator/macerate_glass") .itemInputs( "#forge:glass" @@ -638,7 +638,7 @@ const registerGTCEURecipes = (event) => { .duration(20) .EUt(2); - event.remove({ id: "gtceu:macerator/macerate_glass_pane" }); + removeMaceratorRecipe(event, 'macerate_glass_pane'); event.recipes.gtceu.macerator("gtceu:macerator/macerate_glass_pane") .itemInputs( "#forge:glass_panes" @@ -790,7 +790,7 @@ const registerGTCEURecipes = (event) => { // Macerator global.TFC_HARDWOOD_TYPES.forEach(wood => { - event.remove(`gtceu:macerator/macerate_wood/hanging_sign/${metal.getName()}/${wood}`) + removeMaceratorRecipe(event, `macerate_wood/hanging_sign/${metal.getName()}/${wood}`) event.recipes.gtceu.macerator(`gtceu:macerator/macerate_wood/hanging_sign/${metal.getName()}/${wood}`) .itemInputs(`tfc:wood/hanging_sign/${metal.getName()}/${wood}`) .itemOutputs('gtceu:hardwood_dust') @@ -801,7 +801,7 @@ const registerGTCEURecipes = (event) => { }) global.TFC_SOFTWOOD_TYPES.forEach(wood => { - event.remove(`gtceu:macerator/macerate_wood/hanging_sign/${metal.getName()}/${wood}`) + removeMaceratorRecipe(event, `macerate_wood/hanging_sign/${metal.getName()}/${wood}`) event.recipes.gtceu.macerator(`gtceu:macerator/macerate_wood/hanging_sign/${metal.getName()}/${wood}`) .itemInputs(`tfc:wood/hanging_sign/${metal.getName()}/${wood}`) .itemOutputs('gtceu:wood_dust') diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 2b0f5f486..ce021716a 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -12,41 +12,41 @@ function removeGTCEURecipes(event) { //#region Выход: Крошечная кучка камня - event.remove({ id: 'gtceu:macerator/macerate_stone_button' }) + removeMaceratorRecipe(event, 'macerate_stone_button') //#endregion //#region Выход: Маленькая кучка камня - event.remove({ id: 'gtceu:macerator/macerate_stone_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_brick_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_brick_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_sandstone_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_sandstone_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_red_sandstone_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_red_sandstone_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_granite' }) - event.remove({ id: 'gtceu:macerator/macerate_diorite' }) - event.remove({ id: 'gtceu:macerator/macerate_cobblestone_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_andesite' }) + removeMaceratorRecipe(event, 'macerate_stone_stairs') + removeMaceratorRecipe(event, 'macerate_stone_slab') + removeMaceratorRecipe(event, 'macerate_stone_brick_stairs') + removeMaceratorRecipe(event, 'macerate_stone_brick_slab') + removeMaceratorRecipe(event, 'macerate_sandstone_stairs') + removeMaceratorRecipe(event, 'macerate_sandstone_slab') + removeMaceratorRecipe(event, 'macerate_red_sandstone_stairs') + removeMaceratorRecipe(event, 'macerate_red_sandstone_slab') + removeMaceratorRecipe(event, 'macerate_granite') + removeMaceratorRecipe(event, 'macerate_diorite') + removeMaceratorRecipe(event, 'macerate_cobblestone_slab') + removeMaceratorRecipe(event, 'macerate_andesite') //#endregion //#region Выход: Кучка камня - event.remove({ id: 'gtceu:macerator/macerate_stone_sword' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_shovel' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_pressure_plate' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_pickaxe' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_hoe' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_bricks' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_axe' }) - event.remove({ id: 'gtceu:macerator/macerate_mossy_cobblestone' }) - event.remove({ id: 'gtceu:macerator/macerate_cobblestone_wall' }) - event.remove({ id: 'gtceu:macerator/macerate_cobblestone' }) - event.remove({ id: 'gtceu:macerator/gravel_to_flint' }) - event.remove({ id: 'gtceu:macerator/macerate_furnace' }) + removeMaceratorRecipe(event, 'macerate_stone_sword') + removeMaceratorRecipe(event, 'macerate_stone_shovel') + removeMaceratorRecipe(event, 'macerate_stone_pressure_plate') + removeMaceratorRecipe(event, 'macerate_stone_pickaxe') + removeMaceratorRecipe(event, 'macerate_stone_hoe') + removeMaceratorRecipe(event, 'macerate_stone_bricks') + removeMaceratorRecipe(event, 'macerate_stone_axe') + removeMaceratorRecipe(event, 'macerate_mossy_cobblestone') + removeMaceratorRecipe(event, 'macerate_cobblestone_wall') + removeMaceratorRecipe(event, 'macerate_cobblestone') + removeMaceratorRecipe(event, 'gravel_to_flint') + removeMaceratorRecipe(event, 'macerate_furnace') //#endregion @@ -60,9 +60,9 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/assemble_cobbled_deepslate_into_stair' }) event.remove({ id: 'gtceu:assembler/assemble_cobbled_deepslate_into_polished' }) event.remove({ id: 'gtceu:assembler/assemble_cobbled_deepslate_into_wall' }) - event.remove({ id: 'gtceu:cutter/cut_cobbled_deepslate_into_slab' }) - event.remove({ id: 'gtceu:cutter/cut_cobbled_deepslate_into_slab_water' }) - event.remove({ id: 'gtceu:cutter/cut_cobbled_deepslate_into_slab_distilled_water' }) + removeCutterRecipe(event, 'cut_cobbled_deepslate_into_slab') + removeCutterRecipe(event, 'cut_cobbled_deepslate_into_slab_water') + removeCutterRecipe(event, 'cut_cobbled_deepslate_into_slab_distilled_water') event.remove({ id: 'gtceu:shaped/cobbled_deepslate_polished_hammer' }) event.remove({ id: 'gtceu:forming_press/form_cobbled_deepslate_slab_into_pillar' }) @@ -74,9 +74,9 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/assemble_polished_deepslate_into_stair' }) event.remove({ id: 'gtceu:assembler/assemble_polished_deepslate_into_polished' }) event.remove({ id: 'gtceu:assembler/assemble_polished_deepslate_into_wall' }) - event.remove({ id: 'gtceu:cutter/cut_polished_deepslate_into_slab' }) - event.remove({ id: 'gtceu:cutter/cut_polished_deepslate_into_slab_water' }) - event.remove({ id: 'gtceu:cutter/cut_polished_deepslate_into_slab_distilled_water' }) + removeCutterRecipe(event, 'cut_polished_deepslate_into_slab') + removeCutterRecipe(event, 'cut_polished_deepslate_into_slab_water') + removeCutterRecipe(event, 'cut_polished_deepslate_into_slab_distilled_water') event.remove({ id: 'gtceu:shaped/deepslate_bricks_hammer' }) event.remove({ id: 'gtceu:shaped/deepslate_bricks_stair_saw' }) @@ -86,9 +86,9 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/assemble_deepslate_bricks_into_stair' }) event.remove({ id: 'gtceu:assembler/assemble_deepslate_bricks_into_polished' }) event.remove({ id: 'gtceu:assembler/assemble_deepslate_bricks_into_wall' }) - event.remove({ id: 'gtceu:cutter/cut_deepslate_bricks_into_slab' }) - event.remove({ id: 'gtceu:cutter/cut_deepslate_bricks_into_slab_water' }) - event.remove({ id: 'gtceu:cutter/cut_deepslate_bricks_into_slab_distilled_water' }) + removeCutterRecipe(event, 'cut_deepslate_bricks_into_slab') + removeCutterRecipe(event, 'cut_deepslate_bricks_into_slab_water') + removeCutterRecipe(event, 'cut_deepslate_bricks_into_slab_distilled_water') event.remove({ id: 'gtceu:shaped/deepslate_tile_hammer' }) event.remove({ id: 'gtceu:shaped/deepslate_tile_stair_saw' }) @@ -98,11 +98,11 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/assemble_deepslate_tile_into_stair' }) event.remove({ id: 'gtceu:assembler/assemble_deepslate_tile_into_polished' }) event.remove({ id: 'gtceu:assembler/assemble_deepslate_tile_into_wall' }) - event.remove({ id: 'gtceu:cutter/cut_deepslate_tile_into_slab' }) - event.remove({ id: 'gtceu:cutter/cut_deepslate_tile_into_slab_water' }) - event.remove({ id: 'gtceu:cutter/cut_deepslate_tile_into_slab_distilled_water' }) + removeCutterRecipe(event, 'cut_deepslate_tile_into_slab') + removeCutterRecipe(event, 'cut_deepslate_tile_into_slab_water') + removeCutterRecipe(event, 'cut_deepslate_tile_into_slab_distilled_water') - event.remove({ id: 'gtceu:macerator/macerate_deepslate' }) + removeMaceratorRecipe(event, 'macerate_deepslate') event.remove({ id: 'gtceu:rock_breaker/deepslate' }) // #endregion @@ -116,9 +116,9 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/assemble_blackstone_into_stair' }) event.remove({ id: 'gtceu:assembler/assemble_blackstone_into_polished' }) event.remove({ id: 'gtceu:assembler/assemble_blackstone_into_wall' }) - event.remove({ id: 'gtceu:cutter/cut_blackstone_into_slab' }) - event.remove({ id: 'gtceu:cutter/cut_blackstone_into_slab_water' }) - event.remove({ id: 'gtceu:cutter/cut_blackstone_into_slab_distilled_water' }) + removeCutterRecipe(event, 'cut_blackstone_into_slab') + removeCutterRecipe(event, 'cut_blackstone_into_slab_water') + removeCutterRecipe(event, 'cut_blackstone_into_slab_distilled_water') event.remove({ id: 'gtceu:shaped/polished_blackstone_hammer' }) event.remove({ id: 'gtceu:shaped/polished_blackstone_stair_saw' }) @@ -128,9 +128,9 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/assemble_polished_blackstone_into_stair' }) event.remove({ id: 'gtceu:assembler/assemble_polished_blackstone_into_polished' }) event.remove({ id: 'gtceu:assembler/assemble_polished_blackstone_into_wall' }) - event.remove({ id: 'gtceu:cutter/cut_polished_blackstone_into_slab' }) - event.remove({ id: 'gtceu:cutter/cut_polished_blackstone_into_slab_water' }) - event.remove({ id: 'gtceu:cutter/cut_polished_blackstone_into_slab_distilled_water' }) + removeCutterRecipe(event, 'cut_polished_blackstone_into_slab') + removeCutterRecipe(event, 'cut_polished_blackstone_into_slab_water') + removeCutterRecipe(event, 'cut_polished_blackstone_into_slab_distilled_water') event.remove({ id: 'gtceu:shaped/polished_blackstone_polished_hammer' }) event.remove({ id: 'gtceu:forming_press/form_polished_blackstone_slab_into_pillar' }) @@ -143,9 +143,9 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/assemble_polished_blackstone_brick_into_stair' }) event.remove({ id: 'gtceu:assembler/assemble_polished_blackstone_brick_into_polished' }) event.remove({ id: 'gtceu:assembler/assemble_polished_blackstone_brick_into_wall' }) - event.remove({ id: 'gtceu:cutter/cut_polished_blackstone_brick_into_slab' }) - event.remove({ id: 'gtceu:cutter/cut_polished_blackstone_brick_into_slab_water' }) - event.remove({ id: 'gtceu:cutter/cut_polished_blackstone_brick_into_slab_distilled_water' }) + removeCutterRecipe(event, 'cut_polished_blackstone_brick_into_slab') + removeCutterRecipe(event, 'cut_polished_blackstone_brick_into_slab_water') + removeCutterRecipe(event, 'cut_polished_blackstone_brick_into_slab_distilled_water') event.remove({ id: 'gtceu:rock_breaker/blackstone' }) @@ -225,122 +225,122 @@ function removeGTCEURecipes(event) { // #endregion - //#region Выход: Крошечная кучка дерева + //#region Выход: Крошечная кучка дерева - event.remove({ id: 'gtceu:macerator/macerate_warped_button' }) - event.remove({ id: 'gtceu:macerator/macerate_spruce_button' }) - event.remove({ id: 'gtceu:macerator/macerate_oak_button' }) - event.remove({ id: 'gtceu:macerator/macerate_mangrove_button' }) - event.remove({ id: 'gtceu:macerator/macerate_jungle_button' }) - event.remove({ id: 'gtceu:macerator/macerate_dark_oak_button' }) - event.remove({ id: 'gtceu:macerator/macerate_crimson_button' }) - event.remove({ id: 'gtceu:macerator/macerate_cherry_button' }) - event.remove({ id: 'gtceu:macerator/macerate_birch_button' }) - event.remove({ id: 'gtceu:macerator/macerate_acacia_button' }) + removeMaceratorRecipe(event, 'macerate_warped_button') + removeMaceratorRecipe(event, 'macerate_spruce_button') + removeMaceratorRecipe(event, 'macerate_oak_button') + removeMaceratorRecipe(event, 'macerate_mangrove_button') + removeMaceratorRecipe(event, 'macerate_jungle_button') + removeMaceratorRecipe(event, 'macerate_dark_oak_button') + removeMaceratorRecipe(event, 'macerate_crimson_button') + removeMaceratorRecipe(event, 'macerate_cherry_button') + removeMaceratorRecipe(event, 'macerate_birch_button') + removeMaceratorRecipe(event, 'macerate_acacia_button') //#endregion //#region Выход: Маленькая кучка дерева - event.remove({ id: 'gtceu:macerator/macerate_wooden_sword' }) - event.remove({ id: 'gtceu:macerator/macerate_wooden_shovel' }) - event.remove({ id: 'gtceu:macerator/macerate_wooden_pickaxe' }) - event.remove({ id: 'gtceu:macerator/macerate_wooden_hoe' }) - event.remove({ id: 'gtceu:macerator/macerate_wooden_axe' }) - event.remove({ id: 'gtceu:macerator/macerate_warped_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_warped_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_spruce_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_spruce_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_oak_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_oak_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_mangrove_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_mangrove_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_jungle_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_jungle_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_sword' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_shovel' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_pickaxe' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_hoe' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_axe' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_sword' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_shovel' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_pickaxe' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_hoe' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_axe' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_sword' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_shovel' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_pickaxe' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_hoe' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_axe' }) - event.remove({ id: 'gtceu:macerator/macerate_dark_oak_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_dark_oak_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_crimson_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_crimson_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_cherry_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_cherry_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_birch_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_birch_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_acacia_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_acacia_slab' }) + removeMaceratorRecipe(event, 'macerate_wooden_sword') + removeMaceratorRecipe(event, 'macerate_wooden_shovel') + removeMaceratorRecipe(event, 'macerate_wooden_pickaxe') + removeMaceratorRecipe(event, 'macerate_wooden_hoe') + removeMaceratorRecipe(event, 'macerate_wooden_axe') + removeMaceratorRecipe(event, 'macerate_warped_stairs') + removeMaceratorRecipe(event, 'macerate_warped_slab') + removeMaceratorRecipe(event, 'macerate_spruce_stairs') + removeMaceratorRecipe(event, 'macerate_spruce_slab') + removeMaceratorRecipe(event, 'macerate_oak_stairs') + removeMaceratorRecipe(event, 'macerate_oak_slab') + removeMaceratorRecipe(event, 'macerate_mangrove_stairs') + removeMaceratorRecipe(event, 'macerate_mangrove_slab') + removeMaceratorRecipe(event, 'macerate_jungle_stairs') + removeMaceratorRecipe(event, 'macerate_jungle_slab') + removeMaceratorRecipe(event, 'macerate_iron_sword') + removeMaceratorRecipe(event, 'macerate_iron_shovel') + removeMaceratorRecipe(event, 'macerate_iron_pickaxe') + removeMaceratorRecipe(event, 'macerate_iron_hoe') + removeMaceratorRecipe(event, 'macerate_iron_axe') + removeMaceratorRecipe(event, 'macerate_golden_sword') + removeMaceratorRecipe(event, 'macerate_golden_shovel') + removeMaceratorRecipe(event, 'macerate_golden_pickaxe') + removeMaceratorRecipe(event, 'macerate_golden_hoe') + removeMaceratorRecipe(event, 'macerate_golden_axe') + removeMaceratorRecipe(event, 'macerate_diamond_sword') + removeMaceratorRecipe(event, 'macerate_diamond_shovel') + removeMaceratorRecipe(event, 'macerate_diamond_pickaxe') + removeMaceratorRecipe(event, 'macerate_diamond_hoe') + removeMaceratorRecipe(event, 'macerate_diamond_axe') + removeMaceratorRecipe(event, 'macerate_dark_oak_stairs') + removeMaceratorRecipe(event, 'macerate_dark_oak_slab') + removeMaceratorRecipe(event, 'macerate_crimson_stairs') + removeMaceratorRecipe(event, 'macerate_crimson_slab') + removeMaceratorRecipe(event, 'macerate_cherry_stairs') + removeMaceratorRecipe(event, 'macerate_cherry_slab') + removeMaceratorRecipe(event, 'macerate_birch_stairs') + removeMaceratorRecipe(event, 'macerate_birch_slab') + removeMaceratorRecipe(event, 'macerate_acacia_stairs') + removeMaceratorRecipe(event, 'macerate_acacia_slab') //#endregion //#region Выход: Деревянная пыль - event.remove({ id: 'gtceu:macerator/macerate_trapped_chest' }) - event.remove({ id: 'gtceu:macerator/macerate_spruce_planks' }) - event.remove({ id: 'gtceu:macerator/macerate_spruce_fence_gate' }) - event.remove({ id: 'gtceu:macerator/macerate_spruce_fence' }) - event.remove({ id: 'gtceu:macerator/macerate_spruce_door' }) - event.remove({ id: 'gtceu:macerator/macerate_spruce_boat' }) - event.remove({ id: 'gtceu:macerator/macerate_oak_planks' }) - event.remove({ id: 'gtceu:macerator/macerate_oak_fence_gate' }) - event.remove({ id: 'gtceu:macerator/macerate_oak_fence' }) - event.remove({ id: 'gtceu:macerator/macerate_oak_door' }) - event.remove({ id: 'gtceu:macerator/macerate_oak_boat' }) - event.remove({ id: 'gtceu:macerator/macerate_mangrove_planks' }) - event.remove({ id: 'gtceu:macerator/macerate_mangrove_fence_gate' }) - event.remove({ id: 'gtceu:macerator/macerate_mangrove_fence' }) - event.remove({ id: 'gtceu:macerator/macerate_mangrove_door' }) - event.remove({ id: 'gtceu:macerator/macerate_mangrove_boat' }) - event.remove({ id: 'gtceu:macerator/macerate_jungle_planks' }) - event.remove({ id: 'gtceu:macerator/macerate_jungle_fence_gate' }) - event.remove({ id: 'gtceu:macerator/macerate_jungle_fence' }) - event.remove({ id: 'gtceu:macerator/macerate_jungle_door' }) - event.remove({ id: 'gtceu:macerator/macerate_jungle_boat' }) - event.remove({ id: 'gtceu:macerator/macerate_dark_oak_planks' }) - event.remove({ id: 'gtceu:macerator/macerate_dark_oak_fence_gate' }) - event.remove({ id: 'gtceu:macerator/macerate_dark_oak_fence' }) - event.remove({ id: 'gtceu:macerator/macerate_dark_oak_door' }) - event.remove({ id: 'gtceu:macerator/macerate_dark_oak_boat' }) - event.remove({ id: 'gtceu:macerator/macerate_crafting_table' }) - event.remove({ id: 'gtceu:macerator/macerate_chest' }) - event.remove({ id: 'gtceu:macerator/macerate_chest_minecart' }) - event.remove({ id: 'gtceu:macerator/macerate_cherry_planks' }) - event.remove({ id: 'gtceu:macerator/macerate_cherry_fence_gate' }) - event.remove({ id: 'gtceu:macerator/macerate_cherry_fence' }) - event.remove({ id: 'gtceu:macerator/macerate_cherry_door' }) - event.remove({ id: 'gtceu:macerator/macerate_cherry_boat' }) - event.remove({ id: 'gtceu:macerator/macerate_bookshelf' }) - event.remove({ id: 'gtceu:macerator/macerate_birch_planks' }) - event.remove({ id: 'gtceu:macerator/macerate_birch_fence_gate' }) - event.remove({ id: 'gtceu:macerator/macerate_birch_fence' }) - event.remove({ id: 'gtceu:macerator/macerate_birch_door' }) - event.remove({ id: 'gtceu:macerator/macerate_birch_boat' }) - event.remove({ id: 'gtceu:macerator/macerate_acacia_planks' }) - event.remove({ id: 'gtceu:macerator/macerate_acacia_fence_gate' }) - event.remove({ id: 'gtceu:macerator/macerate_acacia_fence' }) - event.remove({ id: 'gtceu:macerator/macerate_acacia_door' }) - event.remove({ id: 'gtceu:macerator/macerate_acacia_boat' }) - event.remove({ id: 'gtceu:macerator/macerate_bamboo_raft' }) - event.remove({ id: 'gtceu:macerator/macerate_crimson_door' }) - event.remove({ id: 'gtceu:macerator/macerate_crimson_fence' }) - event.remove({ id: 'gtceu:macerator/macerate_crimson_fence_gate' }) - event.remove({ id: 'gtceu:macerator/macerate_crimson_planks' }) - event.remove({ id: 'gtceu:macerator/macerate_warped_door' }) - event.remove({ id: 'gtceu:macerator/macerate_warped_fence' }) - event.remove({ id: 'gtceu:macerator/macerate_warped_fence_gate' }) - event.remove({ id: 'gtceu:macerator/macerate_warped_planks' }) + removeMaceratorRecipe(event, 'macerate_trapped_chest') + removeMaceratorRecipe(event, 'macerate_spruce_planks') + removeMaceratorRecipe(event, 'macerate_spruce_fence_gate') + removeMaceratorRecipe(event, 'macerate_spruce_fence') + removeMaceratorRecipe(event, 'macerate_spruce_door') + removeMaceratorRecipe(event, 'macerate_spruce_boat') + removeMaceratorRecipe(event, 'macerate_oak_planks') + removeMaceratorRecipe(event, 'macerate_oak_fence_gate') + removeMaceratorRecipe(event, 'macerate_oak_fence') + removeMaceratorRecipe(event, 'macerate_oak_door') + removeMaceratorRecipe(event, 'macerate_oak_boat') + removeMaceratorRecipe(event, 'macerate_mangrove_planks') + removeMaceratorRecipe(event, 'macerate_mangrove_fence_gate') + removeMaceratorRecipe(event, 'macerate_mangrove_fence') + removeMaceratorRecipe(event, 'macerate_mangrove_door') + removeMaceratorRecipe(event, 'macerate_mangrove_boat') + removeMaceratorRecipe(event, 'macerate_jungle_planks') + removeMaceratorRecipe(event, 'macerate_jungle_fence_gate') + removeMaceratorRecipe(event, 'macerate_jungle_fence') + removeMaceratorRecipe(event, 'macerate_jungle_door') + removeMaceratorRecipe(event, 'macerate_jungle_boat') + removeMaceratorRecipe(event, 'macerate_dark_oak_planks') + removeMaceratorRecipe(event, 'macerate_dark_oak_fence_gate') + removeMaceratorRecipe(event, 'macerate_dark_oak_fence') + removeMaceratorRecipe(event, 'macerate_dark_oak_door') + removeMaceratorRecipe(event, 'macerate_dark_oak_boat') + removeMaceratorRecipe(event, 'macerate_crafting_table') + removeMaceratorRecipe(event, 'macerate_chest') + removeMaceratorRecipe(event, 'macerate_chest_minecart') + removeMaceratorRecipe(event, 'macerate_cherry_planks') + removeMaceratorRecipe(event, 'macerate_cherry_fence_gate') + removeMaceratorRecipe(event, 'macerate_cherry_fence') + removeMaceratorRecipe(event, 'macerate_cherry_door') + removeMaceratorRecipe(event, 'macerate_cherry_boat') + removeMaceratorRecipe(event, 'macerate_bookshelf') + removeMaceratorRecipe(event, 'macerate_birch_planks') + removeMaceratorRecipe(event, 'macerate_birch_fence_gate') + removeMaceratorRecipe(event, 'macerate_birch_fence') + removeMaceratorRecipe(event, 'macerate_birch_door') + removeMaceratorRecipe(event, 'macerate_birch_boat') + removeMaceratorRecipe(event, 'macerate_acacia_planks') + removeMaceratorRecipe(event, 'macerate_acacia_fence_gate') + removeMaceratorRecipe(event, 'macerate_acacia_fence') + removeMaceratorRecipe(event, 'macerate_acacia_door') + removeMaceratorRecipe(event, 'macerate_acacia_boat') + removeMaceratorRecipe(event, 'macerate_bamboo_raft') + removeMaceratorRecipe(event, 'macerate_crimson_door') + removeMaceratorRecipe(event, 'macerate_crimson_fence') + removeMaceratorRecipe(event, 'macerate_crimson_fence_gate') + removeMaceratorRecipe(event, 'macerate_crimson_planks') + removeMaceratorRecipe(event, 'macerate_warped_door') + removeMaceratorRecipe(event, 'macerate_warped_fence') + removeMaceratorRecipe(event, 'macerate_warped_fence_gate') + removeMaceratorRecipe(event, 'macerate_warped_planks') //#endregion @@ -353,24 +353,19 @@ function removeGTCEURecipes(event) { //#region Выход: Маленькая кучка мяса - event.remove({ id: 'gtceu:macerator/macerate_steak' }) - event.remove({ id: 'gtceu:macerator/macerate_rabbit' }) - event.remove({ id: 'gtceu:macerator/macerate_pork_chop' }) - - //#endregion - - // #region Meat - - event.remove({ id: 'gtceu:macerator/macerate_mutton' }) - event.remove({ id: 'gtceu:macerator/macerate_chicken' }) + removeMaceratorRecipe(event, 'macerate_steak') + removeMaceratorRecipe(event, 'macerate_rabbit') + removeMaceratorRecipe(event, 'macerate_pork_chop') + removeMaceratorRecipe(event, 'macerate_mutton') + removeMaceratorRecipe(event, 'macerate_chicken') // #endregion //#region Выход: Пшеничная пыль event.remove({ id: 'gtceu:shapeless/wheat_to_dust' }) - event.remove({ id: 'gtceu:macerator/macerate_wheat' }) - event.remove({ id: 'gtceu:macerator/macerate_hay_block' }) + removeMaceratorRecipe(event, 'macerate_wheat') + removeMaceratorRecipe(event, 'macerate_hay_block') //#endregion @@ -394,19 +389,19 @@ function removeGTCEURecipes(event) { //#region Выход: Железная пыль - event.remove({ id: 'gtceu:macerator/macerate_iron_trapdoor' }) - event.remove({ id: 'gtceu:macerator/macerate_damaged_anvil' }) - event.remove({ id: 'gtceu:macerator/macerate_chipped_anvil' }) - event.remove({ id: 'gtceu:macerator/macerate_anvil' }) - event.remove({ id: 'gtceu:macerator/macerate_furnace_minecart' }) - event.remove({ id: 'gtceu:macerator/macerate_bucket' }) - event.remove({ id: 'gtceu:macerator/macerate_compass' }) + removeMaceratorRecipe(event, 'macerate_iron_trapdoor') + removeMaceratorRecipe(event, 'macerate_damaged_anvil') + removeMaceratorRecipe(event, 'macerate_chipped_anvil') + removeMaceratorRecipe(event, 'macerate_anvil') + removeMaceratorRecipe(event, 'macerate_furnace_minecart') + removeMaceratorRecipe(event, 'macerate_bucket') + removeMaceratorRecipe(event, 'macerate_compass') //#endregion //#region Выход: Крошечная железная пыль - event.remove({ id: 'gtceu:macerator/macerate_iron_bars' }) + removeMaceratorRecipe(event, 'macerate_iron_bars') //#endregion @@ -418,14 +413,14 @@ function removeGTCEURecipes(event) { //#region Выход: Пыль незерака - event.remove({ id: 'gtceu:macerator/macerate_nether_brick_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_nether_brick_slab' }) + removeMaceratorRecipe(event, 'macerate_nether_brick_stairs') + removeMaceratorRecipe(event, 'macerate_nether_brick_slab') //#endregion //#region Выход: Пыль базальта - event.remove({ id: 'gtceu:macerator/macerate_basalt' }) + removeMaceratorRecipe(event, 'macerate_basalt') //#endregion @@ -439,48 +434,47 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:shaped/bronze_hull' }) event.remove({ id: 'gtceu:arc_furnace/arc_bronze_machine_casing' }) - event.remove({ id: 'gtceu:macerator/macerate_bronze_machine_casing' }) + removeMaceratorRecipe(event, 'macerate_bronze_machine_casing') event.remove({ id: 'gtceu:shaped/steam_extractor_bronze' }) event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_extractor' }) - event.remove({ id: 'gtceu:macerator/macerate_lp_steam_extractor' }) + removeMaceratorRecipe(event, 'macerate_lp_steam_extractor') event.remove({ id: 'gtceu:shaped/steam_macerator_bronze' }) event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_macerator' }) - event.remove({ id: 'gtceu:macerator/macerate_lp_steam_macerator' }) + removeMaceratorRecipe(event, 'macerate_lp_steam_macerator') event.remove({ id: 'gtceu:shaped/steam_compressor_bronze' }) event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_compressor' }) - event.remove({ id: 'gtceu:macerator/macerate_lp_steam_compressor' }) + removeMaceratorRecipe(event, 'macerate_lp_steam_compressor') event.remove({ id: 'gtceu:shaped/steam_hammer_bronze' }) event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_forge_hammer' }) - event.remove({ id: 'gtceu:macerator/macerate_lp_steam_forge_hammer' }) + removeMaceratorRecipe(event, 'macerate_lp_steam_forge_hammer') event.remove({ id: 'gtceu:shaped/steam_furnace_bronze' }) event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_furnace' }) - event.remove({ id: 'gtceu:macerator/macerate_lp_steam_furnace' }) + removeMaceratorRecipe(event, 'macerate_lp_steam_furnace') event.remove({ id: 'gtceu:shaped/steam_alloy_smelter_bronze' }) event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_alloy_smelter' }) - event.remove({ id: 'gtceu:macerator/macerate_lp_steam_alloy_smelter' }) + removeMaceratorRecipe(event, 'macerate_lp_steam_alloy_smelter') event.remove({ id: 'gtceu:shaped/steam_rock_breaker_bronze' }) event.remove({ id: 'gtceu:arc_furnace/arc_lp_steam_rock_crusher' }) - event.remove({ id: 'gtceu:macerator/macerate_lp_steam_rock_crusher' }) + removeMaceratorRecipe(event, 'macerate_lp_steam_rock_crusher') event.remove({ id: 'gtceu:shaped/steam_miner_bronze' }) event.remove({ id: 'gtceu:arc_furnace/arc_steam_miner_bronze' }) - event.remove({ id: 'gtceu:macerator/macerate_steam_miner_bronze' }) + removeMaceratorRecipe(event, 'macerate_steam_miner_bronze') event.remove({ id: 'gtceu:shaped/steam_miner_bronze' }) event.remove({ id: 'gtceu:arc_furnace/arc_steam_miner_bronze' }) - event.remove({ id: 'gtceu:macerator/macerate_steam_miner_bronze' }) + removeMaceratorRecipe(event, 'macerate_steam_miner_bronze') - event.remove({ id: 'gtceu:shaped/steam_miner_steel' }) event.remove({ id: 'gtceu:arc_furnace/arc_steam_miner_steel' }) - event.remove({ id: 'gtceu:macerator/macerate_steam_miner_steel' }) + removeMaceratorRecipe(event, 'macerate_steam_miner_steel') // #endregion @@ -496,7 +490,7 @@ function removeGTCEURecipes(event) { // Удаление рецептов связанных с Primitive Blast Furnace event.remove({ id: 'gtceu:arc_furnace/arc_primitive_blast_furnace' }) - event.remove({ id: 'gtceu:macerator/macerate_primitive_blast_furnace' }) + removeMaceratorRecipe(event, 'macerate_primitive_blast_furnace') // Удаление рецепта беск. воды кавера event.remove('gtceu:assembler/cover_infinite_water') @@ -510,16 +504,16 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:shaped/wooden_barrel' }) event.remove({ id: 'gtceu:assembler/wood_barrel' }) event.remove({ id: 'gtceu:arc_furnace/arc_wood_drum' }) - event.remove({ id: 'gtceu:macerator/macerate_wood_drum' }) + removeMaceratorRecipe(event, 'macerate_wood_drum') // Удаление рецептов связанных с FireBricks event.remove({ id: 'gtceu:shaped/casing_primitive_bricks' }) - event.remove({ id: 'gtceu:macerator/macerate_firebricks' }) + removeMaceratorRecipe(event, 'macerate_firebricks') event.remove({ id: 'gtceu:extractor/extract_primitive_bricks' }) // Удаление рецептов связанных с FireBrick event.remove({ id: 'gtceu:smelting/fireclay_brick' }) - event.remove({ id: 'gtceu:macerator/macerate_firebrick' }) + removeMaceratorRecipe(event, 'macerate_firebrick') // Clay from mud event.remove({ id: 'gtceu:compressor/mud_to_clay' }) @@ -635,11 +629,22 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:assembler/assemble_brick_into_wall' }) event.remove({ id: 'gtceu:compressor/bricks' }) event.remove({ id: 'gtceu:extractor/bricks_extraction' }) - event.remove({ id: 'gtceu:macerator/macerate_bricks' }) - event.remove({ id: 'gtceu:macerator/macerate_brick_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_brick_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_brick_wall' }) - event.remove({ id: 'gtceu:macerator/macerate_flower_pot' }) + removeMaceratorRecipe(event, 'macerate_bricks') + removeMaceratorRecipe(event, 'macerate_brick_stairs') + removeMaceratorRecipe(event, 'macerate_brick_slab') + removeMaceratorRecipe(event, 'macerate_brick_wall') + removeMaceratorRecipe(event, 'macerate_flower_pot') + + removeMaceratorRecipe(event, 'macerate_treated_wood_fence_gate') + removeMaceratorRecipe(event, 'macerate_long_treated_wood_rod') + removeMaceratorRecipe(event, 'macerate_treated_wood_normal_fluid_pipe') + removeMaceratorRecipe(event, 'macerate_treated_wood_large_fluid_pipe') + removeMaceratorRecipe(event, 'macerate_treated_wood_small_fluid_pipe') + removeMaceratorRecipe(event, 'macerate_treated_wood_door') + removeMaceratorRecipe(event, 'macerate_treated_wood_frame') + removeMaceratorRecipe(event, 'macerate_treated_wood_fence') + removeMaceratorRecipe(event, 'macerate_treated_wood_boat') + removeMaceratorRecipe(event, 'macerate_treated_wood_chest_boat') event.remove({ id: 'gtceu:centrifuge/decomposition_centrifuging__fireclay' }) @@ -670,3 +675,13 @@ function removeGTCEURecipes(event) { event.remove({ id: 'gtceu:compressor/compress_plate_dust_wood' }) event.remove({ id: 'gtceu:compressor/compress_plate_dust_treated_wood'}) } + +function removeMaceratorRecipe(event, id) { + event.remove({ id: `gtceu:macerator/${id}` }) + event.remove({ id: `greate:milling/integration/gtceu/macerator/${id}` }) +} + +function removeCutterRecipe(event, id) { + event.remove({ id: `gtceu:cutter/${id}` }) + event.remove({ id: `greate:cutting/integration/gtceu/cutter/${id}` }) +} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js index 4bcbd13a1..8eab97801 100644 --- a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js +++ b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js @@ -120,7 +120,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_forge_hammer' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_forge_hammer') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_forge_hammer') .itemInputs('1x gtceu:hp_steam_forge_hammer') .itemOutputs('7x gtceu:wrought_iron_dust', '2x gtceu:steel_dust', '2x gtceu:tin_alloy_dust', '12x gtceu:brick_dust', '1x #forge:dusts/black_steel') @@ -136,7 +136,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_extractor' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_extractor') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_extractor') .itemInputs('1x gtceu:hp_steam_extractor') .itemOutputs('7x gtceu:wrought_iron_dust', '2x gtceu:steel_dust', '2x gtceu:tin_alloy_dust', '12x gtceu:brick_dust') @@ -152,7 +152,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_macerator' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_macerator') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_macerator') .itemInputs('1x gtceu:hp_steam_macerator') .itemOutputs('7x gtceu:wrought_iron_dust', '2x gtceu:steel_dust', '1x #forge:dusts/black_steel', '1x gtceu:tin_alloy_dust', '12x gtceu:brick_dust') @@ -168,7 +168,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_compressor' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_compressor') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_compressor') .itemInputs('1x gtceu:hp_steam_compressor') .itemOutputs('8x gtceu:wrought_iron_dust', '1x gtceu:steel_dust', '2x gtceu:tin_alloy_dust', '12x gtceu:brick_dust') @@ -184,7 +184,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_furnace' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_furnace') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_furnace') .itemInputs('1x gtceu:hp_steam_furnace') .itemOutputs('7x gtceu:wrought_iron_dust', '2x gtceu:tin_alloy_dust', '1x gtceu:steel_dust', '1x #forge:dusts/black_steel', '12x gtceu:brick_dust') @@ -200,7 +200,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_alloy_smelter' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_alloy_smelter') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_alloy_smelter') .itemInputs('1x gtceu:hp_steam_alloy_smelter') .itemOutputs('7x gtceu:wrought_iron_dust', '3x gtceu:steel_dust', '1x gtceu:tin_alloy_dust', '1x #forge:dusts/black_steel', '12x gtceu:brick_dust') @@ -216,7 +216,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_rock_crusher' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_rock_crusher') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_rock_crusher') .itemInputs('1x gtceu:hp_steam_rock_crusher') .itemOutputs('6x gtceu:wrought_iron_dust', '2x gtceu:tin_alloy_dust', '12x gtceu:brick_dust') @@ -232,7 +232,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_miner' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_miner') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_miner') .itemInputs('1x gtceu:hp_steam_miner') .itemOutputs('7x gtceu:wrought_iron_dust', '2x gtceu:tin_alloy_dust', '1x #forge:dusts/steel', '12x gtceu:brick_dust') @@ -248,7 +248,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_solid_boiler' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_solid_boiler') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_solid_boiler') .itemInputs('1x gtceu:hp_steam_solid_boiler') .itemOutputs('5x gtceu:wrought_iron_dust', '4x #forge:dusts/steel', '2x gtceu:tin_alloy_dust', '12x gtceu:brick_dust') @@ -264,7 +264,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_liquid_boiler' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_liquid_boiler') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_liquid_boiler') .itemInputs('1x gtceu:hp_steam_liquid_boiler') .itemOutputs('5x gtceu:wrought_iron_dust', '4x #forge:dusts/steel', '2x gtceu:tin_alloy_dust', '12x gtceu:brick_dust') @@ -280,7 +280,7 @@ function registerGTCEuTFCMetalsRecipes(event) .EUt(30) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) - event.remove({ id: 'gtceu:macerator/macerate_hp_steam_solar_boiler' }) + removeMaceratorRecipe(event, 'macerate_hp_steam_solar_boiler') event.recipes.gtceu.macerator('tfg:macerate_hp_steam_solar_boiler') .itemInputs('1x gtceu:hp_steam_solar_boiler') .itemOutputs('5x gtceu:wrought_iron_dust', '4x #forge:dusts/silver', '2x gtceu:tin_alloy_dust', '12x gtceu:brick_dust') diff --git a/kubejs/server_scripts/minecraft/recipes.removes.js b/kubejs/server_scripts/minecraft/recipes.removes.js index 2daad74bb..bcd81d0ff 100644 --- a/kubejs/server_scripts/minecraft/recipes.removes.js +++ b/kubejs/server_scripts/minecraft/recipes.removes.js @@ -1305,7 +1305,7 @@ function removeMinecraftRecipes(event) { event.remove({ id: 'gtceu:shaped/sugar' }) event.remove({ id: 'minecraft:sugar_from_honey_bottle' }) - event.remove({ id: 'gtceu:macerator/macerate_sugar_cane' }) + removeMaceratorRecipe(event, 'macerate_sugar_cane') //#endregion @@ -1322,14 +1322,14 @@ function removeMinecraftRecipes(event) { //#region Выход: Семена тыквы event.remove({ id: 'minecraft:pumpkin_seeds' }) - event.remove({ id: 'gtceu:macerator/macerate_pumpkin' }) + removeMaceratorRecipe(event, 'macerate_pumpkin') //#endregion //#region Выход: Семена арбуза - event.remove({ id: 'gtceu:macerator/macerate_melon_slice' }) - event.remove({ id: 'gtceu:macerator/macerate_melon_block' }) + removeMaceratorRecipe(event, 'macerate_melon_slice') + removeMaceratorRecipe(event, 'macerate_melon_block') //#endregion @@ -1656,10 +1656,10 @@ function removeMinecraftRecipes(event) { event.remove({ id: 'gtceu:arc_furnace/arc_chainmail_leggings' }) event.remove({ id: 'gtceu:arc_furnace/arc_chainmail_chestplate' }) event.remove({ id: 'gtceu:arc_furnace/arc_chainmail_helmet' }) - event.remove({ id: 'gtceu:macerator/macerate_chainmail_boots' }) - event.remove({ id: 'gtceu:macerator/macerate_chainmail_leggings' }) - event.remove({ id: 'gtceu:macerator/macerate_chainmail_chestplate' }) - event.remove({ id: 'gtceu:macerator/macerate_chainmail_helmet' }) + removeMaceratorRecipe(event, 'macerate_chainmail_boots') + removeMaceratorRecipe(event, 'macerate_chainmail_leggings') + removeMaceratorRecipe(event, 'macerate_chainmail_chestplate') + removeMaceratorRecipe(event, 'macerate_chainmail_helmet') event.remove({ id: 'minecraft:iron_nugget_from_smelting' }) event.remove({ id: 'minecraft:iron_nugget_from_blasting' }) @@ -1671,13 +1671,13 @@ function removeMinecraftRecipes(event) { event.remove({ id: 'gtceu:arc_furnace/arc_iron_leggings' }) event.remove({ id: 'gtceu:arc_furnace/arc_iron_chestplate' }) event.remove({ id: 'gtceu:arc_furnace/arc_iron_helmet' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_boots' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_leggings' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_chestplate' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_helmet' }) + removeMaceratorRecipe(event, 'macerate_iron_boots') + removeMaceratorRecipe(event, 'macerate_iron_leggings') + removeMaceratorRecipe(event, 'macerate_iron_chestplate') + removeMaceratorRecipe(event, 'macerate_iron_helmet') + removeMaceratorRecipe(event, 'macerate_iron_horse_armor') event.remove({ id: 'gtceu:shaped/iron_horse_armor' }) event.remove({ id: 'gtceu:arc_furnace/arc_iron_horse_armor' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_horse_armor' }) //#endregion @@ -1687,13 +1687,13 @@ function removeMinecraftRecipes(event) { event.remove({ id: 'gtceu:arc_furnace/arc_golden_leggings' }) event.remove({ id: 'gtceu:arc_furnace/arc_golden_chestplate' }) event.remove({ id: 'gtceu:arc_furnace/arc_golden_helmet' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_boots' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_leggings' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_chestplate' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_helmet' }) + removeMaceratorRecipe(event, 'macerate_golden_boots') + removeMaceratorRecipe(event, 'macerate_golden_leggings') + removeMaceratorRecipe(event, 'macerate_golden_chestplate') + removeMaceratorRecipe(event, 'macerate_golden_helmet') + removeMaceratorRecipe(event, 'macerate_golden_horse_armor') event.remove({ id: 'gtceu:shaped/golden_horse_armor' }) event.remove({ id: 'gtceu:arc_furnace/arc_golden_horse_armor' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_horse_armor' }) event.remove({ id: 'minecraft:gold_nugget_from_smelting' }) event.remove({ id: 'minecraft:gold_nugget_from_blasting' }) @@ -1701,12 +1701,12 @@ function removeMinecraftRecipes(event) { //#region Алмазная броня - event.remove({ id: 'gtceu:macerator/macerate_diamond_boots' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_leggings' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_chestplate' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_helmet' }) + removeMaceratorRecipe(event, 'macerate_diamond_boots') + removeMaceratorRecipe(event, 'macerate_diamond_leggings') + removeMaceratorRecipe(event, 'macerate_diamond_chestplate') + removeMaceratorRecipe(event, 'macerate_diamond_helmet') + removeMaceratorRecipe(event, 'macerate_diamond_horse_armor') event.remove({ id: 'gtceu:shaped/diamond_horse_armor' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_horse_armor' }) //#endregion @@ -1722,31 +1722,31 @@ function removeMinecraftRecipes(event) { //#region Деревянные инструменты - event.remove({ id: 'gtceu:macerator/macerate_wooden_sword' }) - event.remove({ id: 'gtceu:macerator/macerate_wooden_pickaxe' }) - event.remove({ id: 'gtceu:macerator/macerate_wooden_axe' }) - event.remove({ id: 'gtceu:macerator/macerate_wooden_shovel' }) - event.remove({ id: 'gtceu:macerator/macerate_wooden_hoe' }) + removeMaceratorRecipe(event, 'macerate_wooden_sword') + removeMaceratorRecipe(event, 'macerate_wooden_pickaxe') + removeMaceratorRecipe(event, 'macerate_wooden_axe') + removeMaceratorRecipe(event, 'macerate_wooden_shovel') + removeMaceratorRecipe(event, 'macerate_wooden_hoe') //#endregion //#region Каменные инстурменты - event.remove({ id: 'gtceu:macerator/macerate_stone_sword' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_pickaxe' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_axe' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_shovel' }) - event.remove({ id: 'gtceu:macerator/macerate_stone_hoe' }) + removeMaceratorRecipe(event, 'macerate_stone_sword') + removeMaceratorRecipe(event, 'macerate_stone_pickaxe') + removeMaceratorRecipe(event, 'macerate_stone_axe') + removeMaceratorRecipe(event, 'macerate_stone_shovel') + removeMaceratorRecipe(event, 'macerate_stone_hoe') //#endregion //#region Железные инструменты - event.remove({ id: 'gtceu:macerator/macerate_iron_sword' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_pickaxe' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_axe' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_shovel' }) - event.remove({ id: 'gtceu:macerator/macerate_iron_hoe' }) + removeMaceratorRecipe(event, 'macerate_iron_sword') + removeMaceratorRecipe(event, 'macerate_iron_pickaxe') + removeMaceratorRecipe(event, 'macerate_iron_axe') + removeMaceratorRecipe(event, 'macerate_iron_shovel') + removeMaceratorRecipe(event, 'macerate_iron_hoe') event.remove({ id: 'gtceu:arc_furnace/arc_iron_sword' }) event.remove({ id: 'gtceu:arc_furnace/arc_iron_pickaxe' }) event.remove({ id: 'gtceu:arc_furnace/arc_iron_axe' }) @@ -1757,11 +1757,11 @@ function removeMinecraftRecipes(event) { //#region Золотые инструменты - event.remove({ id: 'gtceu:macerator/macerate_golden_sword' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_pickaxe' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_axe' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_shovel' }) - event.remove({ id: 'gtceu:macerator/macerate_golden_hoe' }) + removeMaceratorRecipe(event, 'macerate_golden_sword') + removeMaceratorRecipe(event, 'macerate_golden_pickaxe') + removeMaceratorRecipe(event, 'macerate_golden_axe') + removeMaceratorRecipe(event, 'macerate_golden_shovel') + removeMaceratorRecipe(event, 'macerate_golden_hoe') event.remove({ id: 'gtceu:arc_furnace/arc_golden_sword' }) event.remove({ id: 'gtceu:arc_furnace/arc_golden_pickaxe' }) event.remove({ id: 'gtceu:arc_furnace/arc_golden_axe' }) @@ -1772,11 +1772,11 @@ function removeMinecraftRecipes(event) { //#region Алмазные инструменты - event.remove({ id: 'gtceu:macerator/macerate_diamond_sword' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_pickaxe' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_axe' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_shovel' }) - event.remove({ id: 'gtceu:macerator/macerate_diamond_hoe' }) + removeMaceratorRecipe(event, 'macerate_diamond_sword') + removeMaceratorRecipe(event, 'macerate_diamond_pickaxe') + removeMaceratorRecipe(event, 'macerate_diamond_axe') + removeMaceratorRecipe(event, 'macerate_diamond_shovel') + removeMaceratorRecipe(event, 'macerate_diamond_hoe') event.remove({ id: 'gtceu:arc_furnace/arc_diamond_sword' }) event.remove({ id: 'gtceu:arc_furnace/arc_diamond_pickaxe' }) event.remove({ id: 'gtceu:arc_furnace/arc_diamond_axe' }) @@ -2073,7 +2073,7 @@ function removeMinecraftRecipes(event) { event.remove({ id: 'minecraft:ender_chest' }) event.remove({ id: 'minecraft:end_crystal' }) - event.remove({ id: 'gtceu:macerator/macerate_end_stone' }) + removeMaceratorRecipe(event, 'macerate_end_stone') event.remove({ id: 'gtceu:assembler/ender_chest' }) event.remove({ id: 'gtceu:assembler/end_crystal' }) //#endregion diff --git a/kubejs/server_scripts/tfc/recipes.removes.js b/kubejs/server_scripts/tfc/recipes.removes.js index 582bcaf8c..18f5a45aa 100644 --- a/kubejs/server_scripts/tfc/recipes.removes.js +++ b/kubejs/server_scripts/tfc/recipes.removes.js @@ -146,4 +146,6 @@ function removeTFCRecipes(event) { event.remove({ id: 'tfc:crafting/vanilla/redstone/steel_minecart' }) event.remove({ id: 'tfc:crafting/vanilla/redstone/minecart' }) + event.remove({ id: /^tfc:crafting\/dough\/.*/ }) + } \ No newline at end of file