Cleanup BlockState data to reduce duplication with FluidState

[me4502]

With the addition of FluidState, we've got a bit of duplication across BlockState & FluidState. Ideally we should clean this up in the future to share more code.