Updated to match the changes in vanilla mc1.5