Port to 1.21.11

I noticed a spike in activity from 1.21.11 version so I thought I should make a quick hotfix for that version since it was pretty buggy when I dropped support for it, while I was at it, I added changes from the 1.6 update.

(Probably) last release for 1.21.11