Merge pull request #8335 from danth/belt-duplication

simibubi · web-flow · commit c50ba98b6345 · 2025-05-19T11:04:34.000+02:00
Fix item duplication on belts
diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltCrusherInteractionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltCrusherInteractionHandler.java
@@ -63,7 +63,7 @@ public static boolean checkForCrushers(BeltInventory beltInventory, TransportedI
 				remainder = ItemHandlerHelper.copyStackWithSize(currentItem.stack, notFilled);
 
 			currentItem.stack = remainder;
-			beltInventory.belt.sendData();
+			beltInventory.belt.notifyUpdate();
 			return true;
 		}
 
diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltFunnelInteractionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltFunnelInteractionHandler.java
@@ -116,7 +116,7 @@ public static boolean checkForFunnels(BeltInventory beltInventory, TransportedIt
 			funnelBE.flap(true);
 			funnelBE.onTransfer(toInsert);
 			currentItem.stack = remainder;
-			beltInventory.belt.sendData();
+			beltInventory.belt.notifyUpdate();
 			if (blocking)
 				return true;
 		}
diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltInventory.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltInventory.java
@@ -68,8 +68,7 @@ public void tick() {
 			toInsert.clear();
 			items.removeAll(toRemove);
 			toRemove.clear();
-			belt.setChanged();
-			belt.sendData();
+			belt.notifyUpdate();
 		}
 
 		if (belt.getSpeed() == 0)
@@ -79,8 +78,7 @@ public void tick() {
 		if (beltMovementPositive != belt.getDirectionAwareBeltMovementSpeed() > 0) {
 			beltMovementPositive = !beltMovementPositive;
 			Collections.reverse(items);
-			belt.setChanged();
-			belt.sendData();
+			belt.notifyUpdate();
 		}
 
 		// Assuming the first entry is furthest on the belt
@@ -154,11 +152,11 @@ public void tick() {
 				ItemStack item = currentItem.stack;
 				if (handleBeltProcessingAndCheckIfRemoved(currentItem, nextOffset, noMovement)) {
 					iterator.remove();
-					belt.sendData();
+					belt.notifyUpdate();
 					continue;
 				}
 				if (item != currentItem.stack)
-					belt.sendData();
+					belt.notifyUpdate();
 				if (currentItem.locked)
 					continue;
 			}
@@ -217,7 +215,7 @@ public void tick() {
 					currentItem.stack = remainder;
 
 				flapTunnel(this, lastOffset, movementFacing, false);
-				belt.sendData();
+				belt.notifyUpdate();
 				continue;
 			}
 
@@ -228,7 +226,7 @@ public void tick() {
 				eject(currentItem);
 				iterator.remove();
 				flapTunnel(this, lastOffset, movementFacing, false);
-				belt.sendData();
+				belt.notifyUpdate();
 				continue;
 			}
 		}
@@ -248,7 +246,7 @@ protected boolean handleBeltProcessingAndCheckIfRemoved(TransportedItemStack cur
 				return false;
 			if (processingBehaviour == null) {
 				currentItem.locked = false;
-				belt.sendData();
+				belt.notifyUpdate();
 				return false;
 			}
 
@@ -259,7 +257,7 @@ protected boolean handleBeltProcessingAndCheckIfRemoved(TransportedItemStack cur
 				return false;
 
 			currentItem.locked = false;
-			belt.sendData();
+			belt.notifyUpdate();
 			return false;
 		}
 
@@ -292,7 +290,7 @@ protected boolean handleBeltProcessingAndCheckIfRemoved(TransportedItemStack cur
 				if (result == ProcessingResult.HOLD) {
 					currentItem.beltPosition = segment + .5f + (beltMovementPositive ? 1 / 512f : -1 / 512f);
 					currentItem.locked = true;
-					belt.sendData();
+					belt.notifyUpdate();
 					return false;
 				}
 			}
@@ -471,8 +469,7 @@ public void applyToEachWithin(float position, float maxDistanceToPosition,
 			toRemove.add(transported);
 		}
 		if (dirty) {
-			belt.setChanged();
-			belt.sendData();
+			belt.notifyUpdate();
 		}
 	}
 
diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltTunnelInteractionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltTunnelInteractionHandler.java
@@ -56,8 +56,7 @@ public static boolean flapTunnelsAndCheckIfStuck(BeltInventory beltInventory, Tr
 				if (onServer) {
 					brassTunnel.setStackToDistribute(current.stack, movementFacing.getOpposite());
 					current.stack = ItemStack.EMPTY;
-					beltInventory.belt.sendData();
-					beltInventory.belt.setChanged();
+					beltInventory.belt.notifyUpdate();
 				}
 				removed = true;
 			}
@@ -92,7 +91,7 @@ public static boolean flapTunnelsAndCheckIfStuck(BeltInventory beltInventory, Tr
 						flapTunnel(beltInventory, upcomingSegment, d, false);
 
 					current.stack.shrink(1);
-					beltInventory.belt.sendData();
+					beltInventory.belt.notifyUpdate();
 					if (current.stack.getCount() <= 1)
 						break;
 				}

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public static boolean checkForCrushers(BeltInventory beltInventory, TransportedI`
`63`	`63`	`remainder = ItemHandlerHelper.copyStackWithSize(currentItem.stack, notFilled);`
`64`	`64`
`65`	`65`	`currentItem.stack = remainder;`
`66`		`- beltInventory.belt.sendData();`
	`66`	`+ beltInventory.belt.notifyUpdate();`
`67`	`67`	`return true;`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public static boolean checkForFunnels(BeltInventory beltInventory, TransportedIt`
`116`	`116`	`funnelBE.flap(true);`
`117`	`117`	`funnelBE.onTransfer(toInsert);`
`118`	`118`	`currentItem.stack = remainder;`
`119`		`- beltInventory.belt.sendData();`
	`119`	`+ beltInventory.belt.notifyUpdate();`
`120`	`120`	`if (blocking)`
`121`	`121`	`return true;`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,7 @@ public void tick() {`
`68`	`68`	`toInsert.clear();`
`69`	`69`	`items.removeAll(toRemove);`
`70`	`70`	`toRemove.clear();`
`71`		`- belt.setChanged();`
`72`		`- belt.sendData();`
	`71`	`+ belt.notifyUpdate();`
`73`	`72`	`}`
`74`	`73`
`75`	`74`	`if (belt.getSpeed() == 0)`
`@@ -79,8 +78,7 @@ public void tick() {`
`79`	`78`	`if (beltMovementPositive != belt.getDirectionAwareBeltMovementSpeed() > 0) {`
`80`	`79`	`beltMovementPositive = !beltMovementPositive;`
`81`	`80`	`Collections.reverse(items);`
`82`		`- belt.setChanged();`
`83`		`- belt.sendData();`
	`81`	`+ belt.notifyUpdate();`
`84`	`82`	`}`
`85`	`83`
`86`	`84`	`// Assuming the first entry is furthest on the belt`
`@@ -154,11 +152,11 @@ public void tick() {`
`154`	`152`	`ItemStack item = currentItem.stack;`
`155`	`153`	`if (handleBeltProcessingAndCheckIfRemoved(currentItem, nextOffset, noMovement)) {`
`156`	`154`	`iterator.remove();`
`157`		`- belt.sendData();`
	`155`	`+ belt.notifyUpdate();`
`158`	`156`	`continue;`
`159`	`157`	`}`
`160`	`158`	`if (item != currentItem.stack)`
`161`		`- belt.sendData();`
	`159`	`+ belt.notifyUpdate();`
`162`	`160`	`if (currentItem.locked)`
`163`	`161`	`continue;`
`164`	`162`	`}`
`@@ -217,7 +215,7 @@ public void tick() {`
`217`	`215`	`currentItem.stack = remainder;`
`218`	`216`
`219`	`217`	`flapTunnel(this, lastOffset, movementFacing, false);`
`220`		`- belt.sendData();`
	`218`	`+ belt.notifyUpdate();`
`221`	`219`	`continue;`
`222`	`220`	`}`
`223`	`221`
`@@ -228,7 +226,7 @@ public void tick() {`
`228`	`226`	`eject(currentItem);`
`229`	`227`	`iterator.remove();`
`230`	`228`	`flapTunnel(this, lastOffset, movementFacing, false);`
`231`		`- belt.sendData();`
	`229`	`+ belt.notifyUpdate();`
`232`	`230`	`continue;`
`233`	`231`	`}`
`234`	`232`	`}`
`@@ -248,7 +246,7 @@ protected boolean handleBeltProcessingAndCheckIfRemoved(TransportedItemStack cur`
`248`	`246`	`return false;`
`249`	`247`	`if (processingBehaviour == null) {`
`250`	`248`	`currentItem.locked = false;`
`251`		`- belt.sendData();`
	`249`	`+ belt.notifyUpdate();`
`252`	`250`	`return false;`
`253`	`251`	`}`
`254`	`252`
`@@ -259,7 +257,7 @@ protected boolean handleBeltProcessingAndCheckIfRemoved(TransportedItemStack cur`
`259`	`257`	`return false;`
`260`	`258`
`261`	`259`	`currentItem.locked = false;`
`262`		`- belt.sendData();`
	`260`	`+ belt.notifyUpdate();`
`263`	`261`	`return false;`
`264`	`262`	`}`
`265`	`263`
`@@ -292,7 +290,7 @@ protected boolean handleBeltProcessingAndCheckIfRemoved(TransportedItemStack cur`
`292`	`290`	`if (result == ProcessingResult.HOLD) {`
`293`	`291`	`currentItem.beltPosition = segment + .5f + (beltMovementPositive ? 1 / 512f : -1 / 512f);`
`294`	`292`	`currentItem.locked = true;`
`295`		`- belt.sendData();`
	`293`	`+ belt.notifyUpdate();`
`296`	`294`	`return false;`
`297`	`295`	`}`
`298`	`296`	`}`
`@@ -471,8 +469,7 @@ public void applyToEachWithin(float position, float maxDistanceToPosition,`
`471`	`469`	`toRemove.add(transported);`
`472`	`470`	`}`
`473`	`471`	`if (dirty) {`
`474`		`- belt.setChanged();`
`475`		`- belt.sendData();`
	`472`	`+ belt.notifyUpdate();`
`476`	`473`	`}`
`477`	`474`	`}`
`478`	`475`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,7 @@ public static boolean flapTunnelsAndCheckIfStuck(BeltInventory beltInventory, Tr`
`56`	`56`	`if (onServer) {`
`57`	`57`	`brassTunnel.setStackToDistribute(current.stack, movementFacing.getOpposite());`
`58`	`58`	`current.stack = ItemStack.EMPTY;`
`59`		`- beltInventory.belt.sendData();`
`60`		`- beltInventory.belt.setChanged();`
	`59`	`+ beltInventory.belt.notifyUpdate();`
`61`	`60`	`}`
`62`	`61`	`removed = true;`
`63`	`62`	`}`
`@@ -92,7 +91,7 @@ public static boolean flapTunnelsAndCheckIfStuck(BeltInventory beltInventory, Tr`
`92`	`91`	`flapTunnel(beltInventory, upcomingSegment, d, false);`
`93`	`92`
`94`	`93`	`current.stack.shrink(1);`
`95`		`- beltInventory.belt.sendData();`
	`94`	`+ beltInventory.belt.notifyUpdate();`
`96`	`95`	`if (current.stack.getCount() <= 1)`
`97`	`96`	`break;`
`98`	`97`	`}`