Remove parsing dependant on material type
Refactor redstone macros