Skip to content
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

Jump to bottom

Fix hollow log hollow collision with adjacent logs #1371

Open
wants to merge 2 commits into
base: 1.12-fixes
Choose a base branch
from
Open

Fix hollow log hollow collision with adjacent logs #1371

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a85f2ac
Fix hollow log hollow collision with adjacent logs
JoshieGemFinder Apr 20, 2023
ebdb549
Extra refactoring + comments
JoshieGemFinder Nov 9, 2023
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
46 changes: 25 additions & 21 deletions src/main/java/thebetweenlands/common/block/plant/BlockHollowLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,19 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc
return Block.FULL_BLOCK_AABB;
}

protected void addBox(EnumFacing facing, IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, Entity entityIn, boolean isActualState) {
protected void tryAddCollisionBox(EnumFacing blockFace, IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, Entity entityIn, boolean isActualState) {

// dont add collision to faces where they are connected to other logs
if(blockFace.getAxis() != EnumFacing.Axis.Y && worldIn.isBlockLoaded(pos.offset(facing))) {
IBlockState otherstate = worldIn.getBlockState(pos.offset(blockFace));
if(otherstate.getBlock() == BlockRegistry.HOLLOW_LOG && otherstate.getValue(FACING).getAxis() == blockFace.getAxis()) {
return;
}
}

// not my cleanest code, could do something with an array here?
AxisAlignedBB box;
switch(facing) {
switch(blockFace) {
case UP:
box = TOP_BOUNDING_BOX;
break;
Expand All @@ -79,39 +89,33 @@ protected void addBox(EnumFacing facing, IBlockState state, World worldIn, Block
default:
return;
}
// dont add collision to faces where they are connected to other logs
if(facing.getAxis() != EnumFacing.Axis.Y && worldIn.isBlockLoaded(pos.offset(facing))) {
IBlockState lstate = worldIn.getBlockState(pos.offset(facing));
if(lstate.getBlock() == BlockRegistry.HOLLOW_LOG && lstate.getValue(FACING).getAxis() != facing.getAxis()) {
return;
}
}

addCollisionBoxToList(pos, entityBox, collidingBoxes, box);
}

@Override
public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, Entity entityIn, boolean isActualState) {

//probably should do something with getActualState() for performance, like stairs do

EnumFacing facing = state.getValue(FACING);

//don't do any special checks for top and bottom faces
// don't do any special checks for top and bottom faces, they're always there
addCollisionBoxToList(pos, entityBox, collidingBoxes, TOP_BOUNDING_BOX);
addCollisionBoxToList(pos, entityBox, collidingBoxes, BOTTOM_BOUNDING_BOX);

//only add collision to sides that should be solid
switch(facing) {
case NORTH:
case SOUTH:
addBox(EnumFacing.EAST, state, worldIn, pos, entityBox, collidingBoxes, entityIn, isActualState);
addBox(EnumFacing.WEST, state, worldIn, pos, entityBox, collidingBoxes, entityIn, isActualState);
// only add collision to sides that should be solid
switch(facing.getAxis()) {
case EnumFacing.Axis.Z: // NORTH and SOUTH
tryAddCollisionBox(EnumFacing.EAST, state, worldIn, pos, entityBox, collidingBoxes, entityIn, isActualState);
tryAddCollisionBox(EnumFacing.WEST, state, worldIn, pos, entityBox, collidingBoxes, entityIn, isActualState);
break;
case EAST:
case WEST:
addBox(EnumFacing.NORTH, state, worldIn, pos, entityBox, collidingBoxes, entityIn, isActualState);
addBox(EnumFacing.SOUTH, state, worldIn, pos, entityBox, collidingBoxes, entityIn, isActualState);
case EnumFacing.Axis.X: // EAST and WEST
tryAddCollisionBox(EnumFacing.NORTH, state, worldIn, pos, entityBox, collidingBoxes, entityIn, isActualState);
tryAddCollisionBox(EnumFacing.SOUTH, state, worldIn, pos, entityBox, collidingBoxes, entityIn, isActualState);
break;
default:
//don't do any special collision checks for an invalid log
// don't do any special collision checks for an invalid log
addCollisionBoxToList(pos, entityBox, collidingBoxes, NORTH_BOUNDING_BOX);
addCollisionBoxToList(pos, entityBox, collidingBoxes, SOUTH_BOUNDING_BOX);
addCollisionBoxToList(pos, entityBox, collidingBoxes, EAST_BOUNDING_BOX);
Expand Down