Merge branch 'master' of https://github.com/Simple-Station/Parkstatio…

…n-Friendly-Chainsaw into random-gunfire

.editorconfig

@@ -338,5 +338,8 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
 resharper_braces_for_ifelse = required_for_multiline
 resharper_keep_existing_attribute_arrangement = true
 
-[*.{csproj,xml,yml,dll.config,msbuildproj,targets}]
+[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets}]
 indent_size = 2
+
+[{*.yaml,*.yml}]
+ij_yaml_indent_sequence_value = false

.github/workflows/build-docfx.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/build-map-renderer.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/build-test-debug.yml

@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/conflict-labeler.yml

@@ -14,6 +14,6 @@ jobs:
       - name: Check for Merge Conflicts
         uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142
         with:
-          dirtyLabel: "Merge Conflict"
+          dirtyLabel: "Status: Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."

.github/workflows/publish.yml

@@ -22,17 +22,24 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Get Engine Tag
       run: |
         cd RobustToolbox
         git fetch --depth=1
 
+    - name: Install dependencies
+      run: dotnet restore
+
+    - name: Build Packaging
+      run: dotnet build Content.Packaging --configuration Release --no-restore /m
+
+    - name: Package server
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+
     - name: Package client
-      run: |
-        Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64
-        Tools/package_client_build.py
+      run: dotnet run --project Content.Packaging client --no-wipe-release
 
     - name: Update Build Info
       run: Tools/gen_build_info.py

.github/workflows/test-packaging.yml

@@ -51,15 +51,19 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore
 
+      - name: Build Packaging
+        run: dotnet build Content.Packaging --configuration Release --no-restore /m
+
+      - name: Package server
+        run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+
       - name: Package client
-        run: |
-          Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64
-          Tools/package_client_build.py
+        run: dotnet run --project Content.Packaging client --no-wipe-release
 
       - name: Update Build Info
         run: Tools/gen_build_info.py

.github/workflows/update-credits.yml

@@ -23,10 +23,30 @@ jobs:
 
       # TODO
       #- name: Get this week's Patreons
-      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml
+      #  run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml        
+
+      # MAKE SURE YOU ENABLED "Allow GitHub Actions to create and approve pull requests" IN YOUR ACTIONS, OTHERWISE IT WILL MOST LIKELY FAIL
 
-      - name: Commit new credit files
-        uses: stefanzweifel/git-auto-commit-action@v4
+
+      # For this you can use a pat token of an account with direct push access to the repo if you have protected branches. 
+      # Uncomment this and comment the other line if you do this.
+      # https://github.com/stefanzweifel/git-auto-commit-action#push-to-protected-branches
+
+      #- name: Commit new credit files
+      #  uses: stefanzweifel/git-auto-commit-action@v4
+      #  with:
+      #    commit_message: Update Credits
+      #    commit_author: PJBot <[email protected]>
+
+      # This will make a PR
+      - name: Set current date as env variable
+        run: echo "NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_ENV
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
         with:
-          commit_message: Update Credits
-          commit_author: DeltaV-Bot <[email protected]>
+          commit-message: Update Credits
+          title: Update Credits
+          body: This is an automated Pull Request. This PR updates the github contributors in the credits section.
+          author: DeltaV-Bot <[email protected]>
+          branch: automated/credits-${{env.NOW}}

.github/workflows/yaml-linter.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

Content.Benchmarks/Content.Benchmarks.csproj

@@ -8,7 +8,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />

Content.Benchmarks/EntityQueryBenchmark.cs

@@ -0,0 +1,137 @@
+#nullable enable
+using System;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+using Content.IntegrationTests;
+using Content.IntegrationTests.Pair;
+using Content.Shared.Clothing.Components;
+using Content.Shared.Item;
+using Robust.Server.GameObjects;
+using Robust.Shared;
+using Robust.Shared.Analyzers;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Random;
+
+namespace Content.Benchmarks;
+
+[Virtual]
+public class EntityQueryBenchmark
+{
+    public const string Map = "Maps/atlas.yml";
+
+    private TestPair _pair = default!;
+    private IEntityManager _entMan = default!;
+    private MapId _mapId = new MapId(10);
+    private EntityQuery<ClothingComponent> _clothingQuery;
+
+    [GlobalSetup]
+    public void Setup()
+    {
+        ProgramShared.PathOffset = "../../../../";
+        PoolManager.Startup(null);
+
+        _pair = PoolManager.GetServerClient().GetAwaiter().GetResult();
+        _entMan = _pair.Server.ResolveDependency<IEntityManager>();
+
+        _pair.Server.ResolveDependency<IRobustRandom>().SetSeed(42);
+        _pair.Server.WaitPost(() =>
+        {
+            var success = _entMan.System<MapLoaderSystem>().TryLoad(_mapId, Map, out _);
+            if (!success)
+                throw new Exception("Map load failed");
+            _pair.Server.MapMan.DoMapInitialize(_mapId);
+        }).GetAwaiter().GetResult();
+
+        _clothingQuery = _entMan.GetEntityQuery<ClothingComponent>();
+
+        // Apparently ~40% of entities are items, and 1 in 6 of those are clothing.
+        /*
+        var entCount = _entMan.EntityCount;
+        var itemCount = _entMan.Count<ItemComponent>();
+        var clothingCount = _entMan.Count<ClothingComponent>();
+        var itemRatio = (float) itemCount / entCount;
+        var clothingRatio = (float) clothingCount / entCount;
+        Console.WriteLine($"Entities: {entCount}. Items: {itemRatio:P2}. Clothing: {clothingRatio:P2}.");
+        */
+    }
+
+    [GlobalCleanup]
+    public async Task Cleanup()
+    {
+        await _pair.DisposeAsync();
+        PoolManager.Shutdown();
+    }
+
+    [Benchmark]
+    public int HasComponent()
+    {
+        var hashCode = 0;
+        var enumerator = _entMan.AllEntityQueryEnumerator<ItemComponent>();
+        while (enumerator.MoveNext(out var uid, out var _))
+        {
+            if (_entMan.HasComponent<ClothingComponent>(uid))
+                hashCode = HashCode.Combine(hashCode, uid.Id);
+        }
+
+        return hashCode;
+    }
+
+    [Benchmark]
+    public int HasComponentQuery()
+    {
+        var hashCode = 0;
+        var enumerator = _entMan.AllEntityQueryEnumerator<ItemComponent>();
+        while (enumerator.MoveNext(out var uid, out var _))
+        {
+            if (_clothingQuery.HasComponent(uid))
+                hashCode = HashCode.Combine(hashCode, uid.Id);
+        }
+
+        return hashCode;
+    }
+
+    [Benchmark]
+    public int TryGetComponent()
+    {
+        var hashCode = 0;
+        var enumerator = _entMan.AllEntityQueryEnumerator<ItemComponent>();
+        while (enumerator.MoveNext(out var uid, out var _))
+        {
+            if (_entMan.TryGetComponent(uid, out ClothingComponent? clothing))
+                hashCode = HashCode.Combine(hashCode, clothing.GetHashCode());
+        }
+
+        return hashCode;
+    }
+
+    [Benchmark]
+    public int TryGetComponentQuery()
+    {
+        var hashCode = 0;
+        var enumerator = _entMan.AllEntityQueryEnumerator<ItemComponent>();
+        while (enumerator.MoveNext(out var uid, out var _))
+        {
+            if (_clothingQuery.TryGetComponent(uid, out var clothing))
+                hashCode = HashCode.Combine(hashCode, clothing.GetHashCode());
+        }
+
+        return hashCode;
+    }
+
+    /// <summary>
+    /// Enumerate all entities with both an item and clothing component.
+    /// </summary>
+    [Benchmark]
+    public int Enumerator()
+    {
+        var hashCode = 0;
+        var enumerator = _entMan.AllEntityQueryEnumerator<ItemComponent, ClothingComponent>();
+        while (enumerator.MoveNext(out var _, out var clothing))
+        {
+            hashCode = HashCode.Combine(hashCode, clothing.GetHashCode());
+        }
+
+        return hashCode;
+    }
+}

Content.Client/Actions/ActionsSystem.cs

@@ -2,11 +2,11 @@
 using System.Linq;
 using Content.Shared.Actions;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameStates;
 using Robust.Shared.Input.Binding;
+using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Markdown;
 using Robust.Shared.Serialization.Markdown.Mapping;
@@ -41,8 +41,8 @@ public sealed class ActionsSystem : SharedActionsSystem
         public override void Initialize()
         {
             base.Initialize();
-            SubscribeLocalEvent<ActionsComponent, PlayerAttachedEvent>(OnPlayerAttached);
-            SubscribeLocalEvent<ActionsComponent, PlayerDetachedEvent>(OnPlayerDetached);
+            SubscribeLocalEvent<ActionsComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+            SubscribeLocalEvent<ActionsComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
             SubscribeLocalEvent<ActionsComponent, ComponentHandleState>(HandleComponentState);
 
             SubscribeLocalEvent<InstantActionComponent, ComponentHandleState>(OnInstantHandleState);
@@ -87,12 +87,15 @@ private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, Ba
             component.Cooldown = state.Cooldown;
             component.UseDelay = state.UseDelay;
             component.Charges = state.Charges;
+            component.MaxCharges = state.MaxCharges;
+            component.RenewCharges = state.RenewCharges;
             component.Container = EnsureEntity<T>(state.Container, uid);
             component.EntityIcon = EnsureEntity<T>(state.EntityIcon, uid);
             component.CheckCanInteract = state.CheckCanInteract;
             component.ClientExclusive = state.ClientExclusive;
             component.Priority = state.Priority;
             component.AttachedEntity = EnsureEntity<T>(state.AttachedEntity, uid);
+            component.RaiseOnUser = state.RaiseOnUser;
             component.AutoPopulate = state.AutoPopulate;
             component.Temporary = state.Temporary;
             component.ItemIconStyle = state.ItemIconStyle;
@@ -196,12 +199,12 @@ protected override void ActionRemoved(EntityUid performer, EntityUid actionId, A
             return GetActions(user);
         }
 
-        private void OnPlayerAttached(EntityUid uid, ActionsComponent component, PlayerAttachedEvent args)
+        private void OnPlayerAttached(EntityUid uid, ActionsComponent component, LocalPlayerAttachedEvent args)
         {
             LinkAllActions(component);
         }
 
-        private void OnPlayerDetached(EntityUid uid, ActionsComponent component, PlayerDetachedEvent? args = null)
+        private void OnPlayerDetached(EntityUid uid, ActionsComponent component, LocalPlayerDetachedEvent? args = null)
         {
             UnlinkAllActions();
         }

Content.Client/Actions/UI/ActionAlertTooltip.cs

@@ -21,7 +21,7 @@ public sealed class ActionAlertTooltip : PanelContainer
         /// </summary>
         public (TimeSpan Start, TimeSpan End)? Cooldown { get; set; }
 
-        public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string? requires = null)
+        public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string? requires = null, FormattedMessage? charges = null)
         {
             _gameTiming = IoCManager.Resolve<IGameTiming>();
 
@@ -52,6 +52,17 @@ public ActionAlertTooltip(FormattedMessage name, FormattedMessage? desc, string?
                 vbox.AddChild(description);
             }
 
+            if (charges != null && !string.IsNullOrWhiteSpace(charges.ToString()))
+            {
+                var chargesLabel = new RichTextLabel
+                {
+                    MaxWidth = TooltipTextMaxWidth,
+                    StyleClasses = { StyleNano.StyleClassTooltipActionCharges }
+                };
+                chargesLabel.SetMessage(charges);
+                vbox.AddChild(chargesLabel);
+            }
+
             vbox.AddChild(_cooldownLabel = new RichTextLabel
             {
                 MaxWidth = TooltipTextMaxWidth,

Content.Client/Administration/Managers/ClientAdminManager.cs

@@ -4,7 +4,7 @@
 using Robust.Client.Player;
 using Robust.Shared.ContentPack;
 using Robust.Shared.Network;
-using Robust.Shared.Players;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.Managers