Upstream has released updates that appear to apply and compile correctly
Gale Changes:
Dreeam-qwq/Gale@791f8d1 Revert "Fix fluidStateCount increment"
Dreeam-qwq/Gale@463fdde Add back Optimize entity coordinate key
Dreeam-qwq/Gale@3b27166 Add configurable xor-shift random support for optimized lighning random tick
Dreeam-qwq/Gale@1acfc2a Add back IceAndSnowTick optimization in Optimize random calls in chunk ticking