Merge branch 'LoudMode' of https://github.com/Spaghetti-bit/starlight-14 into LoudMode

Author: Spaghetti-bit

.github/workflows/close-master-pr.yml

@@ -16,9 +16,9 @@ jobs:
     steps:
     - uses: superbrothers/close-pull-request@v3
       with:
-        comment: "Thank you for your contribution! It appears you created a PR from your master branch, this is [something you should avoid doing](https://jmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/), and thus this PR has been automatically closed. \n \n We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n \n You can move your current work from the master branch to another branch by following [these commands](https://ohshitgit.com/#accidental-commit-master). And then you may recreate your PR using the new branch."
+        comment: "Thank you for your contribution! It appears you created a pull request from the master branch or another main development branch. This is [something you should avoid doing](https://jmeridth.com/posts/do-not-issue-pull-requests-from-your-master-branch/), and thus this pull request has been automatically closed. \n \n We suggest you follow [our git usage documentation](https://docs.spacestation14.com/en/general-development/setup/git-for-the-ss14-developer.html). \n \n You can move your current work to another branch by following [these commands](https://ohshitgit.com/#accidental-commit-master). Then, you may recreate your pull request using the new branch."
 
-    # If you prefer to just comment on the pr and not close it, uncomment the bellow and comment the above
+    # If you prefer to just comment on the pr and not close it, uncomment the below and comment the above
 
     # - uses: actions/github-script@v7
     #   with:

Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs

@@ -66,6 +66,19 @@ private void OnAppearanceChanged(EntityUid uid, PipeAppearanceComponent componen
         if (args.Sprite == null)
             return;
 
+        // Starlight Start
+
+        // Grabbing the color, moved up.
+        if (!_appearance.TryGetData<Color>(uid, PipeColorVisuals.Color, out var color, args.Component))
+            color = Color.White;
+
+        // Apply color to all explicitly opted-in layers
+        foreach (var tintedLayer in component.ExtraColoredLayers)
+            if (_sprite.LayerMapTryGet((uid, args.Sprite), tintedLayer, out var tintedIndex, false))
+                args.Sprite[tintedIndex].Color = color;
+
+        // Starlight End
+
         if (!args.Sprite.Visible)
         {
             // This entity is probably below a floor and is not even visible to the user -> don't bother updating sprite data.
@@ -81,8 +94,7 @@ private void OnAppearanceChanged(EntityUid uid, PipeAppearanceComponent componen
             return;
         }
 
-        if (!_appearance.TryGetData<Color>(uid, PipeColorVisuals.Color, out var color, args.Component))
-            color = Color.White;
+        // Starlight: Grabbing the Color moved to top of method in Starlight block
 
         for (byte i = 0; i < numberOfPipeLayers; i++)
         {

Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs

@@ -27,14 +27,15 @@ protected override void Open()
         {
             base.Open();
 
-            var atmosSystem = EntMan.System<AtmosphereSystem>();
+            var atmosSystem = EntMan.System<AtmosphereSystem>(); // Starlight
 
             _window = this.CreateWindow<GasFilterWindow>();
-            _window.PopulateGasList(atmosSystem.Gases);
+            // _window.PopulateGasList(atmosSystem.Gases); // Starlight
 
-            _window.ToggleStatusButtonPressed += OnToggleStatusButtonPressed;
+            _window.StatusChanged /*Starlight*/ += OnToggleStatusButtonPressed;
             _window.FilterTransferRateChanged += OnFilterTransferRatePressed;
-            _window.SelectGasPressed += OnSelectGasPressed;
+            _window.GasSelectionChanged += OnGasSelectionChanged; // Starlight
+            // _window.SelectGasPressed += OnSelectGasPressed;  // Starlight
         }
 
         private void OnToggleStatusButtonPressed()
@@ -50,6 +51,7 @@ private void OnFilterTransferRatePressed(string value)
             SendMessage(new GasFilterChangeRateMessage(rate));
         }
 
+        /* Starlight BEGIN
         private void OnSelectGasPressed()
         {
             if (_window is null)
@@ -67,6 +69,7 @@ private void OnSelectGasPressed()
                 SendMessage(new GasFilterSelectGasMessage(gas));
             }
         }
+            Starlight END*/
 
         /// <summary>
         /// Update the UI state based on server-sent info
@@ -81,19 +84,11 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.Title = (cast.FilterLabel);
             _window.SetFilterStatus(cast.Enabled);
             _window.SetTransferRate(cast.TransferRate);
-            if (cast.FilteredGas is not null)
-            {
-                var atmos = EntMan.System<AtmosphereSystem>();
-                var gas = atmos.GetGas((Gas) cast.FilteredGas);
-                var gasName = Loc.GetString(gas.Name);
-                _window.SetGasFiltered(gas.ID, gasName);
-            }
-            else
-            {
-                _window.SetGasFiltered(null, Loc.GetString("comp-gas-filter-ui-filter-gas-none"));
-            }
+            _window.UpdateState(cast); // Starlight: Replaces FilteredGas selection
         }
 
+        private void OnGasSelectionChanged(HashSet<Gas> selectedGases) => SendMessage(new GasFilterSelectGasMessage(selectedGases)); // Starlight add
+
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);

Content.Client/Atmos/UI/GasFilterWindow.xaml

@@ -17,11 +17,23 @@
             <Label Name="CurrentGasLabel" />
         </BoxContainer>
 
-        <BoxContainer Orientation="Vertical" VerticalExpand="True">
+        <!-- <BoxContainer Orientation="Vertical" VerticalExpand="True">
             <Label Text="{Loc comp-gas-filter-ui-filter-gas-select}" />
             <ItemList Name="GasList" SelectMode="Single" VerticalExpand="True"
                       SizeFlagsStretchRatio="0.9" />
             <Button Name="SelectGasButton" Text="{Loc comp-gas-filter-ui-filter-gas-confirm}" HorizontalExpand="True" Disabled="True" />
-        </BoxContainer>
+        </BoxContainer> Starlight removed-->
+
+    <!--Starlight start-->
+    <BoxContainer Orientation="Horizontal" HorizontalExpand="True" SeparationOverride="5" Margin="0 5 0 0">
+        <Button Name="CSelectAll" HorizontalExpand="True" Text="{Loc 'air-alarm-ui-scrubber-select-all-gases-label'}" />
+        <Button Name="CDeselectAll" HorizontalExpand="True" Text="{Loc 'air-alarm-ui-scrubber-deselect-all-gases-label'}" />
+    </BoxContainer>
+
+    <ScrollContainer VerticalExpand="True">
+        <GridContainer Name="CGasContainer" HorizontalExpand="True" HorizontalAlignment="Center" Columns="3" Margin="0 5 0 0" />
+    </ScrollContainer>
+    <!--Starlight end-->
+
     </BoxContainer>
 </DefaultWindow>

Content.Client/Atmos/UI/GasFilterWindow.xaml.cs

@@ -1,12 +1,19 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Numerics;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.Atmos.Monitor.Components;
+using Content.Shared.Atmos.Piping.Trinary.Components;
+using Content.Shared.Atmos.Piping.Unary.Components;
 using Content.Shared.Atmos.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Localization;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Atmos.UI
 {
@@ -19,19 +26,31 @@ public sealed partial class GasFilterWindow : DefaultWindow
         private readonly ButtonGroup _buttonGroup = new();
 
         public bool FilterStatus = true;
-        public string? SelectedGas;
-        public string? CurrentGasId;
+        public HashSet<Gas> SelectedGases = new(); // Starlight
+        // public string? CurrentGasId // Starlight
 
-        public event Action? ToggleStatusButtonPressed;
+        public event Action? StatusChanged; // Starlight
         public event Action<string>? FilterTransferRateChanged;
-        public event Action? SelectGasPressed;
+        // public event Action? SelectGasPressed; // Starlight
+
+        #region Starlight
+        [Dependency] private IEntityManager _entityManager = default!;
+        [Dependency] private IPrototypeManager _prototypeManager = default!;
+        private Dictionary<Gas, Button> _gasControls = new();
+        private GridContainer _gases => CGasContainer;
+        public event Action<HashSet<Gas>>? GasSelectionChanged;
+        private Button _selectAll => CSelectAll;
+        private Button _deselectAll => CDeselectAll;
+        private bool _isUpdatingState;
+        #endregion
 
         public GasFilterWindow()
         {
             RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this); // Starlight add
 
             ToggleStatusButton.OnPressed += _ => SetFilterStatus(!FilterStatus);
-            ToggleStatusButton.OnPressed += _ => ToggleStatusButtonPressed?.Invoke();
+            ToggleStatusButton.OnPressed += _ => StatusChanged?.Invoke(); // Starlight
 
             FilterTransferRateInput.OnTextChanged += _ => SetFilterRate.Disabled = false;
             SetFilterRate.OnPressed += _ =>
@@ -40,10 +59,57 @@ public GasFilterWindow()
                 SetFilterRate.Disabled = true;
             };
 
-            SelectGasButton.OnPressed += _ => SelectGasPressed?.Invoke();
+            // Starlight start
+            var atmosphereSystem = _entityManager.System<SharedAtmosphereSystem>();
+            var allGases = Enum.GetValues<Gas>();
+            SetSize = new Vector2(520, 456);
 
-            GasList.OnItemSelected += GasListOnItemSelected;
-            GasList.OnItemDeselected += GasListOnItemDeselected;
+
+            _selectAll.OnPressed += _ =>
+            {
+                if (_isUpdatingState) return;
+
+                SelectedGases = new HashSet<Gas>(allGases);
+                UpdateGasButtonVisuals();
+                GasSelectionChanged?.Invoke(SelectedGases);
+            };
+
+            _deselectAll.OnPressed += _ =>
+            {
+                if (_isUpdatingState) return;
+
+                SelectedGases.Clear();
+                UpdateGasButtonVisuals();
+                GasSelectionChanged?.Invoke(SelectedGases);
+            };
+
+            foreach (var value in allGases)
+            {
+                ProtoId<GasPrototype> gasProtoId = atmosphereSystem.GetGas(value);
+                var gasName = _prototypeManager.Index(gasProtoId).Name;
+                var gasButton = new Button
+                {
+                    Name = value.ToString(),
+                    Text = Loc.GetString(gasName),
+                    ToggleMode = true,
+                    HorizontalExpand = true,
+                    HorizontalAlignment = HAlignment.Stretch
+                };
+                gasButton.OnToggled += args =>
+                {
+                    if (_isUpdatingState) return;
+
+                    if (args.Pressed)
+                        SelectedGases.Add(value);
+                    else
+                        SelectedGases.Remove(value);
+
+                    GasSelectionChanged?.Invoke(SelectedGases);
+                };
+                _gasControls.Add(value, gasButton);
+                _gases.AddChild(gasButton);
+            }
+            // Starlight end
         }
 
         public void SetTransferRate(float rate)
@@ -64,6 +130,33 @@ public void SetFilterStatus(bool enabled)
             }
         }
 
+        #region Starlight
+        public void UpdateState(GasFilterBoundUserInterfaceState state)
+        {
+            _isUpdatingState = true;
+
+            SetFilterStatus(state.Enabled);
+            SetTransferRate(state.TransferRate);
+
+            SelectedGases = state.FilteredGases != null
+                ? new HashSet<Gas>(state.FilteredGases)
+                : new HashSet<Gas>();
+
+            UpdateGasButtonVisuals();
+
+            _isUpdatingState = false;
+        }
+
+        private void UpdateGasButtonVisuals()
+        {
+            foreach (var (gas, button) in _gasControls)
+            {
+                button.Pressed = SelectedGases.Contains(gas);
+            }
+        }
+        #endregion
+
+        /* Starlight BEGIN
         public void SetGasFiltered(string? id, string name)
         {
             CurrentGasId = id;
@@ -107,5 +200,6 @@ private void GasListOnItemDeselected(ItemList.ItemListDeselectedEventArgs obj)
             SelectedGas = CurrentGasId;
             SelectGasButton.Disabled = true;
         }
+        Starlight END*/
     }
 }

Content.Client/Decals/DecalSystem.cs

@@ -120,6 +120,24 @@ private void OnChunkUpdate(DecalChunkUpdateEvent ev)
                 UpdateChunks(gridId, gridComp, updatedGridChunks);
             }
 
+            // Starlight Start: Diff chunks
+            foreach (var (netGrid, diffs) in ev.Diffs)
+            {
+                if (diffs.Count == 0)
+                    continue;
+
+                var gridId = GetEntity(netGrid);
+
+                if (!TryComp(gridId, out DecalGridComponent? gridComp))
+                {
+                    Log.Error($"Received decal diff for an entity without a decal component: {ToPrettyString(gridId)}");
+                    continue;
+                }
+
+                ApplyChunkDiffs(gridId, gridComp, diffs);
+            }
+            // Starlight End
+
             // Now we'll cull old chunks out of range as the server will send them to us anyway.
             foreach (var (netGrid, chunks) in ev.RemovedChunks)
             {
@@ -138,6 +156,39 @@ private void OnChunkUpdate(DecalChunkUpdateEvent ev)
             }
         }
 
+        // Starlight Start: Merge decal diffs instead of wholesale replace
+        private void ApplyChunkDiffs(EntityUid gridId, DecalGridComponent gridComp, Dictionary<Vector2i, DecalChunkDiff> diffs)
+        {
+            var chunkCollection = gridComp.ChunkCollection.ChunkCollection;
+
+            foreach (var (index, diff) in diffs)
+            {
+                if (!chunkCollection.TryGetValue(index, out var chunk))
+                {
+                    // We should always have this chunk already but if something desynced, don't crash, just start
+                    // a fresh chunk from the diff and let the next full resync correct anything missed.
+                    chunk = new DecalChunk();
+                    chunkCollection[index] = chunk;
+                }
+
+                foreach (var removedId in diff.Removed)
+                {
+                    if (chunk.Decals.ContainsKey(removedId))
+                    {
+                        OnDecalRemoved(gridId, removedId, gridComp, index, chunk);
+                        gridComp.DecalIndex.Remove(removedId);
+                    }
+                }
+
+                foreach (var (decalId, decal) in diff.Upserted)
+                {
+                    chunk.Decals[decalId] = decal;
+                    gridComp.DecalIndex[decalId] = index;
+                }
+            }
+        }
+        // Starlight End
+
         private void UpdateChunks(EntityUid gridId, DecalGridComponent gridComp, Dictionary<Vector2i, DecalChunk> updatedGridChunks)
         {
             var chunkCollection = gridComp.ChunkCollection.ChunkCollection;