January 2024 Upstream Merge

.github/CODEOWNERS

@@ -2,64 +2,54 @@
 
 # Sorting by path instead of by who added it one day :(
 # this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order
-/Resources/ConfigPresets/WizardsDen/  @Chief-Engineer
+#/Resources/ConfigPresets/WizardsDen/  @Chief-Engineer
 
 # Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short.
 # You need to add your name to these entries, not make a new one, if you care about them.
-/Content.*/Toolshed/ @moonheart08
-**/Toolshed/** @moonheart08
-*Command.cs @moonheart08
-/Content.*/Administration/ @moonheart08 @DrSmugleaf @Chief-Engineer
-/Content.*/Station/ @moonheart08
-/Content.*/Maps/ @moonheart08
-/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
-/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
-/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
-/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
-/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
-
-/Resources/Prototypes/Maps/ @Emisse
-
-/Resources/Prototypes/Body/ @DrSmugleaf # suffering
-/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
-/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
-/Content.*/Body/ @DrSmugleaf
-/Content.YAMLLinter @DrSmugleaf
-
-/Content.*/Verbs/ @ElectroJr
-/Content.Client/ContextMenu/ @ElectroJr
-/Content.Shared/Damage/ @ElectroJr @DrSmugleaf
-/Content.Shared/Containers/ItemSlot/ @ElectroJr
-/Content.*/PowerCell/ @ElectroJr
-/Content.*/Doors/ @ElectroJr
-/Content.*/Interaction/ @ElectroJr
-/Content.*/Hands/ @ElectroJr
-/Content.*/Actions/ @ElectroJr
-/Content.*/Explosion/ @ElectroJr
-
-/Content.*/Anomaly/ @EmoGarbage404
-/Content.*/Lathe/ @EmoGarbage404
-/Content.*/Materials/ @EmoGarbage404
-/Content.*/Mech/ @EmoGarbage404
-/Content.*/Research/ @EmoGarbage404
-/Content.*/Stack/ @EmoGarbage404
-/Content.*/Xenoarchaeology/ @EmoGarbage404
-/Content.*/Zombies/ @EmoGarbage404
-/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404
-/Resources/Prototypes/Research/ @EmoGarbage404
-
-/Content.*/Forensics/ @ficcialfaint
+#/Content.*/Toolshed/ @moonheart08
+#**/Toolshed/** @moonheart08
+#*Command.cs @moonheart08
+#/Content.*/Administration/ @moonheart08 @DrSmugleaf @Chief-Engineer
+#/Content.*/Station/ @moonheart08
+#/Content.*/Maps/ @moonheart08
+#/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
+#/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
+#/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
+#/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
+#/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
+
+#/Resources/Prototypes/Maps/ @Emisse
+
+#/Resources/Prototypes/Body/ @DrSmugleaf # suffering
+#/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf
+#/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf
+#/Content.*/Body/ @DrSmugleaf
+#/Content.YAMLLinter @DrSmugleaf
+#/Content.Shared/Damage/ @DrSmugleaf
+
+#/Content.*/Anomaly/ @EmoGarbage404
+#/Content.*/Lathe/ @EmoGarbage404
+#/Content.*/Materials/ @EmoGarbage404
+#/Content.*/Mech/ @EmoGarbage404
+#/Content.*/Research/ @EmoGarbage404
+#/Content.*/Stack/ @EmoGarbage404
+#/Content.*/Xenoarchaeology/ @EmoGarbage404
+#/Content.*/Zombies/ @EmoGarbage404
+#/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404
+#/Resources/Prototypes/Research/ @EmoGarbage404
+
+#/Content.*/Forensics/ @ficcialfaint
 
 # SKREEEE
-/Content.*.Database/ @PJB3005 @DrSmugleaf
-/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
-/Pow3r/ @PJB3005
-/Content.Server/Power/Pow3r/ @PJB3005
+#/Content.*.Database/ @PJB3005 @DrSmugleaf
+#/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
+#/Pow3r/ @PJB3005
+#/Content.Server/Power/Pow3r/ @PJB3005
 
 # notafet
-/Content.*/Atmos/ @Partmedia
-/Content.*/Botany/ @Partmedia
+#/Content.*/Atmos/ @Partmedia
+#/Content.*/Botany/ @Partmedia
 
 #Jezi
-/Content.*/Medical @Jezithyr
-/Content.*/Body @Jezithyr
+#/Content.*/Medical @Jezithyr
+#/Content.*/Body @Jezithyr

.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/publish.yml

@@ -14,25 +14,32 @@ jobs:
 
     steps:
     - name: Install dependencies
-      run: sudo apt-get install -y python3-paramiko
+      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: |
         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

@@ -24,9 +24,29 @@ jobs:
       # TODO
       #- name: Get this week's Patreons
       #  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
+
+
+      # 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: Commit new credit files
-        uses: stefanzweifel/git-auto-commit-action@v4
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
         with:
-          commit_message: Update Credits
-          commit_author: PJBot <[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: PJBot <[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

.vscode/launch.json

@@ -13,6 +13,15 @@
             "console": "internalConsole",
             "stopAtEntry": false
         },
+        {
+            "name": "Client (Compatibility renderer)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
+            "args": "--cvar display.compat=true",
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
         {
             "name": "Server",
             "type": "coreclr",

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/EntityManagerGetAllComponents.cs

@@ -48,6 +48,7 @@ public void Setup()
             var componentFactory = new Mock<IComponentFactory>();
             componentFactory.Setup(p => p.GetComponent<DummyComponent>()).Returns(new DummyComponent());
             componentFactory.Setup(p => p.GetRegistration(It.IsAny<DummyComponent>())).Returns(dummyReg);
+            componentFactory.Setup(p => p.GetAllRegistrations()).Returns(new[] { dummyReg });
             componentFactory.Setup(p => p.GetAllRefTypes()).Returns(new[] { CompIdx.Index<DummyComponent>() });
 
             IoCManager.RegisterInstance<IComponentFactory>(componentFactory.Object);