juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kill SharedEntityExtensions and all popup extensions (#20909)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Kara
2023-10-15 22:56:09 -07:00
committed by GitHub
parent 00e274ea38
commit 77964d4a6b
20 changed files with 135 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Content.Shared/Popups/SharedPopupExtensions.cs
View File

@@ -1,48 +0,0 @@
using Robust.Shared.Map;
using Robust.Shared.Player;
namespace Content.Shared.Popups
{
public static class SharedPopupExtensions
{
/// <summary>
/// Pops up a message at the location of <see cref="source"/> for
/// <see cref="viewer"/> alone to see.
/// </summary>
/// <param name="source">The entity above which the message will appear.</param>
/// <param name="viewer">The entity that will see the message.</param>
/// <param name="message">The message to show.</param>
[Obsolete("Use PopupSystem.PopupEntity instead.")]
public static void PopupMessage(this EntityUid source, EntityUid viewer, string message)
{
var popupSystem = EntitySystem.Get<SharedPopupSystem>();
popupSystem.PopupEntity(message, source, viewer);
}
/// <summary>
/// Pops up a message at the given entity's location for it alone to see.
/// </summary>
/// <param name="viewer">The entity that will see the message.</param>
/// <param name="message">The message to be seen.</param>
[Obsolete("Use PopupSystem.PopupEntity instead.")]
public static void PopupMessage(this EntityUid viewer, string message)
{
viewer.PopupMessage(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>
[Obsolete("Use PopupSystem.PopupCursor instead.")]
public static void PopupMessageCursor(this EntityUid viewer, string message)
{
var popupSystem = EntitySystem.Get<SharedPopupSystem>();
popupSystem.PopupCursor(message, viewer);
}
}
}

37
Content.Shared/Random/Helpers/SharedEntityExtensions.cs
View File

@@ -1,37 +0,0 @@
using System.Numerics;
using Robust.Shared.Random;
using Robust.Shared.Utility;
namespace Content.Shared.Random.Helpers
{
public static class SharedEntityExtensions
{
public static void RandomOffset(this EntityUid entity, float minX, float maxX, float minY, float maxY)
{
DebugTools.AssertNotNull(entity);
DebugTools.Assert(minX <= maxX, $"Minimum X value ({minX}) must be smaller than or equal to the maximum X value ({maxX})");
DebugTools.Assert(minY <= maxY, $"Minimum Y value ({minY}) must be smaller than or equal to the maximum Y value ({maxY})");
var random = IoCManager.Resolve<IRobustRandom>();
var randomX = random.NextFloat() * (maxX - minX) + minX;
var randomY = random.NextFloat() * (maxY - minY) + minY;
var offset = new Vector2(randomX, randomY);
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).LocalPosition += offset;
}
public static void RandomOffset(this EntityUid entity, float min, float max)
{
DebugTools.AssertNotNull(entity);
DebugTools.Assert(min <= max, $"Minimum value ({min}) must be smaller than or equal to the maximum value ({max})");
entity.RandomOffset(min, max, min, max);
}
public static void RandomOffset(this EntityUid entity, float value)
{
value = Math.Abs(value);
entity.RandomOffset(-value, value);
}
}
}

35
Content.Shared/Random/RandomHelperSystem.cs Normal file
View File

@@ -0,0 +1,35 @@
using System.Numerics;
using Content.Shared.Random.Helpers;
using Robust.Shared.Random;
using Robust.Shared.Utility;
namespace Content.Shared.Random;
/// <summary>
/// System containing various content-related random helpers.
/// </summary>
public sealed class RandomHelperSystem : EntitySystem
{
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly IRobustRandom _random = default!;
public void RandomOffset(EntityUid entity, float minX, float maxX, float minY, float maxY)
{
var randomX = _random.NextFloat() * (maxX - minX) + minX;
var randomY = _random.NextFloat() * (maxY - minY) + minY;
var offset = new Vector2(randomX, randomY);
var xform = Transform(entity);
_transform.SetLocalPosition(xform, xform.LocalPosition + offset);
}
public void RandomOffset(EntityUid entity, float min, float max)
{
RandomOffset(entity, min, max, min, max);
}
public void RandomOffset(EntityUid entity, float value)
{
RandomOffset(entity, -value, value);
}
}