Right Click Effects

I've made an item that when right clicked puts a different item in it's place, and it worked at first! But then I added a couple other functions to the same right click function and now it doesn't work. Instead of replacing it in the hand it's being held in, it replaces it in the first slot of the hotbar and I don't know how to fix it. Any tips would be appreciated!