Merge branch '1.20.1/dev' into 1.21.1/dev

Author: Jozufozu

Jenkinsfile

@@ -3,6 +3,13 @@
 pipeline {
     agent none
 
+    options {
+        // After the Build stage the pipeline stalls, waiting for user input to confirm the release stage.
+        // This leaves the builds in a running state even though no work is being done. Enable this option
+        // to automatically cancel earlier stalled builds when a new one is started.
+        disableConcurrentBuilds(abortPrevious: true)
+    }
+
     tools {
         jdk "jdk-21"
     }

common/src/vanillin/java/dev/engine_room/vanillin/visuals/ItemVisual.java

@@ -26,18 +26,17 @@ public class ItemVisual extends AbstractEntityVisual<ItemEntity> implements Simp
 	private static final ThreadLocal<RandomSource> RANDOM = ThreadLocal.withInitial(RandomSource::createNewThreadLocalInstance);
 
 	private final PoseStack pPoseStack = new PoseStack();
-	private final BakedModel bakedModel;
+	private BakedModel bakedModel;
+	private ItemStack currentStack;
 
-	private final InstanceRecycler<TransformedInstance> instances;
+	private InstanceRecycler<TransformedInstance> instances;
 
 	public ItemVisual(VisualizationContext ctx, ItemEntity entity, float partialTick) {
 		super(ctx, entity, partialTick);
 
-		var item = entity.getItem();
-		bakedModel = ItemModels.getModel(item);
-
-		var model = ItemModels.get(level, item, ItemDisplayContext.GROUND);
-
+		currentStack = entity.getItem();
+		bakedModel = ItemModels.getModel(currentStack);
+		var model =  ItemModels.get(level, currentStack, ItemDisplayContext.GROUND);
 		instances = new InstanceRecycler<>(() -> ctx.instancerProvider()
 				.instancer(InstanceTypes.TRANSFORMED, model)
 				.createInstance());
@@ -63,8 +62,18 @@ private void animate(float partialTick) {
 		TransformStack.of(pPoseStack)
 				.translate(getVisualPosition(partialTick));
 
-		instances.resetCount();
 		ItemStack itemstack = entity.getItem();
+		if (!ItemStack.matches(itemstack, currentStack)) {
+			instances.delete();
+			currentStack = itemstack.copy();
+			bakedModel = ItemModels.getModel(currentStack);
+			var model =  ItemModels.get(level, currentStack, ItemDisplayContext.GROUND);
+			instances = new InstanceRecycler<>(() -> visualizationContext.instancerProvider()
+					.instancer(InstanceTypes.TRANSFORMED, model)
+					.createInstance());
+		}
+		instances.resetCount();
+
 		int i = itemstack.isEmpty() ? 187 : Item.getId(itemstack.getItem()) + itemstack.getDamageValue();
 		var random = RANDOM.get();
 		random.setSeed(i);