diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 0a08ffe51..706b7f107 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -458,7 +458,30 @@ const registerAdAstraRecipes = (event) => { //#region Misc blocks + event.shaped('ad_astra:vent', [ + ' B ', + 'BAB', + ' B ' + ], { + A: 'gtceu:steel_frame', + B: '#tfg:metal_bars' + }).id('tfg:shaped/ad_astra_vent') + event.shaped('ad_astra:airlock', [ + 'AB', + 'CD', + ], { + A: '#forge:tools/wrenches', + B: 'gtceu:activity_detector_cover', + C: 'gtceu:fluid_detector_cover', + D: 'gtceu:filter_casing' + }).id('tfg:shaped/airlock') + + event.recipes.gtceu.assembler('ad_astra:airlock') + .itemInputs('gtceu:filter_casing', 'gtceu:fluid_detector_cover', 'gtceu:activity_detector_cover') + .itemOutputs('ad_astra:airlock') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) //#endregion @@ -523,15 +546,71 @@ const registerAdAstraRecipes = (event) => { event.stonecutting(`ad_astra:${x.type}_plateblock`, `#tfg:ad_astra_${x.type}_blocks`) event.stonecutting(`ad_astra:encased_${x.type}_block`, `#tfg:ad_astra_${x.type}_blocks`) - // TODO: button, pressure plate, slab, stairs, doors - //https://github.com/terrarium-earth/Ad-Astra/blob/1.20.x/common/src/main/generated/resources/data/ad_astra/recipes/ - //https://github.com/terrarium-earth/Ad-Astra/blob/1.20.x/common/src/main/java/earth/terrarium/adastra/common/registry/ModBlocks.java + event.stonecutting(`ad_astra:${x.type}_plating_stairs`, `tfg:ad_astra_${x.type}_plating`) + event.stonecutting(`2x ad_astra:${x.type}_plating_slab`, `tfg:ad_astra_${x.type}_plating`) + + // Pressure plates + event.shaped(`ad_astra:${x.type}_plating_pressure_plate`, [ + ' B ', + 'CDC', + ' E ' + ], { + B: '#tfc:hammers', + C: `ad_astra:${x.type}_plating_slab`, + D: '#forge:small_springs', + E: '#forge:tools/screwdrivers' + }).id(`tfg:shaped/ad_astra_${x.type}_pressure_plate`) + + event.recipes.gtceu.assembler(`tfg:ad_astra_${x.type}_pressure_plate`) + .itemInputs('#forge:small_springs', `2x ad_astra:${x.type}_plating_slab`) + .itemOutputs(`2x ad_astra:${x.type}_plating_pressure_plate`) + .duration(50) + .EUt(2) + + // Buttons + generateCutterRecipe(event, `ad_astra:${x.type}_plating_pressure_plate`, `6x ad_astra:${x.type}_plating_button`, 50, 7, `ad_astra_${x.type}_button`) + + // Doors + event.recipes.gtceu.assembler(`tfg:ad_astra_${x.type}_sliding_door`) + .itemInputs(`9x #tfg:ad_astra_${x.type}_blocks`) + .inputFluids(Fluid.of('gtceu:polyethylene', 36)) + .itemOutputs(`ad_astra:${x.type}_sliding_door`) + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(1) }) event.shapeless('ad_astra:marked_iron_pillar', ['ad_astra:iron_pillar', '#forge:dyes/yellow', '#forge:dyes/black']) .id('tfg:shapeless/marked_iron_pillar') - // etrium only has factory block, encased block, plateblock, panel, and (storage) block + event.recipes.gtceu.assembler(`tfg:ad_astra_reinforced_door`) + .itemInputs(`9x #tfg:ad_astra_${x.type}_blocks`, 'gtceu:dense_obsidian_plate') + .inputFluids(Fluid.of('gtceu:polyethylene', 36)) + .itemOutputs(`tfg:ad_astra_reinforced_door`) + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + .circuit(2) + + event.recipes.gtceu.assembler(`tfg:ad_astra_steel_door`) + .itemInputs('createdeco:industrial_iron_door') + .inputFluids(Fluid.of('gtceu:polyethylene', 36)) + .itemOutputs('ad_astra:steel_door') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + // Etrium only has factory block, encased block, plateblock, panel, and (storage) block + + event.recipes.gtceu.assembler('tfg:ad_astra_etrium_panel') + .itemInputs('#forge:storage_blocks/etrium') + .inputFluids(Fluid.of('gtceu:polyethylene', 36)) + .itemOutputs('16x ad_astra:etrium_panel') + .duration(100) + .EUt(GTValues.VA[GTValues.LV]) + + event.stonecutting('ad_astra:etrium_panel', '#tfg:ad_astra_etrium_blocks') + event.stonecutting('ad_astra:etrium_factory_block', '#tfg:ad_astra_etrium_blocks') + event.stonecutting('ad_astra:encased_etrium_block', '#tfg:ad_astra_etrium_blocks') + event.stonecutting('ad_astra:etrium_plateblock', '#tfg:ad_astra_etrium_blocks') //#endregion } diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 1a7e54442..debb64b4d 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -39,11 +39,25 @@ const registerAdAstraItemTags = (event) => { event.add('forge:cobblestone', 'ad_astra:mercury_cobblestone') event.add('forge:cobblestone', 'ad_astra:glacio_cobblestone') - // Insulation Tier 1 - event.add('forge:insulation_t1', 'gtceu:borosilicate_glass_dust') event.add('forge:insulation_t1', 'gtceu:vitrified_asbestos_dust') + + // Deco blocks + const DECO_BLOCKS = [ 'iron', 'steel', 'desh', 'calorite', 'ostrum' ]; + DECO_BLOCKS.forEach(block => { + event.add(`tfg:ad_astra_${block}_blocks`, `ad_astra:${block}_factory_block`) + event.add(`tfg:ad_astra_${block}_blocks`, `ad_astra:${block}_plating`) + event.add(`tfg:ad_astra_${block}_blocks`, `ad_astra:${block}_panel`) + event.add(`tfg:ad_astra_${block}_blocks`, `ad_astra:${block}_pillar`) + event.add(`tfg:ad_astra_${block}_blocks`, `ad_astra:${block}_plateblock`) + event.add(`tfg:ad_astra_${block}_blocks`, `ad_astra:encased_${block}_block`) + }) + + event.add('tfg:ad_astra_etrium_blocks', 'ad_astra:etrium_factory_block') + event.add('tfg:ad_astra_etrium_blocks', 'ad_astra:encased_etrium_block') + event.add('tfg:ad_astra_etrium_blocks', 'ad_astra:etrium_plateblock') + event.add('tfg:ad_astra_etrium_blocks', 'ad_astra:etrium_panel') } const registerAdAstraBlockTags = (event) => { diff --git a/kubejs/startup_scripts/ad_astra/constants.js b/kubejs/startup_scripts/ad_astra/constants.js index b89fb0699..577d259fd 100644 --- a/kubejs/startup_scripts/ad_astra/constants.js +++ b/kubejs/startup_scripts/ad_astra/constants.js @@ -20,12 +20,6 @@ global.AD_ASTRA_DISABLED_ITEMS = 'ad_astra:wrench', 'ad_astra:cheese', 'ad_astra:cheese_block', - 'ad_astra:iron_plate', - 'ad_astra:iron_rod', - 'ad_astra:steel_ingot', - 'ad_astra:steel_nugget', - 'ad_astra:steel_plate', - 'ad_astra:steel_rod', 'ad_astra:photovoltaic_etrium_cell', 'ad_astra:photovoltaic_vesnium_cell', 'ad_astra:engine_frame', @@ -42,20 +36,47 @@ global.AD_ASTRA_DISABLED_ITEMS = 'ad_astra:cryo_fuel_bucket', 'ad_astra_giselle_addon:gravity_normalizer', 'ad_astra:cable_duct', - 'ad_astra:glacio_globe', + 'ad_astra:fluid_pipe_duct', + 'ad_astra:iron_plate', + 'ad_astra:iron_rod', + 'ad_astra:steel_ingot', + 'ad_astra:steel_nugget', + 'ad_astra:steel_plate', + 'ad_astra:steel_rod', + + // Don't integrate these, several systems rely on all ore blocks being gregtech's generated ones + 'ad_astra:moon_ice_shard_ore', + 'ad_astra:deepslate_ice_shard_ore', + 'ad_astra:mars_ice_shard_ore', + 'ad_astra:moon_iron_ore', + 'ad_astra:mars_iron_ore', + 'ad_astra:mercury_iron_ore', + 'ad_astra:moon_desh_ore', + 'ad_astra:deepslate_desh_ore', + 'ad_astra:mars_diamond_ore', + 'ad_astra:mars_ostrum_ore', + 'ad_astra:deepslate_ostrum_ore', + 'ad_astra:venus_calorite_ore', + 'ad_astra:deepslate_calorite_ore', + 'ad_astra:venus_coal_ore', + 'ad_astra:venus_gold_ore', + 'ad_astra:venus_diamond_ore', + 'ad_astra:glacio_ice_shard_ore', + 'ad_astra:glacio_coal_ore', + 'ad_astra:glacio_copper_ore', + 'ad_astra:glacio_iron_ore', + 'ad_astra:glacio_lapis_ore', // TODO: integrate with tag prefixes? 'ad_astra:steel_block', 'ad_astra:raw_desh_block', 'ad_astra:raw_ostrum_block', 'ad_astra:raw_calorite_block', - 'ad_astra:moon_desh_ore', - 'ad_astra:deepslate_desh_ore', - 'ad_astra:mars_ostrum_ore', - 'ad_astra:deepslate_ostrum_ore', - 'ad_astra:venus_calorite_ore', - 'ad_astra:deepslate_calorite_ore', - + + // Disabled until EV planet + + 'ad_astra:tier_2_rocket', + 'ad_astra:desh_engine', // Disabled until IV planets @@ -69,7 +90,8 @@ global.AD_ASTRA_DISABLED_ITEMS = // Disabled until LuV planet - + + 'ad_astra:glacio_globe', // maybe 'ad_astra:tier_4_rocket', 'ad_astra:jet_suit_helmet', 'ad_astra:jet_suit',