Backports of various Neoforge / 1.21.1 features to 1.20.1 for easier maintenance between versions
Fixed compat with Legacy4J
