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

Replace usages of ISharedNotifyManager and IServerNotifyManager with extension methods (#1965)

Browse Source 
* Replace usages of ISharedNotifyManager and IServerNotifyManager with extension methods

* Remove redundant code
This commit is contained in:
DrSmugleaf
2020-09-01 12:34:53 +02:00
committed by GitHub
parent 14259ed920
commit 8f9ed2f562
53 changed files with 247 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs
View File

@@ -188,7 +188,7 @@ namespace Content.Shared.GameObjects.EntitySystems
if (!inRange && popup)
{
var message = Loc.GetString("You can't reach there!");
origin.PopupMessage(origin, message);
origin.PopupMessage(message);
}
return inRange;
@@ -244,7 +244,7 @@ namespace Content.Shared.GameObjects.EntitySystems
if (!inRange && popup)
{
var message = Loc.GetString("You can't reach there!");
origin.PopupMessage(origin, message);
origin.PopupMessage(message);
}
return inRange;
@@ -300,7 +300,7 @@ namespace Content.Shared.GameObjects.EntitySystems
if (!inRange && popup)
{
var message = Loc.GetString("You can't reach there!");
origin.PopupMessage(origin, message);
origin.PopupMessage(message);
}
return inRange;
@@ -355,7 +355,7 @@ namespace Content.Shared.GameObjects.EntitySystems
if (!inRange && popup)
{
var message = Loc.GetString("You can't reach there!");
origin.PopupMessage(origin, message);
origin.PopupMessage(message);
}
return inRange;

30
Content.Shared/Interfaces/ISharedNotifyManager.cs
View File

@@ -33,7 +33,7 @@ namespace Content.Shared.Interfaces
void PopupMessageCursor(IEntity viewer, string message);
}
public static class NotifyManagerExt
public static class SharedNotifyExtensions
{
/// <summary>
/// Pops up a message at the location of <see cref="source"/> for
@@ -44,7 +44,8 @@ namespace Content.Shared.Interfaces
/// <param name="message">The message to show.</param>
public static void PopupMessage(this IEntity source, IEntity viewer, string message)
{
IoCManager.Resolve<ISharedNotifyManager>().PopupMessage(source, viewer, message);
var notifyManager = IoCManager.Resolve<ISharedNotifyManager>();
notifyManager.PopupMessage(source, viewer, message);
}
/// <summary>
@@ -56,5 +57,30 @@ namespace Content.Shared.Interfaces
{
viewer.PopupMessage(viewer, message);
}
/// <summary>
/// Makes a string of text float up from a location on a grid.
/// </summary>
/// <param name="coordinates">Location on a grid that the message floats up from.</param>
/// <param name="viewer">The client attached entity that the message is being sent to.</param>
/// <param name="message">Text contents of the message.</param>
public static void PopupMessage(this GridCoordinates coordinates, IEntity viewer, string message)
{
var notifyManager = IoCManager.Resolve<ISharedNotifyManager>();
notifyManager.PopupMessage(coordinates, viewer, message);
}
/// <summary>
/// Makes a string of text float up from a client's cursor.
/// </summary>
/// <param name="viewer">
/// The client attached entity that the message is being sent to.
/// </param>
/// <param name="message">Text contents of the message.</param>
public static void PopupMessageCursor(this IEntity viewer, string message)
{
var notifyManager = IoCManager.Resolve<ISharedNotifyManager>();
notifyManager.PopupMessageCursor(viewer, message);
}
}
}