Skip to content

Handle collision shape failures during collider baking #1329

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
MACTEP-ABATAP wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle collision shape failures during collider baking #1329

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
44 changes: 35 additions & 9 deletions ...main/java/dev/ryanhcode/sable/physics/impl/rapier/collider/RapierVoxelColliderBakery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.ryanhcode.sable.physics.impl.rapier.collider;

import dev.ryanhcode.sable.Sable;
import dev.ryanhcode.sable.api.block.BlockSubLevelCollisionShape;
import dev.ryanhcode.sable.api.block.BlockWithSubLevelCollisionCallback;
import dev.ryanhcode.sable.api.physics.callback.BlockSubLevelCollisionCallback;
Expand All @@ -13,6 +14,7 @@
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -66,15 +68,7 @@ public RapierVoxelColliderBakery(@NotNull final BlockGetter blockGetter) {
return entry;
}

final VoxelShape shape;

this.level.setup(childState);
if (childState.getBlock() instanceof final BlockSubLevelCollisionShape extension) {
shape = extension.getSubLevelCollisionShape(this.level, childState);
} else {
shape = childState.getCollisionShape(this.level, BlockPos.ZERO, SableCollisionContext.get());
}
this.level.setup(Blocks.AIR.defaultBlockState());
final VoxelShape shape = this.getCollisionShapeOrFallback(childState);

if (shape.isEmpty()) {
return RapierVoxelColliderData.EMPTY;
Expand All @@ -92,6 +86,38 @@ public RapierVoxelColliderBakery(@NotNull final BlockGetter blockGetter) {
return entry;
}

private @NotNull VoxelShape getCollisionShapeOrFallback(final BlockState childState) {
try {
this.level.setup(childState);

final VoxelShape shape;
if (childState.getBlock() instanceof final BlockSubLevelCollisionShape extension) {
shape = extension.getSubLevelCollisionShape(this.level, childState);
} else {
shape = childState.getCollisionShape(this.level, BlockPos.ZERO, SableCollisionContext.get());
}

if (shape == null) {
Sable.LOGGER.warn(
"Block state {} returned a null collision shape. Falling back to a full block collision shape.",
childState
);
return Shapes.block();
}

return shape;
} catch (final Exception exception) {
Sable.LOGGER.warn(
"Failed to get collision shape for block state {}. Falling back to a full block collision shape.",
childState,
exception
);
return Shapes.block();
} finally {
this.level.setup(Blocks.AIR.defaultBlockState());
}
}

/**
* Builds / gets a saved box or compound collision shape for a block
*
Expand Down