Avoid zero-alpha and treat near-opaque XRay/SurfaceXray as opaque to prevent Sodium translucent BSP crashes

Author: cev-api

README.md

@@ -316,6 +316,12 @@ Because so many of these mods are entirely original, I plan to release some of t
 - Reconnect to server and immediately send a command, such as /op player
 - Adds mixin buttons to disconnect/kick/ban screens for all cracked/offline servers that have the above functions
 
+### CoordLogger
+- Detect world and local events and attempt to position it with ESP and chat messages
+- Events that are too far away the direction will be given
+- Toggles for various types of events
+- Toggles for debugging and ESP
+
 ## What’s changed or improved in this fork?
 
 ### ItemESP (Expanded)
@@ -373,6 +379,7 @@ Examples:
 ![Search](https://i.imgur.com/jxcn89u.png)
 
 ### X-Ray Improvements
+- Prevent zero-alpha and treat near-opaque as opaque to prevent Sodium translucent BSP crashes
 - Added ESP (Highlight Corners and or Fill Blocks)
     - Uses cached positions for speed
     - Optional transparency slider for ESP

src/main/java/net/wurstclient/hacks/SurfaceXrayHack.java

@@ -256,6 +256,9 @@ public int getSurfaceOpacityMask()
 	{
 		int alpha = Math.max(0,
 			Math.min(255, (int)Math.round(getSurfaceOpacity() * 255)));
+		if(alpha == 0)
+			alpha = 1; // avoid fully-zero alpha mask which can trigger renderer
+						// edge-cases
 		return alpha << 24 | 0x00FFFFFF;
 	}
 

src/main/java/net/wurstclient/hacks/XRayHack.java

@@ -606,7 +606,12 @@ public boolean isOpacityMode()
 
 	public int getOpacityColorMask()
 	{
-		return (int)(opacity.getValue() * 255) << 24 | 0xFFFFFF;
+		int a = Math.max(0,
+			Math.min(255, (int)Math.round(opacity.getValue() * 255)));
+		if(a == 0)
+			a = 1; // avoid fully-zero alpha which can trigger renderer
+					// edge-cases
+		return (a << 24) | 0x00FFFFFF;
 	}
 
 	public float getOpacityFloat()

src/main/java/net/wurstclient/mixin/sodium/BlockRendererMixin.java

@@ -43,15 +43,24 @@ private int onBufferQuad(int original)
 		{
 			SurfaceState surfaceState = surface.classifyBlock(state, pos);
 			if(surfaceState == SurfaceState.INTERIOR)
-				return original & 0x00FFFFFF;
+				return original & 0x01FFFFFF;
 			if(surfaceState == SurfaceState.SURFACE)
+			{
+				float surf = surface.getSurfaceOpacity();
+				if(surf >= 0.99f)
+					return original; // treat almost-opaque as opaque to avoid
+										// translucent sorting
 				original &= surface.getSurfaceOpacityMask();
+			}
 		}
 
 		XRayHack xray = WurstClient.INSTANCE.getHax().xRayHack;
 		if(!xray.isOpacityMode() || xray.isVisible(state.getBlock(), pos))
 			return original;
-		
+		float op = xray.getOpacityFloat();
+		if(op >= 0.99f)
+			return original; // avoid sending quads to Sodium translucent
+								// pipeline
 		return original & xray.getOpacityColorMask();
 	}
 }

src/main/java/net/wurstclient/mixin/sodium/DefaultFluidRendererMixin.java

@@ -103,16 +103,23 @@ private int onUpdateQuad(int original, @Local(argsOnly = true) BlockPos pos,
 		{
 			SurfaceState surfaceState = surface.classifyFluid(fluid, pos);
 			if(surfaceState == SurfaceState.INTERIOR)
-				return original & 0x00FFFFFF;
+				return original & 0x01FFFFFF;
 			if(surfaceState == SurfaceState.SURFACE)
+			{
+				float surf = surface.getSurfaceOpacity();
+				if(surf >= 0.99f)
+					return original;
 				original &= surface.getSurfaceOpacityMask();
+			}
 		}
 
 		XRayHack xray = WurstClient.INSTANCE.getHax().xRayHack;
 		if(!xray.isOpacityMode()
 			|| xray.isVisible(fluid.createLegacyBlock().getBlock(), pos))
 			return original;
-		
+		float op = xray.getOpacityFloat();
+		if(op >= 0.99f)
+			return original;
 		return original & xray.getOpacityColorMask();
 	}
 }