dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix predicate for cover detection

Browse Source
This commit is contained in:
Darkere
2021-11-14 20:20:01 +01:00
parent e36884d2e4
commit f616ed4cb1
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/refinedmods/refinedstorage/block/CableBlock.java
View File

@@ -1,7 +1,9 @@
package com.refinedmods.refinedstorage.block; package com.refinedmods.refinedstorage.block;
import com.refinedmods.refinedstorage.api.network.node.ICoverable; import com.refinedmods.refinedstorage.api.network.node.ICoverable;
import com.refinedmods.refinedstorage.api.network.node.INetworkNode;
import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy; import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.Cover;
import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverType; import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverType;
import com.refinedmods.refinedstorage.block.shape.ShapeCache; import com.refinedmods.refinedstorage.block.shape.ShapeCache;
import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability; import com.refinedmods.refinedstorage.capability.NetworkNodeProxyCapability;
@@ -29,6 +31,7 @@ import net.minecraft.world.IWorld;
import net.minecraft.world.World; import net.minecraft.world.World;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Optional;
public class CableBlock extends NetworkNodeBlock implements IWaterLoggable { public class CableBlock extends NetworkNodeBlock implements IWaterLoggable {
private static final BooleanProperty NORTH = BooleanProperty.create("north"); private static final BooleanProperty NORTH = BooleanProperty.create("north");
@@ -154,7 +157,7 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable {
return IWaterLoggable.super.canContainFluid(worldIn, pos, state, fluidIn); return IWaterLoggable.super.canContainFluid(worldIn, pos, state, fluidIn);
} }
private boolean hasNode(IWorld world, BlockPos pos, BlockState state, Direction direction) { private boolean hasNodeConnection(IWorld world, BlockPos pos, BlockState state, Direction direction) {
// Prevent the "holder" of a cable block conflicting with a cable connection. // Prevent the "holder" of a cable block conflicting with a cable connection.
if (getDirection() != BlockDirection.NONE && state.get(getDirection().getProperty()).getOpposite() == direction) { if (getDirection() != BlockDirection.NONE && state.get(getDirection().getProperty()).getOpposite() == direction) {
return false; return false;
@@ -166,29 +169,36 @@ public class CableBlock extends NetworkNodeBlock implements IWaterLoggable {
} }
return tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction).isPresent() return tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction).isPresent()
&& isSideNotCoveredOrHollow(tile, direction) && !isSideCovered(tile, direction)
&& isSideNotCoveredOrHollow(world.getTileEntity(pos.offset(direction)), direction.getOpposite()); && !isSideCovered(world.getTileEntity(pos.offset(direction)), direction.getOpposite());
} }
private boolean isSideNotCoveredOrHollow(TileEntity tile, Direction direction) { private boolean isSideCovered(TileEntity tile, Direction direction) {
if (tile == null) { if (tile == null) {
return false; return false;
} }
return tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction)
.map(INetworkNodeProxy::getNode) Optional<INetworkNode> node = tile.getCapability(NetworkNodeProxyCapability.NETWORK_NODE_PROXY_CAPABILITY, direction).map(INetworkNodeProxy::getNode);
.map(iNetworkNode -> !(iNetworkNode instanceof ICoverable)
|| (!((ICoverable) iNetworkNode).getCoverManager().hasCover(direction) if (node.isPresent() && node.get() instanceof ICoverable) {
|| ((ICoverable) iNetworkNode).getCoverManager().getCover(direction).getType() == CoverType.HOLLOW)) Cover cover = ((ICoverable) node.get()).getCoverManager().getCover(direction);
.orElse(false); if (cover == null) {
return false;
} else {
return cover.getType() == CoverType.NORMAL;
}
}
return false;
} }
private BlockState getState(BlockState currentState, IWorld world, BlockPos pos) { private BlockState getState(BlockState currentState, IWorld world, BlockPos pos) {
boolean north = hasNode(world, pos.offset(Direction.NORTH), currentState, Direction.SOUTH); boolean north = hasNodeConnection(world, pos.offset(Direction.NORTH), currentState, Direction.SOUTH);
boolean east = hasNode(world, pos.offset(Direction.EAST), currentState, Direction.WEST); boolean east = hasNodeConnection(world, pos.offset(Direction.EAST), currentState, Direction.WEST);
boolean south = hasNode(world, pos.offset(Direction.SOUTH), currentState, Direction.NORTH); boolean south = hasNodeConnection(world, pos.offset(Direction.SOUTH), currentState, Direction.NORTH);
boolean west = hasNode(world, pos.offset(Direction.WEST), currentState, Direction.EAST); boolean west = hasNodeConnection(world, pos.offset(Direction.WEST), currentState, Direction.EAST);
boolean up = hasNode(world, pos.offset(Direction.UP), currentState, Direction.DOWN); boolean up = hasNodeConnection(world, pos.offset(Direction.UP), currentState, Direction.DOWN);
boolean down = hasNode(world, pos.offset(Direction.DOWN), currentState, Direction.UP); boolean down = hasNodeConnection(world, pos.offset(Direction.DOWN), currentState, Direction.UP);
return currentState return currentState
.with(NORTH, north) .with(NORTH, north)