Make X-Ray fully compatible with Sodium

build.gradle

@@ -24,6 +24,14 @@ repositories {
 	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
 	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
 	// for more information about repositories.
+	maven {
+		name = 'Modrinth'
+		url = 'https://api.modrinth.com/maven'
+
+		content {
+			includeGroup "maven.modrinth"
+		}
+	}
 }
 
 dependencies {
@@ -34,6 +42,9 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+	// Sodium, required for X-Ray compatibility.
+	modCompileOnly "maven.modrinth:sodium:${project.sodium_version}"
 
 	// net.wurstclient.ai.PathPos extends net.minecraft.util.math.BlockPos,
 	// which uses javax.annotation.concurrent.Immutable, which is part of

gradle.properties

@@ -18,3 +18,4 @@ maven_group = net.wurstclient
 archives_base_name = Wurst-Client
 
 # Dependencies
+sodium_version=mc1.20.2-0.5.3

src/main/java/net/wurstclient/mixin/SodiumBlockOcclusionCacheMixin.java

@@ -7,11 +7,7 @@
  */
 package net.wurstclient.mixin;
 
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Pseudo;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockOcclusionCache;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
@@ -20,17 +16,17 @@
 import net.wurstclient.event.EventManager;
 import net.wurstclient.events.ShouldDrawSideListener.ShouldDrawSideEvent;
 
-@Pseudo
-@Mixin(targets = {
-	"me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockOcclusionCache",
-	"me.jellysquid.mods.sodium.client.render.occlusion.BlockOcclusionCache"},
-	remap = false)
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(value = BlockOcclusionCache.class, remap = false)
 public class SodiumBlockOcclusionCacheMixin
 {
 	@Inject(at = @At("HEAD"),
 		method = "shouldDrawSide",
-		cancellable = true,
-		remap = false)
+		cancellable = true)
 	public void shouldDrawSide(BlockState state, BlockView world, BlockPos pos,
 		Direction side, CallbackInfoReturnable<Boolean> cir)
 	{

src/main/java/net/wurstclient/mixin/SodiumBlockRendererMixin.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2014-2023 Wurst-Imperium and contributors.
+ *
+ * This source code is subject to the terms of the GNU General Public
+ * License, version 3. If a copy of the GPL was not distributed with this
+ * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
+ */
+package net.wurstclient.mixin;
+
+import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderContext;
+import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockRenderer;
+
+import net.minecraft.client.render.model.BakedQuad;
+import net.minecraft.util.math.Direction;
+import net.wurstclient.event.EventManager;
+import net.wurstclient.events.ShouldDrawSideListener.ShouldDrawSideEvent;
+
+import org.spongepowered.asm.mixin.Mixin;
+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.List;
+
+@Mixin(value = BlockRenderer.class, remap = false)
+public class SodiumBlockRendererMixin
+{
+    @Inject(at = @At("HEAD"),
+        method = "getGeometry",
+        cancellable = true)
+    private void getGeometry(BlockRenderContext ctx, Direction face,
+		CallbackInfoReturnable<List<BakedQuad>> cir)
+    {
+        if (face != null) return;
+
+        ShouldDrawSideEvent event = new ShouldDrawSideEvent(ctx.state(), ctx.pos());
+        EventManager.fire(event);
+
+        if (event.isRendered() != null && !event.isRendered())
+            cir.setReturnValue(List.of());
+    }
+}

src/main/java/net/wurstclient/mixin/SodiumFluidRendererMixin.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2014-2023 Wurst-Imperium and contributors.
+ *
+ * This source code is subject to the terms of the GNU General Public
+ * License, version 3. If a copy of the GPL was not distributed with this
+ * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
+ */
+package net.wurstclient.mixin;
+
+import me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.FluidRenderer;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.BlockRenderView;
+import net.wurstclient.event.EventManager;
+import net.wurstclient.events.ShouldDrawSideListener.ShouldDrawSideEvent;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(value = FluidRenderer.class, remap = false)
+public class SodiumFluidRendererMixin
+{
+    @Inject(at = @At("HEAD"),
+        method = "isSideExposed",
+        cancellable = true)
+    private void isSideExposed(BlockRenderView world,
+		int x, int y, int z, Direction dir, float height,
+		CallbackInfoReturnable<Boolean> cir)
+    {
+        BlockPos pos = new BlockPos(x, y, z);
+        BlockState state = world.getBlockState(pos);
+        ShouldDrawSideEvent event = new ShouldDrawSideEvent(state, pos);
+        EventManager.fire(event);
+
+        if(event.isRendered() != null)
+            cir.setReturnValue(event.isRendered());
+    }
+}

src/main/resources/wurst.mixins.json

@@ -54,6 +54,8 @@
     "ShulkerBoxScreenMixin",
     "SimpleOptionMixin",
     "SodiumBlockOcclusionCacheMixin",
+    "SodiumBlockRendererMixin",
+    "SodiumFluidRendererMixin",
     "StatsScreenMixin",
     "StatusEffectInstanceMixin",
     "TelemetryManagerMixin",