mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-11 13:04:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix pipe connections and tank hitbox (again)

Browse Source
This commit is contained in:
LordGrimmauld 2020-06-18 07:57:20 +02:00
parent c51e2abf48
commit 197834c36c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeBlock.java
View File

@ -33,7 +33,7 @@ public class FluidPipeBlock extends SixWayBlock implements IWaterLoggable {
} }
public static boolean isTank(BlockState state, IBlockReader world, BlockPos pos, Direction blockFace) { public static boolean isTank(BlockState state, IBlockReader world, BlockPos pos, Direction blockFace) {
return state.hasTileEntity() && world.getTileEntity(pos).getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, blockFace.getOpposite()) != null; return state.hasTileEntity() && world.getTileEntity(pos).getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, blockFace.getOpposite()).isPresent();
} }
// TODO: more generic pipe connection handling. Ideally without marker interface // TODO: more generic pipe connection handling. Ideally without marker interface

4
src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankBlock.java
View File

@ -101,10 +101,10 @@ public class FluidTankBlock extends Block {
public AxisAlignedBB getBodyShape(IBlockReader world, BlockPos pos) { public AxisAlignedBB getBodyShape(IBlockReader world, BlockPos pos) {
return new AxisAlignedBB((isTankToDirection(world, pos, Direction.WEST) ? 0 : 1) / 16f, return new AxisAlignedBB((isTankToDirection(world, pos, Direction.WEST) ? 0 : 1) / 16f,
0.25f, 0,
(isTankToDirection(world, pos, Direction.NORTH) ? 0 : 1) / 16f, (isTankToDirection(world, pos, Direction.NORTH) ? 0 : 1) / 16f,
(isTankToDirection(world, pos, Direction.EAST) ? 16 : 15) / 16f, (isTankToDirection(world, pos, Direction.EAST) ? 16 : 15) / 16f,
0.75f, 1,
(isTankToDirection(world, pos, Direction.SOUTH) ? 16 : 15) / 16f); (isTankToDirection(world, pos, Direction.SOUTH) ? 16 : 15) / 16f);
} }