From 88eee093bed37663dc18550bda75f1f6c6e98b68 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 19 Jan 2026 22:21:06 +0000 Subject: [PATCH] #2740 and #2759 --- CHANGELOG.md | 4 ++++ kubejs/server_scripts/ad_astra/recipes.js | 3 +++ kubejs/server_scripts/afc/recipes.js | 3 +++ kubejs/server_scripts/gregtech/utility.js | 3 +++ kubejs/server_scripts/minecraft/recipes.js | 6 ++++++ kubejs/server_scripts/minecraft/recipes.removes.js | 3 ++- .../server_scripts/tfg/primitive/recipes.wood.js | 14 ++++++++++++++ 7 files changed, 35 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 686c47837..e5c07ddbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,10 @@ - Coke oven bricks now require mortar to craft @Pyritie - Glowstone can now be quickly broken with a pickaxe/mining hammer @Pyritie - Added some more knapping recipes for chalk items, improved the durability of others (#2753) @Pyritie +- Red elk now drop bladders rarely, and have increased meat drops when killed with a butchery knife (#2778) @Pyritie +- Vanilla ferns and large ferns now break into straw with a knife, so Beneath start is a bit less painful early on @Pyritie +- Added shapeless pressure plate to button recipes (#2740) @Pyritie +- Added some Beneath plants to the `#tfg:rubber_plants` tag (#2759) @Pyritie ### Bug fixes - Fixed not being able to craft Paracetamol or Rad-Away @Pyritie - Fixed the missing dried fruit to yeast starter recipe (#2673) @Mqrius diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index b953d9c70..79270e13e 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -410,6 +410,9 @@ const registerAdAstraRecipes = (event) => { .EUt(2) // Buttons + event.shapeless(`3x ad_astra:${x.type}_plating_button`, [`ad_astra:${x.type}_plating_pressure_plate`, '#forge:tools/saws']) + .id(`tfg:shapeless/saw_${x.type}_pressure_plate_to_button`) + generateCutterRecipe(event, `ad_astra:${x.type}_plating_pressure_plate`, `6x ad_astra:${x.type}_plating_button`, 50, 7, `ad_astra_${x.type}_button`) // Doors diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index 3cf811739..1fcc394c8 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -71,6 +71,9 @@ const registerAFCRecipes = (event) => { // ? -> Деревянная кнопка event.remove({ id: `afc:crafting/wood/${wood}_button` }) + event.shapeless(`3x afc:wood/planks/${wood}_button`, [`afc:wood/planks/${wood}_pressure_plate`, '#forge:tools/saws']) + .id(`tfg:shapeless/saw_${wood}_pressure_plate_to_button`) + generateCutterRecipe(event, `afc:wood/planks/${wood}_pressure_plate`, `6x afc:wood/planks/${wood}_button`, 50, 2, `${wood}_button`) //Stomping Barrel diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index 8c5176bf1..b81f7b361 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -331,6 +331,9 @@ function woodBuilder(event, name, lumber, logs, log, stripped_log, plank, stair, .itemOutputs(`6x ${button}`) .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + + event.shapeless(`3x ${button}`, [pressure_plate, '#forge:tools/saws']) + .id(`tfg:shapeless/saw_${name}_pressure_plate_to_button`) } } //#endregion diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index a274981ab..3aa3c0ce3 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1051,6 +1051,12 @@ const registerMinecraftRecipes = (event) => { .EUt(2) }) + event.shapeless('3x minecraft:polished_blackstone_button', ['minecraft:polished_blackstone_pressure_plate', '#forge:tools/saws']) + .id(`tfg:shapeless/saw_blackstone_pressure_plate_to_button`) + + event.shapeless('3x minecraft:bamboo_button', ['minecraft:bamboo_pressure_plate', '#forge:tools/saws']) + .id(`tfg:shapeless/saw_bamboo_pressure_plate_to_button`) + // #endregion // Minecart w/ Furnace diff --git a/kubejs/server_scripts/minecraft/recipes.removes.js b/kubejs/server_scripts/minecraft/recipes.removes.js index da3192bef..883168c8e 100644 --- a/kubejs/server_scripts/minecraft/recipes.removes.js +++ b/kubejs/server_scripts/minecraft/recipes.removes.js @@ -1157,7 +1157,8 @@ function removeMinecraftRecipes(event) { //#endregion //#region Выход: Кнопка из черного камня - + + event.remove({ id: 'gtceu:shaped/stone_button' }) event.remove({ id: 'minecraft:polished_blackstone_button' }) //#endregion diff --git a/kubejs/server_scripts/tfg/primitive/recipes.wood.js b/kubejs/server_scripts/tfg/primitive/recipes.wood.js index 79017f62a..2965d5783 100644 --- a/kubejs/server_scripts/tfg/primitive/recipes.wood.js +++ b/kubejs/server_scripts/tfg/primitive/recipes.wood.js @@ -96,13 +96,24 @@ function registerTFGWoodRecipes(event) { .duration(50) .EUt(2) + event.shapeless(`3x gtceu:treated_wood_button`, [`gtceu:treated_wood_pressure_plate`, '#forge:tools/saws']) + .id(`tfg:shapeless/saw_treated_wood_pressure_plate_to_button`) + event.replaceOutput({ id: 'gtceu:cutter/treated_button' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') event.replaceOutput({ id: 'gtceu:cutter/treated_button_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') event.replaceOutput({ id: 'gtceu:cutter/treated_button_distilled_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') + + event.replaceOutput({ id: 'greate:cutting/integration/gtceu/cutter/treated_button' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') + event.replaceOutput({ id: 'greate:cutting/integration/gtceu/cutter/treated_button_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') + event.replaceOutput({ id: 'greate:cutting/integration/gtceu/cutter/treated_button_distilled_water' }, 'gtceu:treated_wood_button', '6x gtceu:treated_wood_button') event.replaceOutput({ id: 'gtceu:cutter/bamboo_button' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button') event.replaceOutput({ id: 'gtceu:cutter/bamboo_button_water' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button') event.replaceOutput({ id: 'gtceu:cutter/bamboo_button_distilled_water' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button') + + event.replaceOutput({ id: 'greate:cutting/integration/gtceu/bamboo_button' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button') + event.replaceOutput({ id: 'greate:cutting/integration/gtceu/bamboo_button_water' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button') + event.replaceOutput({ id: 'greate:cutting/integration/gtceu/bamboo_button_distilled_water' }, 'minecraft:bamboo_button', '6x minecraft:bamboo_button') // Empty Wooden Form event.shaped('gtceu:empty_wooden_form', [ @@ -202,6 +213,9 @@ function registerTFGWoodRecipes(event) { // ? -> Деревянная кнопка event.remove({ id: `tfc:crafting/wood/${wood}_button` }) + event.shapeless(`3x tfc:wood/planks/${wood}_button`, [`tfc:wood/planks/${wood}_pressure_plate`, '#forge:tools/saws']) + .id(`tfg:shapeless/saw_${wood}_pressure_plate_to_button`) + generateCutterRecipe(event, `tfc:wood/planks/${wood}_pressure_plate`, `6x tfc:wood/planks/${wood}_button`, 50, 7, `${wood}_button`) // Stripped logs