From 57452a562e1990457b782fc44fc0119561427b68 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Mon, 18 Aug 2014 16:10:44 -0400 Subject: [PATCH] Fixed a crash, also fixed the Logistical Transporter not connecting on chunk load. I have absolutely no idea why, but for some reason calling isBlockProvidingIndirectPowerTo() before checking connections fixes the issue. Probably something related to chunk loading. --- .../multipart/PartLogisticalTransporter.java | 11 +++-- .../common/multipart/PartSidedPipe.java | 47 ++++++++++++------- .../network/PacketTransmitterUpdate.java | 8 ++-- 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index 4141fe41b..02272cc28 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -59,11 +59,6 @@ public class PartLogisticalTransporter extends PartTransmitter public HashList transit = new HashList(); public Set needsSync = new HashSet(); - - public PartLogisticalTransporter() - { - redstoneReactive = false; - } @Override public String getType() @@ -135,6 +130,12 @@ public class PartLogisticalTransporter extends PartTransmitter { return TransporterUtils.getConnections(this)[side.ordinal()]; } + + @Override + public boolean handlesRedstone() + { + return false; + } @Override public void update() diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 3e0abb67f..d84f476ef 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -159,6 +159,11 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } } + public boolean handlesRedstone() + { + return true; + } + public boolean renderCenter() { return false; @@ -202,7 +207,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, { byte connections = 0x00; - if(redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z())) + if(handlesRedstone() && redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z())) { return connections; } @@ -227,7 +232,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, { byte connections = 0x00; - if(redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z())) + if(handlesRedstone() && redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z())) { return connections; } @@ -381,7 +386,9 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, @Override public boolean canConnect(ForgeDirection side) { - if(redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z())) + boolean powered = world().isBlockIndirectlyGettingPowered(x(), y(), z()); + + if(handlesRedstone() && redstoneReactive && powered) { return false; } @@ -512,21 +519,24 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, if(possibleTransmitters != currentTransmitterConnections) { - boolean nowPowered = redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z()); - - if(nowPowered != redstonePowered) + if(handlesRedstone()) { - redstonePowered = nowPowered; - - if(nowPowered) + boolean nowPowered = redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z()); + + if(nowPowered != redstonePowered) { - onRedstoneSplit(); + redstonePowered = nowPowered; + + if(nowPowered) + { + onRedstoneSplit(); + } + else { + onRedstoneJoin(); + } + + tile().notifyTileChange(); } - else { - onRedstoneJoin(); - } - - tile().notifyTileChange(); } } @@ -572,7 +582,10 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, @Override public void onNeighborChanged() { - redstoneRefresh(); + if(handlesRedstone()) + { + redstoneRefresh(); + } } @Override @@ -683,7 +696,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, @Override public boolean onRightClick(EntityPlayer player, int side) { - if(!world().isRemote && !(this instanceof PartLogisticalTransporter)) + if(!world().isRemote && handlesRedstone()) { redstoneReactive ^= true; refreshConnections(); diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index 8b3a1ce1f..9d2493179 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -7,9 +7,9 @@ import mekanism.api.gas.GasNetwork; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.api.transmitters.TransmissionType; import mekanism.common.EnergyNetwork; import mekanism.common.FluidNetwork; -import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; import net.minecraft.entity.player.EntityPlayer; @@ -41,7 +41,7 @@ public class PacketTransmitterUpdate implements IMessageHandler)tileEntity).getTransmitterNetwork().clientEnergyScale = message.power; } @@ -50,7 +50,7 @@ public class PacketTransmitterUpdate implements IMessageHandler)tileEntity).getTransmitterNetwork(); @@ -67,7 +67,7 @@ public class PacketTransmitterUpdate implements IMessageHandler)tileEntity).getTransmitterNetwork();