Merge branch '1.21/dev' into 1.21/stable

Author: FlashyReese

build.gradle.kts

@@ -14,7 +14,7 @@ val PARCHMENT_VERSION by extra { null }
 // https://semver.org/
 val MAVEN_GROUP by extra { "me.flashyreese.mods" }
 val ARCHIVE_NAME by extra { "sodium-extra" }
-val MOD_VERSION by extra { "0.6.4" }
+val MOD_VERSION by extra { "0.6.5" }
 val SODIUM_VERSION by extra { "mc1.21.6-0.6.13" }
 
 allprojects {

common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/fog/MixinFogRenderer.java

@@ -24,6 +24,8 @@ public class MixinFogRenderer {
 
     @Inject(method = "getBuffer", at = @At(value = "HEAD"), cancellable = true)
     public void getBuffer(FogRenderer.FogMode fogMode, CallbackInfoReturnable<GpuBufferSlice> cir) {
+        if (Minecraft.getInstance().level == null) return;
+
         int fogDistance = SodiumExtraClientMod.options().renderSettings.multiDimensionFogControl
                 ? SodiumExtraClientMod.options().renderSettings.dimensionFogDistanceMap.getOrDefault(Minecraft.getInstance().level.dimensionType().effectsLocation(), 0)
                 : SodiumExtraClientMod.options().renderSettings.fogDistance;