fix sodium and iris integration for sky and emancipation

wisp-forest · Dec 9, 2024 · 1884dcb · 1884dcb
1 parent b83b08e
commit 1884dcb
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/src/main/java/io/wispforest/affinity/client/render/EmancipationVertexConsumerProvider.java b/src/main/java/io/wispforest/affinity/client/render/EmancipationVertexConsumerProvider.java
@@ -120,7 +120,7 @@ public VertexConsumer overlay(int u, int v) {
 
         @Override
         public VertexConsumer light(int u, int v) {
-            this.delegate.light(u | v << 16);
+            this.light = u | v << 16;
             return this;
         }
 

diff --git a/src/main/java/io/wispforest/affinity/mixin/client/iris/SodiumProgramsMixin.java b/src/main/java/io/wispforest/affinity/mixin/client/iris/SodiumProgramsMixin.java
@@ -0,0 +1,33 @@
+package io.wispforest.affinity.mixin.client.iris;
+
+import io.wispforest.affinity.client.render.SkyCaptureBuffer;
+import io.wispforest.affinity.misc.CompatMixin;
+import io.wispforest.affinity.mixin.client.sodium.TerrainRenderPassAccessor;
+import net.caffeinemc.mods.sodium.client.render.chunk.terrain.DefaultTerrainRenderPasses;
+import net.caffeinemc.mods.sodium.client.render.chunk.terrain.TerrainRenderPass;
+import net.irisshaders.iris.pipeline.programs.SodiumPrograms;
+import net.irisshaders.iris.shadows.ShadowRenderingState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Arrays;
+
+@Pseudo
+@CompatMixin("iris")
+@Mixin(SodiumPrograms.class)
+public class SodiumProgramsMixin {
+
+    @Unique
+    private static final TerrainRenderPass SKY_PASS = Arrays.stream(DefaultTerrainRenderPasses.ALL).filter(pass -> ((TerrainRenderPassAccessor) pass).affinity$getLayer() == SkyCaptureBuffer.SKY_STENCIL_LAYER).findFirst().get();
+
+    @Inject(method = "mapTerrainRenderPass", at = @At("HEAD"), cancellable = true)
+    private void fixSky(TerrainRenderPass pass, CallbackInfoReturnable<SodiumPrograms.Pass> cir) {
+        if (pass != SKY_PASS) return;
+        cir.setReturnValue(ShadowRenderingState.areShadowsCurrentlyBeingRendered() ? SodiumPrograms.Pass.SHADOW : SodiumPrograms.Pass.TERRAIN);
+    }
+
+}
diff --git a/src/main/resources/affinity.mixins.json b/src/main/resources/affinity.mixins.json
@@ -132,11 +132,13 @@
     "client.WorldRendererAccessor",
     "client.WorldRendererMixin",
     "client.iris.HorizonRendererMixin",
+    "client.iris.SodiumProgramsMixin",
     "client.iris.WorldRenderingPhaseMixin",
     "client.sodium.DefaultMaterialsMixin",
     "client.sodium.DefaultTerrainRenderPassesMixin",
     "client.sodium.SodiumWorldRendererMixin",
-    "client.sodium.TerrainRenderPassAccessor"
+    "client.sodium.TerrainRenderPassAccessor",
+    "client.sodium.AlphaMaskConsumerMixin"
   ],
   "injectors": {
     "defaultRequire": 1