From 36f437312fc7bc20f176b9037f23695655b3a7ea Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 26 Nov 2023 13:03:34 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=20=D1=80=D0=B5=D1=86=D0=B5=D0=BF=D1=82=D0=BE=D0=B2=20+?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D1=87=D0=B8=D1=81=D1=82=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B7=D0=B0=20=D0=BA=D1=83=D0=B1=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Распределил рецепты по выходу в разные скрипты * Удалил рецепты для ванильные железных барсов * Переработал рецепты рюкзаков --- .../sophisticatedbackpacks/lang/en_us.json | 11 + .../sophisticatedbackpacks/lang/ru_ru.json | 11 + kubejs/server_scripts/gregtech/recipes.js | 259 -------------- kubejs/server_scripts/minecraft/recipes.js | 325 ++++++++++++++++-- kubejs/server_scripts/sb/recipes.js | 167 ++++++--- kubejs/server_scripts/tfc/recipes.js | 8 + 6 files changed, 453 insertions(+), 328 deletions(-) create mode 100644 kubejs/assets/sophisticatedbackpacks/lang/en_us.json create mode 100644 kubejs/assets/sophisticatedbackpacks/lang/ru_ru.json diff --git a/kubejs/assets/sophisticatedbackpacks/lang/en_us.json b/kubejs/assets/sophisticatedbackpacks/lang/en_us.json new file mode 100644 index 000000000..0e6e4a029 --- /dev/null +++ b/kubejs/assets/sophisticatedbackpacks/lang/en_us.json @@ -0,0 +1,11 @@ +{ + "item.sophisticatedbackpacks.iron_backpack": "Red Steel Backpack", + "item.sophisticatedbackpacks.gold_backpack": "Aluminium Backpack", + "item.sophisticatedbackpacks.diamond_backpack": "Titanium Backpack", + "item.sophisticatedbackpacks.netherite_backpack": "Tungstensteel Backpack", + + "block.sophisticatedbackpacks.iron_backpack": "Red Steel Backpack", + "block.sophisticatedbackpacks.gold_backpack": "Aluminium Backpack", + "block.sophisticatedbackpacks.diamond_backpack": "Titanium Backpack", + "block.sophisticatedbackpacks.netherite_backpack": "Tungstensteel Backpack" +} \ No newline at end of file diff --git a/kubejs/assets/sophisticatedbackpacks/lang/ru_ru.json b/kubejs/assets/sophisticatedbackpacks/lang/ru_ru.json new file mode 100644 index 000000000..59fb21e30 --- /dev/null +++ b/kubejs/assets/sophisticatedbackpacks/lang/ru_ru.json @@ -0,0 +1,11 @@ +{ + "item.sophisticatedbackpacks.iron_backpack": "Рюкзак (Красная сталь)", + "item.sophisticatedbackpacks.gold_backpack": "Рюкзак (Алюминий)", + "item.sophisticatedbackpacks.diamond_backpack": "Рюкзак (Титан)", + "item.sophisticatedbackpacks.netherite_backpack": "Рюкзак (Вольфрам)", + + "block.sophisticatedbackpacks.iron_backpack": "Рюкзак (Красная сталь)", + "block.sophisticatedbackpacks.gold_backpack": "Рюкзак (Алюминий)", + "block.sophisticatedbackpacks.diamond_backpack": "Рюкзак (Титан)", + "block.sophisticatedbackpacks.netherite_backpack": "Рюкзак (Вольфрам)" +} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 98a4fd6f1..77189d77a 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1,26 +1,7 @@ // priority: 0 const registerGTRecipes = (event) => { - // Удаление рецептов связанных с наковальней - event.remove({id: 'gtceu:arc_furnace/arc_anvil'}) - event.remove({id: 'gtceu:macerator/macerate_anvil'}) - event.remove({id: 'gtceu:alloy_smelter/anvil'}) - event.remove({id: 'gtceu:fluid_solidifier/solidify_anvil'}) - - event.remove({id: 'gtceu:arc_furnace/arc_damaged_anvil'}) - event.remove({id: 'gtceu:macerator/macerate_damaged_anvil'}) - event.remove({id: 'gtceu:arc_furnace/arc_chipped_anvil'}) - event.remove({id: 'gtceu:macerator/macerate_chipped_anvil'}) - // Удаление рецептов связанных с печкой - event.remove({id: 'gtceu:assembler/furnace'}) - event.remove({id: 'gtceu:macerator/macerate_furnace'}) - event.remove({id: 'gtceu:assembler/furnace_minecart'}) - - // Удаление рецептов связанных с вагонеткой с печкой - event.remove({id: 'gtceu:arc_furnace/arc_furnace_minecart'}) - event.remove({id: 'gtceu:macerate/macerate_furnace_minecart'}) - // Удаление рецептов связанных с Primitive Blast Furnace event.remove({id: 'gtceu:arc_furnace/arc_primitive_blast_furnace'}) event.remove({id: 'gtceu:macerator/macerate_primitive_blast_furnace'}) @@ -40,114 +21,9 @@ const registerGTRecipes = (event) => { event.remove({id: 'gtceu:smelting/fireclay_brick'}) event.remove({id: 'gtceu:macerator/macerate_firebrick'}) - // Удаление рецептов связанных с Кольчугой - 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: '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'}) - // Удаление рецептов связанных с BioChaff event.remove({id: 'gtceu:macerator/dirt_from_bio_chaff'}) - // Удаление рецептов связанных с Paper - event.remove({id: 'gtceu:shaped/paper'}) - // Удаление других рецептов // @@ -390,24 +266,6 @@ const registerGTRecipes = (event) => { .duration(128) .EUt(3) - // Sugar Cane (Papyrus) -> Paper - event.remove({id: 'gtceu:chemical_bath/paper_from_sugar_cane_distilled'}) - event.remove({id: 'gtceu:chemical_bath/paper_from_sugar_cane'}) - - event.recipes.gtceu.chemical_bath('paper_from_papyrus_distilled') - .itemInputs('tfc:papyrus') - .inputFluids(Fluid.of('gtceu:distilled_water', 100)) - .itemOutputs('minecraft:paper') - .duration(100) - .EUt(7) - - event.recipes.gtceu.chemical_bath('paper_from_papyrus') - .itemInputs('tfc:papyrus') - .inputFluids(Fluid.of('minecraft:water', 100)) - .itemOutputs('minecraft:paper') - .duration(100) - .EUt(7) - // Fire Brick event.smelting('tfc:ceramic/fire_brick', 'gtceu:compressed_fireclay').id('tfg:smelting/fireclay_brick') @@ -558,121 +416,4 @@ const registerGTRecipes = (event) => { C: 'gtceu:heatproof_machine_casing', D: 'gtceu:tin_single_cable' }).id('gtceu:shaped/electric_blast_furnace') - - // LimeWater + Sand -> Mortar - event.recipes.gtceu.centrifuge('mortar') - .itemInputs('#forge:sand') - .inputFluids(Fluid.of('tfc:limewater', 100)) - .itemOutputs('16x tfc:mortar') - .duration(800) - .EUt(8) - - // White Dye Recipes - event.remove({id: 'gtceu:extractor/lily_of_the_valley_dye'}) - event.recipes.gtceu.extractor('white_dye') - .itemInputs('1x #tfc:makes_white_dye') - .itemOutputs('2x minecraft:white_dye') - .duration(200) - .EUt(2) - - // Red Dye Recipes - event.remove({id: 'gtceu:extractor/rose_bush_dye'}) - event.remove({id: 'gtceu:extractor/red_tulip_dye'}) - event.remove({id: 'gtceu:extractor/poppy_dye'}) - event.remove({id: 'gtceu:extractor/beetroot_dye'}) - event.recipes.gtceu.extractor('red_dye') - .itemInputs('1x #tfc:makes_red_dye') - .itemOutputs('2x minecraft:red_dye') - .duration(200) - .EUt(2) - - // Lime Dye Recipes - event.remove({id: 'gtceu:extractor/rose_bush_dye'}) - event.remove({id: 'gtceu:extractor/red_tulip_dye'}) - event.remove({id: 'gtceu:extractor/poppy_dye'}) - event.remove({id: 'gtceu:extractor/beetroot_dye'}) - event.recipes.gtceu.extractor('lime_dye') - .itemInputs('1x tfc:plant/moss') - .itemOutputs('2x minecraft:lime_dye') - .duration(200) - .EUt(2) - - // Light Blue Dye Recipes - event.remove({id: 'gtceu:extractor/blue_orchid_dye'}) - event.recipes.gtceu.extractor('light_blue_dye') - .itemInputs('1x #tfc:makes_light_blue_dye') - .itemOutputs('2x minecraft:light_blue_dye') - .duration(200) - .EUt(2) - - // Green Dye Recipes - event.recipes.gtceu.extractor('green_dye') - .itemInputs('1x #tfc:makes_green_dye') - .itemOutputs('2x minecraft:green_dye') - .duration(200) - .EUt(2) - - // Magenta Dye Recipes - event.remove({id: 'gtceu:extractor/lilac_dye'}) - event.remove({id: 'gtceu:extractor/allium_dye'}) - event.recipes.gtceu.extractor('magenta_dye') - .itemInputs('1x #tfc:makes_magenta_dye') - .itemOutputs('2x minecraft:magenta_dye') - .duration(200) - .EUt(2) - - // Orange Dye Recipes - event.remove({id: 'gtceu:extractor/orange_tulip_dye'}) - event.recipes.gtceu.extractor('orange_dye') - .itemInputs('1x #tfc:makes_orange_dye') - .itemOutputs('2x minecraft:orange_dye') - .duration(200) - .EUt(2) - - // Purple Dye Recipes - event.recipes.gtceu.extractor('purple_dye') - .itemInputs('1x #tfc:makes_purple_dye') - .itemOutputs('2x minecraft:purple_dye') - .duration(200) - .EUt(2) - - // Brown Dye Recipes - event.recipes.gtceu.extractor('brown_dye') - .itemInputs('1x #tfc:makes_brown_dye') - .itemOutputs('2x minecraft:brown_dye') - .duration(200) - .EUt(2) - - // Light Gray Dye Recipes - event.recipes.gtceu.extractor('light_gray_dye') - .itemInputs('1x tfc:plant/yucca') - .itemOutputs('2x minecraft:light_gray_dye') - .duration(200) - .EUt(2) - - // Yellow Dye Recipes - event.remove({id: 'gtceu:extractor/sunflower_dye'}) - event.remove({id: 'gtceu:extractor/dandelion_dye'}) - event.recipes.gtceu.extractor('yellow_dye') - .itemInputs('1x #tfc:makes_yellow_dye') - .itemOutputs('2x minecraft:yellow_dye') - .duration(200) - .EUt(2) - - // Blue Dye Recipes - event.remove({id: 'gtceu:extractor/cornflower_dye'}) - event.recipes.gtceu.extractor('blue_dye') - .itemInputs('1x #tfc:makes_blue_dye') - .itemOutputs('2x minecraft:blue_dye') - .duration(200) - .EUt(2) - - // Pink Dye Recipes - event.remove({id: 'gtceu:extractor/pink_tulip_dye'}) - event.remove({id: 'gtceu:extractor/peony_dye'}) - event.recipes.gtceu.extractor('pink_dye') - .itemInputs('1x #tfc:makes_pink_dye') - .itemOutputs('2x minecraft:pink_dye') - .duration(200) - .EUt(2) } \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index fbee18d6c..7b56a598f 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2,46 +2,86 @@ const registerMinecraftRecipes = (event) => { - // Copper fix - event.remove({id: 'minecraft:copper_ingot_from_smelting_raw_copper'}) - event.remove({id: 'minecraft:copper_ingot_from_blasting_raw_copper'}) + // Удаление рецептов связанных с наковальней + event.remove({id: 'gtceu:arc_furnace/arc_anvil'}) + event.remove({id: 'gtceu:macerator/macerate_anvil'}) + event.remove({id: 'gtceu:alloy_smelter/anvil'}) + event.remove({id: 'gtceu:fluid_solidifier/solidify_anvil'}) - event.smelting('2x #forge:ingots/copper', '1x #forge:raw_materials/copper').id('minecraft:copper_ingot_from_smelting_raw_copper').xp(0.7) - event.blasting('2x #forge:ingots/copper', '1x #forge:raw_materials/copper').id('minecraft:copper_ingot_from_blasting_raw_copper').xp(0.7) + event.remove({id: 'gtceu:arc_furnace/arc_damaged_anvil'}) + event.remove({id: 'gtceu:macerator/macerate_damaged_anvil'}) + event.remove({id: 'gtceu:arc_furnace/arc_chipped_anvil'}) + event.remove({id: 'gtceu:macerator/macerate_chipped_anvil'}) - // Iron fix - event.remove({id: `minecraft:iron_ingot_from_smelting_raw_iron`}) - event.remove({id: `minecraft:iron_ingot_from_blasting_raw_iron`}) + // Удаление рецептов связанных с печкой + event.remove({id: 'gtceu:assembler/furnace'}) + event.remove({id: 'gtceu:macerator/macerate_furnace'}) + event.remove({id: 'gtceu:assembler/furnace_minecart'}) - event.smelting('2x #forge:ingots/iron', '1x #forge:raw_materials/iron').id('minecraft:iron_ingot_from_smelting_raw_iron').xp(0.7) - event.blasting('2x #forge:ingots/iron', '1x #forge:raw_materials/iron').id('minecraft:iron_ingot_from_blasting_raw_iron').xp(0.7) + // Удаление рецептов связанных с вагонеткой с печкой + event.remove({id: 'minecraft:furnace_minecart'}) + event.remove({id: 'gtceu:arc_furnace/arc_furnace_minecart'}) + event.remove({id: 'gtceu:macerate/macerate_furnace_minecart'}) - // Gold fix - event.remove({id: `minecraft:gold_ingot_from_smelting_raw_gold`}) - event.remove({id: `minecraft:gold_ingot_from_blasting_raw_gold`}) + // Удаление рецептов связанных с Кольчугой + 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.smelting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_smelting_raw_gold').xp(0.7) - event.blasting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_blasting_raw_gold').xp(0.7) + // Удаление рецептов связанных с Железной броней + 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: 'minecraft:blast_furnace'}) - event.remove({ id: 'minecraft:furnace_minecart' }) - event.remove({id: 'minecraft:fire_charge'}) - event.remove({id: 'minecraft:fire_charge'}) + // Удаление рецептов связанных с Золотой броней + 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: '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'}) + // Удаление рецептов связанных с Алмазной броней + 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:netherite_ingot_from_netherite_block'}) - event.remove({id: 'minecraft:netherite_block'}) - event.remove({id: 'minecraft:lodestone'}) - + // Удаление рецептов связанных с шаблонами брони 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'}) @@ -58,4 +98,233 @@ const registerMinecraftRecipes = (event) => { 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'}) + + // Удаление рецептов связанных с Paper + event.remove({id: 'gtceu:shaped/paper'}) + + // Удаление рецептов связанных с Iron Bars + event.remove({id: 'gtceu:shaped/iron_bars'}) + event.remove({id: 'gtceu:assembler/iron_bars'}) + + // Удаление других рецептов + event.remove({id: 'minecraft:tripwire_hook'}) + event.remove({id: 'minecraft:blast_furnace'}) + event.remove({id: 'minecraft:fire_charge'}) + event.remove({id: 'minecraft:netherite_ingot_from_netherite_block'}) + event.remove({id: 'minecraft:netherite_block'}) + event.remove({id: 'minecraft:lodestone'}) + + // Исправление рецептов пережарки меди, удволетворяя условиям: обычный кусок -> 2 слитка + event.remove({id: 'minecraft:copper_ingot_from_smelting_raw_copper'}) + event.remove({id: 'minecraft:copper_ingot_from_blasting_raw_copper'}) + + event.smelting('2x #forge:ingots/copper', '1x #forge:raw_materials/copper').id('minecraft:copper_ingot_from_smelting_raw_copper').xp(0.7) + event.blasting('2x #forge:ingots/copper', '1x #forge:raw_materials/copper').id('minecraft:copper_ingot_from_blasting_raw_copper').xp(0.7) + + // Исправление рецептов пережарки железа, удволетворяя условиям: обычный кусок -> 2 слитка + event.remove({id: `minecraft:iron_ingot_from_smelting_raw_iron`}) + event.remove({id: `minecraft:iron_ingot_from_blasting_raw_iron`}) + + event.smelting('2x #forge:ingots/iron', '1x #forge:raw_materials/iron').id('minecraft:iron_ingot_from_smelting_raw_iron').xp(0.7) + event.blasting('2x #forge:ingots/iron', '1x #forge:raw_materials/iron').id('minecraft:iron_ingot_from_blasting_raw_iron').xp(0.7) + + // Исправление рецептов пережарки золота, удволетворяя условиям: обычный кусок -> 2 слитка + event.remove({id: `minecraft:gold_ingot_from_smelting_raw_gold`}) + event.remove({id: `minecraft:gold_ingot_from_blasting_raw_gold`}) + + event.smelting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_smelting_raw_gold').xp(0.7) + event.blasting('2x #forge:ingots/gold', '1x #forge:raw_materials/gold').id('minecraft:gold_ingot_from_blasting_raw_gold').xp(0.7) + + // Sugar Cane (Papyrus) -> Paper + event.remove({id: 'gtceu:chemical_bath/paper_from_sugar_cane_distilled'}) + event.remove({id: 'gtceu:chemical_bath/paper_from_sugar_cane'}) + + event.recipes.gtceu.chemical_bath('paper_from_papyrus_distilled') + .itemInputs('tfc:papyrus') + .inputFluids(Fluid.of('gtceu:distilled_water', 100)) + .itemOutputs('minecraft:paper') + .duration(100) + .EUt(7) + + event.recipes.gtceu.chemical_bath('paper_from_papyrus') + .itemInputs('tfc:papyrus') + .inputFluids(Fluid.of('minecraft:water', 100)) + .itemOutputs('minecraft:paper') + .duration(100) + .EUt(7) + + // White Dye Recipes + event.remove({id: 'gtceu:extractor/lily_of_the_valley_dye'}) + + event.recipes.gtceu.extractor('white_dye') + .itemInputs('1x #tfc:makes_white_dye') + .itemOutputs('2x minecraft:white_dye') + .duration(200) + .EUt(2) + + // Red Dye Recipes + event.remove({id: 'gtceu:extractor/rose_bush_dye'}) + event.remove({id: 'gtceu:extractor/red_tulip_dye'}) + event.remove({id: 'gtceu:extractor/poppy_dye'}) + event.remove({id: 'gtceu:extractor/beetroot_dye'}) + + event.recipes.gtceu.extractor('red_dye') + .itemInputs('1x #tfc:makes_red_dye') + .itemOutputs('2x minecraft:red_dye') + .duration(200) + .EUt(2) + + // Lime Dye Recipes + event.remove({id: 'gtceu:extractor/rose_bush_dye'}) + event.remove({id: 'gtceu:extractor/red_tulip_dye'}) + event.remove({id: 'gtceu:extractor/poppy_dye'}) + event.remove({id: 'gtceu:extractor/beetroot_dye'}) + + event.recipes.gtceu.extractor('lime_dye') + .itemInputs('1x tfc:plant/moss') + .itemOutputs('2x minecraft:lime_dye') + .duration(200) + .EUt(2) + + // Light Blue Dye Recipes + event.remove({id: 'gtceu:extractor/blue_orchid_dye'}) + + event.recipes.gtceu.extractor('light_blue_dye') + .itemInputs('1x #tfc:makes_light_blue_dye') + .itemOutputs('2x minecraft:light_blue_dye') + .duration(200) + .EUt(2) + + // Green Dye Recipes + event.recipes.gtceu.extractor('green_dye') + .itemInputs('1x #tfc:makes_green_dye') + .itemOutputs('2x minecraft:green_dye') + .duration(200) + .EUt(2) + + // Magenta Dye Recipes + event.remove({id: 'gtceu:extractor/lilac_dye'}) + event.remove({id: 'gtceu:extractor/allium_dye'}) + + event.recipes.gtceu.extractor('magenta_dye') + .itemInputs('1x #tfc:makes_magenta_dye') + .itemOutputs('2x minecraft:magenta_dye') + .duration(200) + .EUt(2) + + // Orange Dye Recipes + event.remove({id: 'gtceu:extractor/orange_tulip_dye'}) + + event.recipes.gtceu.extractor('orange_dye') + .itemInputs('1x #tfc:makes_orange_dye') + .itemOutputs('2x minecraft:orange_dye') + .duration(200) + .EUt(2) + + // Purple Dye Recipes + event.recipes.gtceu.extractor('purple_dye') + .itemInputs('1x #tfc:makes_purple_dye') + .itemOutputs('2x minecraft:purple_dye') + .duration(200) + .EUt(2) + + // Brown Dye Recipes + event.recipes.gtceu.extractor('brown_dye') + .itemInputs('1x #tfc:makes_brown_dye') + .itemOutputs('2x minecraft:brown_dye') + .duration(200) + .EUt(2) + + // Light Gray Dye Recipes + event.recipes.gtceu.extractor('light_gray_dye') + .itemInputs('1x tfc:plant/yucca') + .itemOutputs('2x minecraft:light_gray_dye') + .duration(200) + .EUt(2) + + // Yellow Dye Recipes + event.remove({id: 'gtceu:extractor/sunflower_dye'}) + event.remove({id: 'gtceu:extractor/dandelion_dye'}) + + event.recipes.gtceu.extractor('yellow_dye') + .itemInputs('1x #tfc:makes_yellow_dye') + .itemOutputs('2x minecraft:yellow_dye') + .duration(200) + .EUt(2) + + // Blue Dye Recipes + event.remove({id: 'gtceu:extractor/cornflower_dye'}) + + event.recipes.gtceu.extractor('blue_dye') + .itemInputs('1x #tfc:makes_blue_dye') + .itemOutputs('2x minecraft:blue_dye') + .duration(200) + .EUt(2) + + // Pink Dye Recipes + event.remove({id: 'gtceu:extractor/pink_tulip_dye'}) + event.remove({id: 'gtceu:extractor/peony_dye'}) + + event.recipes.gtceu.extractor('pink_dye') + .itemInputs('1x #tfc:makes_pink_dye') + .itemOutputs('2x minecraft:pink_dye') + .duration(200) + .EUt(2) } \ No newline at end of file diff --git a/kubejs/server_scripts/sb/recipes.js b/kubejs/server_scripts/sb/recipes.js index 0d2284fe2..0fbe9c741 100644 --- a/kubejs/server_scripts/sb/recipes.js +++ b/kubejs/server_scripts/sb/recipes.js @@ -20,53 +20,136 @@ const registerSBRecipes = (event) => { }); // Железный рюкзак - event.shaped('sophisticatedbackpacks:iron_backpack', [// arg 1: output - 'ABA', - 'BCB', // arg 2: the shape (array of strings) - 'ABA' - ], { - A: '#forge:plates/double/wrought_iron', - B: '#forge:rods/long/wrought_iron', //arg 3: the mapping object - C: 'sophisticatedbackpacks:backpack' - }); + event.custom({ + type: "sophisticatedbackpacks:backpack_upgrade", + conditions: [ + { + type: "sophisticatedcore:item_enabled", + itemRegistryName: "sophisticatedbackpacks:iron_backpack" + } + ], + key: { + B: { + "item": "sophisticatedbackpacks:backpack" + }, + I: { + "tag": "forge:plates/red_steel" + }, + C: { + "tag": 'forge:chests/wooden' + }, + F: { + "tag": 'forge:rods/red_steel' + } + }, + pattern: [ + "IFI", + "FCF", + "IBI" + ], + result: { + item: "sophisticatedbackpacks:iron_backpack" + } + }).id('sophisticatedbackpacks:iron_backpack_upgrade') // Золотой рюкзак - event.shaped('sophisticatedbackpacks:gold_backpack', [ - 'ABA', - 'CDC', - 'AEA' - ], { - A: '#forge:plates/double/rose_gold', - B: '#forge:rods/long/sterling_silver', - C: '#forge:rods/long/gold', - D: 'sophisticatedbackpacks:iron_backpack', - E: '#forge:plates/double/steel' - }); + event.custom({ + type: "sophisticatedbackpacks:backpack_upgrade", + conditions: [ + { + type: "sophisticatedcore:item_enabled", + itemRegistryName: "sophisticatedbackpacks:gold_backpack" + } + ], + key: { + B: { + "item": "sophisticatedbackpacks:iron_backpack" + }, + I: { + "tag": "forge:plates/aluminium" + }, + C: { + "tag": 'forge:chests/wooden' + }, + F: { + "tag": 'forge:rods/aluminium' + } + }, + pattern: [ + "IFI", + "FCF", + "IBI" + ], + result: { + item: "sophisticatedbackpacks:gold_backpack" + } + }).id('sophisticatedbackpacks:gold_backpack_upgrade') // Алмазный рюкзак - event.shaped('sophisticatedbackpacks:diamond_backpack', [ - 'ABA', - 'BCB', - 'ABA' - ], { - A: '#forge:plates/double/black_steel', - B: '#forge:rods/long/black_steel', - C: 'sophisticatedbackpacks:gold_backpack' - }); + event.custom({ + type: "sophisticatedbackpacks:backpack_upgrade", + conditions: [ + { + type: "sophisticatedcore:item_enabled", + itemRegistryName: "sophisticatedbackpacks:diamond_backpack" + } + ], + key: { + B: { + "item": "sophisticatedbackpacks:gold_backpack" + }, + I: { + "tag": "forge:plates/titanium" + }, + C: { + "tag": 'forge:chests/wooden' + }, + F: { + "tag": 'forge:rods/titanium' + } + }, + pattern: [ + "IFI", + "FCF", + "IBI" + ], + result: { + item: "sophisticatedbackpacks:diamond_backpack" + } + }).id('sophisticatedbackpacks:diamond_backpack_upgrade') // Незеритовый рюкзак - event.shaped('sophisticatedbackpacks:netherite_backpack', [ - 'ABC', - 'DED', - 'CBA' - ], { - A: '#forge:plates/double/blue_steel', - B: '#forge:rods/long/red_steel', - C: '#forge:plates/double/red_steel', - D: '#forge:rods/long/blue_steel', - E: 'sophisticatedbackpacks:diamond_backpack' - }); - + event.custom({ + type: "sophisticatedbackpacks:backpack_upgrade", + conditions: [ + { + type: "sophisticatedcore:item_enabled", + itemRegistryName: "sophisticatedbackpacks:netherite_backpack" + } + ], + key: { + B: { + "item": "sophisticatedbackpacks:diamond_backpack" + }, + I: { + "tag": "forge:plates/tungsten_steel" + }, + C: { + "tag": 'forge:chests/wooden' + }, + F: { + "tag": 'forge:rods/tungsten_steel' + } + }, + pattern: [ + "IFI", + "FCF", + "IBI" + ], + result: { + item: "sophisticatedbackpacks:netherite_backpack" + } + }).id('sophisticatedbackpacks:netherite_backpack_upgrade') // Апгрейды @@ -294,4 +377,6 @@ const registerSBRecipes = (event) => { 'sophisticatedbackpacks:tool_swapper_upgrade', '#forge:circuits/mv' ]); + + // Покраска рюкзака } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 7071ec999..26cfacd03 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -818,6 +818,14 @@ const registerTFCRecipes = (event) => { .itemOutputs('tfc:metal/anvil/blue_steel') .duration(1680) .EUt(16) + + // LimeWater + Sand -> Mortar + event.recipes.gtceu.centrifuge('mortar') + .itemInputs('#forge:sand') + .inputFluids(Fluid.of('tfc:limewater', 100)) + .itemOutputs('16x tfc:mortar') + .duration(800) + .EUt(8) } const registerAutoTFCHeatingRecipes = (event) => {