diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 565edc56..c5422529 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -40,13 +40,14 @@ Bugs - #1347 Capacitor Bank energy duplication bug - #1348 Item conduits not connecting to tesseracts in receive only mode - #1351 Travel Anchor: Item needs to be added before text is displayed +- #1354 ME conduit always connected regardless of visual state - #1357 Power Conduits replaced by growing tree's - #1361 Enlightened Fused Quartz is not blast resistant - #1366 Powered Spawner doesn't remain active when chunk loaded - #1371 Farming Stations don't harvest third/top block of sugar cane or cactus - #1373 Fluid Tank accepts fluid regardless of configuration - #1383 Travel Anchor crash -- #1384 Disabling one side of machines disables the opposite side as well. +- #1384 Disabling one side of machines disables the opposite side as well. - RF Tools not charging in Killer Joe until he has attacked something diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index d3ae0f16..6def26b1 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -3,6 +3,7 @@ package crazypants.enderio.conduit.me; import java.util.Arrays; import java.util.EnumSet; import java.util.List; +import java.util.Set; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -125,7 +126,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { validConnections.add(ForgeDirection.valueOf(connections.getStringTagAt(i))); } } - this.isDense = nbtRoot.getBoolean("isDense"); + isDense = nbtRoot.getBoolean("isDense"); } @Override @@ -251,12 +252,17 @@ public class MEConduit extends AbstractConduit implements IMEConduit { setConnectionMode(faceHit, getNextConnectionMode(faceHit)); } // Attempt to join networks - return ConduitUtil.joinConduits(this, faceHit); + boolean retVal = ConduitUtil.joinConduits(this, faceHit); + if(retVal) { + onNodeChanged(); + } + return retVal; } else if(externalConnections.contains(connDir)) { setConnectionMode(connDir, getNextConnectionMode(connDir)); return true; } else if(containsConduitConnection(connDir)) { ConduitUtil.disconectConduits(this, connDir); + onNodeChanged(); return true; } } @@ -325,7 +331,10 @@ public class MEConduit extends AbstractConduit implements IMEConduit { @Override public EnumSet getConnections() { - return validConnections; + Set cons = getConduitConnections(); + cons.addAll(getExternalConnections()); + return EnumSet.copyOf(cons); + //return validConnections; } @Override