Cleaned up our system for blockstates/variants to be a bit more simple/flexible