Fix bug with pistons improperly swapping blocks
Swap around the ordering of materials
Move blocks storage to lists for each different type