From 13d66821c6dd8a56d19fffc149669e5faa59f453 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 5 Jun 2017 23:47:31 +0200 Subject: [PATCH] Rename INetworkNeighborhoodAware to INetworkNodeVisitor --- ...oodAware.java => INetworkNodeVisitor.java} | 4 +-- .../apiimpl/network/NetworkNodeGraph.java | 25 +++++++++---------- .../apiimpl/network/node/NetworkNode.java | 6 ++--- .../node/NetworkNodeNetworkTransmitter.java | 4 +-- .../node/NetworkNodeWirelessTransmitter.java | 2 +- 5 files changed, 20 insertions(+), 21 deletions(-) rename src/main/java/com/raoulvdberge/refinedstorage/api/network/{INetworkNeighborhoodAware.java => INetworkNodeVisitor.java} (81%) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNeighborhoodAware.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeVisitor.java similarity index 81% rename from src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNeighborhoodAware.java rename to src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeVisitor.java index 413945c8e..3f0b473ab 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNeighborhoodAware.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/INetworkNodeVisitor.java @@ -7,8 +7,8 @@ import net.minecraft.world.World; /** * Allows the network nodes to implement more optimal or non-regular discovery of neighbor nodes. */ -public interface INetworkNeighborhoodAware { - void walkNeighborhood(Operator operator); +public interface INetworkNodeVisitor { + void visit(Operator operator); @FunctionalInterface interface Operator { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java index 78f6bd508..eed1b3177 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeGraph.java @@ -1,8 +1,8 @@ package com.raoulvdberge.refinedstorage.apiimpl.network; import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.api.network.INetworkNeighborhoodAware; import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph; +import com.raoulvdberge.refinedstorage.api.network.INetworkNodeVisitor; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; import com.raoulvdberge.refinedstorage.item.ItemBlockController; @@ -21,7 +21,6 @@ import static com.raoulvdberge.refinedstorage.proxy.CapabilityNetworkNodeProxy.N public class NetworkNodeGraph implements INetworkNodeGraph { private TileController controller; - private Set nodes = new HashSet<>(); public NetworkNodeGraph(TileController controller) { @@ -48,9 +47,9 @@ public class NetworkNodeGraph implements INetworkNodeGraph { operator.apply(controllerWorld, pos, facing.getOpposite()); } - NodeToCheck currentNodeToCheck; - while ((currentNodeToCheck = operator.toCheck.poll()) != null) { - currentNodeToCheck.walkNeighborhood(operator); + Visitor currentVisitor; + while ((currentVisitor = operator.toCheck.poll()) != null) { + currentVisitor.visit(operator); } this.nodes = operator.newNodes; @@ -101,13 +100,13 @@ public class NetworkNodeGraph implements INetworkNodeGraph { } } - private class Operator implements INetworkNeighborhoodAware.Operator { + private class Operator implements INetworkNodeVisitor.Operator { private Set newNodes = new HashSet<>(); private Set previousNodes = new HashSet<>(nodes); private boolean changed; - private Queue toCheck = new ArrayDeque<>(); + private Queue toCheck = new ArrayDeque<>(); @Override public void apply(World world, BlockPos pos, EnumFacing side) { @@ -129,21 +128,21 @@ public class NetworkNodeGraph implements INetworkNodeGraph { previousNodes.remove(otherNode); - toCheck.add(new NodeToCheck(otherNode, world, pos, side, tile)); + toCheck.add(new Visitor(otherNode, world, pos, side, tile)); } } } } } - private class NodeToCheck implements INetworkNeighborhoodAware { + private class Visitor implements INetworkNodeVisitor { private final INetworkNode node; private final World world; private final BlockPos pos; private final EnumFacing side; private final TileEntity tile; - NodeToCheck(INetworkNode node, World world, BlockPos pos, EnumFacing side, TileEntity tile) { + Visitor(INetworkNode node, World world, BlockPos pos, EnumFacing side, TileEntity tile) { this.node = node; this.world = world; this.pos = pos; @@ -152,9 +151,9 @@ public class NetworkNodeGraph implements INetworkNodeGraph { } @Override - public void walkNeighborhood(Operator operator) { - if (node instanceof INetworkNeighborhoodAware) { - ((INetworkNeighborhoodAware) node).walkNeighborhood(operator); + public void visit(Operator operator) { + if (node instanceof INetworkNodeVisitor) { + ((INetworkNodeVisitor) node).visit(operator); } else { for (EnumFacing checkSide : EnumFacing.VALUES) { if (checkSide != side) { // Avoid going backward diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java index f3e0961e9..fa8ba5125 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -2,7 +2,7 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node; import com.raoulvdberge.refinedstorage.RSUtils; import com.raoulvdberge.refinedstorage.api.network.INetwork; -import com.raoulvdberge.refinedstorage.api.network.INetworkNeighborhoodAware; +import com.raoulvdberge.refinedstorage.api.network.INetworkNodeVisitor; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import com.raoulvdberge.refinedstorage.api.util.IWrenchable; import com.raoulvdberge.refinedstorage.apiimpl.API; @@ -21,7 +21,7 @@ import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodAware, IWrenchable { +public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor, IWrenchable { @Nullable protected INetwork network; protected World world; @@ -154,7 +154,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodA } @Override - public void walkNeighborhood(Operator operator) { + public void visit(Operator operator) { for (EnumFacing facing : EnumFacing.VALUES) { if (canConduct(facing)) { operator.apply(world, pos.offset(facing), facing.getOpposite()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java index 42ef88433..a6bdfd380 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java @@ -144,8 +144,8 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { } @Override - public void walkNeighborhood(Operator operator) { - super.walkNeighborhood(operator); + public void visit(Operator operator) { + super.visit(operator); if (canTransmit()) { if (!isSameDimension()) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java index 87417c22e..8f23676bf 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java @@ -85,7 +85,7 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire } @Override - public void walkNeighborhood(Operator operator) { + public void visit(Operator operator) { operator.apply(world, pos.offset(EnumFacing.DOWN), EnumFacing.UP); } }