Update to latest Fabric API and Sodium

Author: Alexander01998

gradle.properties

@@ -7,12 +7,12 @@ org.gradle.configuration-cache=true
 # check these at https://fabricmc.net/develop/ and
 # https://modrinth.com/mod/fabric-api/versions
 minecraft_version=1.21.11
-yarn_mappings=1.21.11+build.2
-loader_version=0.18.2
+yarn_mappings=1.21.11+build.3
+loader_version=0.18.3
 loom_version=1.14-SNAPSHOT
 
 # Fabric API
-fabric_version=0.139.4+1.21.11
+fabric_version=0.140.0+1.21.11
 
 # Mod Properties
 mod_version=v7.51.3-MC1.21.11
@@ -26,5 +26,5 @@ mcx_repo_id=Wurst-Imperium/Wurst-MCX2
 
 # Dependencies
 # check at https://modrinth.com/mod/sodium/versions?l=fabric&g=1.21.11
-sodium_version=mc1.21.11-0.8.0-fabric
+sodium_version=mc1.21.11-0.8.1-fabric
 do_mod_compat_test=true

src/gametest/java/net/wurstclient/gametest/tests/XRayHackTest.java

@@ -57,7 +57,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_opacity",
 			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/hXdzoDB.png"
-				: "https://i.imgur.com/ERrL7ko.png");
+				: "https://i.imgur.com/oZqevTx.png");
 
 		// Exposed only + opacity
 		runWurstCommand(context, "setcheckbox X-Ray only_show_exposed on");
@@ -67,7 +67,7 @@ public static void testXRayHack(ClientGameTestContext context,
 		waitForChunkReloading(context, world);
 		assertScreenshotEquals(context, "xray_exposed_only_opacity",
 			WurstTest.IS_MOD_COMPAT_TEST ? "https://i.imgur.com/ZwIARSr.png"
-				: "https://i.imgur.com/mCnP6LG.png");
+				: "https://i.imgur.com/3DLxNuS.png");
 
 		// Clean up
 		runCommand(server, "fill ~-5 ~-2 ~4 ~5 ~5 ~7 air");

src/main/java/net/wurstclient/mixin/indigo/AbstractTerrainRenderContextMixin.java

@@ -7,43 +7,45 @@
  */
 package net.wurstclient.mixin.indigo;
 
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-// import
-// net.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl;
-// import
-// net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractTerrainRenderContext;
-// import
-// net.fabricmc.fabric.impl.client.indigo.renderer.render.BlockRenderInfo;
+import net.fabricmc.fabric.impl.client.indigo.renderer.mesh.MutableQuadViewImpl;
+import net.fabricmc.fabric.impl.client.indigo.renderer.render.BlockRenderInfo;
+import net.wurstclient.WurstClient;
+import net.wurstclient.hacks.XRayHack;
 
 @Pseudo
 @Mixin(
 	targets = "net.fabricmc.fabric.impl.client.indigo.renderer.render.AbstractTerrainRenderContext",
 	remap = false)
 public abstract class AbstractTerrainRenderContextMixin
 {
-	// @Shadow
-	// @Final
-	// private BlockRenderInfo blockInfo;
+	@Shadow
+	@Final
+	private BlockRenderInfo blockInfo;
 
-	// /**
-	// * Applies X-Ray's opacity mask to the block color after all the normal
-	// * coloring and shading is done, if Indigo is running.
-	// */
-	// @Inject(at = @At("RETURN"),
-	// method =
-	// "shadeQuad(Lnet/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl;ZZZ)V",
-	// require = 0)
-	// private void onShadeQuad(MutableQuadViewImpl quad, boolean ao,
-	// boolean emissive, boolean vanillaShade, CallbackInfo ci)
-	// {
-	// XRayHack xray = WurstClient.INSTANCE.getHax().xRayHack;
-	// if(!xray.isOpacityMode() || xray
-	// .isVisible(blockInfo.blockState.getBlock(), blockInfo.blockPos))
-	// return;
-	
-	// for(int i = 0; i < 4; i++)
-	// quad.color(i, quad.color(i) & xray.getOpacityColorMask());
-	// }
+	/**
+	 * Applies X-Ray's opacity mask to the block color after all the normal
+	 * coloring and shading is done, if Indigo is running.
+	 */
+	@Inject(at = @At("RETURN"),
+		method = "shadeQuad(Lnet/fabricmc/fabric/impl/client/indigo/renderer/mesh/MutableQuadViewImpl;ZZZ)V",
+		require = 0)
+	private void onShadeQuad(MutableQuadViewImpl quad, boolean ao,
+		boolean emissive, boolean vanillaShade, CallbackInfo ci)
+	{
+		XRayHack xray = WurstClient.INSTANCE.getHax().xRayHack;
+		if(!xray.isOpacityMode() || xray
+			.isVisible(blockInfo.blockState.getBlock(), blockInfo.blockPos))
+			return;
+		
+		for(int i = 0; i < 4; i++)
+			quad.color(i, quad.color(i) & xray.getOpacityColorMask());
+	}
 }

src/main/resources/fabric.mod.json

@@ -26,7 +26,7 @@
   "accessWidener": "wurst.accesswidener",
   "depends": {
     "fabricloader": ">=0.17.3",
-    "fabric-api": ">=0.139.1",
+    "fabric-api": ">=0.140.0",
     "minecraft": "~1.21.11-beta.1",
     "java": ">=21"
   },