From a56a214091e74961b18adc2739cd1e5bd193d43b Mon Sep 17 00:00:00 2001
From: cakeGit <65340665+cakeGit@users.noreply.github.com>
Date: Mon, 12 Aug 2024 21:55:59 +0100
Subject: [PATCH] Make track deploying advancement work in schematics

---
 .../kinetics/deployer/DeployerMovementBehaviour.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java
index 728b11b16..4ced96591 100644
--- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerMovementBehaviour.java
@@ -73,7 +73,7 @@ public class DeployerMovementBehaviour implements MovementBehaviour {
 			return;
 
 		activate(context, pos, player, mode);
-		checkForPlacementAdvancement(context, player);
+		checkForTrackPlacementAdvancement(context, player);
 		tryDisposeOfExcess(context);
 		context.stall = player.blockBreakingProgress != null;
 	}
@@ -81,6 +81,8 @@ public class DeployerMovementBehaviour implements MovementBehaviour {
 	public void activate(MovementContext context, BlockPos pos, DeployerFakePlayer player, Mode mode) {
 		Level world = context.world;
 
+		player.placedTracks = false;
+
 		FilterItemStack filter = context.getFilterFromBE();
 		if (AllItems.SCHEMATIC.isIn(filter.item())) {
 			activateAsSchematicPrinter(context, pos, player, world, filter.item());
@@ -104,12 +106,11 @@ public class DeployerMovementBehaviour implements MovementBehaviour {
 
 		player.setYRot(AbstractContraptionEntity.yawFromVector(facingVec));
 		player.setXRot(xRot);
-		player.placedTracks = false;
 
 		DeployerHandler.activate(player, vec, pos, facingVec, mode);
 	}
 
-	protected void checkForPlacementAdvancement(MovementContext context, DeployerFakePlayer player) {
+	protected void checkForTrackPlacementAdvancement(MovementContext context, DeployerFakePlayer player) {
 		if ((context.contraption instanceof MountedContraption || context.contraption instanceof CarriageContraption)
 			&& player.placedTracks && context.blockEntityData != null && context.blockEntityData.contains("Owner"))
 			AllAdvancements.SELF_DEPLOYING.awardTo(context.world.getPlayerByUUID(context.blockEntityData.getUUID("Owner")));
@@ -146,7 +147,7 @@ public class DeployerMovementBehaviour implements MovementBehaviour {
 		if (!context.contraption.hasUniversalCreativeCrate) {
 			IItemHandler itemHandler = context.contraption.getSharedInventory();
 			for (ItemRequirement.StackRequirement required : requiredItems) {
-				ItemStack stack= ItemHelper
+				ItemStack stack = ItemHelper
 					.extract(itemHandler, required::matches, ExtractionCountMode.EXACTLY,
 						required.stack.getCount(), true);
 				if (stack.isEmpty())
@@ -160,8 +161,11 @@ public class DeployerMovementBehaviour implements MovementBehaviour {
 		CompoundTag data = BlockHelper.prepareBlockEntityData(blockState, schematicWorld.getBlockEntity(pos));
 		BlockSnapshot blocksnapshot = BlockSnapshot.create(world.dimension(), world, pos);
 		BlockHelper.placeSchematicBlock(world, blockState, pos, contextStack, data);
+
 		if (ForgeEventFactory.onBlockPlace(player, blocksnapshot, Direction.UP))
 			blocksnapshot.restore(true, false);
+		else if (AllBlocks.TRACK.has(blockState))
+			player.placedTracks = true;
 	}
 
 	@Override