Porting my datapack.

I want to port my datapack + resourcepack from 1.20.3 to 1.21.1. I changed everything so that it doesnt crash and half of it works but A. Entities are skipped and do not spawn. B. Structure chests do not generate anything. C. Structures spawn in water sometimes.