Remove IInteractUsing (#9718)
This commit is contained in:
@@ -1,47 +1,9 @@
|
||||
using System.Threading.Tasks;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Utility;
|
||||
|
||||
namespace Content.Shared.Interaction
|
||||
{
|
||||
/// <summary>
|
||||
/// This interface gives components behavior when their entity is clicked on by a user with an object in their hand
|
||||
/// who is in range and has unobstructed reach of the target entity (allows inside blockers). This includes
|
||||
/// clicking on an object in the world as well as clicking on an object in inventory.
|
||||
/// </summary>
|
||||
[RequiresExplicitImplementation]
|
||||
public interface IInteractUsing
|
||||
{
|
||||
/// <summary>
|
||||
/// The interaction priority. Higher numbers get called first.
|
||||
/// </summary>
|
||||
/// <value>Priority defaults to 0</value>
|
||||
int Priority => 0;
|
||||
|
||||
/// <summary>
|
||||
/// Called when using one object on another when user is in range of the target entity.
|
||||
/// </summary>
|
||||
[Obsolete("Use InteractUsingMessage instead")]
|
||||
Task<bool> InteractUsing(InteractUsingEventArgs eventArgs);
|
||||
}
|
||||
|
||||
public sealed class InteractUsingEventArgs : EventArgs, ITargetedInteractEventArgs
|
||||
{
|
||||
public InteractUsingEventArgs(EntityUid user, EntityCoordinates clickLocation, EntityUid @using, EntityUid target)
|
||||
{
|
||||
User = user;
|
||||
ClickLocation = clickLocation;
|
||||
Using = @using;
|
||||
Target = target;
|
||||
}
|
||||
|
||||
public EntityUid User { get; }
|
||||
public EntityCoordinates ClickLocation { get; }
|
||||
public EntityUid Using { get; }
|
||||
public EntityUid Target { get; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raised when a target entity is interacted with by a user while holding an object in their hand.
|
||||
/// </summary>
|
||||
@@ -623,16 +623,6 @@ namespace Content.Shared.Interaction
|
||||
if (interactUsingEvent.Handled)
|
||||
return;
|
||||
|
||||
var interactUsingEventArgs = new InteractUsingEventArgs(user, clickLocation, used, target);
|
||||
var interactUsings = AllComps<IInteractUsing>(target).OrderByDescending(x => x.Priority);
|
||||
|
||||
foreach (var interactUsing in interactUsings)
|
||||
{
|
||||
// If an InteractUsing returns a status completion we finish our interaction
|
||||
if (await interactUsing.InteractUsing(interactUsingEventArgs))
|
||||
return;
|
||||
}
|
||||
|
||||
InteractDoAfter(user, used, target, clickLocation, canReach: true);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user