Port 1.5.1 to 1.21.4

From 1.5.1: Fixed a bug where shift-clicking an offhand-preferred item when your offhand was already full of that item attempted swapping instead of falling back to vanilla's shift-click behavior, potentially causing glitchy behavior on servers

A cumulative changelog can be found here