merge

CHANGELOG.md

@@ -15,12 +15,10 @@
 - Improved performance of blocks checking if they're oxygenated @Mqrius
 - Added Bamboo Lumber and unified wood-related recipes in the backend (please let us know if anything's wrong!) (#3002) @Inceitious
 - Added a recipe to convert iodine and methane back into iodomethane (#3129) @Pyritie
+- MV Machine Hulls shaped recipe needs 4 Bakelite Plates and 2 Aluminum Plates but can be crafted with Bakelite in an Assembler @TomPlop
+- MV Hatches and Buses now can be crafted with Bakelite @TomPlop
 ### Bug fixes
-- Fixed Uranium Triplatinum not requiring Radon in the Alloy Blast Smelter @TomPlop
-- Added a workaround for oil spouts sometimes giving a fluid that couldn't be used in non-GregTech machines @Pyritie
-- Fixed an issue with server overrides sometimes not applying to server pack exports (#3088) @Mqrius
-- Fixed more startup issues when the system language is set to Turkish (#3099) @Pyritie
-- Fixed a crash when using a schematicannon to place a chain conveyor (#3092) @Pyritie
+- Uraninium Triplatinium Alloy Blast Smelter recipe now requires Radon too
 ### Translation updates
 - Chinese (simplified) @jmecn
 - German @Enderderschander

kubejs/server_scripts/tfg/machines/recipes.bakelite.js

@@ -88,7 +88,62 @@ function registerTFGBakeliteRecipes(event) {
 		.EUt(GTValues.VA[GTValues.MV])
 
 	// machine hull changes/additions
-	event.replaceInput({ id: 'gtceu:shaped/mv_machine_hull' }, '#forge:plates/wrought_iron', '#forge:plates/bakelite')
+
+	// To Move to MV Rework after
+	event.remove({ id: 'gtceu:shaped/mv_machine_hull'})
+	event.shaped('gtceu:mv_machine_hull', [
+		'ABA',
+		'DCD',
+		'ABA'
+	], {
+		A: '#forge:plates/bakelite',
+		B: '#forge:plates/aluminum',
+		C: 'gtceu:mv_machine_casing',
+		D: 'gtceu:copper_single_cable'
+	}).id('tfg:shaped/mv_machine_hull')
+
+	event.remove({ id: 'gtceu:assembler/hull_mv_annealed'})
+	event.recipes.gtceu.assembler('tfg:mv_machine_hull')
+		.itemInputs('gtceu:mv_machine_casing', '2x gtceu:copper_single_cable')
+		.inputFluids('tfg:bakelite 576')
+		.itemOutputs('gtceu:mv_machine_hull')
+		.duration(20*2.5)
+		.EUt(GTValues.VH[GTValues.LV])
+
+	// MV Buses
+	event.recipes.gtceu.assembler('tfg:mv_input_bus')
+		.itemInputs('gtceu:mv_machine_hull', '#tfg:any_bronze_crate')
+		.inputFluids('tfg:bakelite 576')
+		.itemOutputs('gtceu:mv_input_bus')
+		.duration(20*15)
+		.EUt(GTValues.VA[GTValues.MV])
+		.circuit(1)
+
+	event.recipes.gtceu.assembler('tfg:mv_output_bus')
+		.itemInputs('gtceu:mv_machine_hull', '#tfg:any_bronze_crate')
+		.inputFluids('tfg:bakelite 576')
+		.itemOutputs('gtceu:mv_output_bus')
+		.duration(20*15)
+		.EUt(GTValues.VA[GTValues.MV])
+		.circuit(2)
+
+	// MV Hatches
+	event.recipes.gtceu.assembler('tfg:mv_input_hatch')
+		.itemInputs('gtceu:mv_machine_hull', '#tfg:any_bronze_drum')
+		.inputFluids('tfg:bakelite 576')
+		.itemOutputs('gtceu:mv_input_hatch')
+		.duration(20*15)
+		.EUt(GTValues.VA[GTValues.MV])
+		.circuit(1)
+
+	event.recipes.gtceu.assembler('tfg:mv_output_hatch')
+		.itemInputs('gtceu:mv_machine_hull', '#tfg:any_bronze_drum')
+		.inputFluids('tfg:bakelite 576')
+		.itemOutputs('gtceu:mv_output_hatch')
+		.duration(20*15)
+		.EUt(GTValues.VA[GTValues.MV])
+		.circuit(2)
+	// End of MV Changes
 
 	event.recipes.gtceu.assembler('tfg:ulv_hull_bakelite')
 		.itemInputs('gtceu:ulv_machine_casing', '2x #forge:single_cables/red_alloy')