Stocks crashing

- Fixed crash when modifying pipe structures while they are transporting fluids #7515
- Fixed shift-inserting into toolboxes causing items to be voided #7519
- Fixed inconsistent component serialisation in backtank BE
- Fixed table cloths not showing tooltips and enchantment effect when configured
- Fixed shopping list tooltip expanding as its viewed #7503
- Fixed crash when selling enchanted items on a table cloth #7516 #7536

src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java

@@ -125,7 +125,8 @@ public class BacktankBlockEntity extends KineticBlockEntity implements Nameable
 		if (this.customName != null)
 			compound.putString("CustomName", Component.Serializer.toJson(this.customName, registries));
 
-		compound.put("Components", CatnipCodecUtils.encode(DataComponentPatch.CODEC, registries, componentPatch).orElseThrow());
+		compound.put("Components", CatnipCodecUtils.encode(DataComponentPatch.CODEC, registries, componentPatch)
+			.orElse(new CompoundTag()));
 	}
 
 	@Override
@@ -139,7 +140,7 @@ public class BacktankBlockEntity extends KineticBlockEntity implements Nameable
 		if (compound.contains("CustomName", 8))
 			this.customName = Component.Serializer.fromJson(compound.getString("CustomName"), registries);
 
-		componentPatch = CatnipCodecUtils.decode(DataComponentPatch.CODEC, registries, compound).orElse(DataComponentPatch.EMPTY);
+		componentPatch = CatnipCodecUtils.decode(DataComponentPatch.CODEC, registries, compound.getCompound("Components")).orElse(DataComponentPatch.EMPTY);
 		if (prev != 0 && prev != airLevel && airLevel == BacktankUtil.maxAir(capacityEnchantLevel) && clientPacket)
 			playFilledEffect();
 	}

src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxMenu.java

@@ -20,8 +20,6 @@ import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntity;
 
-import net.neoforged.neoforge.items.SlotItemHandler;
-
 public class ToolboxMenu extends MenuBase<ToolboxBlockEntity> {
 
 	public ToolboxMenu(MenuType<?> type, int id, Inventory inv, RegistryFriendlyByteBuf extraData) {
@@ -65,8 +63,9 @@ public class ToolboxMenu extends MenuBase<ToolboxBlockEntity> {
 		if (index < size) {
 			success = !moveItemStackTo(stack, size, slots.size(), false);
 			contentHolder.inventory.onContentsChanged(index);
-		} else
+		} else {
 			success = !moveItemStackTo(stack, 0, size - 1, false);
+		}
 
 		return success ? ItemStack.EMPTY : stack;
 	}
@@ -137,11 +136,11 @@ public class ToolboxMenu extends MenuBase<ToolboxBlockEntity> {
 			int baseIndex = compartment * STACKS_PER_COMPARTMENT;
 
 			// Representative Slots
-			addSlot(new ToolboxSlot(this, inventory, baseIndex, xOffsets[compartment], yOffsets[compartment]));
+			addSlot(new ToolboxSlot(this, inventory, baseIndex, xOffsets[compartment], yOffsets[compartment], true));
 
 			// Hidden Slots
 			for (int i = 1; i < STACKS_PER_COMPARTMENT; i++)
-				addSlot(new SlotItemHandler(inventory, baseIndex + i, -10000, -10000));
+				addSlot(new ToolboxSlot(this, inventory, baseIndex + i, -10000, -10000, false));
 		}
 
 		addPlayerSlots(8, 165);

src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxSlot.java

@@ -1,20 +1,37 @@
 package com.simibubi.create.content.equipment.toolbox;
 
+import net.minecraft.world.item.ItemStack;
 import net.neoforged.neoforge.items.IItemHandler;
 import net.neoforged.neoforge.items.SlotItemHandler;
 
 public class ToolboxSlot extends SlotItemHandler {
 
 	private ToolboxMenu toolboxMenu;
+	private boolean isVisible;
 
-	public ToolboxSlot(ToolboxMenu menu, IItemHandler itemHandler, int index, int xPosition, int yPosition) {
+	public ToolboxSlot(ToolboxMenu menu, IItemHandler itemHandler, int index, int xPosition, int yPosition, boolean isVisible) {
 		super(itemHandler, index, xPosition, yPosition);
 		this.toolboxMenu = menu;
+		this.isVisible = isVisible;
 	}
 
 	@Override
 	public boolean isActive() {
-		return !toolboxMenu.renderPass && super.isActive();
+		return !toolboxMenu.renderPass && super.isActive() && isVisible;
+	}
+	
+	@Override
+	public int getMaxStackSize(ItemStack stack) {
+		ItemStack maxAdd = stack.copy();
+		int maxInput = stack.getMaxStackSize();
+		maxAdd.setCount(maxInput);
+
+		IItemHandler handler = this.getItemHandler();
+		ItemStack currentStack = handler.getStackInSlot(index);
+		ItemStack remainder = handler.insertItem(index, maxAdd, true);
+		int current = currentStack.getCount();
+		int added = maxInput - remainder.getCount();
+		return current + added;
 	}
 
 }

src/main/java/com/simibubi/create/content/fluids/FluidNetwork.java

@@ -45,7 +45,7 @@ public class FluidNetwork {
 	Set<Pair<BlockFace, PipeConnection>> frontier;
 	Set<BlockPos> visited;
 	FluidStack fluid;
-	List<Pair<BlockFace, @Nullable ICapabilityProvider<IFluidHandler>>> targets;
+	List<Pair<BlockFace, FlowSource>> targets;
 	Map<BlockPos, WeakReference<FluidTransportBehaviour>> cache;
 
 	public FluidNetwork(Level world, BlockFace location, Supplier<@Nullable ICapabilityProvider<IFluidHandler>> sourceSupplier) {
@@ -141,8 +141,7 @@ public class FluidNetwork {
 
 					if (adjacent.source.isPresent() && adjacent.source.get()
 						.isEndpoint()) {
-						targets.add(Pair.of(adjacentLocation, adjacent.source.get()
-							.provideHandler()));
+						targets.add(Pair.of(adjacentLocation, adjacent.source.get()));
 						continue;
 					}
 
@@ -169,7 +168,7 @@ public class FluidNetwork {
 
 		if (targets.isEmpty())
 			return;
-		for (Pair<BlockFace, @Nullable ICapabilityProvider<IFluidHandler>> pair : targets) {
+		for (Pair<BlockFace, FlowSource> pair : targets) {
 			if (pair.getSecond() != null && world.getGameTime() % 40 != 0)
 				continue;
 			PipeConnection pipeConnection = get(pair.getFirst());
@@ -177,7 +176,7 @@ public class FluidNetwork {
 				continue;
 			pipeConnection.source.ifPresent(fs -> {
 				if (fs.isEndpoint())
-					pair.setSecond(fs.provideHandler());
+					pair.setSecond(fs);
 			});
 		}
 
@@ -215,14 +214,13 @@ public class FluidNetwork {
 			if (simulate)
 				flowSpeed = transfer.getAmount();
 
-			List<Pair<BlockFace, @Nullable ICapabilityProvider<IFluidHandler>>> availableOutputs = new ArrayList<>(targets);
+			List<Pair<BlockFace, FlowSource>> availableOutputs = new ArrayList<>(targets);
 			while (!availableOutputs.isEmpty() && transfer.getAmount() > 0) {
 				int dividedTransfer = transfer.getAmount() / availableOutputs.size();
 				int remainder = transfer.getAmount() % availableOutputs.size();
 
-				for (Iterator<Pair<BlockFace, @Nullable ICapabilityProvider<IFluidHandler>>> iterator =
-					 availableOutputs.iterator(); iterator.hasNext();) {
-					Pair<BlockFace, @Nullable ICapabilityProvider<IFluidHandler>> pair = iterator.next();
+				for (Iterator<Pair<BlockFace, FlowSource>> iterator = availableOutputs.iterator(); iterator.hasNext();) {
+					Pair<BlockFace, FlowSource> pair = iterator.next();
 					int toTransfer = dividedTransfer;
 					if (remainder > 0) {
 						toTransfer++;
@@ -231,7 +229,7 @@ public class FluidNetwork {
 
 					if (transfer.isEmpty())
 						break;
-					@Nullable ICapabilityProvider<IFluidHandler> targetHandlerProvider = pair.getSecond();
+					@Nullable ICapabilityProvider<IFluidHandler> targetHandlerProvider = pair.getSecond().provideHandler();
 					if (targetHandlerProvider == null) {
 						iterator.remove();
 						continue;

src/main/java/com/simibubi/create/content/logistics/tableCloth/ShoppingListItem.java

@@ -129,7 +129,7 @@ public class ShoppingListItem extends Item {
 						(cost ? CreateLang.translate("table_cloth.total_cost") : CreateLang.text(""))
 							.style(ChatFormatting.GOLD)
 							.add(CreateLang.builder()
-								.add(entry.stack.getHoverName())
+								.add(entry.stack.getHoverName().plainCopy())
 								.text(" x")
 								.text(String.valueOf(entry.count))
 								.style(cost ? ChatFormatting.YELLOW : ChatFormatting.GRAY))
@@ -142,7 +142,7 @@ public class ShoppingListItem extends Item {
 								.addTo(tooltipComponents);
 						for (BigItemStack entry : entries) {
 							CreateLang.builder()
-								.add(entry.stack.getHoverName())
+								.add(entry.stack.getHoverName().plainCopy())
 								.text(" x")
 								.text(String.valueOf(entry.count))
 								.style(cost ? ChatFormatting.YELLOW : ChatFormatting.GRAY)

src/main/java/com/simibubi/create/content/logistics/tableCloth/TableClothBlockEntity.java

@@ -294,7 +294,7 @@ public class TableClothBlockEntity extends SmartBlockEntity {
 		super.write(tag, registries, clientPacket);
 		tag.put("Items", NBTHelper.writeItemList(manuallyAddedItems, registries));
 		tag.putInt("Facing", facing.get2DDataValue());
-		tag.put("RequestData", CatnipCodecUtils.encode(AutoRequestData.CODEC, requestData).orElseThrow());
+		tag.put("RequestData", CatnipCodecUtils.encode(AutoRequestData.CODEC, registries, requestData).orElseThrow());
 		if (owner != null)
 			tag.putUUID("OwnerUUID", owner);
 	}
@@ -303,7 +303,7 @@ public class TableClothBlockEntity extends SmartBlockEntity {
 	protected void read(CompoundTag tag, HolderLookup.Provider registries, boolean clientPacket) {
 		super.read(tag, registries, clientPacket);
 		manuallyAddedItems = NBTHelper.readItemList(tag.getList("Items", Tag.TAG_COMPOUND), registries);
-		requestData = CatnipCodecUtils.decode(AutoRequestData.CODEC, tag.get("RequestData"))
+		requestData = CatnipCodecUtils.decode(AutoRequestData.CODEC, registries, tag.get("RequestData"))
 			.orElse(new AutoRequestData());
 		owner = tag.contains("OwnerUUID") ? tag.getUUID("OwnerUUID") : null;
 		facing = Direction.from2DDataValue(Mth.positiveModulo(tag.getInt("Facing"), 4));

src/main/java/com/simibubi/create/content/logistics/tableCloth/TableClothBlockItem.java

@@ -21,7 +21,7 @@ public class TableClothBlockItem extends BlockItem {
 
 	@Override
 	public boolean isFoil(ItemStack pStack) {
-		return pStack.has(AllDataComponents.CLICK_TO_LINK_DATA);
+		return pStack.has(AllDataComponents.AUTO_REQUEST_DATA);
 	}
 
 	@Override