diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 2312bce42..b8bbbb5ea 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -357,11 +357,11 @@ const registerRailWaysRecipes = (event) => { event.recipes.createSequencedAssembly([ '16x create:track', ], '#tfg:rock_slabs', [ - event.recipes.createDeploying('create:incomplete_track', ['create:incomplete_track', '#tfg:rock_slabs']), - event.recipes.createDeploying('create:incomplete_track', ['create:incomplete_track', 'gtceu:steel_rod']), - event.recipes.createDeploying('create:incomplete_track', ['create:incomplete_track', '#tfc:mortar']), - event.recipes.greate.pressing('create:incomplete_track', 'create:incomplete_track'), - ]).transitionalItem('create:incomplete_track').loops(2).id('tfg:railways/sequenced_assembly/track_create_andesite') + event.recipes.createDeploying('railways:track_incomplete_blackstone', ['railways:track_incomplete_blackstone', '#tfg:rock_slabs']), + event.recipes.createDeploying('railways:track_incomplete_blackstone', ['railways:track_incomplete_blackstone', 'gtceu:steel_rod']), + event.recipes.createDeploying('railways:track_incomplete_blackstone', ['railways:track_incomplete_blackstone', '#tfc:mortar']), + event.recipes.greate.pressing('railways:track_incomplete_blackstone', 'railways:track_incomplete_blackstone'), + ]).transitionalItem('railways:track_incomplete_blackstone').loops(2).id('tfg:railways/sequenced_assembly/track_create_andesite') event.recipes.gtceu.assembler('railways/track') .itemInputs('3x #tfg:rock_slabs', '2x gtceu:steel_rod') @@ -442,6 +442,81 @@ const registerRailWaysRecipes = (event) => { .circuit(3) }); + const OTHER_TRACKS = [ + { rail: 'blackstone', slab: 'minecraft:blackstone_slab', block: 'minecraft:blackstone' }, + { rail: 'acacia', slab: 'afc:wood/planks/baobab_slab', block: 'afc:wood/planks/baobab' }, + { rail: 'birch', slab: 'afc:wood/planks/eucalyptus_slab', block: 'afc:wood/planks/eucalyptus' }, + { rail: 'cherry', slab: 'afc:wood/planks/fig_slab', block: 'afc:wood/planks/fig' }, + { rail: 'jungle', slab: 'afc:wood/planks/teak_slab', block: 'afc:wood/planks/teak' }, + { rail: 'spruce', slab: 'afc:wood/planks/cypress_slab', block: 'afc:wood/planks/cypress' }, + { rail: 'crimson', slab: 'beneath:wood/planks/crimson_slab', block: 'beneath:wood/planks/crimson' }, + { rail: 'warped', slab: 'beneath:wood/planks/warped_slab', block: 'beneath:wood/planks/warped' }, + { rail: 'stripped_bamboo', slab: 'minecraft:bamboo_slab', block: 'minecraft:bamboo_planks' }, + { rail: 'bamboo', slab: 'minecraft:bamboo_block', block: 'minecraft:stripped_bamboo_block' }, + { rail: 'tieless', slab: 'framedblocks:framed_slab', block: 'framedblocks:framed_cube' } + ] + + OTHER_TRACKS.forEach(x => { + event.recipes.createSequencedAssembly([ + `16x railways:track_${x.rail}_narrow`, + ], x.slab, [ + event.recipes.createDeploying(`railways:track_incomplete_${x.rail}_narrow`, [`railways:track_incomplete_${x.rail}_narrow`, `gtceu:steel_rod`]), + event.recipes.createDeploying(`railways:track_incomplete_${x.rail}_narrow`, [`railways:track_incomplete_${x.rail}_narrow`, `#tfc:mortar`]), + event.recipes.greate.pressing(`railways:track_incomplete_${x.rail}_narrow`, `railways:track_incomplete_${x.rail}_narrow`), + ]).transitionalItem(`railways:track_incomplete_${x.rail}_narrow`).loops(2).id(`tfg:railways/sequenced_assembly/track_${x.rail}_narrow_alt`) + + event.recipes.gtceu.assembler(`tfg:railways/track_${x.rail}_narrow_alt`) + .itemInputs(x.slab, `2x gtceu:steel_rod`) + .inputFluids(Fluid.of(`gtceu:concrete`, 144)) + .itemOutputs(`16x railways:track_${x.rail}_narrow`) + .duration(800) + .EUt(16) + .circuit(1) + + event.recipes.createSequencedAssembly([ + `16x railways:track_${x.rail}`, + ], x.slab, [ + event.recipes.createDeploying(`railways:track_incomplete_${x.rail}`, [`railways:track_incomplete_${x.rail}`, x.slab]), + event.recipes.createDeploying(`railways:track_incomplete_${x.rail}`, [`railways:track_incomplete_${x.rail}`, `gtceu:steel_rod`]), + event.recipes.createDeploying(`railways:track_incomplete_${x.rail}`, [`railways:track_incomplete_${x.rail}`, `#tfc:mortar`]), + event.recipes.greate.pressing(`railways:track_incomplete_${x.rail}`, `railways:track_incomplete_${x.rail}`), + ]).transitionalItem(`railways:track_incomplete_${x.rail}`).loops(2).id(`tfg:railways/sequenced_assembly/track_${x.rail}_alt`) + + event.recipes.gtceu.assembler(`tfg:railways/track_${x.rail}_normal_alt`) + .itemInputs(`3x ${x.slab}`, `2x gtceu:steel_rod`) + .inputFluids(Fluid.of(`gtceu:concrete`, 144)) + .itemOutputs(`16x railways:track_${x.rail}`) + .duration(800) + .EUt(16) + .circuit(2) + + event.recipes.createSequencedAssembly([ + `16x railways:track_${x.rail}_wide`, + ], x.slab, [ + event.recipes.createDeploying(`railways:track_incomplete_${x.rail}_wide`, [`railways:track_incomplete_${x.rail}_wide`, x.block]), + event.recipes.createDeploying(`railways:track_incomplete_${x.rail}_wide`, [`railways:track_incomplete_${x.rail}_wide`, `gtceu:steel_rod`]), + event.recipes.createDeploying(`railways:track_incomplete_${x.rail}_wide`, [`railways:track_incomplete_${x.rail}_wide`, `#tfc:mortar`]), + event.recipes.greate.pressing(`railways:track_incomplete_${x.rail}_wide`, `railways:track_incomplete_${x.rail}_wide`), + ]).transitionalItem(`railways:track_incomplete_${x.rail}_wide`).loops(2).id(`tfg:railways/sequenced_assembly/track_${x.rail}_wide_alt`) + + event.recipes.gtceu.assembler(`tfg:railways/track_${x.rail}_wide_alt`) + .itemInputs(`5x ${x.slab}`, `2x gtceu:steel_rod`) + .inputFluids(Fluid.of(`gtceu:concrete`, 144)) + .itemOutputs(`16x railways:track_${x.rail}_wide`) + .duration(800) + .EUt(16) + .circuit(3) + }) + + event.recipes.gtceu.assembler('tfg:railways/phantom_tracks') + .itemInputs('32x create:track', 'ae2:ender_dust') + .itemOutputs('32x railways:track_phantom') + .duration(100) + .EUt(16) + + event.shapeless('8x railways:track_phantom', ['#forge:small_dusts/ender_pearl', '8x create:track']) + .id('tfg:shapeless/phantom_tracks') + event.shaped('1x railways:handcar', [ 'EFE', 'BAA', diff --git a/kubejs/startup_scripts/railways/constants.js b/kubejs/startup_scripts/railways/constants.js index 3f8ac8081..a9b82a08d 100644 --- a/kubejs/startup_scripts/railways/constants.js +++ b/kubejs/startup_scripts/railways/constants.js @@ -4,102 +4,33 @@ global.RAIL_WAYS_DISABLED_ITEMS = [ // Tracks - 'railways:track_ender_narrow', - 'railways:track_birch_narrow', - 'railways:track_blackstone_narrow', 'railways:track_dark_oak_narrow', - 'railways:track_jungle_narrow', - 'railways:track_mangrove_narrow', - 'railways:track_crimson_narrow', - 'railways:track_acacia', - 'railways:track_birch', - 'railways:track_crimson', - 'railways:track_dark_oak', - 'railways:track_jungle', - 'railways:track_oak', - 'railways:track_spruce', - 'railways:track_warped', - 'railways:track_blackstone', - 'railways:track_ender', - 'railways:track_phantom', - 'railways:track_mangrove', - 'railways:track_cherry', - 'railways:track_bamboo', - 'railways:track_stripped_bamboo', - 'railways:track_oak_wide', - 'railways:track_warped_wide', - 'railways:track_spruce_wide', - 'railways:track_acacia_wide', - 'railways:track_ender_wide', - 'railways:track_birch_wide', - 'railways:track_blackstone_wide', - 'railways:track_dark_oak_wide', - 'railways:track_jungle_wide', - 'railways:track_mangrove_wide', - 'railways:track_crimson_wide', - 'railways:track_cherry_wide', - 'railways:track_bamboo_wide', - 'railways:track_stripped_bamboo_wide', 'railways:track_oak_narrow', - 'railways:track_spruce_narrow', - 'railways:track_warped_narrow', - 'railways:track_acacia_narrow', - 'railways:track_cherry_narrow', - 'railways:track_bamboo_narrow', - 'railways:track_stripped_bamboo_narrow', - // Возможно включим позже - 'railways:track_tieless', - 'railways:track_tieless_narrow', - 'railways:track_tieless_wide', + 'railways:track_ender_narrow', + 'railways:track_mangrove_narrow', + 'railways:track_dark_oak', + 'railways:track_oak', + 'railways:track_ender', + 'railways:track_mangrove', + 'railways:track_dark_oak_wide', + 'railways:track_oak_wide', + 'railways:track_ender_wide', + 'railways:track_mangrove_wide', // Incompleted Tracks 'railways:track_incomplete_ender_narrow', - 'railways:track_incomplete_birch_narrow', - 'railways:track_incomplete_blackstone_narrow', 'railways:track_incomplete_dark_oak_narrow', - 'railways:track_incomplete_jungle_narrow', 'railways:track_incomplete_mangrove_narrow', - 'railways:track_incomplete_crimson_narrow', - 'railways:track_incomplete_acacia', - 'railways:track_incomplete_birch', - 'railways:track_incomplete_crimson', 'railways:track_incomplete_dark_oak', - 'railways:track_incomplete_jungle', 'railways:track_incomplete_oak', - 'railways:track_incomplete_spruce', - 'railways:track_incomplete_warped', - 'railways:track_incomplete_blackstone', 'railways:track_incomplete_ender', - 'railways:track_incomplete_phantom', 'railways:track_incomplete_mangrove', - 'railways:track_incomplete_cherry', - 'railways:track_incomplete_bamboo', - 'railways:track_incomplete_stripped_bamboo', 'railways:track_incomplete_oak_wide', - 'railways:track_incomplete_warped_wide', - 'railways:track_incomplete_spruce_wide', - 'railways:track_incomplete_acacia_wide', 'railways:track_incomplete_ender_wide', - 'railways:track_incomplete_birch_wide', - 'railways:track_incomplete_blackstone_wide', 'railways:track_incomplete_dark_oak_wide', - 'railways:track_incomplete_jungle_wide', 'railways:track_incomplete_mangrove_wide', - 'railways:track_incomplete_crimson_wide', - 'railways:track_incomplete_cherry_wide', - 'railways:track_incomplete_bamboo_wide', - 'railways:track_incomplete_stripped_bamboo_wide', 'railways:track_incomplete_oak_narrow', - 'railways:track_incomplete_spruce_narrow', - 'railways:track_incomplete_warped_narrow', - 'railways:track_incomplete_acacia_narrow', - 'railways:track_incomplete_cherry_narrow', - 'railways:track_incomplete_bamboo_narrow', - 'railways:track_incomplete_stripped_bamboo_narrow', - // Возможно включим позже - 'railways:track_incomplete_tieless', - 'railways:track_incomplete_tieless_narrow', - 'railways:track_incomplete_tieless_wide', + 'railways:track_incomplete_phantom', // Incomplete Caps 'railways:white_incomplete_conductor_cap',