Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-15 14:03:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Flipping pipes

Browse source 
- Pipes not connected to anything will no longer change direction when a non-connective block is placed next to them
This commit is contained in:
reidbhuntley 2021-06-10 17:12:45 -04:00
parent 1b5ede1a5d
commit 5bd0c73f45
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java
View file

@ -1,5 +1,6 @@
package com.simibubi.create.content.contraptions.fluids.pipes; package com.simibubi.create.content.contraptions.fluids.pipes;
import java.util.Arrays;
import java.util.Optional; import java.util.Optional;
import java.util.Random; import java.util.Random;
@ -231,6 +232,12 @@ public class FluidPipeBlock extends SixWayBlock implements IWaterLoggable, IWren
if (bracket != null && bracket.isBracketPresent()) if (bracket != null && bracket.isBracketPresent())
return state; return state;
BlockState prevState = state;
int prevStateSides = (int) Arrays.stream(Iterate.directions)
.map(FACING_TO_PROPERTY_MAP::get)
.filter(prevState::get)
.count();
// Update sides that are not ignored // Update sides that are not ignored
for (Direction d : Iterate.directions) for (Direction d : Iterate.directions)
if (d != ignore) { if (d != ignore) {
@ -252,6 +259,10 @@ public class FluidPipeBlock extends SixWayBlock implements IWaterLoggable, IWren
if (connectedDirection != null) if (connectedDirection != null)
return state.with(FACING_TO_PROPERTY_MAP.get(connectedDirection.getOpposite()), true); return state.with(FACING_TO_PROPERTY_MAP.get(connectedDirection.getOpposite()), true);
// If we can't connect to anything and weren't connected before, do nothing
if (prevStateSides == 2)
return prevState;
// Use preferred // Use preferred
return state.with(FACING_TO_PROPERTY_MAP.get(preferredDirection), true) return state.with(FACING_TO_PROPERTY_MAP.get(preferredDirection), true)
.with(FACING_TO_PROPERTY_MAP.get(preferredDirection.getOpposite()), true); .with(FACING_TO_PROPERTY_MAP.get(preferredDirection.getOpposite()), true);
@ -275,10 +286,10 @@ public class FluidPipeBlock extends SixWayBlock implements IWaterLoggable, IWren
return Optional.empty(); return Optional.empty();
return Optional.of(new ItemStack(bracket.getBlock())); return Optional.of(new ItemStack(bracket.getBlock()));
} }
@Override @Override
public boolean allowsMovement(BlockState state, IBlockReader reader, BlockPos pos, PathType type) { public boolean allowsMovement(BlockState state, IBlockReader reader, BlockPos pos, PathType type) {
return false; return false;
} }
} }