From fa24fc62d7dac924ddd0c239a888ed0a7ab211a3 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 4 Feb 2024 18:50:42 +0700 Subject: [PATCH] dead --- CHANGELOG.md | 12 +-------- kubejs/server_scripts/minecraft/recipes.js | 25 ++++++++++++++++++- kubejs/server_scripts/minecraft/tags.js | 4 +++ kubejs/startup_scripts/minecraft/constants.js | 2 ++ 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index faeca0f5a..6fc90a78b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,6 @@ # Changelog -## [0.7.0] - Planned on 15.02.2024 -### Changes -- Немного улучшены квесты начальной эры. -- Добавлены ключи перевода для всех квестов начальной эры. -- Добавлено множество рецептов в миксере дублирующие рецепты бочки TFC. -- Удалена примитивная помпа GTCEu. - -## [0.6.11] - Planned on 05.02.2024 +## [0.6.11] - Planned on 04.02.2024 ### Changes - Fixed smelting recipe of rich raw ores. - Fixed recipe of bio chaff -> vanilla dirt. @@ -27,9 +20,6 @@ - New clay -> assembler -> mold recipes! (Also with fireclay *yay*) - Fixed some recipes for bamboo blocks. -- Удалено множество рецептов незер блоков и предметов, будут возвращены, когда будет добавлен ад. - - ## [0.6.10] - 01.02.2024 ### Updated mods - Embeddium -> 0.2.18 diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index e30a1727a..2882a9622 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1063,10 +1063,33 @@ const registerMinecraftRecipes = (event) => { //#region Бамбуковая кнопка + event.shaped('minecraft:bamboo_pressure_plate', [ + 'ABA', + 'CDC', + 'AEA' + ], { + A: '#forge:screws/wood', + B: '#tfc:hammers', + C: '#tfg:bamboo_slabs', + D: '#forge:springs', + E: '#forge:tools/screwdrivers' + }).id(`minecraft:bamboo_pressure_plate`) + + event.recipes.gtceu.assembler(`tfg:minecraft/bamboo_pressure_plate`) + .itemInputs('#forge:springs', '#tfg:bamboo_slabs') + .circuit(0) + .itemOutputs('2x minecraft:bamboo_pressure_plate') + .duration(50) + .EUt(2) + //#endregion //#region Бамбуковая нажимная плита - + + event.remove({ id: `minecraft:bamboo_button` }) + + generateCutterRecipe(event, 'minecraft:bamboo_pressure_plate', null, '6x minecraft:bamboo_button', 50, 2, `bamboo_button`) + //#endregion //#region Красители diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index dffc0ebd2..596f3af33 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -12,6 +12,10 @@ const registerMinecraftItemTags = (event) => { // Теперь обсидиан сторадж блок event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') + + // Бамбуковые полублоки + event.add('tfg:bamboo_slabs', 'minecraft:bamboo_slab') + event.add('tfg:bamboo_slabs', 'minecraft:bamboo_mosaic_slab') } const registerMinecraftBlockTags = (event) => { diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index d7ce2bd67..693f957b7 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -835,6 +835,8 @@ global.MINECRAFT_DISABLED_ITEMS = [ global.MINECRAFT_HIDED_ITEMS = [ '/spawn_egg/', + 'minecraft:honeycomb', // TODO: Пока что скрыто, не пойму нахера нужно в ТФК и как его получить + 'minecraft:exposed_copper', 'minecraft:exposed_cut_copper', 'minecraft:exposed_cut_copper_stairs',