Merge pull request #75 from TangyKiwi/master

Fix Sodium XRay compat

src/main/java/net/aoba/mixin/BlockMixin.java

@@ -34,15 +34,14 @@
 @Mixin(Block.class)
 public abstract class BlockMixin implements ItemConvertible {
 
-	@Inject(at = { @At("HEAD") }, method = {
-			"shouldDrawSide(Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Direction;)Z" }, cancellable = true)
+	@Inject(at = { @At("RETURN") }, method = {
+			"shouldDrawSide" }, cancellable = true)
 	private static void onShouldDrawSide(BlockState state, BlockState otherState, Direction side,
-			CallbackInfoReturnable<Boolean> cir) {
+										 CallbackInfoReturnable<Boolean> cir) {
 		AobaClient aoba = Aoba.getInstance();
 		XRay xray = (XRay) aoba.moduleManager.xray;
 		if (xray.state.getValue()) {
-			boolean isXray = xray.isXRayBlock(state.getBlock());
-			cir.setReturnValue(isXray);
+			cir.setReturnValue(xray.isXRayBlock(state.getBlock()));
 		}
 	}
 

src/main/java/net/aoba/mixin/ChunkOcclusionDataBuilderMixin.java

@@ -29,7 +29,7 @@
 
 @Mixin(ChunkOcclusionDataBuilder.class)
 public class ChunkOcclusionDataBuilderMixin {
-	@Inject(at = { @At("HEAD") }, method = { "markClosed(Lnet/minecraft/util/math/BlockPos;)V" }, cancellable = true)
+	@Inject(at = { @At("HEAD") }, method = { "markClosed" }, cancellable = true)
 	private void onMarkClosed(BlockPos pos, CallbackInfo ci) {
 		if (Aoba.getInstance().moduleManager.xray.state.getValue()) {
 			ci.cancel();

src/main/java/net/aoba/mixin/FluidRendererMixin.java

@@ -0,0 +1,29 @@
+package net.aoba.mixin;
+
+import net.aoba.Aoba;
+import net.aoba.AobaClient;
+import net.aoba.module.modules.render.XRay;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.block.FluidRenderer;
+import net.minecraft.fluid.FluidState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockRenderView;
+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.CallbackInfo;
+
+@Mixin(FluidRenderer.class)
+public class FluidRendererMixin {
+    @Inject(method = "render", at = @At("HEAD"), cancellable = true)
+    private void onRender(BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, CallbackInfo ci) {
+        AobaClient aoba = Aoba.getInstance();
+        XRay xray = (XRay) aoba.moduleManager.xray;
+        if (xray.state.getValue()) {
+            if (!xray.isXRayBlock(blockState.getBlock()) && !xray.fluids.getValue()) {
+                ci.cancel();
+            }
+        }
+    }
+}

src/main/java/net/aoba/mixin/sodium/SodiumBlockOcclusionCacheMixin.java

@@ -17,13 +17,13 @@
 @Mixin(value = BlockOcclusionCache.class, remap = false)
 public abstract class SodiumBlockOcclusionCacheMixin {
 
-	@Inject(at = { @At("TAIL") }, method = "shouldDrawSide", cancellable = true)
+	@Inject(at = { @At("RETURN") }, method = "shouldDrawSide", cancellable = true)
 	private void onShouldDrawSide(BlockState state, BlockView view, BlockPos pos, Direction facing,
-			CallbackInfoReturnable<Boolean> cir) {
+								  CallbackInfoReturnable<Boolean> cir) {
 		AobaClient aoba = Aoba.getInstance();
 		XRay xray = aoba.moduleManager.xray;
 		if (xray.state.getValue()) {
-			cir.setReturnValue(!xray.isXRayBlock(state.getBlock()));
+			cir.setReturnValue(xray.isXRayBlock(state.getBlock()));
 		}
 	}
 }

src/main/java/net/aoba/mixin/sodium/SodiumBlockRendererMixin.java

@@ -20,9 +20,8 @@ private void onRenderModel(BakedModel model, BlockState state, BlockPos pos, Blo
 		AobaClient aoba = Aoba.getInstance();
 		XRay xray = (XRay) aoba.moduleManager.xray;
 		if (xray.state.getValue()) {
-			if (xray.isXRayBlock(state.getBlock())) {
+			if (!xray.isXRayBlock(state.getBlock())) {
 				ci.cancel();
-				return;
 			}
 		}
 	}

src/main/java/net/aoba/mixin/sodium/SodiumFluidRendererImplMixin.java

@@ -0,0 +1,30 @@
+package net.aoba.mixin.sodium;
+
+import net.aoba.Aoba;
+import net.aoba.AobaClient;
+import net.aoba.module.modules.render.XRay;
+import net.caffeinemc.mods.sodium.client.render.chunk.compile.ChunkBuildBuffers;
+import net.caffeinemc.mods.sodium.client.render.chunk.translucent_sorting.TranslucentGeometryCollector;
+import net.caffeinemc.mods.sodium.client.world.LevelSlice;
+import net.caffeinemc.mods.sodium.fabric.render.FluidRendererImpl;
+import net.minecraft.block.BlockState;
+import net.minecraft.fluid.FluidState;
+import net.minecraft.util.math.BlockPos;
+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.CallbackInfo;
+
+@Mixin(value = FluidRendererImpl.class, remap = false)
+public abstract class SodiumFluidRendererImplMixin {
+    @Inject(method = "render", at = @At("HEAD"), cancellable = true)
+    private void onRender(LevelSlice level, BlockState blockState, FluidState fluidState, BlockPos blockPos, BlockPos offset, TranslucentGeometryCollector collector, ChunkBuildBuffers buffers, CallbackInfo ci) {
+        AobaClient aoba = Aoba.getInstance();
+        XRay xray = (XRay) aoba.moduleManager.xray;
+        if (xray.state.getValue()) {
+            if (!xray.isXRayBlock(blockState.getBlock()) && !xray.fluids.getValue()) {
+                ci.cancel();
+            }
+        }
+    }
+}

src/main/java/net/aoba/mixin/sodium/SodiumLightDataAccessMixin.java

@@ -47,7 +47,7 @@ private void onInit(CallbackInfo info) {
 	private int compute_modifyBL(int light) {
 		if (xray.state.getValue()) {
 			BlockState state = level.getBlockState(pos);
-			if (!xray.isXRayBlock(state.getBlock()))
+			if (xray.isXRayBlock(state.getBlock()))
 				return FULL_LIGHT;
 		}
 

src/main/java/net/aoba/module/modules/render/XRay.java

@@ -23,6 +23,7 @@
 
 import java.util.HashSet;
 
+import net.aoba.settings.types.BooleanSetting;
 import org.lwjgl.glfw.GLFW;
 
 import com.google.common.collect.Lists;
@@ -45,11 +46,17 @@ public class XRay extends Module {
 					Blocks.DEEPSLATE_GOLD_ORE, Blocks.DEEPSLATE_IRON_ORE, Blocks.DEEPSLATE_COAL_ORE)))
 			.onUpdate(this::ReloadRenderer).build();
 
+	public BooleanSetting fluids = BooleanSetting.builder().id("fluids").displayName("Show Fluids")
+			.description("Show fluids (water/lava) when using Xray")
+			.defaultValue(true)
+			.onUpdate(this::ReloadRenderer).build();
+
 	public XRay() {
 		super("XRay", InputUtil.fromKeyCode(GLFW.GLFW_KEY_X, 0));
 		this.setCategory(Category.of("Render"));
 		this.setDescription("Allows the player to see ores.");
 		this.addSetting(blocks);
+		this.addSetting(fluids);
 	}
 
 	@Override
@@ -81,4 +88,10 @@ public void ReloadRenderer(HashSet<Block> block) {
 			MC.worldRenderer.reload();
 		}
 	}
+
+	public void ReloadRenderer(Boolean fluids) {
+		if (MC.worldRenderer != null && state.getValue()) {
+			MC.worldRenderer.reload();
+		}
+	}
 }

src/main/resources/aoba-sodium.mixins.json

@@ -5,6 +5,7 @@
   "client": [
     "SodiumBlockRendererMixin",
     "SodiumBlockOcclusionCacheMixin",
+    "SodiumFluidRendererImplMixin",
     "SodiumLightDataAccessMixin"
   ],
   "injectors": {

src/main/resources/aoba.mixins.json

@@ -15,15 +15,14 @@
 		"interfaces.ICuboid",
 		"interfaces.IEntityModel",
 		"interfaces.IPlayerMoveC2SPacket",
-		"interfaces.IMouse",
+		"interfaces.IMouse"
 	],
 	"client": [
 		"AbstractBlockStateMixin",
 		"AbstractClientPlayerEntityMixin",
 		"AbstractSignEditScreenMixin",
 		"BackgroundRendererMixin",
 		"BlockMixin",
-		"BlockModelRendererMixin",
 		"CactusBlockMixin",
 		"CameraMixin",
 		"ChatHudMixin",
@@ -40,6 +39,7 @@
 		"EntityMixin",
 		"EntityRendererMixin",
 		"FluidBlockMixin",
+		"FluidRendererMixin",
 		"GameOptionsMixin",
 		"GameRendererMixin",
 		"HungerManagerMixin",