Merge remote-tracking branch 'blusunrize/1.20.1' into feature/decorbr…

…icks

changelog.md

@@ -8,9 +8,10 @@
     - Radiators now use constantan instead of copper
     - Tinted glass can be made in larger quantities by using lead
 - Add randomized textures for various hempcrete & concrete blocks (voidsong-dragonfly)
+- Add the electromagnet block (BluSunrize)
+    - It attracts nearby items when given power! 
 - Add the portable electromagnet! (BluSunrize)
-    - It attracts nearby items!
-    - Install it as an upgrade on your accumulator backpack!
+    - Install it as an upgrade on your accumulator backpack to have a magnet on the go!
 - Change hemp blocks to notify their neighbours when they grow (jrtc27)
 - Change Jade Tooltips for multiblocks to work when looking at any part of the machine (HermitOwO)
 - Fix conveyor rendering in the manual (Malte)

src/api/java/blusunrize/immersiveengineering/api/Lib.java

@@ -43,6 +43,7 @@ public class Lib
 
 	public static final String MAGNET_PREVENT_NBT = "PreventRemoteMovement";
 	public static final String MAGNET_SOURCE_NBT = "immersiveengineering:magnet_source";
+	public static final String MAGNET_TIME_NBT = "immersiveengineering:magnet_last_pulled";
 
 	/**
 	 * Gui IDs

src/datagen/java/blusunrize/immersiveengineering/data/Recipes.java

@@ -2297,6 +2297,16 @@ private void recipesMetalDevices(@Nonnull Consumer<FinishedRecipe> 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 recipesConnectors(@Nonnull Consumer<FinishedRecipe> out)
@@ -2995,19 +3005,21 @@ private void recipesIngredients(@Nonnull Consumer<FinishedRecipe> 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("wew")
+				.pattern("rer")
 				.pattern("wiw")
-				.define('w', IETags.copperWire)
-				.define('e', Ingredients.COMPONENT_ELECTRONIC)
+				.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))));

src/datagen/java/blusunrize/immersiveengineering/data/blockstates/BlockStates.java

@@ -443,6 +443,16 @@ protected void registerStatesAndModels()
 							.type(b.get().getType())
 							.end()
 			));
+		{
+			ModelFile magnetModel = models().cubeBottomTop("electromagnet",
+					modLoc("block/metal_device/electromagnet"),
+					modLoc("block/metal_device/electromagnet_bottom"),
+					modLoc("block/metal_device/electromagnet_top")
+			);
+			createRotatedBlock(MetalDevices.ELECTROMAGNET, magnetModel, IEProperties.FACING_ALL, ImmutableList.of(), -90, 0);
+			itemModel(MetalDevices.ELECTROMAGNET, magnetModel);
+		}
+
 		createHemp();
 		{
 			final var pottedHempModel = models()

src/datagen/java/blusunrize/immersiveengineering/data/tags/IEBlockTags.java

@@ -399,6 +399,7 @@ private void registerPickaxeMineable()
 				MetalDevices.TURRET_CHEM,
 				MetalDevices.TURRET_GUN,
 				MetalDevices.CLOCHE,
+				MetalDevices.ELECTROMAGNET,
 				MetalDecoration.LV_COIL,
 				MetalDecoration.MV_COIL,
 				MetalDecoration.HV_COIL,