merge mixins

[o7Moon]

i think stonecutter can handle swapping the boatmixin between boatentity and abstractboatentity, having a separate file for the 1.21.3+ mixin makes it confusing for contributors and easy to miss