Fix handlabeler/utility belt misprediction (#26660)

* Fix handlabeler/utility belt misprediction * Partly moved HandLabelerSystem to shared And cleaned up HandLabelerComponent * WIP format the files so later commits look clearer Doesn't change individual code lines, but may move functions to another file * WIP some more code movement * Hand Labeler is now mostly predicted Only the UI isn't * WIP: Formatting and moved stuff * Using componentstates for prediction correction * review * Update label on label change * Don't overwrite label while editing --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2024-04-28 07:19:30 +03:00
parent 1c78f60bc3
commit a4504e2fef
10 changed files with 250 additions and 190 deletions
--- a/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs
+++ b/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs
@@ -0,0 +1,129 @@
+using Content.Shared.Administration.Logs;
+using Content.Shared.Database;
+using Content.Shared.Interaction;
+using Content.Shared.Labels.Components;
+using Content.Shared.Popups;
+using Content.Shared.Verbs;
+using Robust.Shared.GameStates;
+using Robust.Shared.Network;
+
+namespace Content.Shared.Labels.EntitySystems;
+
+public abstract class SharedHandLabelerSystem : EntitySystem
+{
+    [Dependency] protected readonly SharedUserInterfaceSystem UserInterfaceSystem = default!;
+    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+    [Dependency] private readonly SharedLabelSystem _labelSystem = default!;
+    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+    [Dependency] private readonly INetManager _netManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<HandLabelerComponent, AfterInteractEvent>(AfterInteractOn);
+        SubscribeLocalEvent<HandLabelerComponent, GetVerbsEvent<UtilityVerb>>(OnUtilityVerb);
+        // Bound UI subscriptions
+        SubscribeLocalEvent<HandLabelerComponent, HandLabelerLabelChangedMessage>(OnHandLabelerLabelChanged);
+        SubscribeLocalEvent<HandLabelerComponent, ComponentGetState>(OnGetState);
+        SubscribeLocalEvent<HandLabelerComponent, ComponentHandleState>(OnHandleState);
+    }
+
+    private void OnGetState(Entity<HandLabelerComponent> ent, ref ComponentGetState args)
+    {
+        args.State = new HandLabelerComponentState(ent.Comp.AssignedLabel)
+        {
+            MaxLabelChars = ent.Comp.MaxLabelChars,
+        };
+    }
+
+    private void OnHandleState(Entity<HandLabelerComponent> ent, ref ComponentHandleState args)
+    {
+        if (args.Current is not HandLabelerComponentState state)
+            return;
+
+        ent.Comp.MaxLabelChars = state.MaxLabelChars;
+
+        if (ent.Comp.AssignedLabel == state.AssignedLabel)
+            return;
+
+        ent.Comp.AssignedLabel = state.AssignedLabel;
+        UpdateUI(ent);
+    }
+
+    protected virtual void UpdateUI(Entity<HandLabelerComponent> ent)
+    {
+    }
+
+    private void AddLabelTo(EntityUid uid, HandLabelerComponent? handLabeler, EntityUid target, out string? result)
+    {
+        if (!Resolve(uid, ref handLabeler))
+        {
+            result = null;
+            return;
+        }
+
+        if (handLabeler.AssignedLabel == string.Empty)
+        {
+            if (_netManager.IsServer)
+                _labelSystem.Label(target, null);
+            result = Loc.GetString("hand-labeler-successfully-removed");
+            return;
+        }
+        if (_netManager.IsServer)
+            _labelSystem.Label(target, handLabeler.AssignedLabel);
+        result = Loc.GetString("hand-labeler-successfully-applied");
+    }
+
+    private void OnUtilityVerb(EntityUid uid, HandLabelerComponent handLabeler, GetVerbsEvent<UtilityVerb> args)
+    {
+        if (args.Target is not { Valid: true } target || !handLabeler.Whitelist.IsValid(target) || !args.CanAccess)
+            return;
+
+        var labelerText = handLabeler.AssignedLabel == string.Empty ? Loc.GetString("hand-labeler-remove-label-text") : Loc.GetString("hand-labeler-add-label-text");
+
+        var verb = new UtilityVerb()
+        {
+            Act = () =>
+            {
+                Labeling(uid, target, args.User, handLabeler);
+            },
+            Text = labelerText
+        };
+
+        args.Verbs.Add(verb);
+    }
+
+    private void AfterInteractOn(EntityUid uid, HandLabelerComponent handLabeler, AfterInteractEvent args)
+    {
+        if (args.Target is not { Valid: true } target || !handLabeler.Whitelist.IsValid(target) || !args.CanReach)
+            return;
+
+        Labeling(uid, target, args.User, handLabeler);
+    }
+
+    private void Labeling(EntityUid uid, EntityUid target, EntityUid User, HandLabelerComponent handLabeler)
+    {
+        AddLabelTo(uid, handLabeler, target, out var result);
+        if (result == null)
+            return;
+
+        _popupSystem.PopupClient(result, User, User);
+
+        // Log labeling
+        _adminLogger.Add(LogType.Action, LogImpact.Low,
+            $"{ToPrettyString(User):user} labeled {ToPrettyString(target):target} with {ToPrettyString(uid):labeler}");
+    }
+
+    private void OnHandLabelerLabelChanged(EntityUid uid, HandLabelerComponent handLabeler, HandLabelerLabelChangedMessage args)
+    {
+        var label = args.Label.Trim();
+        handLabeler.AssignedLabel = label[..Math.Min(handLabeler.MaxLabelChars, label.Length)];
+        UpdateUI((uid, handLabeler));
+        Dirty(uid, handLabeler);
+
+        // Log label change
+        _adminLogger.Add(LogType.Action, LogImpact.Low,
+            $"{ToPrettyString(args.Actor):user} set {ToPrettyString(uid):labeler} to apply label \"{handLabeler.AssignedLabel}\"");
+    }
+}