From 7aeca382493852ae738afabb20a8d97f08fa4d4f Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Thu, 21 Aug 2014 21:29:34 +0800 Subject: [PATCH] #898 redstone conduits don't work as expected on solid Blocks --- .../redstone/InsulatedRedstoneConduit.java | 9 ++++- .../conduit/redstone/RedstoneConduit.java | 2 +- .../redstone/RedstoneConduitNetwork.java | 33 ++++++++++++------- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index 4df15851..42c29243 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -303,7 +303,14 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula if(getConectionMode(toDirection.getOpposite()) != ConnectionMode.IN_OUT) { return 0; } - return super.isProvidingWeakPower(toDirection); + return super.isProvidingWeakPower(toDirection); + } + + + + @Override + public int isProvidingStrongPower(ForgeDirection toDirection) { + return isProvidingWeakPower(toDirection); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java index e6ab7e2c..3bc00cc9 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java @@ -186,7 +186,7 @@ public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit @Override public int isProvidingStrongPower(ForgeDirection toDirection) { - return 0; + return isProvidingWeakPower(toDirection); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java index b543eedb..be72e6a3 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduitNetwork.java @@ -9,6 +9,7 @@ import java.util.Set; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.IConduitBundle; @@ -182,18 +183,28 @@ public class RedstoneConduitNetwork extends AbstractConduitNetwork= 15 && signal.x == te.xCoord && signal.y == te.yCoord && signal.z == te.zCoord) { - - worldObj.notifyBlocksOfNeighborChange(te.xCoord + 1, te.yCoord, te.zCoord, worldObj.getBlock(te.xCoord + 1, te.yCoord, te.zCoord)); - worldObj.notifyBlocksOfNeighborChange(te.xCoord - 1, te.yCoord, te.zCoord, worldObj.getBlock(te.xCoord - 1, te.yCoord, te.zCoord)); - worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord + 1, te.zCoord, worldObj.getBlock(te.xCoord, te.yCoord + 1, te.zCoord)); - worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord - 1, te.zCoord, worldObj.getBlock(te.xCoord, te.yCoord - 1, te.zCoord)); - worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord + 1, worldObj.getBlock(te.xCoord, te.yCoord, te.zCoord + 1)); - worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord - 1, worldObj.getBlock(te.xCoord, te.yCoord, te.zCoord - 1)); + worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord, EnderIO.blockConduitBundle); + // Need to notify neighbours neighbours for changes to signals + if(signal != null /*&& signal.strength >= 15 && signal.x == te.xCoord && signal.y == te.yCoord && signal.z == te.zCoord*/) { + if(worldObj.getBlock(te.xCoord + 1, te.yCoord, te.zCoord).isNormalCube()) { + worldObj.notifyBlocksOfNeighborChange(te.xCoord + 1, te.yCoord, te.zCoord, EnderIO.blockConduitBundle); + } + if(worldObj.getBlock(te.xCoord - 1, te.yCoord, te.zCoord).isNormalCube()) { + worldObj.notifyBlocksOfNeighborChange(te.xCoord - 1, te.yCoord, te.zCoord, EnderIO.blockConduitBundle); + } + if(worldObj.getBlock(te.xCoord, te.yCoord + 1, te.zCoord).isNormalCube()) { + worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord + 1, te.zCoord, EnderIO.blockConduitBundle); + } + if(worldObj.getBlock(te.xCoord, te.yCoord - 1, te.zCoord).isNormalCube()) { + worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord - 1, te.zCoord, EnderIO.blockConduitBundle); + } + if(worldObj.getBlock(te.xCoord, te.yCoord, te.zCoord + 1).isNormalCube()) { + worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord + 1, EnderIO.blockConduitBundle); + } + if(worldObj.getBlock(te.xCoord, te.yCoord, te.zCoord - 1).isNormalCube()) { + worldObj.notifyBlocksOfNeighborChange(te.xCoord, te.yCoord, te.zCoord - 1, EnderIO.blockConduitBundle); + } } }