mix of automated and manual cleanups and java modernizations (commit: 7746cf8)
replace old ModernBlockData with direct BlockData ref (commit: 911e31c)