From f804da16139ac3d087032441f2735c21b7505c0d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 30 Apr 2024 16:32:27 +0700 Subject: [PATCH] recipes --- kubejs/server_scripts/ae2/recipes.js | 28 ++++++---- kubejs/server_scripts/etched/recipes.js | 55 +++++++++++++++++++ kubejs/server_scripts/main_server_script.js | 2 + kubejs/server_scripts/me_requester/recipes.js | 28 ++++++++++ kubejs/server_scripts/minecraft/recipes.js | 21 ++++++- 5 files changed, 120 insertions(+), 14 deletions(-) create mode 100644 kubejs/server_scripts/etched/recipes.js create mode 100644 kubejs/server_scripts/me_requester/recipes.js diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index 70fbdf5e8..41d78a442 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -2052,35 +2052,39 @@ const registerAE2Recipes = (event) => { .itemInputs( '#forge:gems/nether_quartz', '4x #forge:dusts/redstone', - 'ae2:charged_certus_quartz_crystal',) + 'ae2:charged_certus_quartz_crystal') + .inputFluids(Fluid.of('minecraft:water', 144)) .itemOutputs('ae2:fluix_crystal') - .duration(40) - .EUt(18) + .duration(420) + .EUt(256) event.recipes.gtceu.mixer('ae2:fluix_crystal_ruby') .itemInputs( '#forge:gems/nether_quartz', '#forge:exquisite_gems/ruby', - 'ae2:charged_certus_quartz_crystal',) + 'ae2:charged_certus_quartz_crystal') + .inputFluids(Fluid.of('minecraft:water', 144)) .itemOutputs('4x ae2:fluix_crystal') - .duration(40) - .EUt(18) + .duration(440) + .EUt(256) event.recipes.gtceu.mixer('ae2:fluix_crystal_quartz') .itemInputs( '#forge:exquisite_gems/nether_quartz', '4x #forge:dusts/redstone', - 'ae2:charged_certus_quartz_crystal',) + 'ae2:charged_certus_quartz_crystal') + .inputFluids(Fluid.of('minecraft:water', 144)) .itemOutputs('4x ae2:fluix_crystal') - .duration(40) - .EUt(18) + .duration(460) + .EUt(256) event.recipes.gtceu.mixer('ae2:fluix_crystal_quartz_ruby') .itemInputs( '#forge:exquisite_gems/nether_quartz', '#forge:exquisite_gems/ruby', - 'ae2:charged_certus_quartz_crystal',) + 'ae2:charged_certus_quartz_crystal') + .inputFluids(Fluid.of('minecraft:water', 144)) .itemOutputs('12x ae2:fluix_crystal') - .duration(40) - .EUt(18) + .duration(480) + .EUt(256) } \ No newline at end of file diff --git a/kubejs/server_scripts/etched/recipes.js b/kubejs/server_scripts/etched/recipes.js new file mode 100644 index 000000000..7a5317129 --- /dev/null +++ b/kubejs/server_scripts/etched/recipes.js @@ -0,0 +1,55 @@ +// priority: 0 + +const registerEtchedRecipes = (event) => { + + // Etching Table + event.shaped('etched:etching_table', [ + 'BCD', + 'AAA' + ], { + A: '#minecraft:planks', + B: '#forge:rings/steel', + C: '#forge:plates/steel', + D: '#forge:plates/diamond' + }).id('etched:etching_table') + + // Album Jukebox + event.shaped('etched:album_jukebox', [ + 'ABA', + 'ACA', + 'ADA' + ], { + A: 'gtceu:red_alloy_double_wire', + B: 'minecraft:repeater', + C: 'minecraft:jukebox', + D: '#forge:chests/wooden' + }).id('etched:album_jukebox') + + // Radio + event.shaped('etched:radio', [ + 'ABA', + 'CDC', + 'EEE' + ], { + A: 'gtceu:red_alloy_single_wire', + B: 'gtceu:copper_spring', + C: 'gtceu:wrought_iron_plate', + D: 'minecraft:note_block', + E: '#minecraft:planks' + }).id('etched:radio') + + // Boombox + event.shaped('etched:boombox', [ + ' A ', + 'ABA', + 'ACA' + ], { + A: '#forge:plates/wrought_iron', + B: 'gtceu:red_alloy_single_wire', + C: 'minecraft:jukebox' + }).id('etched:boombox') + + // Minecart With Jukebox + event.shapeless('etched:jukebox_minecart', ['minecraft:jukebox', 'minecraft:minecart']) + .id('etched:jukebox_minecart') +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 17275e2b6..634974e3e 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -120,6 +120,7 @@ ServerEvents.recipes(event => { registerCreateConnectedRecipes(event) registerExtendedAE2Recipes(event) registerExposureRecipes(event) + registerEtchedRecipes(event) registerFirmaCivRecipes(event) registerFirmaLifeRecipes(event) registerFramedBlocksRecipes(event) @@ -128,6 +129,7 @@ ServerEvents.recipes(event => { registerHandGliderRecipes(event) registerHotOrNotRecipes(event) registerMegaCellsRecipes(event) + registerMERequesterRecipes(event) registerMinecraftRecipes(event) registerMoreRedRecipes(event) registerRailWaysRecipes(event) diff --git a/kubejs/server_scripts/me_requester/recipes.js b/kubejs/server_scripts/me_requester/recipes.js new file mode 100644 index 000000000..aa7a34dd0 --- /dev/null +++ b/kubejs/server_scripts/me_requester/recipes.js @@ -0,0 +1,28 @@ +// priority: 0 + +const registerMERequesterRecipes = (event) => { + + event.remove({ id: 'merequester:requester' }) + + // ME Requester + event.recipes.gtceu.assembler('tfg:merequester/merequester') + .itemInputs('#ae2:interface', '2x ae2:crafting_accelerator', '4x #gtceu:circuits/ev', '4x #forge:plates/copper', '#forge:rods/amethyst') + .itemOutputs('merequester:requester') + .duration(760) + .EUt(506) + + // ME Requester Terminal + event.shaped('merequester:requester_terminal', [ + 'ABC', + 'DED', + 'FGF' + ], { + A: '#forge:tools/screwdrivers', + B: 'ae2:terminal', + C: '#forge:tools/mallets', + D: '#forge:rods/steel', + E: 'merequester:requester', + F: '#forge:plates/steel', + G: 'ae2:engineering_processor' + }).id('merequester:requester_terminal') +} \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 70ec2b5f9..b7d88551b 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2856,13 +2856,30 @@ const registerMinecraftRecipes = (event) => { //#region Выход: Вагонетка event.remove({ id: 'minecraft:minecart' }) - event.remove({ id: 'tfc:crafting/vanilla/redstone/steel_minecart' }) + + event.shaped('minecraft:minecart', [ + 'A A', + 'AAA', + 'B B' + ], { + A: 'gtceu:wrought_iron_plate', + B: 'gtceu:iron_minecart_wheels' + }).id('tfc:crafting/vanilla/redstone/minecart') + + event.shaped('minecraft:minecart', [ + 'A A', + 'AAA', + 'B B' + ], { + A: 'gtceu:wrought_iron_plate', + B: 'gtceu:steel_minecart_wheels' + }).id('tfc:crafting/vanilla/redstone/steel_minecart') event.recipes.gtceu.assembler('minecart') .itemInputs('3x #forge:plates/wrought_iron', '3x #forge:rings/wrought_iron') .itemOutputs('minecraft:minecart') .duration(100) - .EUt(1) + .EUt(2) //#endregion