Climbing refactor (#20516)

Content.Client/Interaction/DragDropHelper.cs

@@ -1,7 +1,7 @@
 using Robust.Client.Input;
 using Robust.Shared.Map;
 
-namespace Content.Client.DragDrop;
+namespace Content.Client.Interaction;
 
 /// <summary>
 /// Helper for implementing drag and drop interactions.

Content.Client/Interaction/DragDropSystem.cs

@@ -1,3 +1,4 @@
+using System.Numerics;
 using Content.Client.CombatMode;
 using Content.Client.Gameplay;
 using Content.Client.Outline;
@@ -7,7 +8,6 @@ using Content.Shared.DragDrop;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Popups;
-using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -20,15 +20,13 @@ using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using System.Numerics;
 using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
-namespace Content.Client.DragDrop;
+namespace Content.Client.Interaction;
 
 /// <summary>
 /// Handles clientside drag and drop logic
 /// </summary>
-[UsedImplicitly]
 public sealed class DragDropSystem : SharedDragDropSystem
 {
     [Dependency] private readonly IStateManager _stateManager = default!;
@@ -45,8 +43,6 @@ public sealed class DragDropSystem : SharedDragDropSystem
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
 
-    private ISawmill _sawmill = default!;
-
     // how often to recheck possible targets (prevents calling expensive
     // check logic each update)
     private const float TargetRecheckInterval = 0.25f;
@@ -110,7 +106,6 @@ public sealed class DragDropSystem : SharedDragDropSystem
     public override void Initialize()
     {
         base.Initialize();
-        _sawmill = Logger.GetSawmill("drag_drop");
         UpdatesOutsidePrediction = true;
         UpdatesAfter.Add(typeof(SharedEyeSystem));
 
@@ -263,7 +258,7 @@ public sealed class DragDropSystem : SharedDragDropSystem
             return;
         }
 
-        _sawmill.Warning($"Unable to display drag shadow for {ToPrettyString(_draggedEntity.Value)} because it has no sprite component.");
+        Log.Warning($"Unable to display drag shadow for {ToPrettyString(_draggedEntity.Value)} because it has no sprite component.");
     }
 
     private bool UpdateDrag(float frameTime)
@@ -392,7 +387,7 @@ public sealed class DragDropSystem : SharedDragDropSystem
             }
 
             // tell the server about the drop attempt
-            RaiseNetworkEvent(new DragDropRequestEvent(GetNetEntity(_draggedEntity.Value), GetNetEntity(entity)));
+            RaisePredictiveEvent(new DragDropRequestEvent(GetNetEntity(_draggedEntity.Value), GetNetEntity(entity)));
             EndDrag();
             return true;
         }

Content.Client/Movement/Systems/ClimbSystem.cs

@@ -1,33 +0,0 @@
-using Content.Client.Interactable;
-using Content.Shared.Climbing;
-using Content.Shared.DragDrop;
-
-namespace Content.Client.Movement.Systems;
-
-public sealed class ClimbSystem : SharedClimbSystem
-{
-    [Dependency] private readonly InteractionSystem _interactionSystem = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-        SubscribeLocalEvent<ClimbableComponent, CanDropTargetEvent>(OnCanDragDropOn);
-    }
-
-    protected override void OnCanDragDropOn(EntityUid uid, ClimbableComponent component, ref CanDropTargetEvent args)
-    {
-        base.OnCanDragDropOn(uid, component, ref args);
-
-        if (!args.CanDrop)
-            return;
-
-        var user = args.User;
-        var target = uid;
-        var dragged = args.Dragged;
-        bool Ignored(EntityUid entity) => entity == target || entity == user || entity == dragged;
-
-        args.CanDrop = _interactionSystem.InRangeUnobstructed(user, target, component.Range, predicate: Ignored)
-                       && _interactionSystem.InRangeUnobstructed(user, dragged, component.Range, predicate: Ignored);
-        args.Handled = true;
-    }
-}

Content.Client/UserInterface/Systems/Actions/ActionUIController.cs

@@ -3,9 +3,9 @@ using System.Numerics;
 using System.Runtime.InteropServices;
 using Content.Client.Actions;
 using Content.Client.Construction;
-using Content.Client.DragDrop;
 using Content.Client.Gameplay;
 using Content.Client.Hands;
+using Content.Client.Interaction;
 using Content.Client.Outline;
 using Content.Client.UserInterface.Controls;
 using Content.Client.UserInterface.Systems.Actions.Controls;