Post-merge fixes

src/datagen/java/blusunrize/immersiveengineering/data/recipes/DeviceRecipes.java

@@ -22,8 +22,8 @@
 import blusunrize.immersiveengineering.common.register.IEBlocks;
 import blusunrize.immersiveengineering.common.register.IEBlocks.*;
 import blusunrize.immersiveengineering.common.register.IEItems;
-import blusunrize.immersiveengineering.common.register.IEItems.Misc;
 import blusunrize.immersiveengineering.common.register.IEItems.Ingredients;
+import blusunrize.immersiveengineering.common.register.IEItems.Misc;
 import blusunrize.immersiveengineering.common.register.IEItems.Tools;
 import blusunrize.immersiveengineering.common.register.IEItems.Weapons;
 import net.minecraft.core.HolderLookup.Provider;
@@ -654,6 +654,16 @@ private void metalDevices(RecipeOutput out)
 					.define('s', IETags.getItemTag(IETags.getTagsFor(chute.getKey()).sheetmetal))
 					.unlockedBy("has_plate", has(IETags.getTagsFor(chute.getKey()).plate))
 					.save(out, toRL(toPath(chute.getValue())));
+		shapedMisc(MetalDevices.ELECTROMAGNET)
+				.pattern("pcp")
+				.pattern("wiw")
+				.pattern("pwp")
+				.define('w', Misc.WIRE_COILS.get(WireType.COPPER))
+				.define('p', IETags.steelRod)
+				.define('i', IETags.getTagsFor(EnumMetals.IRON).ingot)
+				.define('c', Ingredients.COMPONENT_ELECTRONIC)
+				.unlockedBy("has_"+toPath(Ingredients.COMPONENT_ELECTRONIC), has(Ingredients.COMPONENT_ELECTRONIC))
+				.save(out, toRL(toPath(MetalDevices.ELECTROMAGNET)));
 	}
 
 	private void addCoveyorCoveringRecipe(ItemLike basic, RecipeOutput out)

src/datagen/java/blusunrize/immersiveengineering/data/recipes/IngredientRecipes.java

@@ -326,14 +326,24 @@ protected void buildRecipes(RecipeOutput out)
 				.save(out, toRL(toPath(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_INDUCTION))));
 		shapedMisc(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_TESLA))
 				.pattern("iii")
-				.pattern("cfc")
-				.pattern("cec")
+				.pattern("wfw")
+				.pattern("wew")
 				.define('i', IETags.getTagsFor(EnumMetals.ALUMINUM).plate)
 				.define('f', WoodenDecoration.TREATED_FENCE)
-				.define('c', IETags.electrumWire)
+				.define('w', Misc.WIRE_COILS.get(WireType.ELECTRUM))
 				.define('e', Ingredients.COMPONENT_ELECTRONIC_ADV)
 				.unlockedBy("has_powerpack", has(Misc.POWERPACK))
 				.save(out, toRL(toPath(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_TESLA))));
+		shapedMisc(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_MAGNET))
+				.pattern("rer")
+				.pattern("wiw")
+				.pattern(" w ")
+				.define('r', IETags.steelRod)
+				.define('w', Misc.WIRE_COILS.get(WireType.COPPER))
+				.define('e', Ingredients.COMPONENT_ELECTRONIC_ADV)
+				.define('i', IETags.getTagsFor(EnumMetals.IRON).ingot)
+				.unlockedBy("has_powerpack", has(Misc.POWERPACK))
+				.save(out, toRL(toPath(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_MAGNET))));
 
 		shapelessMisc(Ingredients.WIRE_COPPER)
 				.requires(IETags.getTagsFor(EnumMetals.COPPER).plate)
@@ -424,14 +434,6 @@ protected void buildRecipes(RecipeOutput out)
 				.define('p', Items.PAPER)
 				.unlockedBy("has_"+toPath(Items.PAPER), has(Items.PAPER))
 				.save(buildBlueprint(out, "bannerpatterns"), toRL("blueprint_bannerpatterns"));
-		shapedMisc(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_MAGNET))
-				.pattern("wew")
-				.pattern("wiw")
-				.define('w', IETags.copperWire)
-				.define('e', Ingredients.COMPONENT_ELECTRONIC)
-				.define('i', IETags.getTagsFor(EnumMetals.IRON).ingot)
-				.unlockedBy("has_powerpack", has(Misc.POWERPACK))
-				.save(out, toRL(toPath(Misc.TOOL_UPGRADES.get(ToolUpgrade.POWERPACK_MAGNET))));
 	}
 
 	private RecipeOutput buildBlueprint(RecipeOutput out, String blueprint)