Update to latest upstream, and redo mixed mode patch to achieve compatibility with ProtocolLib