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

Fix NPE in fluid renderer mixin ()

Browse source 
* Fix NPE in fluid renderer mixin
* Ensure state, view, and pos are never null
* Bump fabric-rendering-fluids-v1 version
This commit is contained in:
Virtuoel 2019-09-12 05:09:40 +03:00 committed by Player
parent 6b7b8bda7b
commit bcce83c829
2 changed files with 12 additions and 11 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.1")
version = getSubprojectVersion(project, "0.1.2")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

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

@ -52,20 +52,21 @@ public class MixinFluidRenderer {
public void tesselate(ExtendedBlockView view, BlockPos pos, BufferBuilder bufferBuilder, FluidState state, CallbackInfoReturnable<Boolean> info) {
FluidRendererHookContainer ctr = fabric_renderHandler.get();
FluidRenderHandler handler = FluidRenderHandlerRegistryImpl.INSTANCE.getOverride(state.getFluid());
if (handler == null) {
return;
}
/* ActionResult hResult = handler.tesselate(view, pos, bufferBuilder, state);
if (hResult != ActionResult.PASS) {
info.setReturnValue(hResult == ActionResult.SUCCESS);
return;
} */
ctr.view = view;
ctr.pos = pos;
ctr.state = state;
ctr.handler = handler;
/* if (handler == null) {
return;
}
ActionResult hResult = handler.tesselate(view, pos, bufferBuilder, state);
if (hResult != ActionResult.PASS) {
info.setReturnValue(hResult == ActionResult.SUCCESS);
return;
} */
}
@Inject(at = @At("RETURN"), method = "tesselate")
@ -81,7 +82,7 @@ public class MixinFluidRenderer {
// 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));
return chk || !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)