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

Fix FrameBlock::updateShape method #7

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix FrameBlock::updateShape method #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e0833b
Refactor FrameBlock::updateShape method
playwmadness Jul 18, 2024
3dd4540
fixup! Reverse the direction arg of `checkConnection` for better cohe…
playwmadness Jul 18, 2024
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
85 changes: 16 additions & 69 deletions src/main/java/com/starfish_studios/bbb/block/FrameBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@
import com.starfish_studios.bbb.BBBConfig;
import com.starfish_studios.bbb.block.properties.BBBBlockStateProperties;
import com.starfish_studios.bbb.block.properties.FrameStickDirection;
import com.starfish_studios.bbb.registry.BBBItems;
import com.starfish_studios.bbb.registry.BBBTags;
import com.tterrag.registrate.util.entry.RegistryEntry;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.stats.Stats;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
Expand Down Expand Up @@ -216,8 +210,15 @@ public BlockState getStateForPlacement(BlockPlaceContext context) {

@Override
public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor level, BlockPos currentPos, BlockPos neighborPos) {
if (state.getValue(WATERLOGGED)) level.scheduleTick(currentPos, Fluids.WATER, Fluids.WATER.getTickDelay(level));
return getConnections(state, level, currentPos);
if (state.getValue(WATERLOGGED)) {
level.scheduleTick(currentPos, Fluids.WATER, Fluids.WATER.getTickDelay(level));
}
var facing = state.getValue(FACING);
return state
.setValue(TOP, checkConnection(level, currentPos, Direction.UP))
.setValue(BOTTOM, checkConnection(level, currentPos, Direction.DOWN))
.setValue(LEFT, checkConnection(level, currentPos, facing.getClockWise()))
.setValue(RIGHT, checkConnection(level, currentPos, facing.getCounterClockWise()));
}

@Override
Expand Down Expand Up @@ -245,66 +246,12 @@ public boolean isPathfindable(BlockState state, BlockGetter level, BlockPos pos,
return false;
}

public BlockState getConnections(BlockState state, LevelAccessor level, BlockPos pos) {
boolean n = validConnection(level.getBlockState(pos.north()));
boolean e = validConnection(level.getBlockState(pos.east()));
boolean s = validConnection(level.getBlockState(pos.south()));
boolean w = validConnection(level.getBlockState(pos.west()));
boolean t = validConnection(level.getBlockState(pos.above()));
boolean b = validConnection(level.getBlockState(pos.below()));
if (state.getValue(FACING) == Direction.NORTH) {
boolean top = !t || !validConnection(level.getBlockState(pos.above()));
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()));
boolean left = !e || !validConnection(level.getBlockState(pos.east()));
boolean right = !w || !validConnection(level.getBlockState(pos.west()));
return state
.setValue(TOP, top)
.setValue(BOTTOM, bottom)
.setValue(LEFT, left)
.setValue(RIGHT, right);
} else if (state.getValue(FACING) == Direction.EAST) {
boolean top = !t || !validConnection(level.getBlockState(pos.above()));
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()));
boolean left = !s || !validConnection(level.getBlockState(pos.south()));
boolean right = !n || !validConnection(level.getBlockState(pos.north()));
return state
.setValue(TOP, top)
.setValue(BOTTOM, bottom)
.setValue(LEFT, left)
.setValue(RIGHT, right);
} else if (state.getValue(FACING) == Direction.SOUTH) {
boolean top = !t || !validConnection(level.getBlockState(pos.above()));
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()));
boolean left = !w || !validConnection(level.getBlockState(pos.west()));
boolean right = !e || !validConnection(level.getBlockState(pos.east()));
return state
.setValue(TOP, top)
.setValue(BOTTOM, bottom)
.setValue(LEFT, left)
.setValue(RIGHT, right);
} else if (state.getValue(FACING) == Direction.WEST) {
boolean top = !t || !validConnection(level.getBlockState(pos.above()));
boolean bottom = !b || !validConnection(level.getBlockState(pos.below()));
boolean left = !n || !validConnection(level.getBlockState(pos.north()));
boolean right = !s || !validConnection(level.getBlockState(pos.south()));
return state
.setValue(TOP, top)
.setValue(BOTTOM, bottom)
.setValue(LEFT, left)
.setValue(RIGHT, right);
}
return state;
}

public boolean validConnection(BlockState state) {
if (state.isFaceSturdy(null, null, Direction.UP) ||
state.isFaceSturdy(null, null, Direction.DOWN) ||
state.isFaceSturdy(null, null, Direction.NORTH) ||
state.isFaceSturdy(null, null, Direction.EAST) ||
state.isFaceSturdy(null, null, Direction.SOUTH) ||
state.isFaceSturdy(null, null, Direction.WEST)) {
return true;
}
return state.is(BBBTags.BBBBlockTags.FRAMES) || state.is(BBBTags.BBBBlockTags.STONE_FRAMES);
private static boolean checkConnection(LevelAccessor level, BlockPos pos, Direction direction) {
var relativePos = pos.relative(direction);
var state = level.getBlockState(relativePos);
boolean validConnection = state.is(BBBTags.BBBBlockTags.FRAMES)
|| state.is(BBBTags.BBBBlockTags.STONE_FRAMES)
|| state.isFaceSturdy(level, relativePos, direction.getOpposite());
return !validConnection;
}
}