Merge pull request #4 from Lrdmtns/master

Fixing interfaces as they suck dick rn
Warfactory-Offical · Sep 1, 2024 · 7abcf73 · 7abcf73
2 parents e0c6f63 + 954fc92
commit 7abcf73
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/groovy/postInit/ae2.groovy b/groovy/postInit/ae2.groovy
@@ -120,44 +120,44 @@ crafting.remove('appliedenergistics2:network/blocks/interfaces_interface')
 crafting.shapedBuilder().name('interfaces_interface')
         .output(item('appliedenergistics2:interface'))
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateSteel'))
+        .key('P', ore('plateStainlessSteel'))
         .key('G', ore('blockGlass'))
         .key('A', item('appliedenergistics2:material', 44))
         .key('F', item('appliedenergistics2:material', 43))
-        .key('C', metaitem('conveyor.module.lv'))
+        .key('C', metaitem('conveyor.module.hv'))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('interfaces_interface_mv')
+crafting.shapedBuilder().name('interfaces_interface_ev')
         .output(item('appliedenergistics2:interface') * 2)
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateAluminium'))
+        .key('P', ore('plateTitanium'))
         .key('G', ore('blockGlass'))
         .key('A', item('appliedenergistics2:material', 44))
         .key('F', item('appliedenergistics2:material', 43))
-        .key('C', metaitem('conveyor.module.mv'))
+        .key('C', metaitem('conveyor.module.ev'))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('interfaces_interface_hv')
+crafting.shapedBuilder().name('interfaces_interface_iv')
         .output(item('appliedenergistics2:interface') * 4)
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateStainlessSteel'))
+        .key('P', ore('plateTungstenSteel'))
         .key('G', ore('blockGlass'))
         .key('A', item('appliedenergistics2:material', 44))
         .key('F', item('appliedenergistics2:material', 43))
-        .key('C', metaitem('conveyor.module.hv'))
+        .key('C', metaitem('conveyor.module.iv'))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('interfaces_interface_ev')
+crafting.shapedBuilder().name('interfaces_interface_luv')
         .output(item('appliedenergistics2:interface') * 8)
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateTitanium'))
+        .key('P', ore('plateRhodiumPlatedPalladium'))
         .key('G', ore('blockGlass'))
         .key('A', item('appliedenergistics2:material', 44))
         .key('F', item('appliedenergistics2:material', 43))
-        .key('C', metaitem('conveyor.module.ev'))
+        .key('C', metaitem('conveyor.module.luv'))
         .mirrored()
         .register()
 
@@ -166,44 +166,44 @@ crafting.remove('appliedenergistics2:network/blocks/fluid_interfaces_interface')
 crafting.shapedBuilder().name('fluid_interfaces_interface')
         .output(item('appliedenergistics2:fluid_interface'))
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateSteel'))
+        .key('P', ore('plateStainlessSteel'))
         .key('G', ore('blockGlass'))
         .key('A', item('appliedenergistics2:material', 44))
         .key('F', item('appliedenergistics2:material', 43))
-        .key('C', metaitem('electric.pump.lv'))
+        .key('C', metaitem('electric.pump.hv'))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('fluid_interfaces_interface_mv')
+crafting.shapedBuilder().name('fluid_interfaces_interface_ev')
         .output(item('appliedenergistics2:fluid_interface') * 2)
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateAluminium'))
+        .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.mv'))
+        .key('C', metaitem('electric.pump.ev'))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('fluid_interfaces_interface_hv')
+crafting.shapedBuilder().name('fluid_interfaces_interface_iv')
         .output(item('appliedenergistics2:fluid_interface') * 4)
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateStainlessSteel'))
+        .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.hv'))
+        .key('C', metaitem('electric.pump.iv'))
         .mirrored()
         .register()
 
-crafting.shapedBuilder().name('fluid_interfaces_interface_ev')
+crafting.shapedBuilder().name('fluid_interfaces_interface_luv')
         .output(item('appliedenergistics2:fluid_interface') * 8)
         .matrix('PGP', 'ACF', 'PGP')
-        .key('P', ore('plateTitanium'))
+        .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.ev'))
+        .key('C', metaitem('electric.pump.luv'))
         .mirrored()
         .register()
 

diff --git a/groovy/postInit/ae2_fc.groovy b/groovy/postInit/ae2_fc.groovy
@@ -54,10 +54,12 @@ crafting.shapedBuilder().name('burette')
 crafting.remove('ae2fc:dual_interface')
 crafting.shapedBuilder().name('dual_interface')
         .output(item('ae2fc:dual_interface'))
-        .matrix('ICF')
+        .matrix('OPO', 'ICF', 'OPO')
         .key('I', item('appliedenergistics2:interface'))
-        .key('C', ore('circuitMv'))
+        .key('C', ore('circuitHv'))
         .key('F', item('appliedenergistics2:fluid_interface'))
+        .key('P', ore('plateTitanium'))
+        .key('O', ore('screwStainlessSteel'))
         .mirrored()
         .register()