What is the best way to get six-pack abs and tone the body?

I’ve just gotten back into working out, I have been doing it for almost a year now; my question is this, what is the best way to get a six-pack and tone the body as well? Would weight training or body-weight training work? I’m already on a diet and drink water. Here is my question again: what is the best way to get six-pack abs and tone the body as well?