If not then that should be done asap. You will need a complete examination and an x-ray. Often times clicking can signify damage to the ligaments and tendons in the shoulder. You will need an eaxm to determine if this is probable. Typically if an x-ray is done and it is negative an MRI
may be ordered if a tendon or ligament injury is suspected. In the meantime, rest your shoulder and take advil
) or Ibuprofen for the pain and swelling.
Best of luck.