Skip to content

Fix Sodium crash on branches/roots (null material NPE) #1142

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
crunny wants to merge 1 commit into
base: develop/1.21.1
Choose a base branch
from
Open

Fix Sodium crash on branches/roots (null material NPE) #1142

Show file tree
Hide file tree
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
20 changes: 16 additions & 4 deletions fabric/src/main/java/com/dtteam/dynamictrees/model/baked/BasicBranchBlockBakedModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
import net.fabricmc.fabric.api.renderer.v1.mesh.*;
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
import net.fabricmc.fabric.api.renderer.v1.material.MaterialFinder;
import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial;
import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.BlockElement;
import net.minecraft.client.renderer.block.model.BlockElementFace;
Expand Down Expand Up @@ -200,7 +203,7 @@ public void emitBlockQuads(BlockAndTintGetter blockView, BlockState state, Block
}
for (BakedQuad quad : quads) {
if (quad.getDirection() == face) {
emitQuad(emitter, quad, face);
emitQuad(emitter, quad, face, context);
}
}
}
Expand All @@ -214,7 +217,7 @@ public void emitBlockQuads(BlockAndTintGetter blockView, BlockState state, Block
if (sleeveQuads != null) {
for (BakedQuad quad : sleeveQuads) {
if (quad.getDirection() == face) {
emitQuad(emitter, quad, face);
emitQuad(emitter, quad, face, context);
}
}
}
Expand All @@ -224,8 +227,17 @@ public void emitBlockQuads(BlockAndTintGetter blockView, BlockState state, Block
}
}

protected void emitQuad(QuadEmitter emitter, BakedQuad quad, Direction cullFace) {
emitter.fromVanilla(quad, null, cullFace);
protected void emitQuad(QuadEmitter emitter, BakedQuad quad, Direction cullFace, RenderContext context) {
var renderer = RendererAccess.INSTANCE.getRenderer();

MaterialFinder finder = renderer.materialFinder();

finder.disableAo(0, true);
finder.disableDiffuse(0, true);

RenderMaterial material = finder.find();

emitter.fromVanilla(quad, material, cullFace);
emitter.emit();
}

Expand Down
1 change: 0 additions & 1 deletion fabric/src/main/java/com/dtteam/dynamictrees/model/baked/BasicRootsBlockBakedModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ protected int getRadius(BlockState blockState) {
return super.getRadius(blockState);
}

@Override
protected void emitQuad(QuadEmitter emitter, BakedQuad quad, Direction cullFace) {
emitter.fromVanilla(quad, null, null);
emitter.emit();
Expand Down
33 changes: 30 additions & 3 deletions fabric/src/main/java/com/dtteam/dynamictrees/model/baked/SurfaceRootBlockBakedModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
import net.fabricmc.fabric.api.renderer.v1.material.MaterialFinder;
import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial;
import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.BlockElement;
import net.minecraft.client.renderer.block.model.BlockElementFace;
Expand Down Expand Up @@ -254,7 +257,15 @@ public void emitBlockQuads(BlockAndTintGetter blockView, BlockState state, Block
if (coreQuads != null) {
for (BakedQuad quad : coreQuads) {
if (quad.getDirection() == face) {
emitter.fromVanilla(quad, null, null);
var renderer = RendererAccess.INSTANCE.getRenderer();
MaterialFinder finder = renderer.materialFinder();

finder.disableAo(0, true);
finder.disableDiffuse(0, true);

RenderMaterial material = finder.find();

emitter.fromVanilla(quad, material, null);
emitter.emit();
}
}
Expand All @@ -269,15 +280,31 @@ public void emitBlockQuads(BlockAndTintGetter blockView, BlockState state, Block
if (isGrounded && sleevesQuads[idx][connRadius - 1] != null) {
for (BakedQuad quad : sleevesQuads[idx][connRadius - 1]) {
if (quad.getDirection() == face) {
emitter.fromVanilla(quad, null, null);
var renderer = RendererAccess.INSTANCE.getRenderer();
MaterialFinder finder = renderer.materialFinder();

finder.disableAo(0, true);
finder.disableDiffuse(0, true);

RenderMaterial material = finder.find();

emitter.fromVanilla(quad, material, null);
emitter.emit();
}
}
}
if (connectionLevels[idx] == RootConnections.ConnectionLevel.HIGH && vertsQuads[idx][connRadius - 1] != null) {
for (BakedQuad quad : vertsQuads[idx][connRadius - 1]) {
if (quad.getDirection() == face) {
emitter.fromVanilla(quad, null, null);
var renderer = RendererAccess.INSTANCE.getRenderer();
MaterialFinder finder = renderer.materialFinder();

finder.disableAo(0, true);
finder.disableDiffuse(0, true);

RenderMaterial material = finder.find();

emitter.fromVanilla(quad, material, null);
emitter.emit();
}
}
Expand Down
15 changes: 12 additions & 3 deletions fabric/src/main/java/com/dtteam/dynamictrees/model/baked/ThickBranchBlockBakedModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import com.dtteam.dynamictrees.utility.CoordUtils.Surround;
import com.google.common.collect.Maps;
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
import net.fabricmc.fabric.api.renderer.v1.material.MaterialFinder;
import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial;
import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.BlockElement;
import net.minecraft.client.renderer.block.model.BlockElementFace;
Expand Down Expand Up @@ -196,12 +199,18 @@ public void emitBlockQuads(BlockAndTintGetter blockView, BlockState state, Block
int radiusIndex = coreRadius - 9;
if (radiusIndex < 0 || radiusIndex >= trunksBarkQuads.length) return;

var renderer = RendererAccess.INSTANCE.getRenderer();
MaterialFinder finder = renderer.materialFinder();
finder.disableAo(0, true);
finder.disableDiffuse(0, true);
RenderMaterial material = finder.find();

for (Direction face : Direction.values()) {
List<BakedQuad> barkQuads = trunksBarkQuads[radiusIndex];
if (barkQuads != null) {
for (BakedQuad quad : barkQuads) {
if (quad.getDirection() == face) {
emitter.fromVanilla(quad, null, face);
emitter.fromVanilla(quad, material, face);
emitter.emit();
}
}
Expand All @@ -213,7 +222,7 @@ public void emitBlockQuads(BlockAndTintGetter blockView, BlockState state, Block
if (ringQuads != null) {
for (BakedQuad quad : ringQuads) {
if (quad.getDirection() == face) {
emitter.fromVanilla(quad, null, face);
emitter.fromVanilla(quad, material, face);
emitter.emit();
}
}
Expand All @@ -223,7 +232,7 @@ public void emitBlockQuads(BlockAndTintGetter blockView, BlockState state, Block
if (topBarkQuads != null) {
for (BakedQuad quad : topBarkQuads) {
if (quad.getDirection() == face) {
emitter.fromVanilla(quad, null, face);
emitter.fromVanilla(quad, material, face);
emitter.emit();
}
}
Expand Down