diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index a1a614b24..dd593b608 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -3,7 +3,6 @@ const registerAdAstraRecipes = (event) => { event.remove({ mod: 'ad_astra' }) - event.remove({ mod: 'ad_astra_giselle_addon' }) //#region Rocket parts @@ -106,41 +105,34 @@ const registerAdAstraRecipes = (event) => { C: 'tfg:polycaprolactam_fabric', D: '#forge:small_fluid_pipes/polyethylene' }).id('tfg:space_helmet') - - event.shaped('ad_astra:netherite_space_helmet', [ - 'AAA', - 'ADA', - 'BCB' - ], { - A: 'gtceu:laminated_glass', - B: '#forge:plates/titanium_tungsten_carbide', - C: '#forge:plates/polyphenylene_sulfide', - D: '#forge:small_fluid_pipes/polytetrafluoroethylene' - }).id('tfg:netherite_space_helmet') - + + event.recipes.gtceu.assembler('ad_astra:netherite_space_helmet') + .itemInputs( + 'ad_astra:space_helmet', + '3x #forge:plates/titanium_tungsten_carbide', + '3x #forge:plates/polyphenylene_sulfide', + '5x gtceu:laminated_glass' + ) + .itemOutputs('ad_astra:netherite_space_helmet') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) event.shaped('ad_astra:space_suit', [ 'B B', 'ADA', 'BCB' ], { - A: 'ad_astra_giselle_addon:oxygen_can', + A: 'ad_astra:large_gas_tank', B: 'gtceu:carbon_fiber_plate', C: 'tfg:polycaprolactam_fabric', D: 'ad_astra:oxygen_gear' }).id('tfg:space_suit') - event.shaped('ad_astra:netherite_space_suit', [ - 'B B', - 'ADA', - 'BCB' - ], { - A: 'ad_astra_giselle_addon:netherite_oxygen_can', - B: '#forge:plates/titanium_tungsten_carbide', - C: '#forge:plates/polyphenylene_sulfide', - D: 'ad_astra:oxygen_gear' - }).id('tfg:netherite_space_suit') - + event.recipes.gtceu.assembler('ad_astra:netherite_space_suit') + .itemInputs('ad_astra:space_suit', '4x #forge:plates/titanium_tungsten_carbide', '4x #forge:plates/polyphenylene_sulfide') + .itemOutputs('ad_astra:netherite_space_suit') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) event.shaped('ad_astra:space_pants', [ 'BAB', @@ -151,17 +143,12 @@ const registerAdAstraRecipes = (event) => { B: 'gtceu:carbon_fiber_plate', C: 'tfg:polycaprolactam_fabric' }).id('tfg:space_pants') - - event.shaped('ad_astra:netherite_space_pants', [ - 'BAB', - 'C C', - 'B B' - ], { - A: 'gtceu:ev_electric_motor', - B: '#forge:plates/titanium_tungsten_carbide', - C: '#forge:plates/polyphenylene_sulfide' - }).id('tfg:netherite_space_pants') - + + event.recipes.gtceu.assembler('ad_astra:netherite_space_pants') + .itemInputs('ad_astra:space_pants', '4x #forge:plates/titanium_tungsten_carbide', '4x #forge:plates/polyphenylene_sulfide') + .itemOutputs('ad_astra:netherite_space_pants') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) event.shaped('ad_astra:space_boots', [ ' ', @@ -172,14 +159,11 @@ const registerAdAstraRecipes = (event) => { C: 'tfg:polycaprolactam_fabric' }).id('tfg:space_boots') - event.shaped('ad_astra:netherite_space_boots', [ - ' ', - 'C C', - 'B B' - ], { - B: '#forge:plates/titanium_tungsten_carbide', - C: '#forge:plates/polyphenylene_sulfide' - }).id('tfg:netherite_space_boots') + event.recipes.gtceu.assembler('ad_astra:netherite_space_boots') + .itemInputs('ad_astra:space_boots', '2x #forge:plates/titanium_tungsten_carbide', '2x #forge:plates/polyphenylene_sulfide') + .itemOutputs('ad_astra:netherite_space_boots') + .duration(400) + .EUt(GTValues.VA[GTValues.IV]) event.shaped('ad_astra:oxygen_gear', [ diff --git a/pakku-lock.json b/pakku-lock.json index 37eb3f710..c98e0407c 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -259,53 +259,6 @@ } ] }, - { - "pakku_id": "Do6AZHXmaMkf26V5", - "pakku_links": [ - "QXBpbwRXpmbaHixl", - "18IuoLEIRdaY1Jqy", - "R14GIz0WdkeNLuXD", - "rjOX4EXWlGvG84kO" - ], - "type": "MOD", - "slug": { - "curseforge": "ad-astra-giselle-addon" - }, - "name": { - "curseforge": "Ad Astra: Giselle Addon" - }, - "id": { - "curseforge": "714958" - }, - "files": [ - { - "type": "curseforge", - "file_name": "Ad-Astra-Giselle-Addon-forge-1.20.1-6.18.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6119/244/Ad-Astra-Giselle-Addon-forge-1.20.1-6.18.jar", - "id": "6119244", - "parent_id": "714958", - "hashes": { - "sha1": "877b88e224cbcbee498ec9d58f3554dd89e36469", - "md5": "68d8d06a5277e289a242b4acdcf06313" - }, - "required_dependencies": [ - "714059", - "570073", - "704113", - "635042" - ], - "size": 458371, - "date_published": "2025-01-24T09:42:36.753Z" - } - ] - }, { "pakku_id": "txamn8WWF6EJ8Jcg", "type": "MOD",