I attempted to look into this and PR however due to forge and fabric handling this differently it proved more complicated and may require a deeper change to architectury to fully solve. or I could be blind and completely missed a simple solution.