Updated for new API
Merge branch 'master' of https://github.com/MCForge/MCForge-Plugins