fix beta 5 crash

IrisShaders · Nov 17, 2024 · 5d6a035 · 5d6a035
1 parent 7a19eb8
commit 5d6a035
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -58,7 +58,7 @@ dependencies {
 
     modCompileOnly("net.fabricmc.fabric-api:fabric-renderer-api-v1:3.2.9+1172e897d7")
 
-    modImplementation("maven.modrinth", "sodium", "mc1.21-0.6.0-beta.2-fabric")
+    modImplementation("maven.modrinth", "sodium", "mc1.21.1-0.6.0-fabric")
     modCompileOnly("org.antlr:antlr4-runtime:4.13.1")
     modCompileOnly("io.github.douira:glsl-transformer:2.0.1")
     modCompileOnly("org.anarres:jcpp:1.4.14")

diff --git a/common/src/main/java/net/irisshaders/iris/vertices/sodium/terrain/XHFPTerrainVertex.java b/common/src/main/java/net/irisshaders/iris/vertices/sodium/terrain/XHFPTerrainVertex.java
@@ -1,6 +1,7 @@
 package net.irisshaders.iris.vertices.sodium.terrain;
 
 import net.caffeinemc.mods.sodium.api.util.ColorABGR;
+import net.caffeinemc.mods.sodium.api.util.ColorARGB;
 import net.caffeinemc.mods.sodium.client.render.chunk.vertex.format.ChunkVertexEncoder;
 import net.caffeinemc.mods.sodium.client.render.frapi.helper.ColorHelper;
 import net.irisshaders.iris.shaderpack.materialmap.WorldRenderingSettings;
@@ -150,7 +151,7 @@ public long write(long ptr,
 
 			MemoryUtil.memPutInt(ptr, packPositionHi(x, y, z));
 			MemoryUtil.memPutInt(ptr + 4L, packPositionLo(x, y, z));
-			MemoryUtil.memPutInt(ptr + 8L, WorldRenderingSettings.INSTANCE.shouldUseSeparateAo() ? ColorABGR.withAlpha(vertex.color, vertex.ao) : ColorHelper.multiplyRGB(vertex.color, vertex.ao));
+			MemoryUtil.memPutInt(ptr + 8L, WorldRenderingSettings.INSTANCE.shouldUseSeparateAo() ? ColorABGR.withAlpha(vertex.color, vertex.ao) : ColorARGB.mulRGB(vertex.color, vertex.ao));
 			MemoryUtil.memPutInt(ptr + 12L, packTexture(u, v));
 			MemoryUtil.memPutInt(ptr + 16L, packLightAndData(light, material, section));
 

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
     addRuntimeFabricModule("fabric-rendering-fluids-v1")
     addRuntimeFabricModule("fabric-resource-loader-v0")
 
-    modImplementation("maven.modrinth", "sodium", "mc1.21-0.6.0-beta.2-fabric")
+    modImplementation("maven.modrinth", "sodium", "mc1.21.1-0.6.0-fabric")
     implementAndInclude("org.antlr:antlr4-runtime:4.13.1")
     implementAndInclude("io.github.douira:glsl-transformer:2.0.1")
     implementAndInclude("org.anarres:jcpp:1.4.14")

diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
@@ -119,7 +119,7 @@ dependencies {
     includeDep("org.sinytra.forgified-fabric-api:fabric-rendering-data-attachment-v1:0.3.48+73761d2e19")
     includeDep("org.sinytra.forgified-fabric-api:fabric-block-view-api-v2:1.0.10+9afaaf8c19")
 
-    implementation("maven.modrinth", "sodium", "mc1.21-0.6.0-beta.2-neoforge")
+    implementation("maven.modrinth", "sodium", "mc1.21.1-0.6.0-neoforge")
     includeAdditional("io.github.douira:glsl-transformer:2.0.1")
     includeAdditional("org.anarres:jcpp:1.4.14")
 }