Merge pull request #11 from SS14-Classic/upstream_merge

Upstream merge 02/03/2024

.envrc

@@ -1,4 +1,4 @@
-if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
 fi
 use flake

Content.Benchmarks/ColorInterpolateBenchmark.cs

@@ -131,8 +131,8 @@ public static Color InterpolateSysVector4(Color a, Color b,
         public static Color InterpolateSysVector4In(in Color endPoint1, in Color endPoint2,
             float lambda)
         {
-            ref var sva = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(endPoint1));
-            ref var svb = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(endPoint2));
+            ref var sva = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(in endPoint1));
+            ref var svb = ref Unsafe.As<Color, SysVector4>(ref Unsafe.AsRef(in endPoint2));
 
             var res = SysVector4.Lerp(svb, sva, lambda);
 
@@ -156,8 +156,8 @@ public static Color InterpolateSimd(Color a, Color b,
         public static Color InterpolateSimdIn(in Color a, in Color b,
             float lambda)
         {
-            var vecA = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(a));
-            var vecB = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(b));
+            var vecA = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(in a));
+            var vecB = Unsafe.As<Color, Vector128<float>>(ref Unsafe.AsRef(in b));
 
             vecB = Fma.MultiplyAdd(Sse.Subtract(vecB, vecA), Vector128.Create(lambda), vecA);
 

Content.Benchmarks/DeviceNetworkingBenchmark.cs

@@ -4,8 +4,8 @@
 using Content.IntegrationTests;
 using Content.IntegrationTests.Pair;
 using Content.IntegrationTests.Tests.DeviceNetwork;
-using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Systems;
+using Content.Shared.DeviceNetwork;
 using Robust.Shared;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;

Content.Benchmarks/Program.cs

@@ -18,11 +18,6 @@ internal static class Program
 
         public static void Main(string[] args)
         {
-            MainAsync(args).GetAwaiter().GetResult();
-        }
-
-        public static async Task MainAsync(string[] args)
-        {
 #if DEBUG
             Console.ForegroundColor = ConsoleColor.Red;
             Console.WriteLine("\nWARNING: YOU ARE RUNNING A DEBUG BUILD, USE A RELEASE BUILD FOR AN ACCURATE BENCHMARK");

Content.Client/Actions/ActionsSystem.cs

@@ -78,10 +78,12 @@ private void OnWorldTargetHandleState(EntityUid uid, WorldTargetActionComponent
 
         private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, BaseActionComponentState state) where T : BaseActionComponent
         {
+            // TODO ACTIONS use auto comp states
             component.Icon = state.Icon;
             component.IconOn = state.IconOn;
             component.IconColor = state.IconColor;
-            component.Keywords = new HashSet<string>(state.Keywords);
+            component.Keywords.Clear();
+            component.Keywords.UnionWith(state.Keywords);
             component.Enabled = state.Enabled;
             component.Toggled = state.Toggled;
             component.Cooldown = state.Cooldown;
@@ -101,8 +103,7 @@ private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, Ba
             component.ItemIconStyle = state.ItemIconStyle;
             component.Sound = state.Sound;
 
-            if (_playerManager.LocalPlayer?.ControlledEntity == component.AttachedEntity)
-                ActionsUpdated?.Invoke();
+            UpdateAction(uid, component);
         }
 
         protected override void UpdateAction(EntityUid? actionId, BaseActionComponent? action = null)
@@ -111,7 +112,7 @@ protected override void UpdateAction(EntityUid? actionId, BaseActionComponent? a
                 return;
 
             base.UpdateAction(actionId, action);
-            if (_playerManager.LocalPlayer?.ControlledEntity != action.AttachedEntity)
+            if (_playerManager.LocalEntity != action.AttachedEntity)
                 return;
 
             ActionsUpdated?.Invoke();
@@ -144,7 +145,7 @@ private void HandleComponentState(EntityUid uid, ActionsComponent component, ref
                 _added.Add((actionId, action));
             }
 
-            if (_playerManager.LocalPlayer?.ControlledEntity != uid)
+            if (_playerManager.LocalEntity != uid)
                 return;
 
             foreach (var action in _removed)
@@ -177,23 +178,23 @@ public static int ActionComparer((EntityUid, BaseActionComponent?) a, (EntityUid
         protected override void ActionAdded(EntityUid performer, EntityUid actionId, ActionsComponent comp,
             BaseActionComponent action)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity != performer)
+            if (_playerManager.LocalEntity != performer)
                 return;
 
             OnActionAdded?.Invoke(actionId);
         }
 
         protected override void ActionRemoved(EntityUid performer, EntityUid actionId, ActionsComponent comp, BaseActionComponent action)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity != performer)
+            if (_playerManager.LocalEntity != performer)
                 return;
 
             OnActionRemoved?.Invoke(actionId);
         }
 
         public IEnumerable<(EntityUid Id, BaseActionComponent Comp)> GetClientActions()
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user)
+            if (_playerManager.LocalEntity is not { } user)
                 return Enumerable.Empty<(EntityUid, BaseActionComponent)>();
 
             return GetActions(user);
@@ -216,7 +217,7 @@ public void UnlinkAllActions()
 
         public void LinkAllActions(ActionsComponent? actions = null)
         {
-             if (_playerManager.LocalPlayer?.ControlledEntity is not { } user ||
+             if (_playerManager.LocalEntity is not { } user ||
                  !Resolve(user, ref actions, false))
              {
                  return;
@@ -233,7 +234,7 @@ public override void Shutdown()
 
         public void TriggerAction(EntityUid actionId, BaseActionComponent action)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user ||
+            if (_playerManager.LocalEntity is not { } user ||
                 !TryComp(user, out ActionsComponent? actions))
             {
                 return;
@@ -261,7 +262,7 @@ public void TriggerAction(EntityUid actionId, BaseActionComponent action)
         /// </summary>
         public void LoadActionAssignments(string path, bool userData)
         {
-            if (_playerManager.LocalPlayer?.ControlledEntity is not { } user)
+            if (_playerManager.LocalEntity is not { } user)
                 return;
 
             var file = new ResPath(path).ToRootedPath();

Content.Client/Administration/Managers/ClientAdminManager.cs

@@ -15,11 +15,13 @@ public sealed class ClientAdminManager : IClientAdminManager, IClientConGroupImp
         [Dependency] private readonly IClientNetManager _netMgr = default!;
         [Dependency] private readonly IClientConGroupController _conGroup = default!;
         [Dependency] private readonly IResourceManager _res = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
 
         private AdminData? _adminData;
         private readonly HashSet<string> _availableCommands = new();
 
         private readonly AdminCommandPermissions _localCommandPermissions = new();
+        private ISawmill _sawmill = default!;
 
         public event Action? AdminStatusUpdated;
 
@@ -92,17 +94,17 @@ private void UpdateMessageRx(MsgUpdateAdminStatus message)
             }
 
             _availableCommands.UnionWith(message.AvailableCommands);
-            Logger.DebugS("admin", $"Have {message.AvailableCommands.Length} commands available");
+            _sawmill.Debug($"Have {message.AvailableCommands.Length} commands available");
 
             _adminData = message.Admin;
             if (_adminData != null)
             {
                 var flagsText = string.Join("|", AdminFlagsHelper.FlagsToNames(_adminData.Flags));
-                Logger.InfoS("admin", $"Updated admin status: {_adminData.Active}/{_adminData.Title}/{flagsText}");
+                _sawmill.Info($"Updated admin status: {_adminData.Active}/{_adminData.Title}/{flagsText}");
             }
             else
             {
-                Logger.InfoS("admin", "Updated admin status: Not admin");
+                _sawmill.Info("Updated admin status: Not admin");
             }
 
             AdminStatusUpdated?.Invoke();
@@ -114,26 +116,25 @@ private void UpdateMessageRx(MsgUpdateAdminStatus message)
         void IPostInjectInit.PostInject()
         {
             _conGroup.Implementation = this;
+            _sawmill = _logManager.GetSawmill("admin");
         }
 
         public AdminData? GetAdminData(EntityUid uid, bool includeDeAdmin = false)
         {
-            return uid == _player.LocalPlayer?.ControlledEntity
-                ? _adminData
-                : null;
+            return uid == _player.LocalEntity ? _adminData : null;
         }
 
         public AdminData? GetAdminData(ICommonSession session, bool includeDeAdmin = false)
         {
-            if (_player.LocalPlayer?.UserId == session.UserId)
+            if (_player.LocalUser == session.UserId)
                 return _adminData;
 
             return null;
         }
 
         public AdminData? GetAdminData(bool includeDeAdmin = false)
         {
-            if (_player.LocalPlayer is { Session: { } session })
+            if (_player.LocalSession is { } session)
                 return GetAdminData(session, includeDeAdmin);
 
             return null;

Content.Client/Administration/Systems/BwoinkSystem.cs

@@ -19,11 +19,11 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes
             OnBwoinkTextMessageRecieved?.Invoke(this, message);
         }
 
-        public void Send(NetUserId channelId, string text)
+        public void Send(NetUserId channelId, string text, bool playSound)
         {
             // Reuse the channel ID as the 'true sender'.
             // Server will ignore this and if someone makes it not ignore this (which is bad, allows impersonation!!!), that will help.
-            RaiseNetworkEvent(new BwoinkTextMessage(channelId, channelId, text));
+            RaiseNetworkEvent(new BwoinkTextMessage(channelId, channelId, text, playSound: playSound));
             SendInputTextUpdated(channelId, false);
         }
 

Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml

@@ -7,6 +7,8 @@
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">
                 <BoxContainer Access="Public" Name="BwoinkArea" VerticalExpand="True" />
                 <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                    <CheckBox Visible="True" Name="PlaySound" Access="Public" Text="{Loc 'admin-bwoink-play-sound'}" Pressed="True" />
+                    <Control HorizontalExpand="True" MinWidth="5" />
                     <Button Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}" StyleClasses="OpenBoth" HorizontalAlignment="Left" />
                     <Control HorizontalExpand="True" />
                     <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" StyleClasses="OpenRight" />

Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs

@@ -29,6 +29,8 @@ public sealed partial class PlayerListControl : BoxContainer
         private IEntityManager _entManager;
         private IUserInterfaceManager _uiManager;
 
+        private PlayerInfo? _selectedPlayer;
+
         public PlayerListControl()
         {
             _entManager = IoCManager.Resolve<IEntityManager>();
@@ -50,10 +52,14 @@ private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? d
             if (args == null || data is not PlayerListData {Info: var selectedPlayer})
                 return;
 
+            if (selectedPlayer == _selectedPlayer)
+                return;
+
             if (args.Event.Function != EngineKeyFunctions.UIClick)
                 return;
 
             OnSelectionChanged?.Invoke(selectedPlayer);
+            _selectedPlayer = selectedPlayer;
 
             // update label text. Only required if there is some override (e.g. unread bwoink count).
             if (OverrideText != null && args.Button.Children.FirstOrDefault()?.Children?.FirstOrDefault() is Label label)
@@ -95,13 +101,18 @@ private void FilterList()
                 _sortedPlayerList.Sort((a, b) => Comparison(a, b));
 
             PlayerListContainer.PopulateList(_sortedPlayerList.Select(info => new PlayerListData(info)).ToList());
+            if (_selectedPlayer != null)
+                PlayerListContainer.Select(new PlayerListData(_selectedPlayer));
         }
 
         public void PopulateList(IReadOnlyList<PlayerInfo>? players = null)
         {
             players ??= _adminSystem.PlayerList;
 
             _playerList = players.ToList();
+            if (_selectedPlayer != null && !_playerList.Contains(_selectedPlayer))
+                _selectedPlayer = null;
+
             FilterList();
         }
 

Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs

@@ -68,7 +68,7 @@ private void Refresh()
             SeverityRect.Texture = _sprites.Frame0(new SpriteSpecifier.Texture(new ResPath(iconPath)));
         }
 
-        TimeLabel.Text = Note.CreatedAt.ToString("yyyy-MM-dd HH:mm:ss");
+        TimeLabel.Text = Note.CreatedAt.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss");
         ServerLabel.Text = Note.ServerName ?? "Unknown";
         RoundLabel.Text = Note.Round == null ? "Unknown round" : "Round " + Note.Round;
         AdminLabel.Text = Note.CreatedByName;
@@ -91,7 +91,7 @@ private void Refresh()
             if (Note.ExpiryTime.Value > DateTime.UtcNow)
             {
                 ExpiresLabel.Text = Loc.GetString("admin-note-editor-expiry-label-params",
-                    ("date", Note.ExpiryTime.Value.ToString("yyyy-MM-dd HH:mm:ss")),
+                    ("date", Note.ExpiryTime.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")),
                     ("expiresIn", (Note.ExpiryTime.Value - DateTime.UtcNow).ToString("d'd 'hh':'mm")));
                 ExpiresLabel.Modulate = Color.FromHex("#86DC3D");
             }
@@ -104,7 +104,7 @@ private void Refresh()
 
         if (Note.LastEditedAt > Note.CreatedAt)
         {
-            EditedLabel.Text = Loc.GetString("admin-notes-edited", ("author", Note.EditedByName), ("date", Note.LastEditedAt));
+            EditedLabel.Text = Loc.GetString("admin-notes-edited", ("author", Note.EditedByName), ("date", Note.LastEditedAt.Value.ToLocalTime()));
             EditedLabel.Visible = true;
         }
 

Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs

@@ -36,12 +36,12 @@ public AdminNotesLinePopup(SharedAdminNote note, string playerName, bool showDel
             ? Loc.GetString("admin-notes-round-id-unknown")
             : Loc.GetString("admin-notes-round-id", ("id", note.Round));
         CreatedByLabel.Text = Loc.GetString("admin-notes-created-by", ("author", note.CreatedByName));
-        CreatedAtLabel.Text = Loc.GetString("admin-notes-created-at", ("date", note.CreatedAt.ToString("yyyy-MM-dd HH:mm:ss")));
+        CreatedAtLabel.Text = Loc.GetString("admin-notes-created-at", ("date", note.CreatedAt.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")));
         EditedByLabel.Text = Loc.GetString("admin-notes-last-edited-by", ("author", note.EditedByName));
-        EditedAtLabel.Text = Loc.GetString("admin-notes-last-edited-at", ("date", note.LastEditedAt?.ToString("yyyy-MM-dd HH:mm:ss") ?? Loc.GetString("admin-notes-edited-never")));
+        EditedAtLabel.Text = Loc.GetString("admin-notes-last-edited-at", ("date", note.LastEditedAt?.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss") ?? Loc.GetString("admin-notes-edited-never")));
         ExpiryTimeLabel.Text = note.ExpiryTime == null
             ? Loc.GetString("admin-notes-expires-never")
-            : Loc.GetString("admin-notes-expires", ("expires", note.ExpiryTime.Value.ToString("yyyy-MM-dd HH:mm:ss")));
+            : Loc.GetString("admin-notes-expires", ("expires", note.ExpiryTime.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss")));
         NoteTextEdit.InsertAtCursor(note.Message);
 
         if (note.NoteType is NoteType.ServerBan or NoteType.RoleBan)

Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs

@@ -81,7 +81,7 @@ public NoteEdit(SharedAdminNote? note, string playerName, bool canCreate, bool c
             {
                 PermanentCheckBox.Pressed = false;
                 UpdatePermanentCheckboxFields();
-                ExpiryLineEdit.Text = ExpiryTime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                ExpiryLineEdit.Text = ExpiryTime.Value.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss");
             }
         }
 
@@ -173,7 +173,7 @@ private void UpdatePermanentCheckboxFields()
         ExpiryLabel.Visible = !PermanentCheckBox.Pressed;
         ExpiryLineEdit.Visible = !PermanentCheckBox.Pressed;
 
-        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty;
+        ExpiryLineEdit.Text = !PermanentCheckBox.Pressed ? DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") : string.Empty;
     }
 
     private void OnSecretPressed(BaseButton.ButtonEventArgs _)
@@ -269,7 +269,7 @@ private bool ParseExpiryTime()
             return false;
         }
 
-        ExpiryTime = result;
+        ExpiryTime = result.ToUniversalTime();
         ExpiryLineEdit.ModulateSelfOverride = null;
         return true;
     }

Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs

@@ -99,7 +99,7 @@ private void SetLocation()
     {
         UpdateMapOptions();
 
-        if (!_entMan.TryGetComponent(_playerManager.LocalPlayer?.ControlledEntity, out TransformComponent? transform))
+        if (!_entMan.TryGetComponent(_playerManager.LocalEntity, out TransformComponent? transform))
             return;
 
         _pausePreview = true;

Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs

@@ -42,7 +42,7 @@ private void Reset()
             var entManager = IoCManager.Resolve<IEntityManager>();
             var xformSystem = entManager.System<SharedTransformSystem>();
             var playerManager = IoCManager.Resolve<IPlayerManager>();
-            var player = playerManager.LocalPlayer?.ControlledEntity;
+            var player = playerManager.LocalEntity;
 
             var currentMap = MapId.Nullspace;
             var position = Vector2.Zero;

Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs

@@ -28,7 +28,7 @@ protected override void EnteredTree()
         {
             _data.Clear();
 
-            var player = _players.LocalPlayer?.ControlledEntity;
+            var player = _players.LocalEntity;
             var playerGrid = _entities.GetComponentOrNull<TransformComponent>(player)?.GridUid;
             var query = IoCManager.Resolve<IEntityManager>().AllEntityQueryEnumerator<MapGridComponent>();
 

Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs

@@ -31,7 +31,7 @@ protected override void EnteredTree()
             while (gridQuery.MoveNext(out var uid, out _))
             {
                 _gridData.Add(entManager.GetNetEntity(uid));
-                var player = playerManager.LocalPlayer?.ControlledEntity;
+                var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
             }

Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs

@@ -34,7 +34,7 @@ protected override void EnteredTree()
 
             while (gridQuery.MoveNext(out var uid, out _))
             {
-                var player = playerManager.LocalPlayer?.ControlledEntity;
+                var player = playerManager.LocalEntity;
                 var playerGrid = entManager.GetComponentOrNull<TransformComponent>(player)?.GridUid;
                 GridOptions.AddItem($"{uid} {(playerGrid == uid ? " (Current)" : "")}");
                 _gridData.Add(entManager.GetNetEntity(uid));