Merge pull request #21 from killjoy1221/master

Forge compat
Shifting around
Fixes compile errors. Fixed names of lots of methods.