Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs
View File

@@ -12,7 +12,7 @@ public class RadarConsoleBoundInterfaceState : BoundUserInterfaceState
/// <summary>
/// The relevant coordinates to base the radar around.
/// </summary>
public EntityCoordinates? Coordinates;
public NetCoordinates? Coordinates;
/// <summary>
/// The relevant rotation to rotate the angle around.
@@ -23,7 +23,7 @@ public class RadarConsoleBoundInterfaceState : BoundUserInterfaceState
public RadarConsoleBoundInterfaceState(
float maxRange,
EntityCoordinates? coordinates,
NetCoordinates? coordinates,
Angle? angle,
List<DockingInterfaceState> docks)
{
@@ -40,9 +40,9 @@ public class RadarConsoleBoundInterfaceState : BoundUserInterfaceState
[Serializable, NetSerializable]
public sealed class DockingInterfaceState
{
public EntityCoordinates Coordinates;
public NetCoordinates Coordinates;
public Angle Angle;
public EntityUid Entity;
public NetEntity Entity;
public bool Connected;
public Color Color;
public Color HighlightedColor;

6
Content.Shared/Shuttles/BUIStates/ShuttleConsoleBoundInterfaceState.cs
View File

@@ -18,14 +18,14 @@ public sealed class ShuttleConsoleBoundInterfaceState : RadarConsoleBoundInterfa
/// </summary>
public readonly TimeSpan FTLTime;
public List<(EntityUid Entity, string Destination, bool Enabled)> Destinations;
public List<(NetEntity Entity, string Destination, bool Enabled)> Destinations;
public ShuttleConsoleBoundInterfaceState(
FTLState ftlState,
TimeSpan ftlTime,
List<(EntityUid Entity, string Destination, bool Enabled)> destinations,
List<(NetEntity Entity, string Destination, bool Enabled)> destinations,
float maxRange,
EntityCoordinates? coordinates,
NetCoordinates? coordinates,
Angle? angle,
List<DockingInterfaceState> docks) : base(maxRange, coordinates, angle, docks)
{

2
Content.Shared/Shuttles/Events/AutodockRequestMessage.cs
View File

@@ -8,5 +8,5 @@ namespace Content.Shared.Shuttles.Events;
[Serializable, NetSerializable]
public sealed class AutodockRequestMessage : BoundUserInterfaceMessage
{
public EntityUid DockEntity;
public NetEntity DockEntity;
}

2
Content.Shared/Shuttles/Events/EmergencyShuttlePositionMessage.cs
View File

@@ -8,6 +8,6 @@ namespace Content.Shared.Shuttles.Events;
[Serializable, NetSerializable]
public sealed class EmergencyShuttlePositionMessage : EntityEventArgs
{
public EntityUid? StationUid;
public NetEntity? StationUid;
public Box2? Position;
}

2
Content.Shared/Shuttles/Events/ShuttleConsoleFTLRequestMessage.cs
View File

@@ -8,5 +8,5 @@ namespace Content.Shared.Shuttles.Events;
[Serializable, NetSerializable]
public sealed class ShuttleConsoleFTLRequestMessage : BoundUserInterfaceMessage
{
public EntityUid Destination;
public NetEntity Destination;
}

2
Content.Shared/Shuttles/Events/StopAutodockRequestMessage.cs
View File

@@ -8,5 +8,5 @@ namespace Content.Shared.Shuttles.Events;
[Serializable, NetSerializable]
public sealed class StopAutodockRequestMessage : BoundUserInterfaceMessage
{
public EntityUid DockEntity;
public NetEntity DockEntity;
}

2
Content.Shared/Shuttles/Events/UndockRequestMessage.cs
View File

@@ -8,5 +8,5 @@ namespace Content.Shared.Shuttles.Events;
[Serializable, NetSerializable]
public sealed class UndockRequestMessage : BoundUserInterfaceMessage
{
public EntityUid DockEntity;
public NetEntity DockEntity;
}

4
Content.Shared/Shuttles/Systems/SharedShuttleConsoleSystem.cs
View File

@@ -20,9 +20,9 @@ namespace Content.Shared.Shuttles.Systems
[Serializable, NetSerializable]
protected sealed class PilotComponentState : ComponentState
{
public EntityUid? Console { get; }
public NetEntity? Console { get; }
public PilotComponentState(EntityUid? uid)
public PilotComponentState(NetEntity? uid)
{
Console = uid;
}