I managed to move it, yet forgot to actually fix it up...
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing