Move EntityProtocol to Vanilla

Signed-off-by: Jack Huey kitskub@gmail.com
Update some for API changes

Signed-off-by: Jack Huey kitskub@gmail.com