From c2cfd9d9ff40b59781c6e4f4801153de4742cfe4 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 9 Oct 2024 10:30:09 +0700 Subject: [PATCH] restore morered + tfcgrrr + tfcaea + toolbelts --- kubejs/server_scripts/main_server_script.js | 18 +-- kubejs/server_scripts/more_red/recipes.js | 133 +++++++----------- .../sophisticated_backpacks/recipes.js | 50 +++---- .../tfc_grooming_station/recipes.js | 13 +- kubejs/server_scripts/tfcea/recipes.js | 4 +- kubejs/server_scripts/toolbelt/recipes.js | 8 +- 6 files changed, 100 insertions(+), 126 deletions(-) diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 384f1dab4..41d9571a5 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -20,10 +20,10 @@ ServerEvents.tags('item', event => { registerGregTechItemTags(event) // registerMegaCellsItemTags(event) registerMinecraftItemTags(event) - // registerMoreRedItemTags(event) + registerMoreRedItemTags(event) // registerHotOrNotItemTags(event) // registerRailWaysItemTags(event) - // registerSophisticatedBackpacksItemTags(event) + registerSophisticatedBackpacksItemTags(event) registerTFCItemTags(event) }) @@ -46,10 +46,10 @@ ServerEvents.tags('block', event => { registerGregTechBlockTags(event) // registerMegaCellsBlockTags(event) registerMinecraftBlockTags(event) - // registerMoreRedBlockTags(event) + registerMoreRedBlockTags(event) // registerHotOrNotBlockTags(event) // registerRailWaysBlockTags(event) - // registerSophisticatedBackpacksBlockTags(event) + registerSophisticatedBackpacksBlockTags(event) registerTFCBlockTags(event) }) @@ -129,15 +129,15 @@ ServerEvents.recipes(event => { // registerMegaCellsRecipes(event) // registerMERequesterRecipes(event) registerMinecraftRecipes(event) - // registerMoreRedRecipes(event) + registerMoreRedRecipes(event) registerRailWaysRecipes(event) registerRFToolsRecipes(event) registerStorageDrawersRecipes(event) - // registerSophisticatedBackpacksRecipes(event) - // registerTfceaRecipes(event) + registerSophisticatedBackpacksRecipes(event) + registerTfceaRecipes(event) registerTFCRecipes(event) - // registerTFCGroomingStationRecipes(event) - // registerToolBeltRecipes(event) + registerTFCGroomingStationRecipes(event) + registerToolBeltRecipes(event) registerTreeTapRecipes(event) registerWaterFlasksRecipes(event) }) diff --git a/kubejs/server_scripts/more_red/recipes.js b/kubejs/server_scripts/more_red/recipes.js index f9b3072f6..3fb9ac92c 100644 --- a/kubejs/server_scripts/more_red/recipes.js +++ b/kubejs/server_scripts/more_red/recipes.js @@ -25,71 +25,65 @@ const registerMoreRedRecipes = (event) => { // Latch - event.recipes.gtceu.assembler('tfg/morered/latch') + event.recipes.gtceu.assembler('tfg:morered/latch') .itemInputs('4x gtceu:stone_plate', '2x minecraft:redstone_torch', '2x minecraft:redstone') .circuit(0) .itemOutputs('morered:latch') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Pulse Gate - event.recipes.gtceu.assembler('tfg/morered/pulse_gate') + event.recipes.gtceu.assembler('tfg:morered/pulse_gate') .itemInputs('3x gtceu:stone_plate', '2x minecraft:redstone', 'gtceu:wrought_iron_plate') .circuit(1) .itemOutputs('morered:pulse_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Red Wire Post event.shapeless('2x morered:redwire_post', [ '#forge:rods/wrought_iron', '#forge:fine_wires/red_alloy' - ]).id('tfg:crafting/red_wire_post') + ]).id('tfg:shapeless/morered/red_wire_post') // Red Wire Post Plate - event.recipes.gtceu.assembler('tfg/morered/red_wire_post_plate') + event.recipes.gtceu.assembler('tfg:morered/red_wire_post_plate') .itemInputs('3x gtceu:stone_plate', '2x minecraft:redstone', 'morered:redwire_post') .circuit(2) .itemOutputs('morered:redwire_post_plate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Red Wire Post Relay Plate - event.recipes.gtceu.assembler('tfg/morered/red_wire_post_relay_plate') + event.recipes.gtceu.assembler('tfg:morered/red_wire_post_relay_plate') .itemInputs('3x gtceu:stone_plate', '4x minecraft:redstone', 'morered:redwire_post') .circuit(4) .itemOutputs('morered:redwire_post_relay_plate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Red Wire Post Relay Plate - event.recipes.gtceu.assembler('tfg/morered/hexidecrubrometer') + event.recipes.gtceu.assembler('tfg:morered/hexidecrubrometer') .itemInputs('8x gtceu:stone_plate', '9x minecraft:redstone', '4x minecraft:quartz') .circuit(5) .itemOutputs('morered:hexidecrubrometer') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Bundled Cable Post event.shapeless('2x morered:bundled_cable_post', [ '#forge:plates/wrought_iron', 'morered:bundled_network_cable' - ]).id('tfg:crafting/bundled_cable_post') + ]).id('tfg:shapeless/morered/bundled_cable_post') // Bundled Cable Post Plate - event.recipes.gtceu.assembler('tfg/morered/bundled_cable_post_plate') + event.recipes.gtceu.assembler('tfg:morered/bundled_cable_post_plate') .itemInputs('morered:bundled_cable_post', '3x morered:bundled_network_cable', '#forge:plates/wrought_iron') .circuit(6) .itemOutputs('morered:bundled_cable_relay_plate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Red Allot Wire event.shapeless('12x morered:red_alloy_wire', [ '#forge:fine_wires/red_alloy', '#forge:fine_wires/red_alloy', '#forge:fine_wires/red_alloy' - ]).id('tfg:crafting/red_alloy_wire') + ]).id('tfg:shapeless/morered/red_alloy_wire') // Red Wire Spool event.shaped('morered:redwire_spool', [ @@ -100,7 +94,7 @@ const registerMoreRedRecipes = (event) => { A: 'morered:red_alloy_wire', B: '#forge:plates/wrought_iron', C: '#tfc:can_be_lit_on_torch' - }).id('tfg:crafting/redwire_spool') + }).id('tfg:shaped/morered/redwire_spool') // Bundled Cable Spool event.shaped('morered:bundled_cable_spool', [ @@ -111,152 +105,132 @@ const registerMoreRedRecipes = (event) => { A: 'morered:bundled_network_cable', B: '#forge:plates/wrought_iron', C: '#tfc:can_be_lit_on_torch' - }).id('tfg:crafting/bundled_cable_spool') + }).id('tfg:shaped/morered/bundled_cable_spool') // Diode - event.recipes.gtceu.assembler('tfg/morered/diode') + event.recipes.gtceu.assembler('tfg:morered/red_diode') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(7) .itemOutputs('morered:diode') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Not Gate - event.recipes.gtceu.assembler('tfg/morered/not_gate') + event.recipes.gtceu.assembler('tfg:morered/not_gate') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(8) .itemOutputs('morered:not_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Nor Gate - event.recipes.gtceu.assembler('tfg/morered/nor_gate') + event.recipes.gtceu.assembler('tfg:morered/nor_gate') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(9) .itemOutputs('morered:nor_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Nand Gate event.recipes.gtceu.assembler('tfg/morered/nand_gate') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(10) .itemOutputs('morered:nand_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Or Gate - event.recipes.gtceu.assembler('tfg/morered/or_gate') + event.recipes.gtceu.assembler('tfg:morered/or_gate') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(11) .itemOutputs('morered:or_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // And Gate - event.recipes.gtceu.assembler('tfg/morered/and_gate') + event.recipes.gtceu.assembler('tfg:morered/and_gate') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(12) .itemOutputs('morered:and_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // XOR Gate - event.recipes.gtceu.assembler('tfg/morered/xor_gate') + event.recipes.gtceu.assembler('tfg:morered/xor_gate') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(13) .itemOutputs('morered:xor_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // XNOR Gate - event.recipes.gtceu.assembler('tfg/morered/xnor_gate') + event.recipes.gtceu.assembler('tfg:morered/xnor_gate') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(14) .itemOutputs('morered:xnor_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Multiplexer - event.recipes.gtceu.assembler('tfg/morered/multiplexer') + event.recipes.gtceu.assembler('tfg:morered/multiplexer') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(15) .itemOutputs('morered:multiplexer') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // And 2 Gate - event.recipes.gtceu.assembler('tfg/morered/and_2_gate') + event.recipes.gtceu.assembler('tfg:morered/and_2_gate') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(16) .itemOutputs('morered:and_2_gate') - .duration(100) - .EUt(16) - + .EUt(16).duration(100) + // Nand 2 Gate - event.recipes.gtceu.assembler('tfg/morered/nand_2_gate') + event.recipes.gtceu.assembler('tfg:morered/nand_2_gate') .itemInputs('3x gtceu:stone_plate', '3x minecraft:redstone_torch', '4x minecraft:redstone') .circuit(17) .itemOutputs('morered:nand_2_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Bitwise Diode - event.recipes.gtceu.assembler('tfg/morered/bitwise_diode') + event.recipes.gtceu.assembler('tfg:morered/bitwise_diode') .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') .circuit(0) .itemOutputs('morered:bitwise_diode') - .duration(100) - .EUt(16) - + .EUt(16).duration(100) // Bitwise Not Gate - event.recipes.gtceu.assembler('tfg/morered/bitwise_not_gate') + event.recipes.gtceu.assembler('tfg:morered/bitwise_not_gate') .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') .circuit(1) .itemOutputs('morered:bitwise_not_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Bitwise Or Gate - event.recipes.gtceu.assembler('tfg/morered/bitwise_or_gate') + event.recipes.gtceu.assembler('tfg:morered/bitwise_or_gate') .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') .circuit(2) .itemOutputs('morered:bitwise_or_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Bitwise And Gate - event.recipes.gtceu.assembler('tfg/morered/bitwise_and_gate') + event.recipes.gtceu.assembler('tfg:morered/bitwise_and_gate') .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') .circuit(3) .itemOutputs('morered:bitwise_and_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Bitwise Xor Gate - event.recipes.gtceu.assembler('tfg/morered/bitwise_xor_gate') + event.recipes.gtceu.assembler('tfg:morered/bitwise_xor_gate') .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') .circuit(4) .itemOutputs('morered:bitwise_xor_gate') - .duration(100) - .EUt(16) + .EUt(16).duration(100) // Bitwise XNOR Gate - event.recipes.gtceu.assembler('tfg/morered/bitwise_xnor_gate') + event.recipes.gtceu.assembler('tfg:morered/bitwise_xnor_gate') .itemInputs('2x gtceu:stone_plate', 'minecraft:redstone', '3x minecraft:quartz') .circuit(5) .itemOutputs('morered:bitwise_xnor_gate') - .duration(100) - .EUt(16) - - //#region Выход: Крашеные провода + .EUt(16).duration(100) + //#region Крашеные провода event.recipes.gtceu.chemical_bath(`tfg:morered/wire_decolor`) .itemInputs('#morered:colored_network_cables') .inputFluids(Fluid.of(`gtceu:chlorine`, 72)) .itemOutputs('morered:red_alloy_wire') - .duration(300) - .EUt(4) + .EUt(4).duration(300) global.MINECRAFT_DYE_NAMES.forEach(dye => { @@ -268,6 +242,5 @@ const registerMoreRedRecipes = (event) => { .EUt(4) }) - //#endregion } \ No newline at end of file diff --git a/kubejs/server_scripts/sophisticated_backpacks/recipes.js b/kubejs/server_scripts/sophisticated_backpacks/recipes.js index ce8796111..6f89fb732 100644 --- a/kubejs/server_scripts/sophisticated_backpacks/recipes.js +++ b/kubejs/server_scripts/sophisticated_backpacks/recipes.js @@ -17,7 +17,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { B: '#forge:leather', C: '#forge:chests/wooden', D: 'minecraft:name_tag' - }).id('tfg:sophisticated_backpacks/shaped/backpack') + }).id('tfg:shaped/backpack') // Железный рюкзак event.custom({ @@ -50,7 +50,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { result: { item: "sophisticatedbackpacks:iron_backpack" } - }).id('tfg:sophisticated_backpacks/shaped/iron_backpack') + }).id('tfg:shaped/iron_backpack') // Золотой рюкзак event.custom({ @@ -83,7 +83,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { result: { item: "sophisticatedbackpacks:gold_backpack" } - }).id('tfg:sophisticated_backpacks/shaped/gold_backpack') + }).id('tfg:shaped/gold_backpack') // Алмазный рюкзак event.custom({ @@ -116,7 +116,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { result: { item: "sophisticatedbackpacks:diamond_backpack" } - }).id('tfg:sophisticated_backpacks/shaped/diamond_backpack') + }).id('tfg:shaped/diamond_backpack') // Незеритовый рюкзак event.custom({ @@ -149,7 +149,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { result: { item: "sophisticatedbackpacks:netherite_backpack" } - }).id('tfg:sophisticated_backpacks/shaped/netherite_backpack') + }).id('tfg:shaped/netherite_backpack') // Апгрейды @@ -163,7 +163,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { B: '#forge:rods/long/wrought_iron', C: '#forge:leather', D: '#forge:plates/steel' - }).id('tfg:sophisticated_backpacks/shaped/upgrade_base') + }).id('tfg:shaped/upgrade_base') // Улучшение - подбиратель event.shaped('sophisticatedbackpacks:pickup_upgrade', [ @@ -178,13 +178,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { E: 'gtceu:hv_robot_arm', F: '#gtceu:circuits/hv', G: '#gtceu:batteries/hv' - }).id('tfg:sophisticated_backpacks/shaped/pickup_upgrade') + }).id('tfg:shaped/pickup_upgrade') // Улучшение - улучшенный подбиратель event.shapeless('sophisticatedbackpacks:advanced_pickup_upgrade', [ 'sophisticatedbackpacks:pickup_upgrade', '#gtceu:circuits/ev' - ]).id('tfg:sophisticated_backpacks/shapeless/advanced_pickup_upgrade') + ]).id('tfg:shapeless/advanced_pickup_upgrade') // Улучшение - фильтр event.shaped('sophisticatedbackpacks:filter_upgrade', [ @@ -200,13 +200,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { F: 'gtceu:lv_robot_arm', G: '#gtceu:circuits/lv', H: 'gtceu:item_tag_filter' - }).id('tfg:sophisticated_backpacks/shaped/filter_upgrade') + }).id('tfg:shaped/filter_upgrade') // Улучшение - улучшенный фильтр event.shapeless('sophisticatedbackpacks:advanced_filter_upgrade', [ 'sophisticatedbackpacks:filter_upgrade', '#gtceu:circuits/mv' - ]).id('tfg:sophisticated_backpacks/shapeless/advanced_filter_upgrade') + ]).id('tfg:shapeless/advanced_filter_upgrade') // Улучшение - магнит event.shaped('sophisticatedbackpacks:magnet_upgrade', [ @@ -219,13 +219,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { C: '#gtceu:circuits/hv', D: 'sophisticatedbackpacks:upgrade_base', E: '#gtceu:batteries/hv' - }).id('tfg:sophisticated_backpacks/shaped/magnet_upgrade') + }).id('tfg:shaped/magnet_upgrade') // Улучшение - улучшенный магнит event.shapeless('sophisticatedbackpacks:advanced_magnet_upgrade', [ 'sophisticatedbackpacks:magnet_upgrade', '#gtceu:circuits/ev' - ]).id('tfg:sophisticated_backpacks/shapeless/advanced_magnet_upgrade') + ]).id('tfg:shapeless/advanced_magnet_upgrade') // Улучшение - уничтожитель event.shaped('sophisticatedbackpacks:void_upgrade', [ @@ -240,13 +240,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { E: '#forge:tools/wrenches', F: 'gtceu:brass_normal_item_pipe', G: '#forge:ender_pearls' - }).id('tfg:sophisticated_backpacks/shaped/void_upgrade') + }).id('tfg:shaped/void_upgrade') // Улучшение - улучшенный уничтожитель event.shapeless('sophisticatedbackpacks:advanced_void_upgrade', [ 'sophisticatedbackpacks:void_upgrade', '#gtceu:circuits/mv' - ]).id('tfg:sophisticated_backpacks/shapeless/advanced_void_upgrade') + ]).id('tfg:shapeless/advanced_void_upgrade') // Улучшение - Deposit event.shaped('sophisticatedbackpacks:deposit_upgrade', [ @@ -260,13 +260,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { D: 'gtceu:lv_conveyor_module', E: 'sophisticatedbackpacks:upgrade_base', F: 'gtceu:lv_robot_arm' - }).id('tfg:sophisticated_backpacks/shaped/deposit_upgrade') + }).id('tfg:shaped/deposit_upgrade') // Улучшение - улучшенный Deposit event.shapeless('sophisticatedbackpacks:advanced_deposit_upgrade', [ 'sophisticatedbackpacks:deposit_upgrade', '#gtceu:circuits/mv' - ]).id('tfg:sophisticated_backpacks/shapeless/advanced_deposit_upgrade') + ]).id('tfg:shapeless/advanced_deposit_upgrade') // Улучшение - Restock event.shaped('sophisticatedbackpacks:restock_upgrade', [ @@ -280,13 +280,13 @@ const registerSophisticatedBackpacksRecipes = (event) => { D: '#gtceu:batteries/lv', E: 'gtceu:manganese_phosphide_single_wire', F: '#gtceu:circuits/lv', - }).id('tfg:sophisticated_backpacks/shaped/restock_upgrade') + }).id('tfg:shaped/restock_upgrade') // Улучшение - улучшенный Restock event.shapeless('sophisticatedbackpacks:advanced_restock_upgrade', [ 'sophisticatedbackpacks:restock_upgrade', '#gtceu:circuits/mv' - ]).id('tfg:sophisticated_backpacks/shapeless/advanced_restock_upgrade') + ]).id('tfg:shapeless/advanced_restock_upgrade') // Улучшение - Refill event.shaped('sophisticatedbackpacks:refill_upgrade', [ @@ -299,7 +299,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { C: '#gtceu:batteries/lv', D: 'gtceu:lv_robot_arm', E: 'sophisticatedbackpacks:upgrade_base' - }).id('tfg:sophisticated_backpacks/shaped/refill_upgrade') + }).id('tfg:shaped/refill_upgrade') // Улучшение - улучшенный Refill event.shapeless('sophisticatedbackpacks:advanced_refill_upgrade', [ @@ -318,7 +318,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { C: '#gtceu:circuits/zpm', D: 'sophisticatedbackpacks:upgrade_base', E: '#gtceu:batteries/zpm' - }).id('tfg:sophisticated_backpacks/shaped/everlasting_upgrade') + }).id('tfg:shaped/everlasting_upgrade') // Улучшение - верстак event.shaped('sophisticatedbackpacks:crafting_upgrade', [ @@ -330,7 +330,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { B: '#tfc:workbenches', C: '#forge:plates/steel', D: 'sophisticatedbackpacks:upgrade_base', - }).id('tfg:sophisticated_backpacks/shaped/crafting_upgrade') + }).id('tfg:shaped/crafting_upgrade') // Улучшение - Stack Lvl. 1 event.shaped('sophisticatedbackpacks:stack_upgrade_tier_1', [ @@ -343,7 +343,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { C: '#gtceu:batteries/iv', D: 'sophisticatedbackpacks:upgrade_base', E: 'gtceu:iv_field_generator' - }).id('tfg:sophisticated_backpacks/shaped/stack_upgrade_tier_1') + }).id('tfg:shaped/stack_upgrade_tier_1') // Улучшение - проигрыватель event.shaped('sophisticatedbackpacks:jukebox_upgrade', [ @@ -355,7 +355,7 @@ const registerSophisticatedBackpacksRecipes = (event) => { B: 'minecraft:jukebox', C: '#forge:plates/steel', D: 'sophisticatedbackpacks:upgrade_base', - }).id('tfg:sophisticated_backpacks/shaped/jukebox_upgrade') + }).id('tfg:shaped/jukebox_upgrade') // Улучшение - ToolSwapper event.shaped('sophisticatedbackpacks:tool_swapper_upgrade', [ @@ -370,11 +370,11 @@ const registerSophisticatedBackpacksRecipes = (event) => { E: 'sophisticatedbackpacks:upgrade_base', F: '#tfc:shovels', G: '#tfc:axes', - }).id('tfg:sophisticated_backpacks/shaped/tool_swapper_upgrade') + }).id('tfg:shaped/tool_swapper_upgrade') // Улучшение - улучшенный ToolSwapper event.shapeless('sophisticatedbackpacks:advanced_tool_swapper_upgrade', [ 'sophisticatedbackpacks:tool_swapper_upgrade', '#gtceu:circuits/mv' - ]).id('tfg:sophisticated_backpacks/shapeless/advanced_tool_swapper_upgrade') + ]).id('tfg:shapeless/advanced_tool_swapper_upgrade') } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc_grooming_station/recipes.js b/kubejs/server_scripts/tfc_grooming_station/recipes.js index d8d58d98e..e206a8c72 100644 --- a/kubejs/server_scripts/tfc_grooming_station/recipes.js +++ b/kubejs/server_scripts/tfc_grooming_station/recipes.js @@ -1,7 +1,7 @@ // priority: 0 -const registerTFCGroomingStationRecipes = (event) => { - const materials = [ +const registerTFCGroomingStationRecipes = (e) => { + const GROOMING_MATERIALS = [ 'copper', 'bismuth_bronze', 'bronze', @@ -13,9 +13,10 @@ const registerTFCGroomingStationRecipes = (event) => { 'blue_steel' ] - materials.forEach(material => { - console.log(material) - event.shaped(`tfcgroomer:${material}_grooming_station`, [ + GROOMING_MATERIALS.forEach(material => { + e.remove({ id: `tfcgroomer:${material}_grooming_station` }) + + e.shaped(`tfcgroomer:${material}_grooming_station`, [ 'ABA', 'AAA', 'C C' @@ -25,4 +26,4 @@ const registerTFCGroomingStationRecipes = (event) => { C: 'tfc:wattle' }).id(`tfcgroomer:${material}_grooming_station`) }) -} +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfcea/recipes.js b/kubejs/server_scripts/tfcea/recipes.js index c6a96e870..6698addc3 100644 --- a/kubejs/server_scripts/tfcea/recipes.js +++ b/kubejs/server_scripts/tfcea/recipes.js @@ -1,7 +1,7 @@ const registerTfceaRecipes = (event) => { - //удаление рецептов мода + // Удаление рецептов мода event.remove({ mod: 'tfcea' }) event.shaped('tfcea:refrigerator', [ @@ -15,6 +15,6 @@ const registerTfceaRecipes = (event) => { D: 'gtceu:lv_fluid_regulator', E: 'gtceu:lv_machine_hull', F: 'gtceu:lv_electric_pump', - }).id('tfcea:refrigerator') + }).id('tfg:shaped/refrigerator') } \ No newline at end of file diff --git a/kubejs/server_scripts/toolbelt/recipes.js b/kubejs/server_scripts/toolbelt/recipes.js index 60e8b81b7..bdfca422c 100644 --- a/kubejs/server_scripts/toolbelt/recipes.js +++ b/kubejs/server_scripts/toolbelt/recipes.js @@ -14,7 +14,7 @@ const registerToolBeltRecipes = (event) => { A: '#forge:string', B: '#forge:leather', C: '#forge:plates/wrought_iron' - }).id('tfg:toolbelt/shaped/pouch') + }).id('tfg:shaped/pouch') // ToolBelt с размером 2 event.shaped(Item.of('toolbelt:belt', {Size:2}), [ @@ -25,13 +25,13 @@ const registerToolBeltRecipes = (event) => { A: '#forge:string', B: '#forge:leather', C: '#forge:plates/wrought_iron' - }).id('tfg:toolbelt/shaped/belt_' + 2) + }).id('tfg:shaped/belt_2') // ToolBelt с размером 3 - 9 for (let i = 3; i < 10; i++) { event.shapeless(Item.of('toolbelt:belt', {Size:i}), [ Ingredient.of(Item.of('toolbelt:belt', {Size:i-1}).strongNBT()).or(Ingredient.of(Item.of('toolbelt:belt', {Size:i-1,Items:[]}).strongNBT())), 'toolbelt:pouch' - ]).id('tfg:toolbelt/shaped/belt_' + i) + ]).id(`tfg:shaped/belt_${i}`) } -} +} \ No newline at end of file