Fixed transmitter data request, internal rendering now works on world load

This commit is contained in:
aidancbrady committed 2016-05-23 00:23:32 -04:00
1 parent bc1f428050
commit bfba299456
2 files changed
+24 -8

No files matched your search

@@ -22,6 +22,8 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> extends
public MultipartTransmitter<A, N> transmitterDelegate;
public boolean unloaded = true;
public boolean dataRequest = false;
public PartTransmitter()
{
@@ -44,12 +46,24 @@ public abstract class PartTransmitter<A, N extends DynamicNetwork<A, N>> 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<A, N extends DynamicNetwork<A, N>> extends
if(!getWorld().isRemote)
{
TransmitterNetworkRegistry.invalidateTransmitter(getTransmitter());
} else
{
}
else {
getTransmitter().setTransmitterNetwork(null);
}
@@ -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<DataRequestMessage, IM
World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(message.coord4D.dimensionId);
TileEntity tileEntity = message.coord4D.getTileEntity(worldServer);
if(worldServer != null && tileEntity instanceof ITileNetwork)
if(worldServer != null)
{
if(tileEntity instanceof TileEntityMultiblock)
{
@@ -50,7 +49,10 @@ public class PacketDataRequest implements IMessageHandler<DataRequestMessage, IM
}
}
Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), ((ITileNetwork)tileEntity).getNetworkedData(new ArrayList<Object>())), (EntityPlayerMP)player);
if(tileEntity instanceof ITileNetwork)
{
Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), ((ITileNetwork)tileEntity).getNetworkedData(new ArrayList<Object>())), (EntityPlayerMP)player);
}
}
return null;