diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index b10b226db..27194fa97 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -345,7 +345,7 @@ public abstract class DynamicNetwork> implemen { TileEntity connectedBlockA = connectedBlocks[count]; - if(TransmissionType.checkTransmissionType(connectedBlockA, getTransmissionType()) && !dealtWith[count]) + if(TransmissionType.checkTransmissionType(connectedBlockA, getTransmissionType()) && !dealtWith[count] && transmitters.contains(connectedBlockA)) { NetworkFinder finder = new NetworkFinder(((TileEntity)splitPoint).getWorldObj(), getTransmissionType(), Coord4D.get(connectedBlockA), Coord4D.get((TileEntity)splitPoint)); List partNetwork = finder.exploreNetwork(); diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 7cd161c1d..700037c4c 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -468,6 +468,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, if(nowPowered != redstonePowered) { refreshConnections(); + redstonePowered = nowPowered; } } @@ -519,6 +520,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, public void onAdded() { super.onAdded(); + redstonePowered = redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z()); refreshConnections(); } @@ -526,6 +528,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, public void onChunkLoad() { super.onChunkLoad(); + redstonePowered = redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z()); refreshConnections(); } diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index da84ac416..64bf74787 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -17,12 +17,17 @@ import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; public abstract class PartTransmitter> extends PartSidedPipe implements IGridTransmitter { public N theNetwork; + public byte newSidesMerged; + @Override public void bind(TileMultipart t) { @@ -64,6 +69,50 @@ public abstract class PartTransmitter> extends Pa getTransmitterNetwork(); } + @Override + public void onPartChanged(TMultiPart part) + { + byte transmitterConnections = currentTransmitterConnections; + super.onPartChanged(part); + byte addedSides = (byte)(0b00111111 & (currentTransmitterConnections & ~transmitterConnections)); + mergeNewSideNets(addedSides); + } + + public void mergeNewSideNets(byte sides) + { + if(theNetwork != null) + { + HashSet connectedNets = new HashSet(); + + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + if(connectionMapContainsSide(sides, side)) + { + TileEntity cable = Coord4D.get(tile()).getFromSide(side).getTileEntity(world()); + + if(TransmissionType.checkTransmissionType(cable, getTransmissionType()) && ((IGridTransmitter)cable).getTransmitterNetwork(false) != null) + { + connectedNets.add(((IGridTransmitter)cable).getTransmitterNetwork()); + } + } + } + + if(connectedNets.size() == 0) + { + newSidesMerged = 0x00; + return; + } + else { + connectedNets.add(theNetwork); + theNetwork = createNetworkByMergingSet(connectedNets); + theNetwork.fullRefresh(); + theNetwork.updateCapacity(); + newSidesMerged = sides; + sendDesc = true; + } + } + } + @Override public void setTransmitterNetwork(N network) { @@ -223,4 +272,30 @@ public abstract class PartTransmitter> extends Pa @Override public void chunkLoad() {} + + @Override + public void readDesc(MCDataInput packet) + { + super.readDesc(packet); + if(packet.readBoolean()) + { + mergeNewSideNets(packet.readByte()); + } + } + + @Override + public void writeDesc(MCDataOutput packet) + { + super.writeDesc(packet); + if(newSidesMerged != 0x00) + { + packet.writeBoolean(true); + packet.writeByte(newSidesMerged); + newSidesMerged = 0x00; + } + else + { + packet.writeBoolean(false); + } + } }