Re-entering Macau

I will be leaving after December 18 from Macau to China, then travel through China and Japan and return to Macau on January 8 to Macau as my flight back to Germany is leaving on January 10.

Before I was staying on part-time resident student VISA valid until January 05. Will there be any problem re-entering Macau for these 2 days? Should I get a tourist Visa or any other VISA for Macau before leaving to China?