mostly finished 1.21.6, except fog

build.gradle

@@ -87,19 +87,19 @@ dependencies {
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
     //TODO: this is to eventually not need sodium installed as atm its just used for parsing shaders
-    modRuntimeOnlyMsk "maven.modrinth:sodium:mc1.21.5-0.6.13-fabric"
+    modRuntimeOnlyMsk "maven.modrinth:sodium:mc1.21.6-0.6.13-fabric"
-    modCompileOnly "maven.modrinth:sodium:mc1.21.5-0.6.13-fabric"
+    modCompileOnly "maven.modrinth:sodium:mc1.21.6-0.6.13-fabric"
 
-    modImplementation("maven.modrinth:lithium:mc1.21.5-0.16.0-fabric")
+    modImplementation("maven.modrinth:lithium:mc1.21.6-0.17.0-fabric")
 
     //modRuntimeOnly "maven.modrinth:nvidium:0.2.6-beta"
     //modCompileOnly "maven.modrinth:nvidium:0.2.8-beta"
 
-    modCompileOnly("maven.modrinth:modmenu:14.0.0-rc.2")
+    modCompileOnly("maven.modrinth:modmenu:15.0.0-beta.1")
-    modRuntimeOnlyMsk("maven.modrinth:modmenu:14.0.0-rc.2")
+    modRuntimeOnlyMsk("maven.modrinth:modmenu:15.0.0-beta.1")
 
-    modCompileOnly("maven.modrinth:iris:1.8.11+1.21.5-fabric")
+    modCompileOnly("maven.modrinth:iris:1.9.0+1.21.6-fabric")
-    modRuntimeOnlyMsk("maven.modrinth:iris:1.8.11+1.21.5-fabric")
+    modRuntimeOnlyMsk("maven.modrinth:iris:1.9.0+1.21.6-fabric")
 
     //modCompileOnly("maven.modrinth:starlight:1.1.3+1.20.4")
 
@@ -109,7 +109,7 @@ dependencies {
     modCompileOnly("maven.modrinth:chunky:1.4.36-fabric")
     modRuntimeOnlyMsk("maven.modrinth:chunky:1.4.36-fabric")
 
-    modRuntimeOnlyMsk("maven.modrinth:spark:1.10.121-fabric")
+    modRuntimeOnlyMsk("maven.modrinth:spark:1.10.138-fabric")
     modRuntimeOnlyMsk("maven.modrinth:fabric-permissions-api:0.3.3")
     //modRuntimeOnly("maven.modrinth:nsight-loader:1.2.0")
 

gradle.properties

@@ -6,12 +6,12 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.6-rc1
+minecraft_version=1.21.6
-yarn_mappings=1.21.6-rc1+build.1
+yarn_mappings=1.21.6+build.1
 loader_version=0.16.14
 
 # Fabric API
-fabric_version=0.126.1+1.21.6
+fabric_version=0.127.0+1.21.6
 
 # Mod Properties
 mod_version = 0.2.0-alpha

src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinBackgroundRenderer.java

@@ -1,27 +0,0 @@
-package me.cortex.voxy.client.mixin.minecraft;
-
-import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import me.cortex.voxy.client.config.VoxyConfig;
-import me.cortex.voxy.client.core.IGetVoxyRenderSystem;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.BackgroundRenderer;
-import net.minecraft.client.render.Camera;
-import net.minecraft.client.render.Fog;
-import org.joml.Vector4f;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.Inject;
-
-@Mixin(BackgroundRenderer.class)
-public class MixinBackgroundRenderer {
-    @WrapMethod(method = "applyFog")
-    private static Fog voxy$overrideFog(Camera camera, BackgroundRenderer.FogType fogType, Vector4f color, float viewDistance, boolean thickenFog, float tickProgress, Operation<Fog> original) {
-        var vrs = (IGetVoxyRenderSystem)MinecraftClient.getInstance().worldRenderer;
-        if (VoxyConfig.CONFIG.renderVanillaFog || vrs == null || vrs.getVoxyRenderSystem() == null) {
-            return original.call(camera, fogType, color, viewDistance, thickenFog, tickProgress);
-        } else {
-            return Fog.DUMMY;
-        }
-    }
-}

src/main/java/me/cortex/voxy/client/mixin/sodium/MixinDefaultChunkRenderer.java

@@ -8,6 +8,7 @@ import net.caffeinemc.mods.sodium.client.render.chunk.lists.ChunkRenderListItera
 import net.caffeinemc.mods.sodium.client.render.chunk.terrain.DefaultTerrainRenderPasses;
 import net.caffeinemc.mods.sodium.client.render.chunk.terrain.TerrainRenderPass;
 import net.caffeinemc.mods.sodium.client.render.viewport.CameraTransform;
+import net.caffeinemc.mods.sodium.client.util.FogParameters;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.util.math.MatrixStack;
 import org.joml.Matrix4f;
@@ -20,7 +21,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinDefaultChunkRenderer {
 
     @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/render/chunk/ShaderChunkRenderer;end(Lnet/caffeinemc/mods/sodium/client/render/chunk/terrain/TerrainRenderPass;)V", shift = At.Shift.BEFORE))
-    private void injectRender(ChunkRenderMatrices matrices, CommandList commandList, ChunkRenderListIterable renderLists, TerrainRenderPass renderPass, CameraTransform camera, CallbackInfo ci) {
+    private void injectRender(ChunkRenderMatrices matrices, CommandList commandList, ChunkRenderListIterable renderLists, TerrainRenderPass renderPass, CameraTransform camera, FogParameters parameters, CallbackInfo ci) {
         if (renderPass == DefaultTerrainRenderPasses.CUTOUT) {
             var renderer = ((IGetVoxyRenderSystem) MinecraftClient.getInstance().worldRenderer).getVoxyRenderSystem();
             if (renderer != null) {

src/main/resources/client.voxy.mixins.json

@@ -3,7 +3,6 @@
   "package": "me.cortex.voxy.client.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "minecraft.MixinBackgroundRenderer",
     "minecraft.MixinClientCommonNetworkHandler",
     "minecraft.MixinClientLoginNetworkHandler",
     "minecraft.MixinDebugHud",

src/main/resources/fabric.mod.json

@@ -32,7 +32,7 @@
     "common.voxy.mixins.json"
   ],
   "depends": {
-    "minecraft": "1.21.5",
+    "minecraft": "1.21.6",
     "fabricloader": ">=0.14.22",
     "fabric-api": ">=0.91.1",
     "sodium": ">=0.6.13"