Continue effort to update and refactor to Minecraft Forge API