FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-21 03:10:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions7

Honor special case water/glass rendering ()

Browse source
This commit is contained in:
grondag 2019-08-07 23:58:20 +01:00 • committed by modmuss50
parent 9b03381f03
commit 39442fc282
2 changed files with 9 additions and 2 deletions
fabric-rendering-fluids-v1
build.gradle
src/main/java/net/fabricmc/fabric/mixin/client/render/fluid
MixinFluidRenderer.java

2
fabric-rendering-fluids-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-rendering-fluids-v1"
version = getSubprojectVersion(project, "0.1.0")
version = getSubprojectVersion(project, "0.1.1")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

9
fabric-rendering-fluids-v1/src/main/java/net/fabricmc/fabric/mixin/client/render/fluid/MixinFluidRenderer.java
View file

@ -23,6 +23,7 @@ import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.block.FluidRenderer;
import net.minecraft.client.texture.Sprite;
import net.minecraft.fluid.FluidState;
import net.minecraft.tag.FluidTags;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ExtendedBlockView;
import org.spongepowered.asm.mixin.Mixin;
@ -74,7 +75,13 @@ public class MixinFluidRenderer {
@ModifyVariable(at = @At(value = "INVOKE", target = "net/minecraft/client/render/block/FluidRenderer.isSameFluid(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;Lnet/minecraft/fluid/FluidState;)Z"), method = "tesselate", ordinal = 0)
public boolean modLavaCheck(boolean chk) {
return fabric_renderHandler.get().handler != null || chk;
// First boolean local is set by vanilla according to 'matches lava'
// but uses the negation consistent with 'matches water'
// for determining if special water sprite should be used behind glass.
// Has other uses but those have already happened by the time the hook is called.
final FluidRendererHookContainer ctr = fabric_renderHandler.get();
return chk || (ctr != null && !ctr.state.matches(FluidTags.WATER));
}
@ModifyVariable(at = @At(value = "INVOKE", target = "net/minecraft/client/render/block/FluidRenderer.isSameFluid(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction;Lnet/minecraft/fluid/FluidState;)Z"), method = "tesselate", ordinal = 0)