Backport of d29524b to 1.21.10. Also bumped ASM to 9.9.1, EventBus to 7.0.1 (non-beta) and MixinExtras to 0.5.3
d29524b