diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 5d91a39ca..44c6d45a7 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1037,7 +1037,7 @@ const registerCreateRecipes = (event) => { .EUt(20) // Деталь рельса - event.shaped('create:metal_girder', [ + event.shaped('3x create:metal_girder', [ 'AAA', 'BBB' ], { diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 62709ddc9..6aa225daa 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -241,9 +241,8 @@ const registerRailWaysRecipes = (event) => { // Монорельс event.recipes.createSequencedAssembly([ - '6x railways:track_monorail', + '4x railways:track_monorail', ], 'create:metal_girder', [ - event.recipes.createDeploying('railways:track_incomplete_monorail', ['railways:track_incomplete_monorail', 'create:metal_bracket']), event.recipes.createDeploying('railways:track_incomplete_monorail', ['railways:track_incomplete_monorail', '#forge:plates/wrought_iron']), event.recipes.createPressing('railways:track_incomplete_monorail', ['railways:track_incomplete_monorail']), event.recipes.createDeploying('railways:track_incomplete_monorail', ['railways:track_incomplete_monorail', '#forge:plates/wrought_iron']), @@ -252,122 +251,113 @@ const registerRailWaysRecipes = (event) => { event.recipes.gtceu.assembler('railways/monorail') .itemInputs('create:metal_girder', '2x #forge:plates/wrought_iron') - .itemOutputs('6x railways:track_monorail') + .itemOutputs('4x railways:track_monorail') .duration(250) .EUt(32) // Железнодорожное полотно (Узкое) event.recipes.createSequencedAssembly([ - 'railways:track_create_andesite_narrow', + '8x railways:track_create_andesite_narrow', ], '#tfg:rock_slabs', [ - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_nugget']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_nugget']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_nugget']), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_nugget']), + event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', 'gtceu:steel_rod']), + event.recipes.createDeploying('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow', '#tfc:mortar']), event.recipes.createPressing('railways:track_incomplete_create_andesite_narrow', ['railways:track_incomplete_create_andesite_narrow']), - ]).transitionalItem('railways:track_incomplete_create_andesite_narrow').loops(1).id('tfg:railways/sequenced_assembly/track_create_andesite_narrow_from_steel') + ]).transitionalItem('railways:track_incomplete_create_andesite_narrow').loops(2).id('tfg:railways/sequenced_assembly/track_create_andesite_narrow_from_steel') - event.recipes.gtceu.assembler('railways/track_create_andesite_narrow_from_steel') - .itemInputs('#tfg:rock_slabs', '4x gtceu:steel_nugget') - .itemOutputs('railways:track_create_andesite_narrow') + event.recipes.gtceu.assembler('railways/track_create_andesite_narrow_from_steel') + .itemInputs('#tfg:rock_slabs', '2x gtceu:steel_rod') + .inputFluids(Fluid.of('gtceu:concrete', 144)) + .itemOutputs('8x railways:track_create_andesite_narrow') .duration(800) - .EUt(32) + .EUt(16) + .circuit(1) // Железнодорожное полотно (Нормальное) event.recipes.createSequencedAssembly([ - 'create:track', - ], 'railways:track_create_andesite_narrow', [ - event.recipes.createCutting('create:incomplete_track', 'create:incomplete_track').processingTime(100), + '8x 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.createPressing('create:incomplete_track', ['create:incomplete_track']), - ]).transitionalItem('create:incomplete_track').loops(1).id('tfg:railways/sequenced_assembly/track_create_andesite') + ]).transitionalItem('create:incomplete_track').loops(2).id('tfg:railways/sequenced_assembly/track_create_andesite') - event.recipes.gtceu.assembler('railways/track') - .itemInputs('railways:track_create_andesite_narrow') + event.recipes.gtceu.assembler('railways/track') + .itemInputs('3x #tfg:rock_slabs', '2x gtceu:steel_rod') .inputFluids(Fluid.of('gtceu:concrete', 144)) - .itemOutputs('create:track') + .itemOutputs('8x create:track') .duration(800) .EUt(16) + .circuit(2) // Железнодорожное полотно (Широкое) event.recipes.createSequencedAssembly([ - 'railways:track_create_andesite_wide', - ], 'create:track', [ - event.recipes.createCutting('railways:track_incomplete_create_andesite_wide', 'railways:track_incomplete_create_andesite_wide').processingTime(100), - event.recipes.createDeploying('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide', '#tfg:rock_slabs']), + '8x railways:track_create_andesite_wide', + ], '#tfg:rock_slabs', [ + event.recipes.createDeploying('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide', '#forge:stone']), + event.recipes.createDeploying('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide', 'gtceu:steel_rod']), event.recipes.createDeploying('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide', '#tfc:mortar']), event.recipes.createPressing('railways:track_incomplete_create_andesite_wide', ['railways:track_incomplete_create_andesite_wide']), - ]).transitionalItem('railways:track_incomplete_create_andesite_wide').loops(1).id('tfg:railways/sequenced_assembly/track_create_andesite_wide') + ]).transitionalItem('railways:track_incomplete_create_andesite_wide').loops(2).id('tfg:railways/sequenced_assembly/track_create_andesite_wide') - event.recipes.gtceu.assembler('railways/track_create_andesite_wide') - .itemInputs('create:track') + event.recipes.gtceu.assembler('railways/track_create_andesite_wide') + .itemInputs('5x #tfg:rock_slabs', '2x gtceu:steel_rod') .inputFluids(Fluid.of('gtceu:concrete', 144)) - .itemOutputs('railways:track_create_andesite_wide') + .itemOutputs('8x railways:track_create_andesite_wide') .duration(800) .EUt(16) + .circuit(3) // Железнодородные полотна из дерева global.TFC_WOOD_TYPES.forEach(woodType => { // Узкое event.recipes.createSequencedAssembly([ - `railways:track_tfc_${woodType}_narrow`, + `8x railways:track_tfc_${woodType}_narrow`, ], `tfc:wood/planks/${woodType}_slab`, [ - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_nugget']), - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_nugget']), - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_nugget']), - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_nugget']), - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, '4x #forge:screws']), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, 'gtceu:steel_rod']), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`, '#forge:screws']), event.recipes.createPressing(`railways:track_incomplete_tfc_${woodType}_narrow`, [`railways:track_incomplete_tfc_${woodType}_narrow`]), - ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}_narrow`).loops(1).id(`tfg:railways/sequenced_assembly/track_create_${woodType}_narrow`) + ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}_narrow`).loops(2).id(`tfg:railways/sequenced_assembly/track_create_${woodType}_narrow`) - event.recipes.gtceu.assembler(`railways/track_create_${woodType}_narrow`) - .itemInputs(`tfc:wood/planks/${woodType}_slab`, '4x gtceu:steel_nugget', '4x #forge:screws') - .itemOutputs(`railways:track_tfc_${woodType}_narrow`) + event.recipes.gtceu.assembler(`railways/track_create_${woodType}_narrow`) + .itemInputs(`tfc:wood/planks/${woodType}_slab`, '2x gtceu:steel_rod', '2x #forge:screws') + .itemOutputs(`8x railways:track_tfc_${woodType}_narrow`) .duration(800) - .EUt(32) + .EUt(16) + .circuit(1) // Нормальное event.recipes.createSequencedAssembly([ - `railways:track_tfc_${woodType}`, - ], `railways:track_tfc_${woodType}_narrow`, [ - event.recipes.createCutting(`railways:track_incomplete_tfc_${woodType}`, `railways:track_incomplete_tfc_${woodType}`).processingTime(100), - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, `tfc:wood/planks/${woodType}_slab`]), - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, '4x #forge:screws']), - event.recipes.createPressing(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`]), - ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}`).loops(1).id(`tfg:railways/sequenced_assembly/track_create_${woodType}`) + `8x railways:track_tfc_${woodType}`, + ], `tfc:wood/planks/${woodType}_slab`, [ + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, `tfc:wood/lumber/${woodType}`]), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, 'gtceu:steel_rod']), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`, '#forge:screws']), + event.recipes.createPressing(`railways:track_incomplete_tfc_${woodType}`, [`railways:track_incomplete_tfc_${woodType}`]), + ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}`).loops(2).id(`tfg:railways/sequenced_assembly/track_create_${woodType}`) - event.recipes.gtceu.assembler(`railways/track_${woodType}`) - .itemInputs(`railways:track_tfc_${woodType}_narrow`, '4x #forge:screws') - .itemOutputs(`railways:track_tfc_${woodType}`) + event.recipes.gtceu.assembler(`railways/track_${woodType}`) + .itemInputs(`tfc:wood/planks/${woodType}_slab`, `2x tfc:wood/lumber/${woodType}`, '2x gtceu:steel_rod', '2x #forge:screws') + .itemOutputs(`8x railways:track_tfc_${woodType}`) .duration(800) .EUt(16) + .circuit(2) // Широкое event.recipes.createSequencedAssembly([ - `railways:track_tfc_${woodType}_wide`, - ], `railways:track_tfc_${woodType}`, [ - event.recipes.createCutting(`railways:track_incomplete_tfc_${woodType}_wide`, `railways:track_incomplete_tfc_${woodType}_wide`).processingTime(100), + `8x railways:track_tfc_${woodType}_wide`, + ], `tfc:wood/planks/${woodType}_slab`, [ event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, `tfc:wood/planks/${woodType}_slab`]), - event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, '4x #forge:screws']), - event.recipes.createPressing(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`]), - ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}_wide`).loops(1).id(`tfg:railways/sequenced_assembly/track_create_${woodType}_wide`) + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, `gtceu:steel_rod`]), + event.recipes.createDeploying(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`, '#forge:screws']), + event.recipes.createPressing(`railways:track_incomplete_tfc_${woodType}_wide`, [`railways:track_incomplete_tfc_${woodType}_wide`]) + ]).transitionalItem(`railways:track_incomplete_tfc_${woodType}_wide`).loops(2).id(`tfg:railways/sequenced_assembly/track_create_${woodType}_wide`) - event.recipes.gtceu.assembler(`railways/track_${woodType}_wide`) - .itemInputs(`railways:track_tfc_${woodType}`, '4x #forge:screws') - .itemOutputs(`railways:track_tfc_${woodType}_wide`) + event.recipes.gtceu.assembler(`railways/track_${woodType}_wide`) + .itemInputs(`3x tfc:wood/planks/${woodType}_slab`, '2x gtceu:steel_rod', '2x #forge:screws') + .itemOutputs(`8x railways:track_tfc_${woodType}_wide`) .duration(800) .EUt(16) + .circuit(3) }); } - - -/* - -event.recipes.gtceu.assembler('') - .itemInputs('') - .itemOutputs('') - .duration() - .EUt() - -*/ \ No newline at end of file diff --git a/kubejs/startup_scripts/railways/constants.js b/kubejs/startup_scripts/railways/constants.js index 845e8b116..3b232b34a 100644 --- a/kubejs/startup_scripts/railways/constants.js +++ b/kubejs/startup_scripts/railways/constants.js @@ -22,6 +22,9 @@ global.RAIL_WAYS_DISABLED_ITEMS = [ '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', @@ -33,10 +36,16 @@ global.RAIL_WAYS_DISABLED_ITEMS = [ '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', @@ -62,6 +71,9 @@ global.RAIL_WAYS_DISABLED_ITEMS = [ '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', @@ -73,10 +85,16 @@ global.RAIL_WAYS_DISABLED_ITEMS = [ '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', @@ -122,4 +140,4 @@ global.RAIL_WAYS_DISABLED_ITEMS = [ 'railways:conductor_vent', 'railways:jukeboxcart', 'railways:benchcart' -]; \ No newline at end of file +];