From 08152f28cbb1a1dbc5eb257f982ccd9f12ce0f7c Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 30 Oct 2014 07:57:35 -0400 Subject: [PATCH] Revert the revert to the redstone change. Going to try to make it work with machines properly. This reverts commit 5b791c231c64ac1bc0f0008495a43f6d8b97e878. --- .../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 6b1a0324..7efd3b8e 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -312,7 +312,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 e3266e98..9dda6d8d 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java @@ -227,7 +227,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); + } } }