From 8a4cfda6d77270618f1c36564ef10cb837b4d5ac Mon Sep 17 00:00:00 2001 From: null <56081759+NullWanderer@users.noreply.github.com> Date: Sun, 5 May 2024 01:39:06 +0200 Subject: [PATCH] Fix content UIs --- .../DeltaV/Harpy/HarpySingerSystem.cs | 2 +- .../SubdermalBionicSyrinxImplantSystem.cs | 17 ++++---- .../EntitySystems/DeepFryerSystem.Storage.cs | 7 ++-- .../Kitchen/EntitySystems/DeepFryerSystem.cs | 41 ++++++++----------- .../ReverseEngineeringSystem.cs | 4 +- 5 files changed, 31 insertions(+), 40 deletions(-) diff --git a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs index 21b5b3a2456..d38378297a1 100644 --- a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs +++ b/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs @@ -134,7 +134,7 @@ namespace Content.Server.DeltaV.Harpy if (HasComp(uid) && TryComp(uid, out var actor)) { - _instrument.ToggleInstrumentUi(uid, actor.PlayerSession); + _instrument.ToggleInstrumentUi(uid, uid); } } diff --git a/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs b/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs index bd728c4e1bc..dfd47378bdd 100644 --- a/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs +++ b/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs @@ -56,7 +56,7 @@ public sealed class SubdermalBionicSyrinxImplantSystem : EntitySystem ent.Comp.SpeechVerb = msg.Verb; // verb is only important to metagamers so no need to log as opposed to name - _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-success"), ent, msg.Session); + _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-success"), ent, msg.Actor); TrySetLastSpeechVerb(ent, msg.Verb); @@ -89,18 +89,17 @@ public sealed class SubdermalBionicSyrinxImplantSystem : EntitySystem { if (message.Name.Length > HumanoidCharacterProfile.MaxNameLength || message.Name.Length <= 0) { - _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-failure"), uid, message.Session, PopupType.SmallCaution); + _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-failure"), uid, message.Actor, PopupType.SmallCaution); return; } component.VoiceName = message.Name; - if (message.Session.AttachedEntity != null) - _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(message.Session.AttachedEntity.Value):player} set voice of {ToPrettyString(uid):mask}: {component.VoiceName}"); - else - _adminLogger.Add(LogType.Action, LogImpact.Medium, $"Voice of {ToPrettyString(uid):mask} set: {component.VoiceName}"); + _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(message.Actor):player} set voice of {ToPrettyString(uid):mask}: {component.VoiceName}"); + + _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-success"), uid, message.Actor); - _popupSystem.PopupEntity(Loc.GetString("voice-mask-popup-success"), uid, message.Session); TrySetLastKnownName(uid, message.Name); + UpdateUI(uid, component); } @@ -124,8 +123,8 @@ public sealed class SubdermalBionicSyrinxImplantSystem : EntitySystem if (!Resolve(owner, ref component, logMissing: false)) return; - if (_uiSystem.TryGetUi(owner, VoiceMaskUIKey.Key, out var bui)) - _uiSystem.SetUiState(bui, new VoiceMaskBuiState(component.VoiceName, component.SpeechVerb)); + if (_uiSystem.HasUi(owner, VoiceMaskUIKey.Key)) + _uiSystem.SetUiState(owner, VoiceMaskUIKey.Key, new VoiceMaskBuiState(component.VoiceName, component.SpeechVerb)); } /// diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Storage.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Storage.cs index 8858286dbf6..2473690ce80 100644 --- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Storage.cs +++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.Storage.cs @@ -80,14 +80,13 @@ public sealed partial class DeepFryerSystem private void OnInsertItem(EntityUid uid, DeepFryerComponent component, DeepFryerInsertItemMessage args) { - var user = args.Session.AttachedEntity; + var user = args.Actor; - if (user == null || - !TryComp(user, out var handsComponent) || + if (!TryComp(user, out var handsComponent) || handsComponent.ActiveHandEntity == null) return; if (handsComponent.ActiveHandEntity != null) - TryInsertItem(uid, component, user.Value, handsComponent.ActiveHandEntity.Value); + TryInsertItem(uid, component, user, handsComponent.ActiveHandEntity.Value); } } diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs index 86acaa05dc3..b93c87f2f43 100644 --- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs +++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs @@ -131,8 +131,7 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem component.FryingOilThreshold, EntityManager.GetNetEntityArray(component.Storage.ContainedEntities.ToArray())); - if (!_uiSystem.TrySetUiState(uid, DeepFryerUiKey.Key, state)) - _sawmill.Warning($"{ToPrettyString(uid)} was unable to set UI state."); + _uiSystem.SetUiState(uid, DeepFryerUiKey.Key, state); } /// @@ -529,15 +528,12 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem if (!_containerSystem.Remove(removedItem, component.Storage)) return; - var user = args.Session.AttachedEntity; + var user = args.Actor; - if (user != null) - { - _handsSystem.TryPickupAnyHand(user.Value, removedItem); + _handsSystem.TryPickupAnyHand(user, removedItem); - _adminLogManager.Add(LogType.Action, LogImpact.Low, - $"{ToPrettyString(user.Value)} took {ToPrettyString(args.Item)} out of {ToPrettyString(uid)}."); - } + _adminLogManager.Add(LogType.Action, LogImpact.Low, + $"{ToPrettyString(user)} took {ToPrettyString(args.Item)} out of {ToPrettyString(uid)}."); _audioSystem.PlayPvs(component.SoundRemoveItem, uid, AudioParamsInsertRemove); @@ -585,17 +581,17 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem private void OnScoopVat(EntityUid uid, DeepFryerComponent component, DeepFryerScoopVatMessage args) { - var user = args.Session.AttachedEntity; + var user = args.Actor; if (user == null || - !TryGetActiveHandSolutionContainer(uid, user.Value, out var heldItem, out var heldSolution, + !TryGetActiveHandSolutionContainer(uid, user, out var heldItem, out var heldSolution, out var transferAmount)) return; if (!_solutionContainerSystem.TryGetSolution(component.Owner, component.Solution.Name, out var solution)) return; - _solutionTransferSystem.Transfer(user.Value, + _solutionTransferSystem.Transfer(user, uid, solution.Value, heldItem.Value, @@ -607,10 +603,9 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem private void OnClearSlagStart(EntityUid uid, DeepFryerComponent component, DeepFryerClearSlagMessage args) { - var user = args.Session.AttachedEntity; + var user = args.Actor; - if (user == null || - !TryGetActiveHandSolutionContainer(uid, user.Value, out var heldItem, out var heldSolution, + if (!TryGetActiveHandSolutionContainer(uid, user, out var heldItem, out var heldSolution, out var transferAmount)) return; @@ -620,17 +615,17 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem _popupSystem.PopupEntity( Loc.GetString("deep-fryer-oil-no-slag"), uid, - user.Value); + user); return; } - var delay = Math.Clamp((float) wasteVolume * 0.1f, 1f, 5f); + var delay = TimeSpan.FromSeconds(Math.Clamp((float) wasteVolume * 0.1f, 1f, 5f)); var ev = new ClearSlagDoAfterEvent(heldSolution.Value.Comp.Solution, transferAmount); //JJ Comment - not sure I have DoAfterArgs configured correctly. - var doAfterArgs = new DoAfterArgs(EntityManager, user.Value, delay, ev, uid, uid, heldItem) + var doAfterArgs = new DoAfterArgs(EntityManager, user, delay, ev, uid, uid, heldItem) { BreakOnDamage = true, BreakOnMove = true, @@ -641,6 +636,7 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem _doAfterSystem.TryStartDoAfter(doAfterArgs); } + [Obsolete("Obsolete")] private void OnRemoveAllItems(EntityUid uid, DeepFryerComponent component, DeepFryerRemoveAllItemsMessage args) { if (component.Storage.ContainedEntities.Count == 0) @@ -648,13 +644,10 @@ public sealed partial class DeepFryerSystem : SharedDeepfryerSystem _containerSystem.EmptyContainer(component.Storage); - var user = args.Session.AttachedEntity; + var user = args.Actor; - if (user != null) - { - _adminLogManager.Add(LogType.Action, LogImpact.Low, - $"{ToPrettyString(user.Value)} removed all items from {ToPrettyString(uid)}."); - } + _adminLogManager.Add(LogType.Action, LogImpact.Low, + $"{ToPrettyString(user)} removed all items from {ToPrettyString(uid)}."); _audioSystem.PlayPvs(component.SoundRemoveItem, uid, AudioParamsInsertRemove); diff --git a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs index 85fa160d8ee..a745a821264 100644 --- a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs +++ b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs @@ -187,7 +187,7 @@ public sealed class ReverseEngineeringSystem : EntitySystem if (!Resolve(uid, ref component)) return; - if (!_ui.TryGetUi(uid, ReverseEngineeringMachineUiKey.Key, out var bui)) + if (!_ui.HasUi(uid, ReverseEngineeringMachineUiKey.Key)) return; EntityUid? item = component.CurrentItem; @@ -202,7 +202,7 @@ public sealed class ReverseEngineeringSystem : EntitySystem var state = new ReverseEngineeringMachineScanUpdateState(netItem, canScan, component.CachedMessage, scanning, component.SafetyOn, component.AutoScan, component.Progress, remaining, component.AnalysisDuration); - _ui.SetUiState(bui, state); + _ui.SetUiState(uid, ReverseEngineeringMachineUiKey.Key, state); } private ReverseEngineeringTickResult Roll(ReverseEngineeringMachineComponent component, out int actualRoll)