Upstream has released updates that appears to apply and compile correctly
Paper Changes:
b8372fc0 Improve handling of indestructable blocks
a2a06640 Add moon phase API
47f71aea Fix SpawnChangeEvent not firing for all use-cases
b6c860f2 Don't require FACING data
0c1716a1 Add #setMaxPlayers API
02aed275 [CI-SKIP] Require dependencies script (#4172)
1ccc1c67 Add smithing item helpers
20d9ec6b Fix MC-197271
e9287056 [CI-SKIP] Update issue templates with notices
949a9956ab