Updated for Thaumcraft 4.2 - Some minor refactoring