From 236b8d16f9bdbd95db2f6d2edebc873683cda955 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 4 Feb 2024 18:37:30 +0700 Subject: [PATCH] some work --- CHANGELOG.md | 3 ++- kubejs/server_scripts/gregtech/recipes.js | 9 ------- kubejs/server_scripts/minecraft/recipes.js | 24 +++++++++++++++++-- kubejs/server_scripts/tfc/recipes.js | 2 +- kubejs/startup_scripts/minecraft/constants.js | 8 +++++-- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eafdbe647..faeca0f5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,9 +25,10 @@ - New wet sponge -> sponge recipes! - New carpet recipes! - New clay -> assembler -> mold recipes! (Also with fireclay *yay*) +- Fixed some recipes for bamboo blocks. - Удалено множество рецептов незер блоков и предметов, будут возвращены, когда будет добавлен ад. -- Возвращены некоторые рецепты для бамбуковых блоков. + ## [0.6.10] - 01.02.2024 ### Updated mods diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 4033c020c..e65c52ec5 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -380,7 +380,6 @@ const registerGTCEURecipes = (event) => { 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_bamboo_button' }) event.remove({ id: 'gtceu:macerator/macerate_acacia_button' }) //#endregion @@ -425,10 +424,6 @@ const registerGTCEURecipes = (event) => { 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_bamboo_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_bamboo_slab' }) - event.remove({ id: 'gtceu:macerator/macerate_bamboo_mosaic_stairs' }) - event.remove({ id: 'gtceu:macerator/macerate_bamboo_mosaic_slab' }) event.remove({ id: 'gtceu:macerator/macerate_acacia_stairs' }) event.remove({ id: 'gtceu:macerator/macerate_acacia_slab' }) @@ -482,10 +477,6 @@ const registerGTCEURecipes = (event) => { 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_bamboo_planks'}) // TODO - event.remove({id: 'gtceu:macerator/macerate_bamboo_fence_gate'}) // TODO - event.remove({id: 'gtceu:macerator/macerate_bamboo_fence'}) // TODO - event.remove({id: 'gtceu:macerator/macerate_bamboo_door'}) // TODO 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'}) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 284c8c3ba..e30a1727a 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -939,6 +939,11 @@ const registerMinecraftRecipes = (event) => { event.remove({ id: `gtceu:assembler/${wood}_sign` }) }); + event.remove({ id: 'minecraft:stripped_warped_hyphae' }) + event.remove({ id: 'minecraft:warped_hyphae' }) + event.remove({ id: 'minecraft:stripped_crimson_hyphae' }) + event.remove({ id: 'minecraft:crimson_hyphae' }) + //#endregion //#region Выход: Камнерез @@ -1039,16 +1044,31 @@ const registerMinecraftRecipes = (event) => { event.shapeless('2x minecraft:bamboo_planks', [ '#minecraft:bamboo_blocks', '#tfc:saws' - ]).id('tfg:shapeless/bamboo_planks') + ]).id('minecraft:bamboo_planks') //#endregion - //#region Выход: Плот с сундуком + //#region Выход: Плот с сундуком из бамбука event.remove({ id: 'minecraft:bamboo_chest_raft' }) //#endregion + //#region Выход: Таблички из бамбука + + event.remove({ id: 'minecraft:bamboo_sign' }) + event.remove({ id: 'minecraft:bamboo_hanging_sign' }) + + //#endregion + + //#region Бамбуковая кнопка + + //#endregion + + //#region Бамбуковая нажимная плита + + //#endregion + //#region Красители // White diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 24f096ae6..b511729d1 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -2903,7 +2903,7 @@ const registerTFCRecipes = (event) => { .EUt(2) // Empty Jar - event.recipes.gtceu.assember(`tfg:tfc/glass_jar`) + event.recipes.gtceu.assembler(`tfg:tfc/glass_jar`) .itemInputs('#tfc:glass_batches_tier_2') .circuit(2) .itemOutputs('tfc:empty_jar') diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 943abc19e..d7ce2bd67 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -373,6 +373,12 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:mangrove_sign", "minecraft:mangrove_hanging_sign", + // Бамбук + 'minecraft:bamboo_sign', + 'minecraft:bamboo_hanging_sign', + 'minecraft:bamboo_raft', + 'minecraft:bamboo_chest_raft', + // Шалкеры 'minecraft:shulker_box', 'minecraft:white_shulker_box', @@ -550,8 +556,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:gravel', 'minecraft:moss_block', 'minecraft:moss_carpet', - 'minecraft:bamboo_raft', - 'minecraft:bamboo_chest_raft', 'minecraft:large_fern', 'minecraft:tall_grass', 'minecraft:sculk_vein',