[WIP] Fix fluid dupe?

[ferriarnus]

Description

There are a few bug reports related to fluid duping. This here is one of the only code paths I think something could go wrong. If nothing else this should simplify the code. I'll keep it a draft until we can verify why/how it happens.

Closes #503 #519 #595

Todo

• Things that are yet to be completed for this PR to no longer be a draft.

Checklist:

• My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you).
• I have performed a self-review of my own code.
• I have commented my code in areas it may be challenging to understand.
• I have made corresponding changes to the documentation.
• My changes are ready for review from a contributor.

[Rover656]

I'll try to take a look at this PR tomorrow or Friday :)

[Rover656]

I was unable to even reproduce a dupe bug on my side, but i think its reasonable to move to using the fluidutil :)