Fix new_style_water

This fixes the former broken new_style_water and removes this function from the shader.