Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-11-22 19:58:35 +01:00
Code Issues Projects Releases Wiki Activity

remove an unnecessary method

Browse source
This commit is contained in:
Ell 2020-10-13 19:00:11 +02:00
parent 03a798649a
commit cafa3f39c2
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/de/ellpeck/prettypipes/network/PipeNetwork.java
View file

@ -297,15 +297,6 @@ public class PipeNetwork implements ICapabilitySerializable<CompoundNBT>, GraphL
return null; return null;
} }
public List<PipeTileEntity> getNetworkNodes(BlockPos pos, Predicate<PipeTileEntity> predicate) {
if (!this.isNode(pos))
return Collections.emptyList();
return this.getOrderedNetworkNodes(pos).stream()
.map(this::getPipe)
.filter(predicate)
.collect(Collectors.toList());
}
private List<NetworkEdge> createAllEdges(BlockPos pos, BlockState state, boolean ignoreCurrBlocked) { private List<NetworkEdge> createAllEdges(BlockPos pos, BlockState state, boolean ignoreCurrBlocked) {
this.startProfile("create_all_edges"); this.startProfile("create_all_edges");
List<NetworkEdge> edges = new ArrayList<>(); List<NetworkEdge> edges = new ArrayList<>();
@ -361,7 +352,9 @@ public class PipeNetwork implements ICapabilitySerializable<CompoundNBT>, GraphL
return null; return null;
} }
private List<BlockPos> getOrderedNetworkNodes(BlockPos node) { public List<BlockPos> getOrderedNetworkNodes(BlockPos node) {
if (!this.isNode(node))
return Collections.emptyList();
List<BlockPos> ret = this.nodeToConnectedNodes.get(node); List<BlockPos> ret = this.nodeToConnectedNodes.get(node);
if (ret == null) { if (ret == null) {
this.startProfile("compile_connected_nodes"); this.startProfile("compile_connected_nodes");

8
src/main/java/de/ellpeck/prettypipes/pipe/PipeTileEntity.java
View file

@ -304,11 +304,13 @@ public class PipeTileEntity extends TileEntity implements INamedContainerProvide
} }
private PressurizerTileEntity findPressurizer() { private PressurizerTileEntity findPressurizer() {
for (PipeTileEntity node : PipeNetwork.get(this.world).getNetworkNodes(this.pos, p -> true)) { PipeNetwork network = PipeNetwork.get(this.world);
for (BlockPos node : network.getOrderedNetworkNodes(this.pos)) {
PipeTileEntity pipe = network.getPipe(node);
for (Direction dir : Direction.values()) { for (Direction dir : Direction.values()) {
IPipeConnectable connectable = node.getPipeConnectable(dir); IPipeConnectable connectable = pipe.getPipeConnectable(dir);
if (connectable instanceof PressurizerBlock) if (connectable instanceof PressurizerBlock)
return Utility.getTileEntity(PressurizerTileEntity.class, this.world, node.pos.offset(dir)); return Utility.getTileEntity(PressurizerTileEntity.class, this.world, node.offset(dir));
} }
} }
return null; return null;