diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 4d941aa89..6ac752205 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -683,9 +683,12 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, protected void markDirtyAcceptor(EnumFacing side) {} + public abstract void onWorldJoin(); + @Override public void onAdded() { + onWorldJoin(); super.onAdded(); refreshConnections(); @@ -694,6 +697,7 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart, @Override public void onLoaded() { + onWorldJoin(); super.onLoaded(); //refreshConnections(); TODO causes StackOverflow. Why? diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index fd77101a9..ef715cc1e 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -8,11 +8,13 @@ import java.util.LinkedHashSet; import mekanism.api.Coord4D; import mekanism.api.IAlloyInteraction; import mekanism.api.transmitters.DynamicNetwork; +import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.common.capabilities.Capabilities; import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; import net.minecraft.util.EnumFacing; @@ -32,29 +34,24 @@ public abstract class PartTransmitter> extends return transmitterDelegate; } -/* + public abstract N createNewNetwork(); + + public abstract N createNetworkByMerging(Collection networks); + @Override public void onWorldJoin() { - super.onWorldJoin(); - if(!getWorld().isRemote) { TransmitterNetworkRegistry.registerOrphanTransmitter(getTransmitter()); } else { - MinecraftForge.EVENT_BUS.post(new NetworkClientRequest(tile())); + MinecraftForge.EVENT_BUS.post(new NetworkClientRequest(getWorld().getTileEntity(getPos()))); } unloaded = false; } -*/ - public abstract N createNewNetwork(); - - public abstract N createNetworkByMerging(Collection networks); - -/* @Override public void onUnloaded() { @@ -73,19 +70,18 @@ public abstract class PartTransmitter> extends } @Override - public void preRemove() + public void onRemoved() { if(!getWorld().isRemote) { TransmitterNetworkRegistry.invalidateTransmitter(getTransmitter()); - } - else { + } else + { getTransmitter().setTransmitterNetwork(null); } - - super.preRemove(); + + super.onRemoved(); } -*/ @Override public void markDirtyTransmitters() diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 353524db3..533e24c9c 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -245,14 +245,12 @@ public class PartUniversalCable extends PartTransmitter