From bfba299456c69e218da1f4f6b2140bd59d95e453 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 23 May 2016 00:23:32 -0400 Subject: [PATCH] Fixed transmitter data request, internal rendering now works on world load --- .../common/multipart/PartTransmitter.java | 24 +++++++++++++++---- .../common/network/PacketDataRequest.java | 8 ++++--- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index d1e3ee840..4b8d69a23 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -22,6 +22,8 @@ public abstract class PartTransmitter> extends public MultipartTransmitter transmitterDelegate; public boolean unloaded = true; + + public boolean dataRequest = false; public PartTransmitter() { @@ -44,12 +46,24 @@ public abstract class PartTransmitter> extends { TransmitterNetworkRegistry.registerOrphanTransmitter(getTransmitter()); } - else { - MinecraftForge.EVENT_BUS.post(new NetworkClientRequest(getWorld().getTileEntity(getPos()))); - } unloaded = false; } + + @Override + public void update() + { + super.update(); + + if(getWorld().isRemote) + { + if(!dataRequest) + { + dataRequest = true; + MinecraftForge.EVENT_BUS.post(new NetworkClientRequest(getWorld().getTileEntity(getPos()))); + } + } + } @Override public void onUnloaded() @@ -74,8 +88,8 @@ public abstract class PartTransmitter> extends if(!getWorld().isRemote) { TransmitterNetworkRegistry.invalidateTransmitter(getTransmitter()); - } else - { + } + else { getTransmitter().setTransmitterNetwork(null); } diff --git a/src/main/java/mekanism/common/network/PacketDataRequest.java b/src/main/java/mekanism/common/network/PacketDataRequest.java index 08614d809..c7ad8bbf0 100644 --- a/src/main/java/mekanism/common/network/PacketDataRequest.java +++ b/src/main/java/mekanism/common/network/PacketDataRequest.java @@ -14,7 +14,6 @@ import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityMultiblock; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; @@ -33,7 +32,7 @@ public class PacketDataRequest implements IMessageHandler())), (EntityPlayerMP)player); + if(tileEntity instanceof ITileNetwork) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), ((ITileNetwork)tileEntity).getNetworkedData(new ArrayList())), (EntityPlayerMP)player); + } } return null;