Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

2
Content.Shared/Mech/Components/MechComponent.cs
View File

@@ -169,6 +169,6 @@ public sealed class MechComponentState : ComponentState
public FixedPoint2 MaxIntegrity;
public FixedPoint2 Energy;
public FixedPoint2 MaxEnergy;
public EntityUid? CurrentSelectedEquipment;
public NetEntity? CurrentSelectedEquipment;
public bool Broken;
}

2
Content.Shared/Mech/Components/MechPilotComponent.cs
View File

@@ -22,5 +22,5 @@ public sealed partial class MechPilotComponent : Component
[Serializable, NetSerializable]
public sealed class MechPilotComponentState : ComponentState
{
public EntityUid Mech;
public NetEntity Mech;
}

8
Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
View File

@@ -69,7 +69,7 @@ public abstract class SharedMechSystem : EntitySystem
MaxIntegrity = component.MaxIntegrity,
Energy = component.Energy,
MaxEnergy = component.MaxEnergy,
CurrentSelectedEquipment = component.CurrentSelectedEquipment,
CurrentSelectedEquipment = GetNetEntity(component.CurrentSelectedEquipment),
Broken = component.Broken
};
}
@@ -83,7 +83,7 @@ public abstract class SharedMechSystem : EntitySystem
component.MaxIntegrity = state.MaxIntegrity;
component.Energy = state.Energy;
component.MaxEnergy = state.MaxEnergy;
component.CurrentSelectedEquipment = state.CurrentSelectedEquipment;
component.CurrentSelectedEquipment = EnsureEntity<MechComponent>(state.CurrentSelectedEquipment, uid);
component.Broken = state.Broken;
}
@@ -91,7 +91,7 @@ public abstract class SharedMechSystem : EntitySystem
{
args.State = new MechPilotComponentState
{
Mech = component.Mech
Mech = GetNetEntity(component.Mech)
};
}
@@ -100,7 +100,7 @@ public abstract class SharedMechSystem : EntitySystem
if (args.Current is not MechPilotComponentState state)
return;
component.Mech = state.Mech;
component.Mech = EnsureEntity<MechPilotComponent>(state.Mech, uid);
}
#endregion

2
Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs
View File

@@ -31,7 +31,7 @@ public sealed class MechSoundboardSystem : EntitySystem
{
Sounds = sounds.ToList()
};
args.States.Add(uid, state);
args.States.Add(GetNetEntity(uid), state);
}
private void OnSoundboardMessage(EntityUid uid, MechSoundboardComponent comp, MechEquipmentUiMessageRelayEvent args)

18
Content.Shared/Mech/MechUI.cs
View File

@@ -13,7 +13,7 @@ public enum MechUiKey : byte
/// </summary>
public sealed class MechEquipmentUiStateReadyEvent : EntityEventArgs
{
public Dictionary<EntityUid, BoundUserInterfaceState> States = new();
public Dictionary<NetEntity, BoundUserInterfaceState> States = new();
}
/// <summary>
@@ -35,9 +35,9 @@ public sealed class MechEquipmentUiMessageRelayEvent : EntityEventArgs
[Serializable, NetSerializable]
public sealed class MechEquipmentRemoveMessage : BoundUserInterfaceMessage
{
public EntityUid Equipment;
public NetEntity Equipment;
public MechEquipmentRemoveMessage(EntityUid equipment)
public MechEquipmentRemoveMessage(NetEntity equipment)
{
Equipment = equipment;
}
@@ -49,7 +49,7 @@ public sealed class MechEquipmentRemoveMessage : BoundUserInterfaceMessage
[Serializable, NetSerializable]
public abstract class MechEquipmentUiMessage : BoundUserInterfaceMessage
{
public EntityUid Equipment;
public NetEntity Equipment;
}
/// <summary>
@@ -58,9 +58,9 @@ public abstract class MechEquipmentUiMessage : BoundUserInterfaceMessage
[Serializable, NetSerializable]
public sealed class MechGrabberEjectMessage : MechEquipmentUiMessage
{
public EntityUid Item;
public NetEntity Item;
public MechGrabberEjectMessage(EntityUid equipment, EntityUid uid)
public MechGrabberEjectMessage(NetEntity equipment, NetEntity uid)
{
Equipment = equipment;
Item = uid;
@@ -75,7 +75,7 @@ public sealed class MechSoundboardPlayMessage : MechEquipmentUiMessage
{
public int Sound;
public MechSoundboardPlayMessage(EntityUid equipment, int sound)
public MechSoundboardPlayMessage(NetEntity equipment, int sound)
{
Equipment = equipment;
Sound = sound;
@@ -106,13 +106,13 @@ public sealed class MechSoundboardPlayMessage : MechEquipmentUiMessage
[Serializable, NetSerializable]
public sealed class MechBoundUiState : BoundUserInterfaceState
{
public Dictionary<EntityUid, BoundUserInterfaceState> EquipmentStates = new();
public Dictionary<NetEntity, BoundUserInterfaceState> EquipmentStates = new();
}
[Serializable, NetSerializable]
public sealed class MechGrabberUiState : BoundUserInterfaceState
{
public List<EntityUid> Contents = new();
public List<NetEntity> Contents = new();
public int MaxContents;
}