Changed to use base classes
Merge branch 'master' of github.com:OpenMods/OpenBlocks