Refactored constants
Merge branch '3.6.0' of https://github.com/WildBamaBoy/minecraft-comes-alive into 3.6.0