Merge pull request #5 from Lrdmtns/master

Rest of the Lrdic ae2 fixes
Warfactory-Offical · Sep 1, 2024 · f5cfe39 · f5cfe39
2 parents 7abcf73 + 8503242
commit f5cfe39
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 42 deletions.
diff --git a/groovy/postInit/ae2.groovy b/groovy/postInit/ae2.groovy
@@ -163,50 +163,51 @@ crafting.shapedBuilder().name('interfaces_interface_luv')
 
 // Fluid Interface
 crafting.remove('appliedenergistics2:network/blocks/fluid_interfaces_interface')
-crafting.shapedBuilder().name('fluid_interfaces_interface')
+crafting.shapedBuilder().name('fluid_interfaces_interface_ev')
         .output(item('appliedenergistics2:fluid_interface'))
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateStainlessSteel'))
+        .key('P', ore('plateTitanium'))
         .key('G', ore('blockGlass'))
         .key('A', item('appliedenergistics2:material', 44))
         .key('F', item('appliedenergistics2:material', 43))
-        .key('C', metaitem('electric.pump.hv'))
+        .key('C', metaitem('electric.pump.ev'))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('fluid_interfaces_interface_ev')
+crafting.shapedBuilder().name('fluid_interfaces_interface_iv')
         .output(item('appliedenergistics2:fluid_interface') * 2)
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateTitanium'))
+        .key('P', ore('plateTungstenSteel'))
         .key('G', ore('blockGlass'))
         .key('A', item('appliedenergistics2:material', 44))
         .key('F', item('appliedenergistics2:material', 43))
-        .key('C', metaitem('electric.pump.ev'))
+        .key('C', metaitem('electric.pump.iv'))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('fluid_interfaces_interface_iv')
+crafting.shapedBuilder().name('fluid_interfaces_interface_luv')
         .output(item('appliedenergistics2:fluid_interface') * 4)
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateTungstenSteel'))
+        .key('P', ore('plateRhodiumPlatedPalladium'))
         .key('G', ore('blockGlass'))
         .key('A', item('appliedenergistics2:material', 44))
         .key('F', item('appliedenergistics2:material', 43))
-        .key('C', metaitem('electric.pump.iv'))
+        .key('C', metaitem('electric.pump.luv'))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('fluid_interfaces_interface_luv')
+crafting.shapedBuilder().name('fluid_interfaces_interface')
         .output(item('appliedenergistics2:fluid_interface') * 8)
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateRhodiumPlatedPalladium'))
+        .key('P', ore('plateNaquadahAlloy'))
         .key('G', ore('blockGlass'))
         .key('A', item('appliedenergistics2:material', 44))
         .key('F', item('appliedenergistics2:material', 43))
-        .key('C', metaitem('electric.pump.luv'))
+        .key('C', metaitem('electric.pump.Zpm'))
         .mirrored()
         .register()
 
+
 // Cell Workbench
 crafting.remove('appliedenergistics2:network/blocks/cell_workbench')
 crafting.shapedBuilder().name('cell_workbench')
@@ -336,39 +337,40 @@ recipemap('canner').recipeBuilder()
 
 // Molecular Assembler
 crafting.remove('appliedenergistics2:network/crafting/molecular_assembler')
-crafting.shapedBuilder().name('molecular_assembler')
+crafting.shapedBuilder().name('molecular_assembler_ev')
         .output(item('appliedenergistics2:molecular_assembler'))
         .matrix('PGP', 'ARF', 'PGP')
-        .key('P', ore('plateStainlessSteel'))
+        .key('P', ore('plateTitanium'))
         .key('G', item('appliedenergistics2:quartz_glass'))
         .key('A', item('appliedenergistics2:material', 44))
-        .key('R', metaitem('robot.arm.hv'))
+        .key('R', metaitem('robot.arm.ev'))
         .key('F', item('appliedenergistics2:material', 43))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('molecular_assembler_ev')
-        .output(item('appliedenergistics2:molecular_assembler') * 4)
+crafting.shapedBuilder().name('molecular_assembler_iv')
+        .output(item('appliedenergistics2:molecular_assembler') * 2)
         .matrix('PGP', 'ARF', 'PGP')
-        .key('P', ore('plateTitanium'))
+        .key('P', ore('plateTungstenSteel'))
         .key('G', item('appliedenergistics2:quartz_glass'))
         .key('A', item('appliedenergistics2:material', 44))
-        .key('R', metaitem('robot.arm.ev'))
+        .key('R', metaitem('robot.arm.iv'))
         .key('F', item('appliedenergistics2:material', 43))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('molecular_assembler_iv')
-        .output(item('appliedenergistics2:molecular_assembler') * 16)
+crafting.shapedBuilder().name('molecular_assembler_luv')
+        .output(item('appliedenergistics2:molecular_assembler') * 4)
         .matrix('PGP', 'ARF', 'PGP')
-        .key('P', ore('plateTungstenSteel'))
+        .key('P', ore('plateRhodiumPlatedPalladium'))
         .key('G', item('appliedenergistics2:quartz_glass'))
         .key('A', item('appliedenergistics2:material', 44))
-        .key('R', metaitem('robot.arm.iv'))
+        .key('R', metaitem('robot.arm.luv'))
         .key('F', item('appliedenergistics2:material', 43))
         .mirrored()
         .register()
 
+
 // Wireless Terminal
 crafting.remove('appliedenergistics2:network/wireless_terminal')
 crafting.shapedBuilder().name('wireless_terminal')
@@ -995,7 +997,7 @@ crafting.shapedBuilder().name('storage_bus_fluid')
         .output(item('appliedenergistics2:part', 221))
         .matrix('IPC')
         .key('I', item('appliedenergistics2:fluid_interface'))
-        .key('P', metaitem('electric.pump.lv'))
+        .key('P', metaitem('electric.pump.ev'))
         .key('C', item('appliedenergistics2:part', 16))
         .mirrored()
         .register()
@@ -1017,7 +1019,7 @@ crafting.shapedBuilder().name('import_bus_fluid')
         .output(item('appliedenergistics2:part', 241))
         .matrix('IPC')
         .key('I', item('appliedenergistics2:material', 44))
-        .key('P', metaitem('electric.pump.lv'))
+        .key('P', metaitem('electric.pump.ev'))
         .key('C', item('appliedenergistics2:part', 16))
         .mirrored()
         .register()
@@ -1039,7 +1041,7 @@ crafting.shapedBuilder().name('export_bus_fluid')
         .output(item('appliedenergistics2:part', 261))
         .matrix('IPC')
         .key('I', item('appliedenergistics2:material', 43))
-        .key('P', metaitem('electric.pump.lv'))
+        .key('P', metaitem('electric.pump.ev'))
         .key('C', item('appliedenergistics2:part', 16))
         .mirrored()
         .register()
@@ -1146,8 +1148,8 @@ crafting.shapedBuilder().name('terminal_expanded_processing')
         .output(item('appliedenergistics2:part', 341))
         .matrix('PB', 'Cd')
         .key('P', item('appliedenergistics2:part', 340))
-        .key('B', metaitem('sensor.luv'))
-        .key('C', metaitem('emitter.luv'))
+        .key('B', metaitem('sensor.ev'))
+        .key('C', metaitem('emitter.ev'))
         .key('d', ore('toolScrewdriver')) //TODO native tools
         .register()
 

diff --git a/groovy/postInit/ae2_fc.groovy b/groovy/postInit/ae2_fc.groovy
@@ -4,12 +4,12 @@ crafting.remove('ae2fc:fluid_discretizer')
 crafting.shapedBuilder().name('fluid_discretizer')
         .output(item('ae2fc:fluid_discretizer'))
         .matrix('PDP', 'ECS', 'PUP')
-        .key('P', ore('plateIridium'))
-        .key('D', ore('cableGtDoubleOsmium'))
-        .key('E', metaitem('emitter.iv'))
-        .key('C', ore('circuitZpm'))
-        .key('S', metaitem('sensor.iv'))
-        .key('U', metaitem('electric.pump.iv'))
+        .key('P', ore('plateStainlessSteel'))
+        .key('D', ore('cableGtDoubleAluminium'))
+        .key('E', metaitem('emitter.hv'))
+        .key('C', ore('circuitHv'))
+        .key('S', metaitem('sensor.hv'))
+        .key('U', metaitem('electric.pump.hv'))
         .mirrored()
         .register()
 
@@ -85,9 +85,9 @@ crafting.shapedBuilder().name('fluid_pattern_terminal')
         .output(item('ae2fc:part_fluid_pattern_terminal'))
         .matrix('TA', 'BC')
         .key('T', item('appliedenergistics2:part', 340))
-        .key('A', metaitem('fluid.regulator.iv'))
-        .key('B', metaitem('emitter.iv'))
-        .key('C', ore('circuitZpm'))
+        .key('A', metaitem('fluid.regulator.hv'))
+        .key('B', metaitem('emitter.hv'))
+        .key('C', ore('circuitIv'))
         .register()
 
 // Extended Fluid Pattern Terminal
@@ -96,9 +96,9 @@ crafting.shapedBuilder().name('fluid_pattern_ex_terminal')
         .output(item('ae2fc:part_fluid_pattern_ex_terminal'))
         .matrix('TA', 'BC')
         .key('T', item('appliedenergistics2:part', 341))
-        .key('A', metaitem('fluid.regulator.luv'))
-        .key('B', metaitem('emitter.luv'))
-        .key('C', ore('circuitZpm'))
+        .key('A', metaitem('fluid.regulator.ev'))
+        .key('B', metaitem('emitter.ev'))
+        .key('C', ore('circuitLuv'))
         .register()
 
 // ME Ultimate Encoder
@@ -122,7 +122,7 @@ crafting.shapedBuilder().name('wireless_fluid_pattern_terminal')
         .matrix('TC', 'Kd')
         .key('d', ore('toolScrewdriver')) //TODO native tools
         .key('T', item('appliedenergistics2:wireless_pattern_terminal'))
-        .key('C', ore('circuitZpm'))
-        .key('K', metaitem('fluid.regulator.iv'))
+        .key('C', ore('circuitEv'))
+        .key('K', metaitem('fluid.regulator.ev'))
         .register()