Use a Vector2i rather than X and Y

We have the Vector2i class already, let's use it.
Incorrectly ordered