THe good thief doesn[t count becauwe Christ had not made baptism obligatory, and the church was not yet established because pentecost had not come.
Actually, if you read the Roman Catechism, which interprets the council of Trent, the council, when it said, “or the desire for them” wasn’t saying you can be justified either by baptism or the desire for baptism. It said no one can be justified without baptism or its desire. Meaning all who are to be saved are to be baptized. But all who are to be baptized must desire baptism. Watch, this is pretty cool:
"Dispositions for Baptism
Intention
The faithful are also to be instructed in the necessary dispositions for Baptism. In the first place they must desire and intend to receive it; for as in Baptism we all die to sin and resolve to live a new life, it is fit that it be administered to those only who receive it of their own free will and accord; it is to be forced upon none. Hence we learn from holy tradition that it has been the invariable practice to administer Baptism to no individual without previously asking him if he be willing to receive it. This disposition even infants are presumed to have, since the will of the Church, which promises for them, cannot be mistaken."
So what Trent means is that all have to be baptized to be saved. And in order to be baptized, all have to desire baptism. It must be a free act of the will, otherwise, if a person receive it only for fire insurance, it is a sacrilege, and it will condemn the person to hell, should they die on the spot. It’s interesting how the dsaving waters of baptism become waters of condemnation for those who are not properly disposed. THerefore, we must be disposed.
BUT is this disposition sufficient BY ITSELF and incomplete for salvation?
"Baptism Made Obligatory After Christ’s Resurrection
The second period to be distinguished, that is, the time when the law of Baptism was made, also admits of no doubt. Holy writers are unanimous in saying that after the Resurrection of our Lord, when He gave to His Apostles the command to go and teach all nations: baptising them in the name of the Father, and of the Son, and of the Holy Ghost, **the law of Baptism became obligatory on all who were to be saved."
“If the knowledge of what has been hitherto explained be, as it is, of highest importance to the faithful, it is no less important to them to learn that the law of Baptism, as established by our Lord, extends to all, so that unless they are regenerated to God through the grace of Baptism, be their parents Christians or infidels, they are born to eternal misery and destruction. Pastors, therefore, should often explain these words of the Gospel: Unless a man be born again of water and the Holy Ghost, he cannot enter into the kingdom of God.”