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

kubejs/server_scripts/ad_astra/recipes.js

@@ -16,25 +16,52 @@ const registerAdAstraRecipes = (event) => {
 		B: '#forge:rods/steel'
 	}).id('tfg:launch_pad')
 
-	event.recipes.gtceu.assembler('tfg:rocket_nose_cone')
-		.itemInputs(
-			'minecraft:lightning_rod',
-			'1x #forge:double_plates/stainless_steel',
-			'3x #forge:plates/stainless_steel')
-		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 720))
-		.itemOutputs('ad_astra:rocket_nose_cone')
-		.duration(600)
+	//#region Tier 1 rocket
+
+	event.recipes.gtceu.assembler('tfg:rocket_nose_cone_t1')
+	.itemInputs(
+		'gtceu:hv_emitter',
+		'gtceu:dense_rocket_alloy_t1_plate',
+		'3x gtceu:double_stainless_steel_plate')
+	.inputFluids(Fluid.of('gtceu:polyethylene', 16000))
+	.itemOutputs('ad_astra:rocket_nose_cone')
+	.duration(1200)
+	.EUt(480)
+
+	event.recipes.gtceu.pyrolyse_oven('gtceu:pyrolose_vitrified_asbestos_dust')
+	.inputFluids(Fluid.of('gtceu:nitrogen', 100))
+	.itemInputs('gtceu:asbestos_dust')
+	.itemOutputs('gtceu:vitrified_asbestos_dust')
+	.duration(80)
+	.EUt(GTValues.VA[GTValues.MV])
+
+	event.recipes.gtceu.mixer('gtceu:rocket_alloy_t1')
+		.itemInputs('6x #forge:dusts/aluminium', '2x #forge:dusts/stainless_steel')
+		.inputFluids(Fluid.of('gtceu:red_steel', 144))
+		.itemOutputs('9x #forge:dusts/rocket_alloy_t1')
+		.duration(580)
 		.EUt(480)
 
-	event.shaped('2x ad_astra:rocket_fin', [
-		' A ',
-		'AAA',
-		'A A'
-	], {
-		A: '#forge:plates/aluminium',
-	}).id('tfg:rocket_fin')
+	event.recipes.gtceu.chemical_bath('rocket_alloy_cool_down_water')
+		.itemInputs('#forge:hot_ingots/rocket_alloy_t1')
+		.inputFluids(Fluid.of('minecraft:water', 100))
+		.itemOutputs('#forge:ingots/rocket_alloy_t1')
+		.duration(400)
+		.EUt(120)
 
-	//#region Tier 1 rocket
+	event.recipes.gtceu.chemical_bath('rocket_alloy_cool_down_distilled_water')
+		.itemInputs('#forge:hot_ingots/rocket_alloy_t1')
+		.inputFluids(Fluid.of('gtceu:distilled_water', 100))
+		.itemOutputs('#forge:ingots/rocket_alloy_t1')
+		.duration(250)
+		.EUt(120)
+
+	event.recipes.gtceu.alloy_smelter(`gtceu:alloy_smelter_rocket_fin_t1`)
+		.itemInputs('#forge:plates/rocket_alloy_t1', '#forge:double_plates/stainless_steel')
+		.itemOutputs('ad_astra:rocket_fin')
+		.duration(150)
+		.EUt(GTValues.VA[GTValues.HV])
+		
 
 	event.recipes.gtceu.assembler('tfg:steel_engine')
 		.itemInputs(
@@ -43,34 +70,23 @@ const registerAdAstraRecipes = (event) => {
 			'gtceu:hv_electric_pump',
 			'2x gtceu:power_thruster',
 			'#forge:rotors/stainless_steel')
-		.inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 720))
+		.inputFluids(Fluid.of('gtceu:blue_steel', 1152))
 		.itemOutputs('ad_astra:steel_engine')
 		.duration(600)
 		.EUt(480)
 
-	event.custom({
-		type: 'ad_astra:nasa_workbench',
-		ingredients: [
-			{ item: 'ad_astra:rocket_nose_cone' },
-			{ item: 'gtceu:clean_machine_casing' },
-			{ item: 'gtceu:clean_machine_casing' },
-			{ item: 'gtceu:mv_sensor' },
-			{ item: 'gtceu:mv_emitter' },
-			{ item: 'gtceu:stainless_steel_crate' },
-			{ item: 'gtceu:hv_machine_hull' },
-			{ item: 'ad_astra:rocket_fin' },
-			{ item: 'gtceu:stainless_steel_drum' },
-			{ item: 'gtceu:stainless_steel_drum' },
-			{ item: 'ad_astra:rocket_fin' },
-			{ item: 'ad_astra:rocket_fin' },
-			{ item: 'ad_astra:steel_engine' },
-			{ item: 'ad_astra:rocket_fin' }
-		],
-		result: {
-			count: 1,
-			id: 'ad_astra:tier_1_rocket'
-		}
-	})
+	event.recipes.gtceu.assembler('ad_astra:assembler_tier_1_rocket')
+		.itemInputs(
+			'8x #forge:dense_plates/rocket_alloy_t1',
+			'4x ad_astra:rocket_fin',
+			'1x ad_astra:steel_engine',
+			'1x ad_astra:rocket_nose_cone',
+		    	'16x #forge:insulation_t1')
+		.inputFluids(Fluid.of('gtceu:silicon', 576))
+		.itemOutputs('ad_astra:tier_1_rocket')
+		.duration(1200)
+		.EUt(480)
+
 	//#endregion
 
 	//#region Tier 2 rocket

kubejs/server_scripts/ad_astra/tags.js

@@ -35,6 +35,11 @@ const registerAdAstraItemTags = (event) => {
 	event.add('forge:cobblestone', 'ad_astra:venus_cobblestone')
 	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')
 }
 
 const registerAdAstraBlockTags = (event) => {

kubejs/startup_scripts/tfg/materials.js

@@ -38,4 +38,20 @@ const registerTFGMaterials = (event) => {
 		.color('0xede8da')
 		.secondaryColor('0xeddcad')
 		.components('12x carbon', '22x hydrogen', '11x oxygen')
-}
+
+	// Space Rocket Materials
+
+	event.create('rocket_alloy_t1')
+		.ingot()
+		.components('6x aluminium', '2x stainless_steel', '1x red_steel')
+		.color(0x333e47)
+		.iconSet('metallic')
+		.flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_GEAR, GTMaterialFlags.GENERATE_DENSE)
+		.blastTemp(1760, 'low', 120, 1200)
+
+	event.create('vitrified_asbestos')
+        	.dust()
+		.fluid()
+		.iconSet('glass')
+        	.color(0xcccccc)
+}