Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@227544c Move TickThread changes from Moonrise patch to MCUtils
PaperMC/Paper@67d414a Allow plugin aliases to override vanilla commands (#11186)
PaperMC/Paper@58c7ea3 Preserve command node when re-registering modern commands through old API (#11184)
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@438863c Shutdown L4J cordially if the server stops before it's even started (#11172)