From a11b0b39b503a34bd8c1d30d48a1f9fa12b94f5c Mon Sep 17 00:00:00 2001
From: mofetaxd <conchud423@gmail.com>
Date: Wed, 8 Apr 2026 07:46:43 -0300
Subject: [PATCH] fix xray only shows exposed faces of lava and water

---
 .../SodiumDefaultFluidRendererMixin.java      | 43 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/sodium/SodiumDefaultFluidRendererMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/sodium/SodiumDefaultFluidRendererMixin.java
index f4c1d78e38..7ed71dfa18 100644
--- a/src/main/java/meteordevelopment/meteorclient/mixin/sodium/SodiumDefaultFluidRendererMixin.java
+++ b/src/main/java/meteordevelopment/meteorclient/mixin/sodium/SodiumDefaultFluidRendererMixin.java
@@ -5,6 +5,7 @@
 
 package meteordevelopment.meteorclient.mixin.sodium;
 
+import meteordevelopment.meteorclient.systems.modules.Modules;
 import meteordevelopment.meteorclient.systems.modules.render.Xray;
 import net.caffeinemc.mods.sodium.client.model.color.ColorProvider;
 import net.caffeinemc.mods.sodium.client.model.light.LightPipeline;
@@ -16,10 +17,14 @@
 import net.caffeinemc.mods.sodium.client.render.chunk.terrain.material.Material;
 import net.caffeinemc.mods.sodium.client.render.chunk.translucent_sorting.TranslucentGeometryCollector;
 import net.caffeinemc.mods.sodium.client.world.LevelSlice;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
+import net.minecraft.world.BlockRenderView;
+import net.minecraft.world.BlockView;
+
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -28,6 +33,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(value = DefaultFluidRenderer.class, remap = false)
 public abstract class SodiumDefaultFluidRendererMixin {
@@ -39,7 +45,7 @@ public abstract class SodiumDefaultFluidRendererMixin {
     private int xrayAlpha;
 
     @Inject(method = "render", at = @At("HEAD"), cancellable = true)
-    private void onRender(LevelSlice level, net.minecraft.block.BlockState blockState, FluidState fluidState, BlockPos blockPos, BlockPos offset, TranslucentGeometryCollector collector, ChunkModelBuilder meshBuilder, Material material, ColorProvider<FluidState> colorProvider, Sprite[] sprites, CallbackInfo ci) {
+    private void onRender(LevelSlice level, BlockState blockState, FluidState fluidState, BlockPos blockPos, BlockPos offset, TranslucentGeometryCollector collector, ChunkModelBuilder meshBuilder, Material material, ColorProvider<FluidState> colorProvider, Sprite[] sprites, CallbackInfo ci) {
         xrayAlpha = Xray.getAlpha(fluidState.getBlockState(), blockPos);
 
         // Cancel block rendering when alpha is 0, required for Iris support but unnecessary to check for shaders, we already force be disabled when Xray is enabled
@@ -47,7 +53,42 @@ private void onRender(LevelSlice level, net.minecraft.block.BlockState blockStat
             ci.cancel();
         }
     }
+    
+    @Inject(method = "isFullBlockFluidSideVisible", at = @At("HEAD"), cancellable = true)
+    private void meteor$forceFullBlockFluidSideVisible(BlockView view, BlockPos pos, Direction dir, FluidState fluid, CallbackInfoReturnable<Boolean> cir) {
+        Xray xray = Modules.get().get(Xray.class);
+            if (!xray.isActive()) return;
+ 
+        BlockState state = view.getBlockState(pos);
+            if (!xray.isBlocked(state.getBlock(), null)) {
+                BlockPos neighborPos = pos.offset(dir);
+                BlockState neighborState = view.getBlockState(neighborPos);
+                    cir.setReturnValue(!neighborState.getFluidState().isOf(fluid.getFluid()));
+        }
+    }
+    
+    @Inject(method = "isFluidSideExposed", at = @At("HEAD"), cancellable = true)
+    private void meteor$forceFluidSideExposed(BlockRenderView world, BlockState ownBlockState, BlockPos neighborPos, Direction dir, float height, CallbackInfoReturnable<Boolean> cir) {
+        Xray xray = Modules.get().get(Xray.class);
+            if (!xray.isActive()) return;
 
+            if (!xray.isBlocked(ownBlockState.getBlock(), null)) {
+                BlockState neighborState = world.getBlockState(neighborPos);
+                    cir.setReturnValue(!neighborState.getFluidState().isOf(ownBlockState.getFluidState().getFluid()));
+        }
+    }
+ 
+    @Inject(method = "getUpFaceExposureByNeighbors", at = @At("HEAD"), cancellable = true)
+    private void meteor$forceUpFaceExposed(BlockRenderView level, BlockPos pos, FluidState fluidState, CallbackInfoReturnable<Integer> cir) {
+        Xray xray = Modules.get().get(Xray.class);
+            if (!xray.isActive()) return;
+                BlockState state = level.getBlockState(pos);
+        
+            if (!xray.isBlocked(state.getBlock(), null)) {
+                cir.setReturnValue(3);
+        }
+    }
+    
     @Inject(method = "updateQuad", at = @At("TAIL"))
     private void onUpdateQuad(ModelQuadViewMutable quad, LevelSlice level, BlockPos pos, LightPipeline lighter, Direction dir, ModelQuadFacing facing, float brightness, ColorProvider<FluidState> colorProvider, FluidState fluidState, CallbackInfo ci) {
         if (xrayAlpha != -1) {