Apply Moonrise patch

This does not compile. The goal was to get the patch close to
the 1.21.4 variant so that applying changes from the Moonrise mod
would be as simple as possible.

Note: Some diffs were applied from 1.21.5, most were not.

Author: Spottedleaf