Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow picking facade or interface on cable.

Browse Source
This commit is contained in:
Florian Nücke
2021-08-02 22:57:49 +02:00
parent 553d147f08
commit d9d5ff6c36
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/li/cil/oc2/common/block/BusCableBlock.java
View File

@@ -27,6 +27,7 @@ import net.minecraft.util.*;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.util.math.shapes.VoxelShapes;
@@ -354,6 +355,30 @@ public final class BusCableBlock extends Block {
return shapes[getShapeIndex(state)];
}
@Override
public ItemStack getPickBlock(final BlockState state, final RayTraceResult target, final IBlockReader world, final BlockPos pos, final PlayerEntity player) {
final TileEntity tileEntity = world.getBlockEntity(pos);
if (!(tileEntity instanceof BusCableTileEntity)) {
return super.getPickBlock(state, target, world, pos, player);
}
final BusCableTileEntity busCableTileEntity = (BusCableTileEntity) tileEntity;
final ItemStack facadeItem = busCableTileEntity.getFacade();
if (!facadeItem.isEmpty()) {
return facadeItem;
}
if (target instanceof BlockRayTraceResult) {
final Direction side = getHitSide(pos, (BlockRayTraceResult) target);
if (getConnectionType(state, side) == ConnectionType.INTERFACE) {
return new ItemStack(Items.BUS_INTERFACE.get());
}
}
return super.getPickBlock(state, target, world, pos, player);
}
///////////////////////////////////////////////////////////////////
@Override