space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

More obsoletions component messages.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2021-05-13 02:24:35 +02:00
parent e4f24ec125
commit c5b34bab69
14 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Robust.Client/GameObjects/ClientEntityManager.cs
View File

@@ -109,6 +109,7 @@ namespace Robust.Client.GameObjects
}
/// <inheritdoc />
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public void SendComponentNetworkMessage(INetChannel? channel, IEntity entity, IComponent component, ComponentMessage message)
{
if (!component.NetID.HasValue)

2
Robust.Client/GameObjects/Components/Renderable/SpriteComponent.cs
View File

@@ -2193,10 +2193,12 @@ namespace Robust.Client.GameObjects
return Enumerable.Empty<T>();
}
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public void SendMessage(IComponent? owner, ComponentMessage message)
{
}
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public void SendNetworkMessage(IComponent owner, ComponentMessage message, INetChannel? channel = null)
{
}

3
Robust.Client/GameObjects/PlayerMessages.cs
View File

@@ -1,12 +1,15 @@
using System;
using Robust.Shared.GameObjects;
namespace Robust.Client.GameObjects
{
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public class PlayerAttachedMsg : ComponentMessage
{
}
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public class PlayerDetachedMsg : ComponentMessage
{

2
Robust.Server/GameObjects/Components/Actor/ActorComponent.cs
View File

@@ -27,6 +27,7 @@ namespace Robust.Server.GameObjects
/// Raised on an entity whenever a player attaches to this entity.
/// </summary>
[Serializable]
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public class PlayerAttachedMsg : ComponentMessage
{
public IPlayerSession NewPlayer { get; }
@@ -41,6 +42,7 @@ namespace Robust.Server.GameObjects
/// Raised on an entity whenever a player detaches from this entity.
/// </summary>
[Serializable]
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public class PlayerDetachedMsg : ComponentMessage
{
public IPlayerSession OldPlayer { get; }

1
Robust.Server/GameObjects/ServerEntityManager.cs
View File

@@ -137,6 +137,7 @@ namespace Robust.Server.GameObjects
}
/// <inheritdoc />
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public void SendComponentNetworkMessage(INetChannel? channel, IEntity entity, IComponent component,
ComponentMessage message)
{

4
Robust.Shared/Containers/ContainerContentsModifiedMessage.cs
View File

@@ -1,3 +1,4 @@
using System;
using Robust.Shared.GameObjects;
namespace Robust.Shared.Containers
@@ -5,6 +6,7 @@ namespace Robust.Shared.Containers
/// <summary>
/// The contents of this container have been changed.
/// </summary>
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public class ContainerContentsModifiedMessage : ComponentMessage
{
/// <summary>
@@ -35,4 +37,4 @@ namespace Robust.Shared.Containers
Removed = removed;
}
}
}
}

2
Robust.Shared/GameObjects/Component.cs
View File

@@ -210,9 +210,11 @@ namespace Robust.Shared.GameObjects
}
/// <inheritdoc />
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public virtual void HandleMessage(ComponentMessage message, IComponent? component) { }
/// <inheritdoc />
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public virtual void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null) { }
/// <param name="player"></param>

5
Robust.Shared/GameObjects/ComponentMessages/Messages.cs
View File

@@ -1,7 +1,9 @@
using JetBrains.Annotations;
using System;
using JetBrains.Annotations;
namespace Robust.Shared.GameObjects
{
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public class RelayMovementEntityMessage : ComponentMessage
{
[PublicAPI]
@@ -16,6 +18,7 @@ namespace Robust.Shared.GameObjects
/// <summary>
/// The entity transform parent has been changed.
/// </summary>
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
public class ParentChangedMessage : ComponentMessage
{
/// <summary>

2
Robust.Shared/GameObjects/EntityManager.cs
View File

@@ -458,6 +458,7 @@ namespace Robust.Shared.GameObjects
var session = netMsg.Session;
compMsg.Remote = true;
#pragma warning disable 618
var uid = netMsg.EntityUid;
if (compMsg.Directed)
{
@@ -471,6 +472,7 @@ namespace Robust.Shared.GameObjects
component.HandleNetworkMessage(compMsg, compChannel, session);
}
}
#pragma warning restore 618
}
/// <summary>

5
Robust.Shared/GameObjects/IComponent.cs
View File

@@ -1,4 +1,5 @@
using Robust.Shared.Network;
using System;
using Robust.Shared.Network;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.Timing;
@@ -105,6 +106,7 @@ namespace Robust.Shared.GameObjects
/// </summary>
/// <param name="message">Incoming event message.</param>
/// <param name="component">The local component that sent the message.</param>
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
void HandleMessage(ComponentMessage message, IComponent? component);
/// <summary>
@@ -113,6 +115,7 @@ namespace Robust.Shared.GameObjects
/// <param name="message">Incoming event message.</param>
/// <param name="netChannel">The channel of the remote client that sent the message.</param>
/// <param name="session">The session data for the player who sent this message. Null if this is a client.</param>
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null);
/// <summary>

2
Robust.Shared/GameObjects/IEntity.cs
View File

@@ -185,6 +185,7 @@ namespace Robust.Shared.GameObjects
/// </summary>
/// <param name="owner">Object that sent the event.</param>
/// <param name="message">Message to send.</param>
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
void SendMessage(IComponent? owner, ComponentMessage message);
/// <summary>
@@ -192,6 +193,7 @@ namespace Robust.Shared.GameObjects
/// </summary>
/// <param name="owner"></param>
/// <param name="message">Message to send.</param>
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
void SendNetworkMessage(IComponent owner, ComponentMessage message, INetChannel? channel = null);
/// <summary>

1
Robust.Shared/GameObjects/IEntityNetworkManager.cs
View File

@@ -34,6 +34,7 @@ namespace Robust.Shared.GameObjects
/// <param name="entity">Entity sending the message (also entity to send to).</param>
/// <param name="component">Component that sent the message.</param>
/// <param name="message">Message to send.</param>
[Obsolete("Component Messages are deprecated, use Entity Events instead.")]
void SendComponentNetworkMessage(INetChannel? channel, IEntity entity, IComponent component,
ComponentMessage message);

2
Robust.Shared/GameObjects/NetworkComponentMessage.cs
View File

@@ -30,7 +30,9 @@ namespace Robust.Shared.GameObjects
/// <summary>
/// The message payload.
/// </summary>
#pragma warning disable 618
public readonly ComponentMessage Message;
#pragma warning restore 618
/// <summary>
/// If the message is from the client, the client's session.

4
Robust.Shared/Network/Messages/MsgEntity.cs
View File

@@ -23,7 +23,9 @@ namespace Robust.Shared.Network.Messages
public EntityMessageType Type { get; set; }
public EntityEventArgs SystemMessage { get; set; }
#pragma warning disable 618
public ComponentMessage ComponentMessage { get; set; }
#pragma warning restore 618
public EntityUid EntityUid { get; set; }
public uint NetId { get; set; }
@@ -55,7 +57,9 @@ namespace Robust.Shared.Network.Messages
var serializer = IoCManager.Resolve<IRobustSerializer>();
int length = buffer.ReadVariableInt32();
using var stream = buffer.ReadAlignedMemory(length);
#pragma warning disable 618
ComponentMessage = serializer.Deserialize<ComponentMessage>(stream);
#pragma warning restore 618
}
break;
}