Update to revision 6 of MCStats lite metrics
Clean up some calls
Start preparing for trapped chest support