Updated Upstream (Pufferfish)Upstream has released updates that appear to apply and compile correctlyPufferfish Changes:pufferfish-gg/Pufferfish@ad7419e Pull PaperMC/Paper#9377 downstream (commit: d728130)