Fix #1657 and Fix #1662

Author: IThundxr

src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java

@@ -452,25 +452,24 @@ private void tryClearingSpoutputOverflow() {
 					continue;
 				}
 
-			if (targetInv == null)
-				break;
-
-			long inserted = TransferUtil.insertItem(targetInv, itemStack);
-			if (inserted == 0)
-				continue;
-			if (filter != null && !filter.test(itemStack))
-				continue;
+				if (targetInv == null)
+					break;
 
-			if (visualizedOutputItems.size() < 3)
-				visualizedOutputItems.add(LongAttached.withZero(itemStack));
-			update = true;
+				try (Transaction nested = t.openNested()) {
+					long inserted = targetInv.insert(ItemVariant.of(itemStack), itemStack.getCount(), nested);
+					if (itemStack.getCount() != inserted)
+						continue;
+					if (filter != null && !filter.test(itemStack))
+						continue;
+
+					if (visualizedOutputItems.size() < 3)
+						visualizedOutputItems.add(LongAttached.withZero(itemStack));
+					update = true;
 
-			inserted = TransferUtil.insertItem(targetInv, itemStack.copy());
-			if (inserted == itemStack.getCount())
-				iterator.remove();
-			else
-				itemStack.setCount((int) inserted);
-		}
+					iterator.remove();
+					nested.commit();
+				}
+			}
 
 			for (Iterator<FluidStack> iterator = spoutputFluidBuffer.iterator(); iterator.hasNext();) {
 				FluidStack fluidStack = iterator.next();