illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Pyritie 2025-07-23 20:31:43 +01:00
commit 1e7a234b88
26 changed files with 2873 additions and 2673 deletions
Download patch file Download diff file Expand all files Collapse all files

62
kubejs/server_scripts/ad_astra/recipes.js
View file

@ -96,6 +96,68 @@ const registerAdAstraRecipes = (event) => {
//#endregion
//region tier 2 rocket DISABLED UNTIL EV
event.remove({ mod: 'gtceu', input: 'gtceu:hot_rocket_alloy_t2_ingot' })
/*
event.recipes.gtceu.mixer('tfg:rocket_alloy_t2')
.itemInputs('19x #forge:dusts/titanium', '3x #forge:small_dusts/chromium', '3x #forge:small_dusts/tin', '3x #forge:small_dusts/aluminium')
.inputFluids(Fluid.of('gtceu:vanadium', 540))
.itemOutputs('25x #forge:dusts/rocket_alloy_t2')
.duration(580)
.circuit(5)
.EUt(GTValues.VA[GTValues.EV])
event.recipes.gtceu.vacuum_freezer('tfg:vacuum_freezer/cool_rocket_alloy_t2_alloy')
.itemInputs('#forge:hot_ingots/rocket_alloy_t2')
.inputFluids(Fluid.of('gtceu:distilled_water', 500), Fluid.of('tfg:cryogenized_fluix', 288))
.itemOutputs('#forge:ingots/rocket_alloy_t2')
.duration(120)
.EUt(GTValues.VA[GTValues.HV])
event.recipes.gtceu.assembler('tfg:rocket_fin_t2')
.itemInputs('#forge:plates/rocket_alloy_t2', '#forge:double_plates/titanium')
.itemOutputs('tfg:rocket_fin_t2')
.duration(180)
.circuit(3)
.EUt(GTValues.VA[GTValues.EV])
event.recipes.gtceu.assembler('tfg:rocket_cone_t2')
.itemInputs('gtceu:ev_emitter', '#forge:dense_plates/rocket_alloy_t2', '#forge:double_plates/titanium', '#forge:double_plates/desh')
.itemOutputs('tfg:rocket_cone_t2')
.duration(1440)
.circuit(3)
.EUt(GTValues.VA[GTValues.EV])
event.recipes.gtceu.assembler('tfg:rocket_desh_engine')
.itemInputs(
'4x #forge:double_plates/titanium',
'4x #gtceu:circuits/ev',
'gtceu:ev_electric_pump',
'3x gtceu:advanced_power_thruster',
'4x #forge:rods/magnetic_neodymium',
'#forge:rotors/titanium')
.inputFluids(Fluid.of('gtceu:desh', 144 * 12))
.itemOutputs('ad_astra:desh_engine')
.duration(800)
.circuit(3)
.EUt(GTValues.VA[GTValues.EV])
event.recipes.gtceu.assembler('ad_astra:tier_2_rocket')
.itemInputs(
'12x #forge:dense_plates/rocket_alloy_t2',
'4x tfg:rocket_fin_t2',
'1x ad_astra:desh_engine',
'1x tfg:rocket_cone_t2',
'12x #forge:insulation_t2/roll'
)
.inputFluids(Fluid.of('tfg:cryogenized_fluix', 144 * 2 * 16))
.itemOutputs('ad_astra:tier_2_rocket')
.duration(1440)
.circuit(3)
.EUt(GTValues.VA[GTValues.EV])
*/
//#endregion

11
kubejs/server_scripts/ad_astra/tags.js
View file

@ -56,9 +56,13 @@ const registerAdAstraItemTags = (event) => {
event.add('forge:insulation_t1', 'gtceu:vitrified_asbestos_dust')
//Insulation Tier 2
event.add('forge:insulation_t2', 'tfg:aes_insulation_sheet')
event.add('forge:insulation_t2', 'tfg:aes_insulation_roll')
event.add('forge:insulation_t2/sheet', 'tfg:aes_insulation_sheet')
event.add('forge:insulation_t2/roll', 'tfg:aes_insulation_roll')
//Rocket Engines
event.add('ad_astra:rocket_engine', 'ad_astra:steel_engine')
event.add('ad_astra:rocket_engine', 'ad_astra:desh_engine')
// Deco blocks
const DECO_BLOCKS = [ 'iron', 'steel', 'desh', 'calorite', 'ostrum' ];
DECO_BLOCKS.forEach(block => {
@ -276,6 +280,9 @@ const registerAdAstraBiomeTags = (event) => {
event.add('tfg:has_structure/moon_rabbit_houses', biome)
event.add('species:limpet_spawns', biome)
})
event.add('sandworm_mod:can_spawn_sandworms', 'tfg:mars/martian_dunes')
event.add('sandworm_mod:can_spawn_sandworms', 'tfg:mars/martian_deep_desert')
}
const registerAdAstraEntityTypeTags = (event) => {