Rewrite for MC 1.6-1.7 Attempt 2.

Got working 1.6