[1.18.2] Tags... FluidTags

So my mod is small and only has one obstacle to upgrading from 1.18.1 -> 1.18.2.
In 1.18.1 I did..

TagKey<Fluid> fluidtags = FluidTags.getStaticTags();;
Iterator<Tag<Fluid>> iterator = fluidtags.iterator();
while(iterator.hasNext())
{
  //and I did my test here
}

I could always do the isEyeInFluid thing and test for just water...
 

entity.isEyeInFluid(FluidTags.WATER)

But seeing as how some mods are adding liquids that can act like water I figured I would loop over fluids just to be safe.
Not sure if they moved this, or shortsightedly did away with the possibility of being in something other than lava or water.
No ideas where to proceed, any pointers in the right direction... some way of getting tags of a fluid nature to loop over and test against?
Like I said worst case I can do the isEyeInFluid thing but it seems like a future problem.