Add SharedPopupSystem.PopupClient for cursor and coordinates (#27231)
This commit is contained in:
@@ -5,7 +5,6 @@ using Content.Shared.Popups;
|
|||||||
using Robust.Client.Graphics;
|
using Robust.Client.Graphics;
|
||||||
using Robust.Client.Input;
|
using Robust.Client.Input;
|
||||||
using Robust.Client.Player;
|
using Robust.Client.Player;
|
||||||
using Robust.Client.ResourceManagement;
|
|
||||||
using Robust.Client.UserInterface;
|
using Robust.Client.UserInterface;
|
||||||
using Robust.Shared.Configuration;
|
using Robust.Shared.Configuration;
|
||||||
using Robust.Shared.Map;
|
using Robust.Shared.Map;
|
||||||
@@ -163,6 +162,15 @@ namespace Content.Client.Popups
|
|||||||
PopupEntity(message, uid, type);
|
PopupEntity(message, uid, type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void PopupClient(string? message, EntityUid? recipient, PopupType type = PopupType.Small)
|
||||||
|
{
|
||||||
|
if (recipient == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (_timing.IsFirstTimePredicted)
|
||||||
|
PopupCursor(message, recipient.Value, type);
|
||||||
|
}
|
||||||
|
|
||||||
public override void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
|
public override void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
|
||||||
{
|
{
|
||||||
if (recipient == null)
|
if (recipient == null)
|
||||||
@@ -172,6 +180,15 @@ namespace Content.Client.Popups
|
|||||||
PopupEntity(message, uid, recipient.Value, type);
|
PopupEntity(message, uid, recipient.Value, type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void PopupClient(string? message, EntityCoordinates coordinates, EntityUid? recipient, PopupType type = PopupType.Small)
|
||||||
|
{
|
||||||
|
if (recipient == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (_timing.IsFirstTimePredicted)
|
||||||
|
PopupCoordinates(message, coordinates, recipient.Value, type);
|
||||||
|
}
|
||||||
|
|
||||||
public override void PopupEntity(string? message, EntityUid uid, PopupType type = PopupType.Small)
|
public override void PopupEntity(string? message, EntityUid uid, PopupType type = PopupType.Small)
|
||||||
{
|
{
|
||||||
if (TryComp(uid, out TransformComponent? transform))
|
if (TryComp(uid, out TransformComponent? transform))
|
||||||
|
|||||||
@@ -88,11 +88,19 @@ namespace Content.Server.Popups
|
|||||||
RaiseNetworkEvent(new PopupEntityEvent(message, type, GetNetEntity(uid)), actor.PlayerSession);
|
RaiseNetworkEvent(new PopupEntityEvent(message, type, GetNetEntity(uid)), actor.PlayerSession);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void PopupClient(string? message, EntityUid? recipient, PopupType type = PopupType.Small)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
public override void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
|
public override void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
|
||||||
{
|
{
|
||||||
// do nothing duh its for client only
|
// do nothing duh its for client only
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void PopupClient(string? message, EntityCoordinates coordinates, EntityUid? recipient, PopupType type = PopupType.Small)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
public override void PopupEntity(string? message, EntityUid uid, ICommonSession recipient, PopupType type = PopupType.Small)
|
public override void PopupEntity(string? message, EntityUid uid, ICommonSession recipient, PopupType type = PopupType.Small)
|
||||||
{
|
{
|
||||||
if (message == null)
|
if (message == null)
|
||||||
|
|||||||
@@ -82,12 +82,24 @@ namespace Content.Shared.Popups
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract void PopupEntity(string? message, EntityUid uid, Filter filter, bool recordReplay, PopupType type = PopupType.Small);
|
public abstract void PopupEntity(string? message, EntityUid uid, Filter filter, bool recordReplay, PopupType type = PopupType.Small);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Variant of <see cref="PopupCursor(string, EntityUid, PopupType)"/> that only runs on the client, outside of prediction.
|
||||||
|
/// Useful for shared code that is always ran by both sides to avoid duplicate popups.
|
||||||
|
/// </summary>
|
||||||
|
public abstract void PopupClient(string? message, EntityUid? recipient, PopupType type = PopupType.Small);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> that only runs on the client, outside of prediction.
|
/// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> that only runs on the client, outside of prediction.
|
||||||
/// Useful for shared code that is always ran by both sides to avoid duplicate popups.
|
/// Useful for shared code that is always ran by both sides to avoid duplicate popups.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small);
|
public abstract void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Variant of <see cref="PopupCoordinates(string, EntityCoordinates, PopupType)"/> that only runs on the client, outside of prediction.
|
||||||
|
/// Useful for shared code that is always ran by both sides to avoid duplicate popups.
|
||||||
|
/// </summary>
|
||||||
|
public abstract void PopupClient(string? message, EntityCoordinates coordinates, EntityUid? recipient, PopupType type = PopupType.Small);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> for use with prediction. The local client will show
|
/// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> for use with prediction. The local client will show
|
||||||
/// the popup to the recipient, and the server will show it to every other player in PVS range. If recipient is null, the local client
|
/// the popup to the recipient, and the server will show it to every other player in PVS range. If recipient is null, the local client
|
||||||
|
|||||||
Reference in New Issue
Block a user