Skip to content

fix xray only shows exposed faces of lava and water #6303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mofetaxd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix xray only shows exposed faces of lava and water #6303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion ...ain/java/meteordevelopment/meteorclient/mixin/sodium/SodiumDefaultFluidRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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 {
Expand All @@ -39,15 +45,50 @@ 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
if (xrayAlpha == 0) {
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) {
Expand Down
Loading