Update ItemStack reference to getTypeId()
Cleanup
Merge branch '2.x' into 162-upgrade