If you've had a kidney stone, are your chances good of having them again in the future?

I had them when I was 21 from calcium buildup resulting from not drinking enough water. I'm 28 now, & I drink a lot more water but probably still not enough. Do you know what my risks are, because I definitely wouldn't want to go through that nightmare again! Thanks :)