Merge branch 'master' into vulpkanin

.editorconfig

@@ -129,7 +129,7 @@ csharp_indent_braces = false
 csharp_indent_switch_labels = true
 
 # Space preferences
-csharp_space_after_cast = true
+csharp_space_after_cast = false
 csharp_space_after_colon_in_inheritance_clause = true
 csharp_space_after_comma = true
 csharp_space_after_dot = false

.github/workflows/publish-publish.yml

@@ -6,27 +6,23 @@ name: Publish Public
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 1 * * *'
+  - cron: '0 1 * * *'
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Check configuration
-      env:
-        PUBLIC_PATH: ${{ secrets.BUILDS_PUBLIC_PATH }}
-      if: ${{ env.PUBLIC_PATH == '' }}
-      uses: andymckay/[email protected]
+#    - name: Install dependencies
+#      run: sudo apt-get install -y python3-paramiko python3-lxml
 
     - uses: actions/[email protected]
       with:
         submodules: 'recursive'
-
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Get Engine Tag
       run: |
@@ -40,27 +36,40 @@ jobs:
       run: dotnet build Content.Packaging --configuration Release --no-restore /m
 
     - name: Package server
-      run: dotnet run --project Content.Packaging server --hybrid-acz --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
+      run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64
 
-    - name: Shuffle files around
-      run: |
-        mkdir "release/${{ github.sha }}"
-        mv release/SS14.Server*.zip "release/${{ github.sha }}"
+    - name: Package client
+      run: dotnet run --project Content.Packaging client --no-wipe-release
 
-    - name: Upload files to mothership
-      uses: burnett01/[email protected]
+    - name: Upload build artifact
+      id: artifact-upload-step
+      uses: actions/upload-artifact@v4
       with:
-        switches: -avzr --ignore-existing
-        path: "release/${{ github.sha }}"
-        remote_path: ${{ secrets.BUILDS_PUBLIC_PATH }}
-        remote_host: ${{ secrets.BUILDS_HOST }}
-        remote_user: ${{ secrets.BUILDS_USERNAME }}
-        remote_key: ${{ secrets.BUILDS_SSH_KEY }}
+        name: build
+        path: release/*.zip
+        compression-level: 0
+        retention-days: 0
+
+    - name: Publish version
+      run: Tools/publish_github_artifact.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
+        GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
+
+#    - name: Publish changelog (Discord)
+#      run: Tools/actions_changelogs_since_last_run.py
+#      env:
+#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+
+#    - name: Publish changelog (RSS)
+#      run: Tools/actions_changelog_rss.py
+#      env:
+#        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
 
-    - name: Generate public HTML
-      uses: appleboy/ssh-action@master
+    - uses: geekyeggo/delete-artifact@v5
+      if: always()
       with:
-        host: ${{ secrets.BUILDS_HOST }}
-        username: ${{ secrets.BUILDS_USERNAME }}
-        key: ${{ secrets.BUILDS_SSH_KEY }}
-        script: node ~/scripts/generate_html_page.js -fork ${{ vars.FORK_ID_PUBLIC }} -id ${{ github.sha }}
+        name: build

.github/workflows/publish.yml

@@ -1,12 +1,12 @@
 name: Publish
 
-concurrency:
-  group: publish
+#concurrency:
+#  group: publish
 
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 6 * * *'
+  - cron: '0 1 * * *'
 
 jobs:
   build:
@@ -19,25 +19,6 @@ jobs:
     - uses: actions/[email protected]
       with:
         submodules: 'recursive'
-
-    # Corvax-Secrets-Start
-    - name: Setup secrets
-      env:
-        SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
-      if: ${{ env.SSH_KEY != '' }}
-      run: |
-        mkdir ~/.ssh
-        echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-        chmod 600 ~/.ssh/id_rsa
-        echo "HOST *" > ~/.ssh/config
-        echo "StrictHostKeyChecking no" >> ~/.ssh/config
-        git clone [email protected]:corvax-nexus/secrets.git Secrets
-        cp -R Secrets/Resources/Prototypes Resources/Prototypes/CorvaxSecrets
-        cp -R Secrets/Resources/ServerPrototypes Resources/Prototypes/CorvaxSecretsServer
-        cp -R Secrets/Resources/Locale Resources/Locale/ru-RU/corvax-secrets
-        cp -R Secrets/Resources/Textures Resources/Textures/CorvaxSecrets
-    # Corvax-Secrets-End
-
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
@@ -60,42 +41,35 @@ jobs:
     - name: Package client
       run: dotnet run --project Content.Packaging client --no-wipe-release
 
-    - name: Update Build Info
-      env:
-        FORK_ID: ${{ vars.FORK_ID }}
-      run: Tools/gen_build_info.py
-
-    - name: Shuffle files around
-      run: |
-        mkdir "release/${{ github.sha }}"
-        mv release/*.zip "release/${{ github.sha }}"
-
-    - name: Upload files to mothership
-      uses: burnett01/[email protected]
+    - name: Upload build artifact
+      id: artifact-upload-step
+      uses: actions/upload-artifact@v4
       with:
-        switches: -avzr --ignore-existing
-        path: "release/${{ github.sha }}"
-        remote_path: ${{ secrets.BUILDS_PATH }}
-        remote_host: ${{ secrets.BUILDS_HOST }}
-        remote_user: ${{ secrets.BUILDS_USERNAME }}
-        remote_key: ${{ secrets.BUILDS_SSH_KEY }}
+        name: build
+        path: release/*.zip
+        compression-level: 0
+        retention-days: 0
 
-    - name: Update manifest JSON
-      uses: appleboy/ssh-action@master
+    - name: Publish version
+      run: Tools/publish_github_artifact.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
+        GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }}
+
+    #    - name: Publish changelog (Discord)
+    #      run: Tools/actions_changelogs_since_last_run.py
+    #      env:
+    #        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+
+    #    - name: Publish changelog (RSS)
+    #      run: Tools/actions_changelog_rss.py
+    #      env:
+    #        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+
+    - uses: geekyeggo/delete-artifact@v5
+      if: always()
       with:
-        host: ${{ secrets.BUILDS_HOST }}
-        username: ${{ secrets.BUILDS_USERNAME }}
-        key: ${{ secrets.BUILDS_SSH_KEY }}
-        script: node ~/scripts/push_to_manifest.js -fork ${{ vars.FORK_ID }} -id ${{ github.sha }}
-
-#    - name: Publish changelog (Discord)
-#      run: Tools/actions_changelogs_since_last_run.py
-#      env:
-#        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
-#        TRANSLATION_API_URL: ${{ secrets.CHANGELOG_TRANSLATION_API_URL }}
-
-#    - name: Publish changelog (RSS)
-#      run: Tools/actions_changelog_rss.py
-#      env:
-#        CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
+        name: build

.github/workflows/test-packaging.yml

@@ -78,13 +78,3 @@ jobs:
 
       - name: Package client
         run: dotnet run --project Content.Packaging client --no-wipe-release
-
-      - name: Update Build Info
-        env:
-          FORK_ID: ${{ vars.FORK_ID }}
-        run: Tools/gen_build_info.py
-
-      - name: Shuffle files around
-        run: |
-          mkdir "release/${{ github.sha }}"
-          mv release/*.zip "release/${{ github.sha }}"

Content.Client/Access/UI/AccessLevelControl.xaml.cs

@@ -12,11 +12,18 @@ namespace Content.Client.Access.UI;
 [GenerateTypedNameReferences]
 public sealed partial class AccessLevelControl : GridContainer
 {
+    [Dependency] private readonly ILogManager _logManager = default!;
+
+    private ISawmill _sawmill = default!;
+
     public readonly Dictionary<ProtoId<AccessLevelPrototype>, Button> ButtonsList = new();
 
     public AccessLevelControl()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
+
+        _sawmill = _logManager.GetSawmill("accesslevelcontrol");
     }
 
     public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
@@ -25,7 +32,7 @@ public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototyp
         {
             if (!prototypeManager.TryIndex(access, out var accessLevel))
             {
-                Logger.Error($"Unable to find accesslevel for {access}");
+                _sawmill.Error($"Unable to find accesslevel for {access}");
                 continue;
             }
 

Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs

@@ -2,6 +2,7 @@
 using Content.Shared.Access.Components;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
+using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.AccessOverriderComponent;
 
@@ -23,45 +24,49 @@ protected override void Open()
         {
             base.Open();
 
+            _window = this.CreateWindow<AccessOverriderWindow>();
+            RefreshAccess();
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+            _window.OnSubmit += SubmitData;
+
+            _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId));
+        }
+
+        public override void OnProtoReload(PrototypesReloadedEventArgs args)
+        {
+            base.OnProtoReload(args);
+            if (!args.WasModified<AccessLevelPrototype>())
+                return;
+
+            RefreshAccess();
+
+            if (State != null)
+                _window?.UpdateState(_prototypeManager, (AccessOverriderBoundUserInterfaceState) State);
+        }
+
+        private void RefreshAccess()
+        {
             List<ProtoId<AccessLevelPrototype>> accessLevels;
 
             if (EntMan.TryGetComponent<AccessOverriderComponent>(Owner, out var accessOverrider))
             {
                 accessLevels = accessOverrider.AccessLevels;
                 accessLevels.Sort();
             }
-
             else
             {
                 accessLevels = new List<ProtoId<AccessLevelPrototype>>();
                 _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!");
             }
 
-            _window = new AccessOverriderWindow(this, _prototypeManager, accessLevels)
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName
-            };
-
-            _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId));
-
-            _window.OnClose += Close;
-            _window.OpenCentered();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            if (!disposing)
-                return;
-
-            _window?.Dispose();
+            _window?.SetAccessLevels(_prototypeManager, accessLevels);
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)
         {
             base.UpdateState(state);
             var castState = (AccessOverriderBoundUserInterfaceState) state;
-            _window?.UpdateState(castState);
+            _window?.UpdateState(_prototypeManager, castState);
         }
 
         public void SubmitData(List<ProtoId<AccessLevelPrototype>> newAccessList)