smoking really only became fashionable post-ww1. Alcohol consumption may have motivated early agriculture.

It's unlikely that something as ingrained as alcohol will be made unfashionable except on multi-generational time scales.

That being said, the current trend of alcohol in every aspect of life might become pase, as more individuals seek to avoid drunkeness/temptation outside of a bar.