Skip to content

Remove 0 velocity and replace it with collision block instead #53

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
divaltor wants to merge 3 commits into
base: 1.21.1
Choose a base branch
from
Open

Remove 0 velocity and replace it with collision block instead #53

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebcfb5f
cattlegrid: Remove 0 velocity and forbid mobs to pathfind it
divaltor Apr 21, 2026
4652372
cattlegrid: Add collision effect via virtual walls
divaltor Apr 21, 2026
e99abcd
cattlegrid: Remove pathfinding because build is failing due `common` …
divaltor Apr 21, 2026
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
26 changes: 22 additions & 4 deletions common/src/main/java/net/satisfy/farm_and_charm/core/block/CattlegridBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import net.minecraft.world.level.pathfinder.PathComputationType;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.EntityCollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.satisfy.farm_and_charm.core.registry.TagRegistry;
Expand All @@ -28,6 +29,15 @@
import java.util.List;

public class CattlegridBlock extends Block {
private static final VoxelShape FLOOR_COLLISION = Shapes.block();
private static final VoxelShape MOB_WALLS = Shapes.or(
Block.box(0.0, 16.0, 0.0, 16.0, 28.0, 2.0),
Block.box(0.0, 16.0, 14.0, 16.0, 28.0, 16.0),
Block.box(0.0, 16.0, 0.0, 2.0, 28.0, 16.0),
Block.box(14.0, 16.0, 0.0, 16.0, 28.0, 16.0)
);
private static final VoxelShape MOB_COLLISION = Shapes.or(FLOOR_COLLISION, MOB_WALLS);

public CattlegridBlock(Properties properties) {
super(properties);
}
Expand All @@ -54,8 +64,7 @@ public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) {
return;
}

if (entity instanceof Mob mob) {
mob.makeStuckInBlock(state, new Vec3(0.0, 1.0, 0.0));
if (entity instanceof Mob) {
return;
}

Expand All @@ -71,7 +80,16 @@ protected boolean isPathfindable(BlockState state, PathComputationType type) {

@Override
public @NotNull VoxelShape getCollisionShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) {
return Shapes.block();
if (!(context instanceof EntityCollisionContext entityContext)) {
return MOB_COLLISION;
}

Entity entity = entityContext.getEntity();
if (!(entity instanceof Mob) || entity.getType().is(TagRegistry.CAN_WALK_OVER_CATTLEGRID)) {
return FLOOR_COLLISION;
}

return MOB_COLLISION;
}

@Override
Expand All @@ -86,4 +104,4 @@ public void appendHoverText(ItemStack itemStack, Item.TooltipContext tooltipCont
tooltip.add(Component.translatable("tooltip.farm_and_charm.tooltip_information.hold", shiftKey).withStyle(Style.EMPTY.withColor(TextColor.fromRgb(earthyColor))));
}
}
}
}