I fucked my hands up punching a punching bag without gloves. Someone stole or hid the boxing gloves we had in the gym and I kind of wanted to make my knuckles harder anyways but yeah I prolly shouldn't do that again.
now my knuckles are swollen and I almost got block hands.
You'll probably heal up just fine. Before I got into martial arts, I always used to tear my hands up when I did heavy bag work outs, even with gloves on. Later, when I first started conditioning my hands, I would end up with fists that looked like I'd beaten all my knuckles flat, then once I graduated from heavy bag routines to working my punches out on a heavy wooden post, I think I actually did beat my knuckles flat a couple of times. Once was really bad, because I couldn't straighten my middle or ring fingers. The x-rays were pretty comical (not quite "why the fuck does that bone go in a spiral?" but close), but I was able to rehabilitate the hand on my own.
There are some specific liniments used in conditioning. Dit Da Jow is essential in any of the iron body/arms/palm trainings. Even if you aren't martial arts inclined, it is a handy bottle to have around. It works on swelling, sprains, bruises, and even on minor burns. It is also good for inflamed tendons.
The only downside is that the versions that are readily available tend to be weaker. I guess they have to make allowances for some idiot who decides to drink it even though it clearly says 'external use only'.