From 3b53132b2f1ce89f12b419acb132dac2fa04a072 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 20 Dec 2023 23:09:14 +0700 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=86=D0=B5=D0=B5=D0=B5=D0=B5?= =?UTF-8?q?=D0=BF=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubejs/client_scripts/mods/minecraft.js | 2 +- kubejs/server_scripts/ae2/recipes.js | 2 +- kubejs/server_scripts/create/recipes.js | 1 + kubejs/server_scripts/gregtech/recipes.js | 44 ++ kubejs/server_scripts/minecraft/recipes.js | 493 +++++++++++------- kubejs/startup_scripts/gtceu/constants.js | 10 +- kubejs/startup_scripts/minecraft/constants.js | 211 +++++--- 7 files changed, 501 insertions(+), 262 deletions(-) diff --git a/kubejs/client_scripts/mods/minecraft.js b/kubejs/client_scripts/mods/minecraft.js index bcad23a6d..50ac75c58 100644 --- a/kubejs/client_scripts/mods/minecraft.js +++ b/kubejs/client_scripts/mods/minecraft.js @@ -25,5 +25,5 @@ const registerMinecraftCategories = (event) => { event.remove('minecraft:plugins/waxing') // TODO: Сделать с вариантами TFC event.remove('minecraft:plugins/wax_scraping') // TODO: Сделать с вариантами TFC event.remove('minecraft:plugins/oxidizing') // TODO: Сделать с вариантами TFC - event.remove('minecraft:plugins/oxidation_scrapping') // TODO: Сделать с вариантами TFC + event.remove('minecraft:plugins/oxidation_scraping') // TODO: Сделать с вариантами TFC } diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index cf9746e69..db19fbaa5 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -83,7 +83,7 @@ const registerAE2Recipes = (event) => { ], { A: 'ae2:basic_card', B: 'ae2:cell_component_1k', - C: 'minecraft:crafting_table' + C: '#tfc:workbenches' }).id('tfg:crafting/crafting_card') // Redstone Card diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index e4fd84711..0d380ab9d 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -4,4 +4,5 @@ const registerCreateRecipes = (event) => { // Удаление рецептов мода create event.remove({ mod: 'create' }); + event.remove({ mod: 'railways' }); } \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index de8b5ddc6..bf27d3500 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -524,6 +524,50 @@ const registerGTCEURecipes = (event) => { //#endregion + //#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 Выход: Пыль мяса + + event.remove({ id: 'gtceu:macerator/macerate_mutton' }) + event.remove({ id: 'gtceu:macerator/macerate_chicken' }) + + event.recipes.gtceu.macerator('macerate_meat_to_dust') + .itemInputs('#tfc:foods/meats') + .itemOutputs('gtceu:meat_dust', 'gtceu:bone_tiny_dust') + .duration(100) + .EUt(2) + + //#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' }) + + //#endregion + + //#region Выход: Слиток кованного железа + + event.remove({ id: 'gtceu:arc_furnace/arc_chest_minecart' }) + + //#endregion + + + + + + + + + + // Compressed Coke Clay event.shaped('gtceu:compressed_coke_clay', [ 'AAA', diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 047ea368d..1a07be9d3 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -1268,12 +1268,317 @@ const registerMinecraftRecipes = (event) => { //#endregion - /* + //#region Выход: Шалкеры + + event.remove({ id: 'minecraft:shulker_box' }) + event.remove({ id: 'tfc:barrel/dye/bleach_shulkers' }) + event.remove({ id: 'gtceu:assembler/purple_shulker_box' }) + + global.MINECRAFT_DYE_NAMES.forEach(dye => { + event.remove({ id: `tfc:barrel/dye/${dye}_shulker` }) + }) + + //#endregion + + //#region Выход: Кондуит + + event.remove({ id: 'minecraft:conduit' }) + + //#endregion + + //#region Выход: Калиброванный сенсор Скалка + + event.remove({ id: 'minecraft:calibrated_sculk_sensor' }) + + //#endregion + + //#region Выход: Вагонетка с сундуком + + event.remove({ id: 'gtceu:assembler/chest_minecart' }) + + //#endregion + + //#region Выход: Верстак + + event.remove({ id: 'tfc:crafting/vanilla/crafting_table' }) + event.remove({ id: 'gtceu:assembler/crafting_table' }) + + //#endregion + + //#region Выход: Хлеб + + event.remove({ id: 'minecraft:bread' }) + + //#endregion + + //#region Выход: Жаренная свинина + + event.remove({ id: 'minecraft:cooked_porkchop' }) + event.remove({ id: 'minecraft:cooked_porkchop_from_smoking' }) + + //#endregion + + //#region Выход: Жаренная курятина + + event.remove({ id: 'minecraft:cooked_chicken' }) + event.remove({ id: 'minecraft:cooked_chicken_from_smoking' }) + + //#endregion + + //#region Выход: Жаренная козлятина + + event.remove({ id: 'minecraft:cooked_mutton' }) + event.remove({ id: 'minecraft:cooked_mutton_from_smoking' }) + + //#endregion + + //#region Выход: Жаренная зайчатина + + event.remove({ id: 'minecraft:cooked_rabbit' }) + event.remove({ id: 'minecraft:cooked_rabbit_from_smoking' }) + + //#endregion + + //#region Выход: Жаренная коровятина + + event.remove({ id: 'minecraft:cooked_beef' }) + event.remove({ id: 'minecraft:cooked_beef_from_smoking' }) + + //#endregion + + //#region Выход: Блок сена + + event.recipes.gtceu.packer('hay_block') + .itemInputs('9x tfc:straw') + .itemOutputs('minecraft:hay_block') + .duration(200) + .EUt(2) + + //#endregion + + //#region Выход: Торт + + event.remove({ id: 'minecraft:cake' }) + + //#endregion + + //#region Выход: Печеньки (Нееет) + + event.remove({ id: 'minecraft:cookie' }) + + //#endregion + + //#region Выход: Сундук + + event.remove({ id: 'gtceu:assembler/chest' }) + + //#endregion + + //#region Выход: Удочки + + event.remove({ id: 'minecraft:warped_fungus_on_a_stick' }) + event.remove({ id: 'minecraft:carrot_on_a_stick' }) + + //#endregion + + //#region Выход: Светильник Джека + event.recipes.gtceu.canner('jack_o_lantern') .itemInputs('tfc:pumpkin') .itemOutputs('2x minecraft:pink_dye', 'minecraft:glowstone_dust') .duration(100) - .EUt(4)*/ + .EUt(4) + + //#endregion + + + + + + + + //#region Шаблоны брони + + event.remove({id: 'minecraft:wild_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:wayfinder_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:ward_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:vex_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:tide_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:spire_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:snout_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:silence_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:shaper_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:sentry_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:rib_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:raiser_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:host_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:eye_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:dune_armor_trim_smithing_template_smithing_trim'}) + event.remove({id: 'minecraft:coast_armor_trim_smithing_template_smithing_trim'}) + + //#endregion + + //#region Кольчуга + + event.remove({id: 'gtceu:shaped/chainmail_boots'}) + event.remove({id: 'gtceu:shaped/chainmail_leggings'}) + event.remove({id: 'gtceu:shaped/chainmail_chestplate'}) + event.remove({id: 'gtceu:shaped/chainmail_helmet'}) + event.remove({id: 'gtceu:arc_furnace/arc_chainmail_boots'}) + 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'}) + event.remove({id: 'minecraft:iron_nugget_from_smelting'}) + event.remove({id: 'minecraft:iron_nugget_from_blasting'}) + + //#endregion + + //#region Железная броня + + event.remove({id: 'gtceu:arc_furnace/arc_iron_boots'}) + 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'}) + 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 + + //#region Золотая броня + + event.remove({id: 'gtceu:arc_furnace/arc_golden_boots'}) + 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'}) + 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'}) + + //#endregion + + //#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'}) + event.remove({id: 'gtceu:shaped/diamond_horse_armor'}) + event.remove({id: 'gtceu:macerator/macerate_diamond_horse_armor'}) + + //#endregion + + //#region Незеритовая броня + + event.remove({id: 'minecraft:netherite_helmet_smithing'}) + event.remove({id: 'minecraft:netherite_chestplate_smithing'}) + event.remove({id: 'minecraft:netherite_leggings_smithing'}) + event.remove({id: 'minecraft:netherite_boots_smithing'}) + + //#endregion + + //#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'}) + + //#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'}) + + //#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'}) + 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'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_shovel'}) + event.remove({id: 'gtceu:arc_furnace/arc_iron_hoe'}) + + //#endregion + + //#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'}) + 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'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_shovel'}) + event.remove({id: 'gtceu:arc_furnace/arc_golden_hoe'}) + + //#endregion + + //#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'}) + 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'}) + event.remove({id: 'gtceu:arc_furnace/arc_diamond_shovel'}) + event.remove({id: 'gtceu:arc_furnace/arc_diamond_hoe'}) + + //#endregion + + //#region Незеритовые инструменты + + event.remove({id: 'minecraft:netherite_sword_smithing'}) + event.remove({id: 'minecraft:netherite_pickaxe_smithing'}) + event.remove({id: 'minecraft:netherite_axe_smithing'}) + event.remove({id: 'minecraft:netherite_shovel_smithing'}) + event.remove({id: 'minecraft:netherite_hoe_smithing'}) + + //#endregion + + + + + + + + + + + + + /* + */ //#region Выход: @@ -1330,9 +1635,6 @@ const registerMinecraftRecipes = (event) => { // Удаление рецептов палок event.remove({id: 'minecraft:stick'}) - // Удаление рецептов камня - event.remove({id: 'gtceu:compressor/stone_from_dust'}) - // Удаление рецептов жиги event.remove({id: 'tfc:crafting/vanilla/flint_and_steel'}) event.remove({id: 'ad_astra:recipes/flint_and_steel'}) @@ -1358,139 +1660,6 @@ const registerMinecraftRecipes = (event) => { event.remove({id: 'gtceu:arc_furnace/arc_furnace_minecart'}) event.remove({id: 'gtceu:macerate/macerate_furnace_minecart'}) - // Удаление рецептов связанных с Кольчугой - event.remove({id: 'gtceu:shaped/chainmail_boots'}) - event.remove({id: 'gtceu:shaped/chainmail_leggings'}) - event.remove({id: 'gtceu:shaped/chainmail_chestplate'}) - event.remove({id: 'gtceu:shaped/chainmail_helmet'}) - event.remove({id: 'gtceu:arc_furnace/arc_chainmail_boots'}) - 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'}) - event.remove({id: 'minecraft:iron_nugget_from_smelting'}) - event.remove({id: 'minecraft:iron_nugget_from_blasting'}) - - // Удаление рецептов связанных с Железной броней - event.remove({id: 'gtceu:arc_furnace/arc_iron_boots'}) - 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'}) - 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'}) - - // Удаление рецептов связанных с Золотой броней - event.remove({id: 'gtceu:arc_furnace/arc_golden_boots'}) - 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'}) - 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'}) - - // Удаление рецептов связанных с Алмазной броней - 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'}) - event.remove({id: 'gtceu:shaped/diamond_horse_armor'}) - event.remove({id: 'gtceu:macerator/macerate_diamond_horse_armor'}) - - // Удаление рецептов сваязанных с Незеритовой броней - event.remove({id: 'minecraft:netherite_helmet_smithing'}) - event.remove({id: 'minecraft:netherite_chestplate_smithing'}) - event.remove({id: 'minecraft:netherite_leggings_smithing'}) - event.remove({id: 'minecraft:netherite_boots_smithing'}) - - // Удаление рецептов связанных с шаблонами брони - event.remove({id: 'minecraft:wild_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:wayfinder_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:ward_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:vex_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:tide_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:spire_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:snout_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:silence_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:shaper_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:sentry_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:rib_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:raiser_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:host_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:eye_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:dune_armor_trim_smithing_template_smithing_trim'}) - event.remove({id: 'minecraft:coast_armor_trim_smithing_template_smithing_trim'}) - - // Удаление рецептов связанных с Деревянными инструментами - 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'}) - - // Удаление рецептов связанных с Каменными инструментами - 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'}) - - // Удаление рецептов связанных с Железными инструментами - 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'}) - 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'}) - event.remove({id: 'gtceu:arc_furnace/arc_iron_shovel'}) - event.remove({id: 'gtceu:arc_furnace/arc_iron_hoe'}) - - // Удаление рецептов связанных с Золотыми инструментами - 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'}) - 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'}) - event.remove({id: 'gtceu:arc_furnace/arc_golden_shovel'}) - event.remove({id: 'gtceu:arc_furnace/arc_golden_hoe'}) - - // Удаление рецептов связанных с Алмазными инструментами - 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'}) - 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'}) - event.remove({id: 'gtceu:arc_furnace/arc_diamond_shovel'}) - event.remove({id: 'gtceu:arc_furnace/arc_diamond_hoe'}) - - // Удаление рецептов связанных с Незеритовыми инструментами - event.remove({id: 'minecraft:netherite_sword_smithing'}) - event.remove({id: 'minecraft:netherite_pickaxe_smithing'}) - event.remove({id: 'minecraft:netherite_axe_smithing'}) - event.remove({id: 'minecraft:netherite_shovel_smithing'}) - event.remove({id: 'minecraft:netherite_hoe_smithing'}) - // Удаление рецептов связанных с Repeater event.remove({id: 'minecraft:repeater'}) @@ -1507,26 +1676,6 @@ const registerMinecraftRecipes = (event) => { event.remove({id: 'gtceu:shaped/iron_bars'}) event.remove({id: 'gtceu:assembler/iron_bars'}) - // Удаление рецептов связанных с Wheat - event.remove({id: 'minecraft:packed_mud'}) - event.remove({id: 'minecraft:cookie'}) - event.remove({id: 'minecraft:cake'}) - event.remove({id: 'minecraft:bread'}) - event.remove({id: 'gtceu:packer/hay_block'}) - - // Удаление рецептов связанных с Wheat Dust - event.remove({id: 'gtceu:packer/package_wheat_tiny_dust'}) - event.remove({id: 'gtceu:packer/package_wheat_small_dust'}) - event.remove({id: 'gtceu:packer/unpackage_wheat_tiny_dust'}) - event.remove({id: 'gtceu:packer/unpackage_wheat_small_dust'}) - event.remove({id: 'gtceu:shaped/tiny_dust_assembling_wheat'}) - event.remove({id: 'gtceu:shaped/small_dust_assembling_wheat'}) - event.remove({id: 'gtceu:shaped/tiny_dust_disassembling_wheat'}) - event.remove({id: 'gtceu:shaped/small_dust_disassembling_wheat'}) - event.remove({id: 'gtceu:macerator/macerate_wheat'}) - event.remove({id: 'gtceu:macerator/macerate_hay_block'}) - event.remove({id: 'gtceu:shapeless/wheat_to_dust'}) - // Удаление рецептов связанных с TripWire Hook event.remove({id: 'minecraft:tripwire_hook'}) event.remove({id: 'tfc:crafting/vanilla/redstone/tripwire_hook'}) @@ -1540,34 +1689,6 @@ const registerMinecraftRecipes = (event) => { // Удаление рецептов связанных с Saddle event.remove({id: 'gtceu:shaped/saddle'}) - // Удаление рецептов связанных с песком - event.remove({id: 'gtceu:forge_hammer/smooth_sandstone_to_sand'}) - event.remove({id: 'gtceu:forge_hammer/sandstone_to_sand'}) - event.remove({id: 'gtceu:forge_hammer/chiseled_sandstone_to_sand'}) - - event.remove({id: 'gtceu:centrifuge/soul_sand_separation'}) - event.remove({id: 'gtceu:centrifuge/mycelium_separation'}) - event.remove({id: 'gtceu:centrifuge/endstone_separation'}) - - // Удаление рецептов связанных с красным песком - event.remove({id: 'gtceu:forge_hammer/smooth_red_sandstone_to_red_sand'}) - event.remove({id: 'gtceu:forge_hammer/red_sandstone_to_red_sand'}) - event.remove({id: 'gtceu:forge_hammer/chiseled_red_sandstone_to_red_sand'}) - - // Удаление рецептов связанных с SandStone - event.remove({id: 'minecraft:sandstone'}) - event.remove({id: 'gtceu:compressor/sandstone'}) - - // Удаление рецептов связанных с Red SandStone - - // Удаление рецептов блоков из RockBreaker - event.remove({id: 'gtceu:rock_breaker/stone'}) - event.remove({id: 'gtceu:rock_breaker/obsidian'}) - event.remove({id: 'gtceu:rock_breaker/granite'}) - event.remove({id: 'gtceu:rock_breaker/diorite'}) - event.remove({id: 'gtceu:rock_breaker/andesite'}) - event.remove({id: 'gtceu:rock_breaker/cobblestone'}) - // Удаление рецептов связанных с книжными полками event.remove({id: 'minecraft:chiseled_bookshelf'}) event.remove({id: 'gtceu:assembler/bookshelf'}) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 693b85b89..0cdfdf31a 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -1,15 +1,19 @@ // priority: 0 global.GTCEU_DISABLED_ITEMS = [ + // Пыль пшеницы + 'gtceu:wheat_dust', + 'gtceu:wheat_small_dust', + 'gtceu:wheat_tiny_dust', + + // Другое 'gtceu:flint_mortar', 'gtceu:flint_knife', 'gtceu:firebrick', 'gtceu:firebricks', 'gtceu:wood_drum', 'gtceu:primitive_blast_furnace', - 'gtceu:wheat_dust', - 'gtceu:wheat_small_dust', - 'gtceu:wheat_tiny_dust', + 'gtceu:wood_drill_head', 'gtceu:wood_chainsaw_head', 'gtceu:rubber_sapling', diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 30813cf92..239028002 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -187,6 +187,18 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:bubble_coral', 'minecraft:fire_coral', + // Блоки коралов + 'minecraft:dead_tube_coral_block', + 'minecraft:dead_fire_coral_block', + 'minecraft:dead_horn_coral_block', + 'minecraft:dead_bubble_coral_block', + 'minecraft:dead_brain_coral_block', + 'minecraft:tube_coral_block', + 'minecraft:brain_coral_block', + 'minecraft:bubble_coral_block', + 'minecraft:fire_coral_block', + 'minecraft:horn_coral_block', + // Дерево // Дуб "minecraft:oak_wood", @@ -359,6 +371,107 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:mangrove_sign", "minecraft:mangrove_hanging_sign", + // Шалкеры + 'minecraft:shulker_box', + 'minecraft:white_shulker_box', + 'minecraft:orange_shulker_box', + 'minecraft:magenta_shulker_box', + 'minecraft:light_blue_shulker_box', + 'minecraft:yellow_shulker_box', + 'minecraft:lime_shulker_box', + 'minecraft:pink_shulker_box', + 'minecraft:gray_shulker_box', + 'minecraft:light_gray_shulker_box', + 'minecraft:cyan_shulker_box', + 'minecraft:purple_shulker_box', + 'minecraft:blue_shulker_box', + 'minecraft:brown_shulker_box', + 'minecraft:green_shulker_box', + 'minecraft:red_shulker_box', + 'minecraft:black_shulker_box', + + // Мясо + 'minecraft:porkchop', + 'minecraft:chicken', + 'minecraft:mutton', + 'minecraft:rabbit', + 'minecraft:beef', + 'minecraft:cooked_porkchop', + 'minecraft:cooked_chicken', + 'minecraft:cooked_mutton', + 'minecraft:cooked_rabbit', + 'minecraft:cooked_beef', + + // Семена + 'minecraft:wheat_seeds', + 'minecraft:pumpkin_seeds', + 'minecraft:melon_seeds', + 'minecraft:torchflower_seeds', + 'minecraft:beetroot_seeds', + + // Инструменты + "minecraft:wooden_sword", + "minecraft:wooden_pickaxe", + "minecraft:wooden_axe", + "minecraft:wooden_shovel", + "minecraft:wooden_hoe", + + "minecraft:stone_sword", + "minecraft:stone_pickaxe", + "minecraft:stone_axe", + "minecraft:stone_shovel", + "minecraft:stone_hoe", + + "minecraft:iron_sword", + "minecraft:iron_pickaxe", + "minecraft:iron_axe", + "minecraft:iron_shovel", + "minecraft:iron_hoe", + + "minecraft:golden_sword", + "minecraft:golden_pickaxe", + "minecraft:golden_axe", + "minecraft:golden_shovel", + "minecraft:golden_hoe", + + "minecraft:diamond_sword", + "minecraft:diamond_pickaxe", + "minecraft:diamond_axe", + "minecraft:diamond_shovel", + "minecraft:diamond_hoe", + + "minecraft:netherite_sword", + "minecraft:netherite_pickaxe", + "minecraft:netherite_axe", + "minecraft:netherite_shovel", + "minecraft:netherite_hoe", + + // Броня + "minecraft:netherite_helmet", + "minecraft:netherite_chestplate", + "minecraft:netherite_leggings", + "minecraft:netherite_boots", + "minecraft:golden_helmet", + "minecraft:golden_chestplate", + "minecraft:golden_leggings", + "minecraft:golden_boots", + "minecraft:iron_helmet", + "minecraft:iron_chestplate", + "minecraft:iron_leggings", + "minecraft:iron_boots", + "minecraft:chainmail_helmet", + "minecraft:chainmail_chestplate", + "minecraft:chainmail_leggings", + "minecraft:chainmail_boots", + "minecraft:diamond_helmet", + "minecraft:diamond_chestplate", + "minecraft:diamond_leggings", + "minecraft:diamond_boots", + + "minecraft:iron_horse_armor", + "minecraft:golden_horse_armor", + "minecraft:diamond_horse_armor", + // Другое 'minecraft:calcite', 'minecraft:tuff', @@ -419,12 +532,32 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:dried_kelp_block', 'minecraft:dried_kelp', 'minecraft:pink_petals', - 'minecraft:wheat_seeds', - 'minecraft:pumpkin_seeds', - 'minecraft:melon_seeds', - 'minecraft:wheat_seeds', - 'minecraft:torchflower_seeds', - 'minecraft:beetroot_seeds', + 'minecraft:peony', + 'minecraft:rose_bush', + 'minecraft:lilac', + 'minecraft:sunflower', + 'minecraft:chain_command_block', + 'minecraft:turtle_egg', + 'minecraft:sniffer_egg', + 'minecraft:elytra', + 'minecraft:structure_block', + 'minecraft:jigsaw', + 'minecraft:sculk_sensor', + 'minecraft:calibrated_sculk_sensor', + 'minecraft:conduit', + 'minecraft:chest_minecart', + 'minecraft:bread', + 'minecraft:wheat', + 'minecraft:cookie', + 'minecraft:cake', + 'minecraft:crafting_table', + 'minecraft:chest', + 'minecraft:trapped_chest', + 'minecraft:scute', + 'minecraft:fishing_rod', + 'minecraft:warped_fungus_on_a_stick', + 'minecraft:carrot_on_a_stick', + 'minecraft:pumpkin', /* // Other @@ -492,71 +625,7 @@ global.MINECRAFT_DISABLED_ITEMS = [ "minecraft:deepslate_diamond_ore", "minecraft:nether_gold_ore", "minecraft:nether_quartz_ore", - "minecraft:ancient_debris", - - // Tools - "minecraft:wooden_sword", - "minecraft:wooden_pickaxe", - "minecraft:wooden_axe", - "minecraft:wooden_shovel", - "minecraft:wooden_hoe", - - "minecraft:stone_sword", - "minecraft:stone_pickaxe", - "minecraft:stone_axe", - "minecraft:stone_shovel", - "minecraft:stone_hoe", - - "minecraft:iron_sword", - "minecraft:iron_pickaxe", - "minecraft:iron_axe", - "minecraft:iron_shovel", - "minecraft:iron_hoe", - - "minecraft:golden_sword", - "minecraft:golden_pickaxe", - "minecraft:golden_axe", - "minecraft:golden_shovel", - "minecraft:golden_hoe", - - "minecraft:diamond_sword", - "minecraft:diamond_pickaxe", - "minecraft:diamond_axe", - "minecraft:diamond_shovel", - "minecraft:diamond_hoe", - - "minecraft:netherite_sword", - "minecraft:netherite_pickaxe", - "minecraft:netherite_axe", - "minecraft:netherite_shovel", - "minecraft:netherite_hoe", - - // Armor - // Horse - "minecraft:iron_horse_armor", - "minecraft:golden_horse_armor", - "minecraft:diamond_horse_armor", - // Player - "minecraft:netherite_helmet", - "minecraft:netherite_chestplate", - "minecraft:netherite_leggings", - "minecraft:netherite_boots", - "minecraft:golden_helmet", - "minecraft:golden_chestplate", - "minecraft:golden_leggings", - "minecraft:golden_boots", - "minecraft:iron_helmet", - "minecraft:iron_chestplate", - "minecraft:iron_leggings", - "minecraft:iron_boots", - "minecraft:chainmail_helmet", - "minecraft:chainmail_chestplate", - "minecraft:chainmail_leggings", - "minecraft:chainmail_boots", - "minecraft:diamond_helmet", - "minecraft:diamond_chestplate", - "minecraft:diamond_leggings", - "minecraft:diamond_boots",*/ + "minecraft:ancient_debris",*/ ]; global.VANILLA_WOOD_TYPES = [