From e67d8da904c650255eaeb8c86d39ad2885d4afe3 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Tue, 11 Feb 2025 14:28:11 +0100
Subject: [PATCH] Redrawals

- Fixed schematic rendering offset by a tick
- Fixed item vaults not marking themselves as needed to be saved
- Fixed steam engines not rotating with their shaft when not animating
---
 .../steamEngine/SteamEngineVisual.java        | 15 +++++++++------
 .../logistics/vault/ItemVaultBlockEntity.java |  1 +
 .../schematics/client/SchematicHandler.java   |  2 --
 .../schematics/client/SchematicRenderer.java  | 19 ++++++++-----------
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineVisual.java b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineVisual.java
index a6618ceaf9..8598932c4f 100644
--- a/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineVisual.java
+++ b/src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineVisual.java
@@ -26,6 +26,7 @@ public class SteamEngineVisual extends AbstractBlockEntityVisual<SteamEngineBloc
 	protected final TransformedInstance connector;
 
 	private Float lastAngle = Float.NaN;
+	private Axis lastAxis = null;
 
 	public SteamEngineVisual(VisualizationContext context, SteamEngineBlockEntity blockEntity, float partialTick) {
 		super(context, blockEntity, partialTick);
@@ -47,11 +48,18 @@ public class SteamEngineVisual extends AbstractBlockEntityVisual<SteamEngineBloc
 
 	private void animate() {
 		Float angle = blockEntity.getTargetAngle();
+		Axis axis = Axis.Y;
 
-		if (Objects.equals(angle, lastAngle)) {
+		PoweredShaftBlockEntity shaft = blockEntity.getShaft();
+		if (shaft != null)
+			axis = KineticBlockEntityRenderer.getRotationAxisOf(shaft);
+
+		if (Objects.equals(angle, lastAngle) && lastAxis == axis) {
 			return;
 		}
+		
 		lastAngle = angle;
+		lastAxis = axis;
 
 		if (angle == null) {
 			piston.setVisible(false);
@@ -66,11 +74,6 @@ public class SteamEngineVisual extends AbstractBlockEntityVisual<SteamEngineBloc
 
 		Direction facing = SteamEngineBlock.getFacing(blockState);
 		Axis facingAxis = facing.getAxis();
-		Axis axis = Axis.Y;
-
-		PoweredShaftBlockEntity shaft = blockEntity.getShaft();
-		if (shaft != null)
-			axis = KineticBlockEntityRenderer.getRotationAxisOf(shaft);
 
 		boolean roll90 = facingAxis.isHorizontal() && axis == Axis.Y || facingAxis.isVertical() && axis == Axis.Z;
 		float sine = Mth.sin(angle);
diff --git a/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlockEntity.java b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlockEntity.java
index d1d6f840d4..7bf2da0bec 100644
--- a/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlockEntity.java
+++ b/src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlockEntity.java
@@ -47,6 +47,7 @@ public class ItemVaultBlockEntity extends SmartBlockEntity implements IMultiBloc
 			protected void onContentsChanged(int slot) {
 				super.onContentsChanged(slot);
 				updateComparators();
+				level.blockEntityChanged(worldPosition);
 			}
 		};
 
diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java
index 3dc0c019af..67f476e1eb 100644
--- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java
@@ -98,8 +98,6 @@ public class SchematicHandler implements IGuiOverlay {
 		if (activeSchematicItem != null && transformation != null)
 			transformation.tick();
 
-		renderers.forEach(SchematicRenderer::tick);
-
 		LocalPlayer player = mc.player;
 		ItemStack stack = findBlueprintInHand(player);
 		if (stack == null) {
diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java
index 7e9e401ae1..9139a79a90 100644
--- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java
+++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java
@@ -53,20 +53,17 @@ public class SchematicRenderer {
 		changed = true;
 	}
 
-	public void tick() {
-		if (!active)
-			return;
-		Minecraft mc = Minecraft.getInstance();
-		if (mc.level == null || mc.player == null || !changed)
-			return;
-
-		redraw();
-		changed = false;
-	}
-
 	public void render(PoseStack ms, SuperRenderTypeBuffer buffers) {
 		if (!active)
 			return;
+		
+		Minecraft mc = Minecraft.getInstance();
+		if (mc.level == null || mc.player == null)
+			return;
+		if (changed)
+			redraw();
+		changed = false;
+		
 		bufferCache.forEach((layer, buffer) -> {
 			buffer.renderInto(ms, buffers.getBuffer(layer));
 		});