Fixed Tile Entity Classes & Block ID issues

Forgot to sync my changes so need to re-submit it. Also I made a couple of ID changes because of conflicting IDs.