Skip to content

Defensive null checks for Chain Conveyor renderer to prevent NPE during package rendering #9067

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
wants to merge 1 commit into
base: mc1.20.1/dev
Choose a base branch
from
Open

Defensive null checks for Chain Conveyor renderer to prevent NPE during package rendering #9067

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
58 changes: 43 additions & 15 deletions src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,27 @@ public ChainConveyorRenderer(Context context) {

@Override
protected void renderSafe(ChainConveyorBlockEntity be, float partialTicks, PoseStack ms, MultiBufferSource buffer,
int light, int overlay) {
int light, int overlay) {
// Defensive: if the BE has no level or blockstate yet, bail out early.
if (be == null)
return;
Level level = be.getLevel();
if (level == null)
return;
BlockState state = be.getBlockState();
if (state == null)
return;

super.renderSafe(be, partialTicks, ms, buffer, light, overlay);
BlockPos pos = be.getBlockPos();

renderChains(be, ms, buffer, light, overlay);

if (VisualizationManager.supportsVisualization(be.getLevel()))
if (VisualizationManager.supportsVisualization(level))
return;

CachedBuffers.partial(AllPartialModels.CHAIN_CONVEYOR_WHEEL, be.getBlockState())
// use the validated state variable
CachedBuffers.partial(AllPartialModels.CHAIN_CONVEYOR_WHEEL, state)
.light(light)
.overlay(overlay)
.renderInto(ms, buffer.getBuffer(RenderType.cutoutMipped()));
Expand Down Expand Up @@ -100,10 +111,22 @@ private void renderBox(ChainConveyorBlockEntity be, PoseStack ms, MultiBufferSou
physicsData.modelKey = key;
}

//More Safety Checks
ResourceLocation modelKey = physicsData.modelKey;
if (modelKey == null)
Copy link
Contributor

@Jozufozu Jozufozu Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As Tropheus said this is the only check that should be necessary and the others should be removed. Do we need a similar check in the ChainConveyorVisual?

Also can we move it up in the method to skip the expensive light lookups if we're going to early out anyway?

return;

var rigModel = AllPartialModels.PACKAGE_RIGGING.get(modelKey);
var boxModel = AllPartialModels.PACKAGES.get(modelKey);

// If either partial model is missing, skip rendering this package to avoid cache loader nulls.
if (rigModel == null || boxModel == null)
return;

SuperByteBuffer rigBuffer =
CachedBuffers.partial(AllPartialModels.PACKAGE_RIGGING.get(physicsData.modelKey), blockState);
CachedBuffers.partial(rigModel, blockState);
SuperByteBuffer boxBuffer =
CachedBuffers.partial(AllPartialModels.PACKAGES.get(physicsData.modelKey), blockState);
CachedBuffers.partial(boxModel, blockState);

Vec3 dangleDiff = VecHelper.rotate(targetPosition.add(0, 0.5, 0)
.subtract(position), -yaw, Axis.Y);
Expand Down Expand Up @@ -153,20 +176,25 @@ private void renderChains(ChainConveyorBlockEntity be, PoseStack ms, MultiBuffer
.length());

Level level = be.getLevel();
if (level == null)
continue;
BlockPos tilePos = be.getBlockPos();
Vec3 startOffset = stats.start()
.subtract(Vec3.atCenterOf(tilePos));

if (!VisualizationManager.supportsVisualization(be.getLevel())) {
SuperByteBuffer guard =
CachedBuffers.partial(AllPartialModels.CHAIN_CONVEYOR_GUARD, be.getBlockState());
guard.center();
guard.rotateYDegrees((float) yaw);

guard.uncenter();
guard.light(light)
.overlay(overlay)
.renderInto(ms, buffer.getBuffer(RenderType.cutoutMipped()));
if (!VisualizationManager.supportsVisualization(level)) {
BlockState state = be.getBlockState();
if (state != null) {
SuperByteBuffer guard =
CachedBuffers.partial(AllPartialModels.CHAIN_CONVEYOR_GUARD, state);
guard.center();
guard.rotateYDegrees((float) yaw);

guard.uncenter();
guard.light(light)
.overlay(overlay)
.renderInto(ms, buffer.getBuffer(RenderType.cutoutMipped()));
}
}

ms.pushPose();
Expand Down