Merge remote-tracking branch 'upstream/master' into 2024-09-27-sprite…

…-flick

RELEASE-NOTES.md

@@ -43,6 +43,7 @@ END TEMPLATE-->
 
 ### Bugfixes
 
+* Auto-networked dictionaries now use `TryAdd()` to avoid duplicate key errors when a dictionary contains multiple unknown networked entities.
 * Fixed `ICommonSession.Ping` always returning zero instead of the ping. Note that this will still return zero for client-side code when trying to get the ping of other players.
 
 ### Other

Robust.Client/Physics/PhysicsSystem.Predict.cs

@@ -156,7 +156,6 @@ internal void UpdateIsTouching(List<Contact> toUpdate)
 
             if (activeA == false && activeB == false)
             {
-                contact.IsTouching = false;
                 continue;
             }
 

Robust.Client/UserInterface/Controls/TabContainer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Numerics;
 using Robust.Client.Graphics;
 using Robust.Shared.Input;
@@ -21,6 +22,8 @@ public class TabContainer : Container
 
         private int _currentTab;
         private bool _tabsVisible = true;
+        // The right-most coordinate of each tab header
+        private List<float> _tabRight = new();
 
         public int CurrentTab
         {
@@ -157,11 +160,14 @@ protected internal override void Draw(DrawingHandleScreen handle)
 
             var headerOffset = 0f;
 
+            _tabRight.Clear();
+
             // Then, draw the tabs.
             for (var i = 0; i < ChildCount; i++)
             {
                 if (!GetTabVisible(i))
                 {
+                    _tabRight.Add(headerOffset);
                     continue;
                 }
 
@@ -214,6 +220,8 @@ protected internal override void Draw(DrawingHandleScreen handle)
                 }
 
                 headerOffset += boxAdvance;
+                // Remember the right-most point of this tab, for testing clicked areas
+                _tabRight.Add(headerOffset);
             }
         }
 
@@ -283,46 +291,17 @@ protected internal override void KeyBindDown(GUIBoundKeyEventArgs args)
             args.Handle();
 
             var relX = args.RelativePixelPosition.X;
-
-            var font = _getFont();
-            var boxActive = _getTabBoxActive();
-            var boxInactive = _getTabBoxInactive();
-
-            var headerOffset = 0f;
-
+            float tabLeft = 0;
             for (var i = 0; i < ChildCount; i++)
             {
-                if (!GetTabVisible(i))
+                if (relX > tabLeft && relX <= _tabRight[i])
                 {
-                    continue;
-                }
-
-                var title = GetActualTabTitle(i);
-
-                var titleLength = 0;
-                // Get string length.
-                foreach (var rune in title.EnumerateRunes())
-                {
-                    if (!font.TryGetCharMetrics(rune, UIScale, out var metrics))
-                    {
-                        continue;
-                    }
-
-                    titleLength += metrics.Advance;
-                }
-
-                var active = _currentTab == i;
-                var box = active ? boxActive : boxInactive;
-                var boxAdvance = titleLength + (box?.MinimumSize.X ?? 0);
-
-                if (headerOffset < relX && headerOffset + boxAdvance > relX)
-                {
-                    // Got em.
                     CurrentTab = i;
                     return;
                 }
 
-                headerOffset += boxAdvance;
+                // Next tab starts here
+                tabLeft = _tabRight[i];
             }
         }
 

Robust.Client/UserInterface/XAML/Proxy/XamlHotReloadManager.cs

@@ -58,16 +58,16 @@ private FileSystemWatcher CreateWatcher(string location)
         var watcher = new FileSystemWatcher(location)
         {
             IncludeSubdirectories = true,
-            NotifyFilter = NotifyFilters.LastWrite,
+            NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName,
         };
 
-        watcher.Changed += (_, args) =>
+        void OnWatcherEvent(object sender, FileSystemEventArgs args)
         {
             switch (args.ChangeType)
             {
-                case WatcherChangeTypes.Renamed:
                 case WatcherChangeTypes.Deleted:
                     return;
+                case WatcherChangeTypes.Renamed:
                 case WatcherChangeTypes.Created:
                 case WatcherChangeTypes.Changed:
                 case WatcherChangeTypes.All:
@@ -98,7 +98,10 @@ private FileSystemWatcher CreateWatcher(string location)
 
                 _xamlProxyManager.SetImplementation(resourceFileName, newText);
             });
-        };
+        }
+
+        watcher.Changed += OnWatcherEvent;
+        watcher.Renamed += OnWatcherEvent;
         watcher.EnableRaisingEvents = true;
         return watcher;
     }

Robust.Server/GameStates/PvsChunk.cs

@@ -141,9 +141,10 @@ public bool PopulateContents(EntityQuery<MetaDataComponent> meta, EntityQuery<Tr
         {
             // TODO ARCH multi-component queries
             if (!meta.TryGetComponent(child, out var childMeta)
-                || !xform.TryGetComponent(child, out var childXform))
+                || !xform.TryGetComponent(child, out var childXform)
+                || childMeta.EntityLifeStage >= EntityLifeStage.Terminating)
             {
-                DebugTools.Assert($"PVS chunk contains a deleted entity: {child}");
+                DebugTools.Assert($"PVS chunk contains a delete or terminating entity: {child}");
                 MarkDirty();
                 return false;
             }
@@ -188,9 +189,10 @@ public bool PopulateContents(EntityQuery<MetaDataComponent> meta, EntityQuery<Tr
                 {
                     // TODO ARCH multi-component queries
                     if (!meta.TryGetComponent(child, out var childMeta)
-                        || !xform.TryGetComponent(child, out var childXform))
+                        || !xform.TryGetComponent(child, out var childXform)
+                        || childMeta.EntityLifeStage >= EntityLifeStage.Terminating)
                     {
-                        DebugTools.Assert($"PVS chunk contains a deleted entity: {child}");
+                        DebugTools.Assert($"PVS chunk contains a delete or terminating entity: {child}");
                         MarkDirty();
                         return false;
                     }

Robust.Server/GameStates/PvsSystem.Chunks.cs

@@ -232,6 +232,7 @@ internal void ProcessVisibleChunksSequential()
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private void AddEntityToChunk(EntityUid uid, MetaDataComponent meta, PvsChunkLocation location)
     {
+        DebugTools.Assert(meta.EntityLifeStage < EntityLifeStage.Terminating);
         ref var chunk = ref CollectionsMarshal.GetValueRefOrAddDefault(_chunks, location, out var existing);
         if (!existing)
         {

Robust.Server/GameStates/PvsSystem.cs

@@ -129,14 +129,14 @@ public override void Initialize()
 
         SubscribeLocalEvent<MapChangedEvent>(OnMapChanged);
         SubscribeLocalEvent<GridRemovalEvent>(OnGridRemoved);
-        SubscribeLocalEvent<EntityTerminatingEvent>(OnEntityTerminating);
         SubscribeLocalEvent<TransformComponent, TransformStartupEvent>(OnTransformStartup);
 
         _playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
         _transform.OnBeforeMoveEvent += OnEntityMove;
         EntityManager.EntityAdded += OnEntityAdded;
         EntityManager.EntityDeleted += OnEntityDeleted;
         EntityManager.AfterEntityFlush += AfterEntityFlush;
+        EntityManager.BeforeEntityTerminating += OnEntityTerminating;
 
         Subs.CVar(_configManager, CVars.NetPVS, SetPvs, true);
         Subs.CVar(_configManager, CVars.NetMaxUpdateRange, OnViewsizeChanged, true);
@@ -162,6 +162,7 @@ public override void Shutdown()
         EntityManager.EntityAdded -= OnEntityAdded;
         EntityManager.EntityDeleted -= OnEntityDeleted;
         EntityManager.AfterEntityFlush -= AfterEntityFlush;
+        EntityManager.BeforeEntityTerminating -= OnEntityTerminating;
 
         _parallelMgr.ParallelCountChanged -= ResetParallelism;
 

Robust.Shared/GameObjects/EntityManager.Network.cs

@@ -391,7 +391,7 @@ public void EnsureEntityDictionary<TComp, TValue>(Dictionary<NetEntity, TValue>
         entities.EnsureCapacity(netEntities.Count);
         foreach (var pair in netEntities)
         {
-            entities.Add(EnsureEntity<TComp>(pair.Key, callerEntity), pair.Value);
+            entities.TryAdd(EnsureEntity<TComp>(pair.Key, callerEntity), pair.Value);
         }
     }
 
@@ -402,7 +402,7 @@ public void EnsureEntityDictionaryNullableValue<TComp, TValue>(Dictionary<NetEnt
         entities.EnsureCapacity(netEntities.Count);
         foreach (var pair in netEntities)
         {
-            entities.Add(EnsureEntity<TComp>(pair.Key, callerEntity), pair.Value);
+            entities.TryAdd(EnsureEntity<TComp>(pair.Key, callerEntity), pair.Value);
         }
     }
 
@@ -413,7 +413,7 @@ public void EnsureEntityDictionary<TComp, TKey>(Dictionary<TKey, NetEntity> netE
         entities.EnsureCapacity(netEntities.Count);
         foreach (var pair in netEntities)
         {
-            entities.Add(pair.Key, EnsureEntity<TComp>(pair.Value, callerEntity));
+            entities.TryAdd(pair.Key, EnsureEntity<TComp>(pair.Value, callerEntity));
         }
     }
 
@@ -424,7 +424,7 @@ public void EnsureEntityDictionary<TComp, TKey>(Dictionary<TKey, NetEntity?> net
         entities.EnsureCapacity(netEntities.Count);
         foreach (var pair in netEntities)
         {
-            entities.Add(pair.Key, EnsureEntity<TComp>(pair.Value, callerEntity));
+            entities.TryAdd(pair.Key, EnsureEntity<TComp>(pair.Value, callerEntity));
         }
     }
 
@@ -435,7 +435,7 @@ public void EnsureEntityDictionary<TComp>(Dictionary<NetEntity, NetEntity> netEn
         entities.EnsureCapacity(netEntities.Count);
         foreach (var pair in netEntities)
         {
-            entities.Add(EnsureEntity<TComp>(pair.Key, callerEntity), EnsureEntity<TComp>(pair.Value, callerEntity));
+            entities.TryAdd(EnsureEntity<TComp>(pair.Key, callerEntity), EnsureEntity<TComp>(pair.Value, callerEntity));
         }
     }
 
@@ -446,7 +446,7 @@ public void EnsureEntityDictionary<TComp>(Dictionary<NetEntity, NetEntity?> netE
         entities.EnsureCapacity(netEntities.Count);
         foreach (var pair in netEntities)
         {
-            entities.Add(EnsureEntity<TComp>(pair.Key, callerEntity), EnsureEntity<TComp>(pair.Value, callerEntity));
+            entities.TryAdd(EnsureEntity<TComp>(pair.Key, callerEntity), EnsureEntity<TComp>(pair.Value, callerEntity));
         }
     }
 

Robust.Shared/GameObjects/EntityManager.cs

@@ -93,6 +93,14 @@ public abstract partial class EntityManager : IEntityManager
         public event Action<Entity<MetaDataComponent>>? EntityAdded;
         public event Action<Entity<MetaDataComponent>>? EntityInitialized;
         public event Action<Entity<MetaDataComponent>>? EntityDeleted;
+
+        /// <summary>
+        /// Internal termination event handlers. This is mainly for exception tolerance, we want to ensure that PVS,
+        /// and other important engine systems can get updated before some content code throws an exception.
+        /// </summary>
+        internal event TerminatingEventHandler? BeforeEntityTerminating;
+        public delegate void TerminatingEventHandler(ref EntityTerminatingEvent ev);
+
         public event Action? BeforeEntityFlush;
         public event Action? AfterEntityFlush;
 
@@ -556,6 +564,7 @@ private void RecursiveFlagEntityTermination(EntityUid uid,
             try
             {
                 var ev = new EntityTerminatingEvent((uid, metadata));
+                BeforeEntityTerminating?.Invoke(ref ev);
                 EventBus.RaiseLocalEvent(uid, ref ev, true);
             }
             catch (Exception e)

Robust.Shared/Localization/Loc.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using JetBrains.Annotations;
-using Robust.Shared.ContentPack;
 using Robust.Shared.IoC;
 
 namespace Robust.Shared.Localization
@@ -36,6 +34,7 @@ public static string GetString(string messageId)
             return LocalizationManager.GetString(messageId);
         }
 
+        [Obsolete("Use ILocalizationManager")]
         public static bool TryGetString(string messageId, [NotNullWhen(true)] out string? message)
         {
             return LocalizationManager.TryGetString(messageId, out message);
@@ -49,6 +48,7 @@ public static string GetString(string messageId, params (string,object)[] args)
             return LocalizationManager.GetString(messageId, args);
         }
 
+        [Obsolete("Use ILocalizationManager")]
         public static bool TryGetString(
             string messageId,
             [NotNullWhen(true)] out string? value,

Robust.Shared/Physics/Dynamics/Contacts/Contact.cs

@@ -31,10 +31,13 @@
 using System.Collections.Generic;
 using System.Numerics;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
+using Robust.Shared.Maths;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
+using Robust.Shared.ViewVariables;
 
 namespace Robust.Shared.Physics.Dynamics.Contacts
 {
@@ -94,11 +97,13 @@ internal Contact(IManifoldManager manifoldManager)
         /// <summary>
         ///     Determines whether the contact is touching.
         /// </summary>
+        [ViewVariables]
         public bool IsTouching { get; internal set; }
 
         /// Enable/disable this contact. This can be used inside the pre-solve
         /// contact listener. The contact is only disabled for the current
         /// time step (or sub-step in continuous collisions).
+        [ViewVariables]
         public bool Enabled { get; set; }
 
         /// <summary>
@@ -256,9 +261,7 @@ internal void UpdateIsTouching(Transform bodyATransform, Transform bodyBTransfor
             {
                 var manifold = Manifold;
                 Evaluate(ref manifold, bodyATransform, bodyBTransform);
-
-                if (IsTouching)
-                    IsTouching = manifold.PointCount > 0;
+                IsTouching = manifold.PointCount > 0;
             }
         }