Merge branch '1.17' into 1.18

Author: IMS212

src/main/java/net/coderbot/iris/pipeline/newshader/NewWorldRenderingPipeline.java

@@ -581,7 +581,8 @@ public void finalizeLevelRendering() {
 
 	@Override
 	public boolean shouldDisableVanillaEntityShadows() {
-		return true;
+		// OptiFine seems to disable vanilla shadows when the shaderpack uses shadow mapping?
+		return shadowMapRenderer instanceof ShadowRenderer;
 	}
 
 	@Override

src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/mixin/IrisSodiumCompatMixinPlugin.java

@@ -1,6 +1,5 @@
 package net.coderbot.iris.compat.sodium.mixin;
 
-import net.coderbot.iris.Iris;
 import net.coderbot.iris.compat.sodium.SodiumVersionCheck;
 import net.fabricmc.loader.api.FabricLoader;
 import org.objectweb.asm.tree.ClassNode;
@@ -22,7 +21,8 @@ public void onLoad(String mixinPackage) {
 		}).orElse(false);
 
 		if (!validSodiumVersion) {
-			Iris.logger.error("Invalid/missing version of Sodium detected, disabling compatibility mixins!");
+			// We can't use Iris' logger here due to classloading issues.
+			System.err.println("[Iris] Invalid/missing version of Sodium detected, disabling compatibility mixins!");
 		}
 	}