Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/assets/voxy/shaders/post/depth_copy.frag

@@ -1,8 +1,9 @@
 #version 330 core
 
 layout(binding = 0) uniform sampler2D depthTex;
+layout(location = 1) uniform vec2 scaleFactor;
 
 in vec2 UV;
 void main() {
-    gl_FragDepth = texture(depthTex, UV).r;
+    gl_FragDepth = texture(depthTex, UV*scaleFactor).r;
 }

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

@@ -5,28 +5,28 @@
   "client": [
     "flashback.MixinFlashbackMeta",
     "flashback.MixinFlashbackRecorder",
-    "iris.MixinLevelRenderer",
-    "iris.MixinPackRenderTargetDirectives",
     "iris.CustomUniformsAccessor",
     "iris.IrisRenderingPipelineAccessor",
     "iris.MixinIris",
     "iris.MixinIrisRenderingPipeline",
     "iris.MixinIrisSamplers",
+    "iris.MixinLevelRenderer",
     "iris.MixinMatrixUniforms",
+    "iris.MixinPackRenderTargetDirectives",
     "iris.MixinProgramSet",
     "iris.MixinShaderPackSourceNames",
     "iris.MixinStandardMacros",
-    "minecraft.MixinClientLevel",
+    "minecraft.MixinBlockableEventLoop",
     "minecraft.MixinClientChunkCache",
     "minecraft.MixinClientCommonPacketListenerImpl",
+    "minecraft.MixinClientLevel",
     "minecraft.MixinClientPacketListener",
     "minecraft.MixinFogRenderer",
     "minecraft.MixinGlDebug",
+    "minecraft.MixinLevelRenderer",
     "minecraft.MixinMinecraft",
     "minecraft.MixinRenderSystem",
-    "minecraft.MixinBlockableEventLoop",
     "minecraft.MixinWindow",
-    "minecraft.MixinLevelRenderer",
     "nvidium.MixinRenderPipeline",
     "sodium.AccessorChunkTracker",
     "sodium.AccessorSodiumWorldRenderer",
@@ -34,7 +34,8 @@
     "sodium.MixinDefaultChunkRenderer",
     "sodium.MixinRenderSectionManager",
     "sodium.MixinSodiumOptionsGUI",
-    "sodium.MixinSodiumWorldRenderer"
+    "sodium.MixinSodiumWorldRenderer",
+    "minecraft.MixinLayerLightSectionStorage"
   ],
   "injectors": {
     "defaultRequire": 1

src/main/resources/fabric.mod.json

@@ -28,7 +28,10 @@
     ]
   },
   "mixins": [
-    "client.voxy.mixins.json",
+    {
+      "config": "client.voxy.mixins.json",
+      "environment": "client"
+    },
     "common.voxy.mixins.json"
   ],
   "depends": {