A recent commit has been made that caused patches to be out of order, rebuilding
Mojang asked me to make some changes, so applied them here.