tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EntitySystemMessage Removal & InteractionSystem directed events (#3572)

Browse Source 
* Removed obsolete EntitySystemMessage, now everything uses the base EntityEventArgs or the derived HandledEntityEventArgs.
Setup InteractionSystem to use new directed events.

* Update Submodule.
This commit is contained in:
Acruid
2021-03-09 11:22:48 -08:00
committed by GitHub
parent 549d84174c
commit 6edc416afc
47 changed files with 110 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/GameObjects/EntitySystemMessages/CombatModeSystemMessages.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
public static class CombatModeSystemMessages
{
[Serializable, NetSerializable]
public sealed class SetTargetZoneMessage : EntitySystemMessage
public sealed class SetTargetZoneMessage : EntityEventArgs
{
public SetTargetZoneMessage(TargetingZone targetZone)
{
@@ -20,7 +20,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
}
[Serializable, NetSerializable]
public sealed class SetCombatModeActiveMessage : EntitySystemMessage
public sealed class SetCombatModeActiveMessage : EntityEventArgs
{
public SetCombatModeActiveMessage(bool active)
{

2
Content.Shared/GameObjects/EntitySystemMessages/DragDropMessage.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
/// Requests a drag / drop interaction to be performed
/// </summary>
[Serializable, NetSerializable]
public class DragDropMessage : EntitySystemMessage
public class DragDropMessage : EntityEventArgs
{
public EntityCoordinates DropLocation { get; }
public EntityUid Dropped { get; }

4
Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
public static class ExamineSystemMessages
{
[Serializable, NetSerializable]
public class RequestExamineInfoMessage : EntitySystemMessage
public class RequestExamineInfoMessage : EntityEventArgs
{
public readonly EntityUid EntityUid;
@@ -20,7 +20,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
}
[Serializable, NetSerializable]
public class ExamineInfoResponseMessage : EntitySystemMessage
public class ExamineInfoResponseMessage : EntityEventArgs
{
public readonly EntityUid EntityUid;
public readonly FormattedMessage Message;

2
Content.Shared/GameObjects/EntitySystemMessages/Gravity/GravityChangedMessage.cs
View File

@@ -4,7 +4,7 @@ using Robust.Shared.Map;
namespace Content.Shared.GameObjects.EntitySystemMessages.Gravity
{
public class GravityChangedMessage : EntitySystemMessage
public class GravityChangedMessage : EntityEventArgs
{
public GravityChangedMessage(IMapGrid grid)
{

4
Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
public static class MeleeWeaponSystemMessages
{
[Serializable, NetSerializable]
public sealed class PlayMeleeWeaponAnimationMessage : EntitySystemMessage
public sealed class PlayMeleeWeaponAnimationMessage : EntityEventArgs
{
public PlayMeleeWeaponAnimationMessage(string arcPrototype, Angle angle, EntityUid attacker, EntityUid source, List<EntityUid> hits, bool textureEffect = false, bool arcFollowAttacker = true)
{
@@ -33,7 +33,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
}
[Serializable, NetSerializable]
public sealed class PlayLungeAnimationMessage : EntitySystemMessage
public sealed class PlayLungeAnimationMessage : EntityEventArgs
{
public Angle Angle { get; }
public EntityUid Source { get; }

2
Content.Shared/GameObjects/EntitySystemMessages/PlayerContainerVisibilityMessage.cs
View File

@@ -6,7 +6,7 @@ using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.EntitySystemMessages
{
[Serializable, NetSerializable]
public class PlayerContainerVisibilityMessage : EntitySystemMessage
public class PlayerContainerVisibilityMessage : EntityEventArgs
{
public readonly bool CanSeeThrough;

2
Content.Shared/GameObjects/EntitySystemMessages/SuspicionMessages.cs
View File

@@ -8,7 +8,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
public static class SuspicionMessages
{
[Serializable, NetSerializable]
public sealed class SetSuspicionEndTimerMessage : EntitySystemMessage
public sealed class SetSuspicionEndTimerMessage : EntityEventArgs
{
public TimeSpan? EndTime;
}

6
Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
public static class VerbSystemMessages
{
[Serializable, NetSerializable]
public class RequestVerbsMessage : EntitySystemMessage
public class RequestVerbsMessage : EntityEventArgs
{
public readonly EntityUid EntityUid;
@@ -21,7 +21,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
}
[Serializable, NetSerializable]
public class VerbsResponseMessage : EntitySystemMessage
public class VerbsResponseMessage : EntityEventArgs
{
public readonly NetVerbData[] Verbs;
public readonly EntityUid Entity;
@@ -55,7 +55,7 @@ namespace Content.Shared.GameObjects.EntitySystemMessages
}
[Serializable, NetSerializable]
public class UseVerbMessage : EntitySystemMessage
public class UseVerbMessage : EntityEventArgs
{
public readonly EntityUid EntityUid;
public readonly string VerbKey;

4
Content.Shared/GameObjects/EntitySystems/Atmos/SharedAtmosDebugOverlaySystem.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Shared.GameObjects.EntitySystems.Atmos
/// No point re-sending every tile if only a subset might have been updated.
/// </summary>
[Serializable, NetSerializable]
public sealed class AtmosDebugOverlayMessage : EntitySystemMessage
public sealed class AtmosDebugOverlayMessage : EntityEventArgs
{
public GridId GridId { get; }
@@ -55,7 +55,7 @@ namespace Content.Shared.GameObjects.EntitySystems.Atmos
}
[Serializable, NetSerializable]
public sealed class AtmosDebugOverlayDisableMessage : EntitySystemMessage
public sealed class AtmosDebugOverlayDisableMessage : EntityEventArgs
{
}
}

2
Content.Shared/GameObjects/EntitySystems/Atmos/SharedGasTileOverlaySystem.cs
View File

@@ -100,7 +100,7 @@ namespace Content.Shared.GameObjects.EntitySystems.Atmos
/// No point re-sending every tile if only a subset might have been updated.
/// </summary>
[Serializable, NetSerializable]
public sealed class GasOverlayMessage : EntitySystemMessage
public sealed class GasOverlayMessage : EntityEventArgs
{
public GridId GridId { get; }

6
Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Shared.GameObjects.EntitySystems
/// a structure-construction.
/// </summary>
[Serializable, NetSerializable]
public class TryStartStructureConstructionMessage : EntitySystemMessage
public class TryStartStructureConstructionMessage : EntityEventArgs
{
/// <summary>
/// Position to start building.
@@ -47,7 +47,7 @@ namespace Content.Shared.GameObjects.EntitySystems
/// an item-construction.
/// </summary>
[Serializable, NetSerializable]
public class TryStartItemConstructionMessage : EntitySystemMessage
public class TryStartItemConstructionMessage : EntityEventArgs
{
/// <summary>
/// The construction prototype to start building.
@@ -64,7 +64,7 @@ namespace Content.Shared.GameObjects.EntitySystems
/// Send server -> client to tell the client that a ghost has started to be constructed.
/// </summary>
[Serializable, NetSerializable]
public class AckStructureConstructionMessage : EntitySystemMessage
public class AckStructureConstructionMessage : EntityEventArgs
{
public readonly int GhostId;