California lawmakers pass water plan to improve supply