Skip to content

Bedrock block hitboxes #919

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

Merged
merged 21 commits into from
Nov 3, 2025
Merged

Bedrock block hitboxes #919

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
aef1ad5
Adjust Bedrock Hitboxes
Exterminate5573 Oct 20, 2025
58ca0e1
Merge branch 'ViaVersion:main' into feat/bedrock-hitboxes
Exterminate5573 Oct 20, 2025
a5c013f
Merge branch 'main' into feat/bedrock-hitboxes
FlorianMichael Oct 20, 2025
fc66e79
Revert incorrect changes
Exterminate5573 Oct 20, 2025
658e4a3
Merge remote-tracking branch 'origin/feat/bedrock-hitboxes' into feat…
Exterminate5573 Oct 20, 2025
7677987
Fix bedrock chest collision
Exterminate5573 Oct 20, 2025
5502795
Bro
Exterminate5573 Oct 21, 2025
abe1668
Exact bedrock shape
Exterminate5573 Oct 21, 2025
602f40f
More block collision shapes
Exterminate5573 Oct 21, 2025
a054bb4
trapdoor
Exterminate5573 Oct 21, 2025
af28d0e
De-float and fix culling shapes
Exterminate5573 Oct 21, 2025
5e3f339
Clean mixins
Exterminate5573 Oct 21, 2025
164643c
Finalize block shapes
Exterminate5573 Oct 22, 2025
3d911fb
Unify method names
Exterminate5573 Oct 22, 2025
bc91881
Dragon egg
Exterminate5573 Oct 22, 2025
cc45166
Sea pickle
Exterminate5573 Oct 22, 2025
27dd03a
Candle Cake
Exterminate5573 Oct 22, 2025
dcd4e76
Fix pickle outline shape
Exterminate5573 Oct 22, 2025
694ec07
Fix pickle outline shape
Exterminate5573 Oct 22, 2025
72b8357
Merge branch 'main' into feat/bedrock-hitboxes
Exterminate5573 Nov 3, 2025
6d11363
Refactor to bedrock package
Exterminate5573 Nov 3, 2025
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
4 changes: 3 additions & 1 deletion ...java/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinBedBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.world.BlockView;
import net.raphimc.viabedrock.api.BedrockProtocolVersion;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
Expand All @@ -55,7 +56,8 @@ protected MixinBedBlock(Settings settings) {
private void changeOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) {
if (ViaFabricPlusMixinPlugin.MORE_CULLING_PRESENT && viaFabricPlus$requireOriginalShape) {
viaFabricPlus$requireOriginalShape = false;
} else if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_13_2)) {
} else if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_13_2)
|| ProtocolTranslator.getTargetVersion().equals(BedrockProtocolVersion.bedrockLatest)) {
cir.setReturnValue(viaFabricPlus$shape_r1_13_2);
}
}
Expand Down
32 changes: 31 additions & 1 deletion ...va/com/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinChestBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,43 @@
import java.util.Map;
import java.util.function.Supplier;
import net.minecraft.block.AbstractChestBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.ChestBlock;
import net.minecraft.block.ShapeContext;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.block.entity.ChestBlockEntity;
import net.minecraft.block.enums.ChestType;
import net.minecraft.state.property.EnumProperty;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView;
import net.raphimc.viabedrock.api.BedrockProtocolVersion;
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

@Mixin(ChestBlock.class)
public abstract class MixinChestBlock extends AbstractChestBlock<ChestBlockEntity> {

@Unique
private static final VoxelShape viaFabricPlus$single_chest_shape_bedrock = VoxelShapes.cuboid(0.025F, 0, 0.025F, 0.975F, 0.95F, 0.975F);

@Unique
private static final Map<Direction, VoxelShape> viaFabricPlus$double_chest_shapes_bedrock = Map.of(
Direction.NORTH, VoxelShapes.cuboid(0.025F, 0, 0, 0.975F, 0.95F, 0.975F),
Direction.SOUTH, VoxelShapes.cuboid(0.025F, 0, 0.025F, 0.975F, 0.95F, 1),
Direction.WEST, VoxelShapes.cuboid(0, 0, 0.025F, 0.975F, 0.95F, 0.975F),
Direction.EAST, VoxelShapes.cuboid(0.025F, 0, 0.025F, 1, 0.95F, 0.975F)
);

@Shadow
@Final
private static Map<Direction, VoxelShape> DOUBLE_SHAPES_BY_DIRECTION;
Expand All @@ -55,6 +70,15 @@ public abstract class MixinChestBlock extends AbstractChestBlock<ChestBlockEntit
@Final
private static VoxelShape SINGLE_SHAPE;

@Shadow
@Final
public static EnumProperty<ChestType> CHEST_TYPE;

@Shadow
public static Direction getFacing(final BlockState state) {
return null;
}

protected MixinChestBlock(Settings settings, Supplier<BlockEntityType<? extends ChestBlockEntity>> blockEntityTypeSupplier) {
super(settings, blockEntityTypeSupplier);
}
Expand All @@ -63,12 +87,18 @@ protected MixinChestBlock(Settings settings, Supplier<BlockEntityType<? extends
private void changeOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) {
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_4_2)) {
cir.setReturnValue(VoxelShapes.fullCube());
} else if (ProtocolTranslator.getTargetVersion().equals(BedrockProtocolVersion.bedrockLatest)) {
cir.setReturnValue(switch (state.get(CHEST_TYPE)) {
case SINGLE -> viaFabricPlus$single_chest_shape_bedrock;
case LEFT, RIGHT -> viaFabricPlus$double_chest_shapes_bedrock.get(getFacing(state));
});
}
}

@Override
public VoxelShape getCullingShape(BlockState state) {
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_4_2)) {
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_4_2)
|| ProtocolTranslator.getTargetVersion().equals(BedrockProtocolVersion.bedrockLatest)) {
if (state.get(ChestBlock.CHEST_TYPE) == ChestType.SINGLE) {
return SINGLE_SHAPE;
} else {
Expand Down
12 changes: 11 additions & 1 deletion ...m/viaversion/viafabricplus/injection/mixin/features/block/shape/MixinEnderChestBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
package com.viaversion.viafabricplus.injection.mixin.features.block.shape;

import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.BlockWithEntity;
import net.minecraft.block.EnderChestBlock;
Expand All @@ -30,17 +31,23 @@
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView;
import net.raphimc.viabedrock.api.BedrockProtocolVersion;
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

@Mixin(EnderChestBlock.class)
public abstract class MixinEnderChestBlock extends BlockWithEntity {

//https://bugs-legacy.mojang.com/browse/MCPE-94126
@Unique
private static final VoxelShape viaFabricPlus$shape_bedrock = Block.createColumnShape(15.15F, 0.0F, 15.15F);

@Shadow
@Final
private static VoxelShape SHAPE;
Expand All @@ -53,12 +60,15 @@ protected MixinEnderChestBlock(Settings settings) {
private void changeOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable<VoxelShape> cir) {
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_4_2)) {
cir.setReturnValue(VoxelShapes.fullCube());
} else if (ProtocolTranslator.getTargetVersion().equals(BedrockProtocolVersion.bedrockLatest)) {
cir.setReturnValue(viaFabricPlus$shape_bedrock);
}
}

@Override
public VoxelShape getCullingShape(BlockState state) {
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_4_2)) {
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_4_2)
|| ProtocolTranslator.getTargetVersion().equals(BedrockProtocolVersion.bedrockLatest)) {
return SHAPE;
} else {
return super.getCullingShape(state);
Expand Down