mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Restore some client-side network stuff. More fixes
This commit is contained in:
1 parent
ede0015eec
commit
16ce88f09a
13 files changed
+67
-59
No files matched your search
@@ -47,6 +47,7 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
|
||||
{
|
||||
IGridTransmitter transmitter = ((ITransmitterTile)tileEntity).getTransmitter();
|
||||
DynamicNetwork network = transmitter.hasTransmitterNetwork() && !message.newNetwork ? transmitter.getTransmitterNetwork() : transmitter.createEmptyNetwork();
|
||||
network.register();
|
||||
transmitter.setTransmitterNetwork(network);
|
||||
for(Coord4D coord : message.transmitterCoords)
|
||||
{
|
||||
@@ -57,6 +58,7 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
|
||||
((ITransmitterTile)tile).getTransmitter().setTransmitterNetwork(network);
|
||||
}
|
||||
}
|
||||
network.updateCapacity();
|
||||
}
|
||||
}
|
||||
else if(message.packetType == PacketType.ENERGY)
|
||||
@@ -109,8 +111,8 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
|
||||
net.refFluid = message.fluidType;
|
||||
}
|
||||
|
||||
net.buffer = message.fluidStack;
|
||||
net.didTransfer = message.didFluidTransfer;
|
||||
net.fluidScale = message.fluidScale;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -200,7 +202,7 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
|
||||
break;
|
||||
case FLUID:
|
||||
dataStream.writeInt(fluidStack != null ? fluidStack.getFluid().getID() : -1);
|
||||
dataStream.writeFloat(fluidStack != null ? fluidScale : 0);
|
||||
dataStream.writeInt(fluidStack != null ? fluidStack.amount : 0);
|
||||
dataStream.writeBoolean(didFluidTransfer);
|
||||
break;
|
||||
default:
|
||||
@@ -245,8 +247,13 @@ public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdat
|
||||
{
|
||||
int type = dataStream.readInt();
|
||||
fluidType = type != -1 ? FluidRegistry.getFluid(type) : null;
|
||||
fluidScale = dataStream.readFloat();
|
||||
amount = dataStream.readInt();
|
||||
didFluidTransfer = dataStream.readBoolean();
|
||||
|
||||
if(fluidType != null)
|
||||
{
|
||||
fluidStack = new FluidStack(fluidType, amount);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user