Merge pull request #489 from Rxup/upstream-sync

Upstream sync

Content.Client/Content.Client.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
     <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
     <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Client\</OutputPath>

Content.Client/CrewManifest/UI/CrewManifestListing.cs

@@ -1,18 +1,14 @@
-using Content.Shared.CCVar;
-using Content.Shared.CrewManifest;
+using Content.Shared.CrewManifest;
 using Content.Shared.Roles;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using System.Linq;
 
 namespace Content.Client.CrewManifest.UI;
 
 public sealed class CrewManifestListing : BoxContainer
 {
-    [Dependency] private readonly IConfigurationManager _configManager = default!;
     [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     private readonly SpriteSystem _spriteSystem;
@@ -25,7 +21,7 @@ public CrewManifestListing()
 
     public void AddCrewManifestEntries(CrewManifestEntries entries)
     {
-        var entryDict = new Dictionary<string, List<CrewManifestEntry>>();
+        var entryDict = new Dictionary<DepartmentPrototype, List<CrewManifestEntry>>();
 
         foreach (var entry in entries.Entries)
         {
@@ -34,37 +30,19 @@ public void AddCrewManifestEntries(CrewManifestEntries entries)
                 // this is a little expensive, and could be better
                 if (department.Roles.Contains(entry.JobPrototype))
                 {
-                    entryDict.GetOrNew(department.ID).Add(entry);
+                    entryDict.GetOrNew(department).Add(entry);
                 }
             }
         }
 
-        var entryList = new List<(string section, List<CrewManifestEntry> entries)>();
+        var entryList = new List<(DepartmentPrototype section, List<CrewManifestEntry> entries)>();
 
         foreach (var (section, listing) in entryDict)
         {
             entryList.Add((section, listing));
         }
 
-        var sortOrder = _configManager.GetCVar(CCVars.CrewManifestOrdering).Split(",").ToList();
-
-        entryList.Sort((a, b) =>
-        {
-            var ai = sortOrder.IndexOf(a.section);
-            var bi = sortOrder.IndexOf(b.section);
-
-            // this is up here so -1 == -1 occurs first
-            if (ai == bi)
-                return 0;
-
-            if (ai == -1)
-                return -1;
-
-            if (bi == -1)
-                return 1;
-
-            return ai.CompareTo(bi);
-        });
+        entryList.Sort((a, b) => DepartmentUIComparer.Instance.Compare(a.section, b.section));
 
         foreach (var item in entryList)
         {

Content.Client/CrewManifest/UI/CrewManifestSection.cs

@@ -4,24 +4,25 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Prototypes;
 using System.Numerics;
+using Content.Shared.Roles;
 
 namespace Content.Client.CrewManifest.UI;
 
 public sealed class CrewManifestSection : BoxContainer
 {
-    public CrewManifestSection(IPrototypeManager prototypeManager, SpriteSystem spriteSystem, string sectionTitle,
+    public CrewManifestSection(
+        IPrototypeManager prototypeManager,
+        SpriteSystem spriteSystem,
+        DepartmentPrototype section,
         List<CrewManifestEntry> entries)
     {
         Orientation = LayoutOrientation.Vertical;
         HorizontalExpand = true;
 
-        if (Loc.TryGetString($"department-{sectionTitle}", out var localizedDepart))
-            sectionTitle = localizedDepart;
-
         AddChild(new Label()
         {
             StyleClasses = { "LabelBig" },
-            Text = Loc.GetString(sectionTitle)
+            Text = Loc.GetString($"department-{section.ID}")
         });
 
         var gridContainer = new GridContainer()
@@ -55,8 +56,9 @@ public CrewManifestSection(IPrototypeManager prototypeManager, SpriteSystem spri
                 var icon = new TextureRect()
                 {
                     TextureScale = new Vector2(2, 2),
-                    Stretch = TextureRect.StretchMode.KeepCentered,
+                    VerticalAlignment = VAlignment.Center,
                     Texture = spriteSystem.Frame0(jobIcon.Icon),
+                    Margin = new Thickness(0, 0, 4, 0)
                 };
 
                 titleContainer.AddChild(icon);

Content.Client/Decals/DecalSystem.cs

@@ -50,16 +50,8 @@ public override void Shutdown()
         protected override void OnDecalRemoved(EntityUid gridId, uint decalId, DecalGridComponent component, Vector2i indices, DecalChunk chunk)
         {
             base.OnDecalRemoved(gridId, decalId, component, indices, chunk);
-
-            if (!component.DecalZIndexIndex.Remove(decalId, out var zIndex))
-                return;
-
-            if (!component.DecalRenderIndex.TryGetValue(zIndex, out var renderIndex))
-                return;
-
-            renderIndex.Remove(decalId);
-            if (renderIndex.Count == 0)
-                component.DecalRenderIndex.Remove(zIndex);
+            DebugTools.Assert(chunk.Decals.ContainsKey(decalId));
+            chunk.Decals.Remove(decalId);
         }
 
         private void OnHandleState(EntityUid gridUid, DecalGridComponent gridComp, ref ComponentHandleState args)
@@ -133,8 +125,6 @@ private void OnChunkUpdate(DecalChunkUpdateEvent ev)
         private void UpdateChunks(EntityUid gridId, DecalGridComponent gridComp, Dictionary<Vector2i, DecalChunk> updatedGridChunks)
         {
             var chunkCollection = gridComp.ChunkCollection.ChunkCollection;
-            var renderIndex = gridComp.DecalRenderIndex;
-            var zIndexIndex = gridComp.DecalZIndexIndex;
 
             // Update any existing data / remove decals we didn't receive data for.
             foreach (var (indices, newChunkData) in updatedGridChunks)
@@ -155,11 +145,6 @@ private void UpdateChunks(EntityUid gridId, DecalGridComponent gridComp, Diction
 
                 foreach (var (uid, decal) in newChunkData.Decals)
                 {
-                    if (zIndexIndex.TryGetValue(uid, out var zIndex))
-                        renderIndex[zIndex].Remove(uid);
-
-                    renderIndex.GetOrNew(decal.ZIndex)[uid] = decal;
-                    zIndexIndex[uid] = decal.ZIndex;
                     gridComp.DecalIndex[uid] = indices;
                 }
             }

Content.Client/Decals/Overlays/DecalOverlay.cs

@@ -3,6 +3,7 @@
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.Map;
+using Robust.Shared.Map.Enumerators;
 using Robust.Shared.Prototypes;
 
 namespace Content.Client.Decals.Overlays
@@ -15,6 +16,8 @@ public sealed class DecalOverlay : GridOverlay
 
         private readonly Dictionary<string, (Texture Texture, bool SnapCardinals)> _cachedTextures = new(64);
 
+        private readonly List<(uint Id, Decal Decal)> _decals = new();
+
         public DecalOverlay(
             SpriteSystem sprites,
             IEntityManager entManager,
@@ -30,10 +33,10 @@ protected override void Draw(in OverlayDrawArgs args)
             if (args.MapId == MapId.Nullspace)
                 return;
 
-            var grid = Grid;
+            var owner = Grid.Owner;
 
-            if (!_entManager.TryGetComponent(grid, out DecalGridComponent? decalGrid) ||
-                !_entManager.TryGetComponent(grid, out TransformComponent? xform))
+            if (!_entManager.TryGetComponent(owner, out DecalGridComponent? decalGrid) ||
+                !_entManager.TryGetComponent(owner, out TransformComponent? xform))
             {
                 return;
             }
@@ -46,46 +49,68 @@ protected override void Draw(in OverlayDrawArgs args)
             var xformSystem = _entManager.System<TransformSystem>();
             var eyeAngle = args.Viewport.Eye?.Rotation ?? Angle.Zero;
 
-            var zIndexDictionary = decalGrid.DecalRenderIndex;
+            var gridAABB = xformSystem.GetInvWorldMatrix(xform).TransformBox(args.WorldBounds.Enlarged(1f));
+            var chunkEnumerator = new ChunkIndicesEnumerator(gridAABB, SharedDecalSystem.ChunkSize);
+            _decals.Clear();
+
+            while (chunkEnumerator.MoveNext(out var index))
+            {
+                if (!decalGrid.ChunkCollection.ChunkCollection.TryGetValue(index.Value, out var chunk))
+                    continue;
+
+                foreach (var (id, decal) in chunk.Decals)
+                {
+                    if (!gridAABB.Contains(decal.Coordinates))
+                        continue;
+
+                    _decals.Add((id, decal));
+                }
+            }
 
-            if (zIndexDictionary.Count == 0)
+            if (_decals.Count == 0)
                 return;
 
-            var (_, worldRot, worldMatrix) = xformSystem.GetWorldPositionRotationMatrix(xform);
+            _decals.Sort((x, y) =>
+            {
+                var zComp = x.Decal.ZIndex.CompareTo(y.Decal.ZIndex);
 
+                if (zComp != 0)
+                    return zComp;
+
+                return x.Id.CompareTo(y.Id);
+            });
+
+            var (_, worldRot, worldMatrix) = xformSystem.GetWorldPositionRotationMatrix(xform);
             handle.SetTransform(worldMatrix);
 
-            foreach (var decals in zIndexDictionary.Values)
+            foreach (var (_, decal) in _decals)
             {
-                foreach (var decal in decals.Values)
+                if (!_cachedTextures.TryGetValue(decal.Id, out var cache))
                 {
-                    if (!_cachedTextures.TryGetValue(decal.Id, out var cache))
+                    // Nothing to cache someone messed up
+                    if (!_prototypeManager.TryIndex<DecalPrototype>(decal.Id, out var decalProto))
                     {
-                        // Nothing to cache someone messed up
-                        if (!_prototypeManager.TryIndex<DecalPrototype>(decal.Id, out var decalProto))
-                        {
-                            continue;
-                        }
-
-                        cache = (_sprites.Frame0(decalProto.Sprite), decalProto.SnapCardinals);
-                        _cachedTextures[decal.Id] = cache;
+                        continue;
                     }
 
-                    var cardinal = Angle.Zero;
-
-                    if (cache.SnapCardinals)
-                    {
-                        var worldAngle = eyeAngle + worldRot;
-                        cardinal = worldAngle.GetCardinalDir().ToAngle();
-                    }
+                    cache = (_sprites.Frame0(decalProto.Sprite), decalProto.SnapCardinals);
+                    _cachedTextures[decal.Id] = cache;
+                }
 
-                    var angle = decal.Angle - cardinal;
+                var cardinal = Angle.Zero;
 
-                    if (angle.Equals(Angle.Zero))
-                        handle.DrawTexture(cache.Texture, decal.Coordinates, decal.Color);
-                    else
-                        handle.DrawTexture(cache.Texture, decal.Coordinates, angle, decal.Color);
+                if (cache.SnapCardinals)
+                {
+                    var worldAngle = eyeAngle + worldRot;
+                    cardinal = worldAngle.GetCardinalDir().ToAngle();
                 }
+
+                var angle = decal.Angle - cardinal;
+
+                if (angle.Equals(Angle.Zero))
+                    handle.DrawTexture(cache.Texture, decal.Coordinates, decal.Color);
+                else
+                    handle.DrawTexture(cache.Texture, decal.Coordinates, angle, decal.Color);
             }
 
             handle.SetTransform(Matrix3.Identity);

Content.Client/Doors/AirlockSystem.cs

@@ -1,7 +1,6 @@
 using Content.Client.Wires.Visualizers;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
-using Content.Shared.Prying.Components;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 
@@ -16,13 +15,6 @@ public override void Initialize()
         base.Initialize();
         SubscribeLocalEvent<AirlockComponent, ComponentStartup>(OnComponentStartup);
         SubscribeLocalEvent<AirlockComponent, AppearanceChangeEvent>(OnAppearanceChange);
-        SubscribeLocalEvent<AirlockComponent, BeforePryEvent>(OnAirlockPryAttempt);
-    }
-
-    private void OnAirlockPryAttempt(EntityUid uid, AirlockComponent component, ref BeforePryEvent args)
-    {
-        // TODO: Temporary until airlocks predicted.
-        args.Cancelled = true;
     }
 
     private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args)
@@ -104,7 +96,7 @@ private void OnAppearanceChange(EntityUid uid, AirlockComponent comp, ref Appear
                 ||  state == DoorState.Denying
                 || (state == DoorState.Open && comp.OpenUnlitVisible)
                 || (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.ClosedLights, out var closedLights, args.Component) && closedLights))
-                    && !boltedVisible && !emergencyLightsVisible; ;
+                    && !boltedVisible && !emergencyLightsVisible;
         }
 
         args.Sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, unlitVisible);
@@ -120,5 +112,17 @@ private void OnAppearanceChange(EntityUid uid, AirlockComponent comp, ref Appear
                 && !boltedVisible
             );
         }
+
+        switch (state)
+        {
+            case DoorState.Open:
+                args.Sprite.LayerSetState(DoorVisualLayers.BaseUnlit, comp.ClosingSpriteState);
+                args.Sprite.LayerSetAnimationTime(DoorVisualLayers.BaseUnlit, 0);
+                break;
+            case DoorState.Closed:
+                args.Sprite.LayerSetState(DoorVisualLayers.BaseUnlit, comp.OpeningSpriteState);
+                args.Sprite.LayerSetAnimationTime(DoorVisualLayers.BaseUnlit, 0);
+                break;
+        }
     }
 }