Merge branch 'dev' into make-slide-reel-better

.github/workflows/build.yaml

@@ -29,10 +29,10 @@ jobs:
       schemas_changed: ${{ steps.changed_files.outputs.files_changed }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
 
       # Disable Strong Name Verification to let us pull a switch-a-roo
       - name: Disable strong name validation
@@ -51,19 +51,19 @@ jobs:
         run: rm .\NewHorizons\bin\${{ inputs.build_type }}\NewHorizons.xml
 
       - name: Upload Mod Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: xen.NewHorizons.${{ inputs.build_type }}
           path: .\NewHorizons\bin\${{ inputs.build_type }}
 
       - name: Upload Schemas Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: NewHorizons-Schemas-${{ inputs.build_type }}
           path: .\NewHorizons\Schemas
 
       - name: Verify Changed Schemas
-        uses: tj-actions/verify-changed-files@v17
+        uses: tj-actions/verify-changed-files@v20
         id: changed_files
         with:
           files: NewHorizons/Schemas/**

.github/workflows/docs_build.yml

@@ -29,10 +29,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download Schemas
         if: ${{ inputs.schemas_artifact != 'null' }}
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.schemas_artifact }}
           path: NewHorizons/Schemas
@@ -55,4 +55,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

.github/workflows/release_build.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
       - name: Read Manifest
         id: read-manifest
         uses: notiz-dev/github-action-json-property@release
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download Asset
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: xen.NewHorizons.Release
           path: xen.NewHorizons

.github/workflows/update_schemas.yml

@@ -18,12 +18,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.SCHEMAS_TOKEN }}
 
       - name: Download Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact_name }}
           path: NewHorizons/Schemas/

NewHorizons/Components/Props/NHSupernovaPlanetEffectController.cs

@@ -188,7 +188,11 @@ namespace NewHorizons.Components.Props
                     {
                         for (int i = 0; i < _ambientLight.Length; i++)
                         {
-                            _ambientLight[i].intensity = _ambientLightOrigIntensity[i] * (1f - collapseProgress);
+                            var ambientLight = _ambientLight[i];
+                            if (ambientLight != null)
+                            {
+                                ambientLight.intensity = _ambientLightOrigIntensity[i] * (1f - collapseProgress);
+                            }
                         }
                     }