be4upstream

AdventureTimeSS14 · May 21, 2024 · 62936ac · 62936ac
1 parent ba13dc6
commit 62936ac
Show file tree

Hide file tree

Showing 22 changed files with 203 additions and 358 deletions.
diff --git a/Content.Client/ADT/EmotePanel/EmotePanelSystem.cs b/Content.Client/ADT/EmotePanel/EmotePanelSystem.cs
diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
@@ -221,7 +221,7 @@ private bool TryTargetWorld(in PointerInputCmdArgs args, EntityUid actionId, Wor
 
         var coords = args.Coordinates;
 
-        if (!_actionsSystem.ValidateWorldTarget(user, coords, action))
+        if (!_actionsSystem.ValidateWorldTarget(user, coords, (actionId, action)))
         {
             // Invalid target.
             if (action.DeselectOnMiss)
@@ -256,7 +256,7 @@ private bool TryTargetEntity(in PointerInputCmdArgs args, EntityUid actionId, En
 
         var entity = args.EntityUid;
 
-        if (!_actionsSystem.ValidateEntityTarget(user, entity, action))
+        if (!_actionsSystem.ValidateEntityTarget(user, entity, (actionId, action)))
         {
             if (action.DeselectOnMiss)
                 StopTargeting();

diff --git a/Content.Server/ADT/Boombox/BoomBoxSystem.cs b/Content.Server/ADT/Boombox/BoomBoxSystem.cs
@@ -32,11 +32,10 @@ public sealed class BoomBoxSystem : EntitySystem
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
-    [Dependency] private readonly UserInterfaceSystem _userInterface = default!;
     [Dependency] private readonly SharedHandsSystem _hands = default!;
     [Dependency] private readonly IEntityManager _entities = default!;
     [Dependency] private readonly DeviceLinkSystem _signalSystem = default!;
-
+    [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
     public override void Initialize()
     {
         base.Initialize();
@@ -181,7 +180,7 @@ private void UpdateUserInterface(EntityUid uid, BoomBoxComponent? component = nu
 
 
         var state = new BoomBoxUiState(canPlusVol, canMinusVol, canStop, canStart);
-        _userInterface.TrySetUiState(uid, BoomBoxUiKey.Key, state);
+        _uiSystem.SetUiState(uid, BoomBoxUiKey.Key, state);
     }
 
     private void MinusVol(EntityUid uid, BoomBoxComponent? component = null)

diff --git a/Content.Server/ADT/Changeling/EntitySystems/ChangelingSlugSystem.cs b/Content.Server/ADT/Changeling/EntitySystems/ChangelingSlugSystem.cs
@@ -81,8 +81,7 @@ private bool LayEggs(EntityUid uid, EntityUid target, LingSlugComponent componen
         var doAfter = new DoAfterArgs(EntityManager, uid, component.LayingDuration, new LingEggDoAfterEvent(), uid, target: target)
         {
             DistanceThreshold = 2,
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             AttemptFrequency = AttemptFrequency.StartAndEnd
         };

diff --git a/Content.Server/ADT/Changeling/EntitySystems/ChangelingSystem.Abilities.cs b/Content.Server/ADT/Changeling/EntitySystems/ChangelingSystem.Abilities.cs
@@ -176,8 +176,7 @@ private void StartAbsorbing(EntityUid uid, ChangelingComponent component, LingAb
         var doAfter = new DoAfterArgs(EntityManager, uid, component.AbsorbDuration, new AbsorbDoAfterEvent(), uid, target: target)
         {
             DistanceThreshold = 2,
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             AttemptFrequency = AttemptFrequency.StartAndEnd
         };
@@ -1031,8 +1030,7 @@ private void OnBiodegrade(EntityUid uid, ChangelingComponent component, LingBiod
         var doAfter = new DoAfterArgs(EntityManager, uid, component.BiodegradeDuration, new BiodegradeDoAfterEvent(), uid, target: uid)
         {
             DistanceThreshold = 2,
-            BreakOnUserMove = true,
-            BreakOnTargetMove = true,
+            BreakOnMove = true,
             BreakOnDamage = true,
             AttemptFrequency = AttemptFrequency.StartAndEnd,
             RequireCanInteract = false

diff --git a/Content.Server/ADT/Chemistry/ReagentAnalyzerSystem.cs b/Content.Server/ADT/Chemistry/ReagentAnalyzerSystem.cs
@@ -55,7 +55,7 @@ private void UpdateUiState(Entity<ReagentAnalyzerComponent> reagentAnalyzer)
             var outputContainerInfo = BuildOutputContainerInfo(outputContainer);
 
             var state = new ReagentAnalyzerBoundUserInterfaceState(outputContainerInfo);
-            _userInterfaceSystem.TrySetUiState(reagentAnalyzer, ReagentAnalyzerUiKey.Key, state);
+            _userInterfaceSystem.SetUiState(reagentAnalyzer.Owner, ReagentAnalyzerUiKey.Key, state);
         }
 
         private ContainerInfo? BuildOutputContainerInfo(EntityUid? container)
@@ -91,4 +91,4 @@ private void ClickSound(Entity<ReagentAnalyzerComponent> reagentAnalyzer)
             _audioSystem.PlayPvs(reagentAnalyzer.Comp.ClickSound, reagentAnalyzer, AudioParams.Default.WithVolume(-2f));
         }
     }
-}
+}
diff --git a/Content.Server/ADT/EmotePanel/EmotePanelSystem.cs b/Content.Server/ADT/EmotePanel/EmotePanelSystem.cs
diff --git a/Content.Server/ADT/SlimeHair/SlimeHairSystem.Abilities.cs b/Content.Server/ADT/SlimeHair/SlimeHairSystem.Abilities.cs
@@ -32,7 +32,7 @@ private void SlimeHairAction(EntityUid uid, SlimeHairComponent comp, SlimeHairAc
         if (!TryComp<ActorComponent>(uid, out var actor))
             return;
 
-        _uiSystem.TryOpen(uid, SlimeHairUiKey.Key, actor.PlayerSession);
+        _uiSystem.OpenUi(uid, SlimeHairUiKey.Key, actor.PlayerSession);
 
         UpdateInterface(uid, comp);