Revert "Moved tank data to its own CompoundTag"

This reverts commit c832b40da419d86b4366318c40dfe2d5f894fb44.