From 578b767791e75bc77afeb37c666bed82d6bfeb9d Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 29 Apr 2021 03:23:15 +1000
Subject: [PATCH] Mark interactions as obsolete (#3902)

---
 .../Interfaces/GameObjects/Components/Interaction/IActivate.cs | 1 +
 .../GameObjects/Components/Interaction/IAfterInteract.cs       | 1 +
 .../Interfaces/GameObjects/Components/Interaction/IAttack.cs   | 3 +++
 .../Interfaces/GameObjects/Components/Interaction/IDropped.cs  | 1 +
 .../Interfaces/GameObjects/Components/Interaction/IEquipped.cs | 1 +
 .../GameObjects/Components/Interaction/IEquippedHand.cs        | 2 ++
 .../GameObjects/Components/Interaction/IHandDeselected.cs      | 1 +
 .../GameObjects/Components/Interaction/IHandSelected.cs        | 1 +
 .../GameObjects/Components/Interaction/IInteractHand.cs        | 1 +
 .../GameObjects/Components/Interaction/IInteractUsing.cs       | 1 +
 .../GameObjects/Components/Interaction/IRangedInteract.cs      | 2 +-
 .../Interfaces/GameObjects/Components/Interaction/IThrown.cs   | 1 +
 .../GameObjects/Components/Interaction/IUnequipped.cs          | 2 ++
 .../GameObjects/Components/Interaction/IUnequippedHand.cs      | 2 ++
 .../Interfaces/GameObjects/Components/Interaction/IUse.cs      | 1 +
 15 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs
index 4b76747e35..51c8ddccc7 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs
@@ -18,6 +18,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
         /// <summary>
         ///     Called when this component is activated by another entity who is in range.
         /// </summary>
+        [Obsolete("Use ActivateInWorldMessage instead")]
         void Activate(ActivateEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs
index b5fd2ea5c7..4898f827f9 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs
@@ -27,6 +27,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
         /// <summary>
         /// Called when we interact with nothing, or when we interact with an entity out of range that has no behavior
         /// </summary>
+        [Obsolete("Use AfterInteractMessage instead")]
         Task<bool> AfterInteract(AfterInteractEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs
index 8c60e71ad6..822adb96db 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAttack.cs
@@ -14,7 +14,10 @@ namespace Content.Shared.Interfaces.GameObjects.Components
     public interface IAttack
     {
         // Redirects to ClickAttack by default.
+        [Obsolete("WideAttack")]
         bool WideAttack(AttackEventArgs eventArgs) => ClickAttack(eventArgs);
+
+        [Obsolete("Use ClickAttack instead")]
         bool ClickAttack(AttackEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs
index 2f527ba032..e4d68088b5 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs
@@ -12,6 +12,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
     [RequiresExplicitImplementation]
     public interface IDropped
     {
+        [Obsolete("Use DroppedMessage instead")]
         void Dropped(DroppedEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs
index a050b90659..c1f6225e3a 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs
@@ -18,6 +18,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
     [RequiresExplicitImplementation]
     public interface IEquipped
     {
+        [Obsolete("Use EquippedMessage instead")]
         void Equipped(EquippedEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs
index 4d42c4ba77..31adf0aef8 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using System;
 using Content.Shared.GameObjects.Components.Items;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
@@ -15,6 +16,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
     [RequiresExplicitImplementation]
     public interface IEquippedHand
     {
+        [Obsolete("Use EquippedHandMessage instead")]
         void EquippedHand(EquippedHandEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs
index 39fb21b8d9..e24c70c876 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs
@@ -12,6 +12,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
     [RequiresExplicitImplementation]
     public interface IHandDeselected
     {
+        [Obsolete("Use HandDeselectedMessage instead")]
         void HandDeselected(HandDeselectedEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs
index d4d833699f..734162718c 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs
@@ -12,6 +12,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
     [RequiresExplicitImplementation]
     public interface IHandSelected
     {
+        [Obsolete("Use HandSelectedMessage instead")]
         void HandSelected(HandSelectedEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs
index 51de4b1da4..65e903e957 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs
@@ -15,6 +15,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
         /// <summary>
         /// Called when a player directly interacts with an empty hand when user is in range of the target entity.
         /// </summary>
+        [Obsolete("Use AttackHandMessage instead")]
         bool InteractHand(InteractHandEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs
index 9b19336466..43c3ecbcaa 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs
@@ -24,6 +24,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
         /// <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);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs
index c0a94f8702..20b059ba87 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs
@@ -16,7 +16,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
         /// <summary>
         /// Called when we try to interact with an entity out of range
         /// </summary>
-        /// <returns></returns>
+        [Obsolete("Use RangedInteractMessage instead")]
         bool RangedInteract(RangedInteractEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs
index db4812420f..2ec23d6e1e 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs
@@ -12,6 +12,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
     [RequiresExplicitImplementation]
     public interface IThrown
     {
+        [Obsolete("Use ThrownMessage instead")]
         void Thrown(ThrownEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs
index cbde9c578e..88068f24c6 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using System;
 using Content.Shared.GameObjects.Components.Inventory;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
@@ -17,6 +18,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
     [RequiresExplicitImplementation]
     public interface IUnequipped
     {
+        [Obsolete("Use UnequippedMessage instead")]
         void Unequipped(UnequippedEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs
index 3a62406af9..7178543036 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using System;
 using Content.Shared.GameObjects.Components.Items;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
@@ -14,6 +15,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
     [RequiresExplicitImplementation]
     public interface IUnequippedHand
     {
+        [Obsolete("Use UnequippedHandMessage instead")]
         void UnequippedHand(UnequippedHandEventArgs eventArgs);
     }
 
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs
index 8dc45ade88..2fd2f774bc 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs
@@ -16,6 +16,7 @@ namespace Content.Shared.Interfaces.GameObjects.Components
         /// Called when we activate an object we are holding to use it
         /// </summary>
         /// <returns></returns>
+        [Obsolete("Use UseInHandMessage instead")]
         bool UseEntity(UseEntityEventArgs eventArgs);
     }