1.21.4 BackPort

This is a 1.21.4 back port that’s only works for 1.21.1 and 1.20.1