Merge branch 'master' of https://github.com/krzys-h/UndertaleModTool …

…into tile-editor

.github/workflows/publish_cli.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore UndertaleModCli
     - name: Build

.github/workflows/publish_gui.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/publish_gui_nightly.yml

@@ -29,7 +29,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
@@ -79,7 +79,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore UndertaleModCli
     - name: Build

.github/workflows/publish_gui_release.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/publish_pr.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
@@ -74,7 +74,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore UndertaleModCli
     - name: Build

UndertaleModLib/Models/UndertaleEmbeddedTexture.cs

@@ -316,21 +316,33 @@ public GMImage Image
         /// <summary>
         /// The width of the texture.
         /// </summary>
-        public int Width => _image.Width;
+        /// <remarks>
+        /// In the case of an invalid or missing image, this will always be <c>-1</c>.
+        /// </remarks>
+        public int Width => _image?.Width ?? -1;
 
         /// <summary>
         /// The height of the texture.
         /// </summary>
-        public int Height => _image.Height;
+        /// <remarks>
+        /// In the case of an invalid or missing image, this will always be <c>-1</c>.
+        /// </remarks>
+        public int Height => _image?.Height ?? -1;
 
         /// <summary>
         /// Whether this texture uses the QOI format.
         /// </summary>
+        /// <remarks>
+        /// In the case of an invalid or missing image, this will always be <see langword="false" />.
+        /// </remarks>
         public bool FormatQOI => _image.Format is GMImage.ImageFormat.Qoi or GMImage.ImageFormat.Bz2Qoi;
 
         /// <summary>
         /// Whether this texture uses the BZ2 format. (Always used in combination with QOI.)
         /// </summary>
+        /// <remarks>
+        /// In the case of an invalid or missing image, this will always be <see langword="false" />.
+        /// </remarks>
         public bool FormatBZ2 => _image.Format is GMImage.ImageFormat.Bz2Qoi;
 
         /// <summary>

UndertaleModLibTests/UndertaleModLibTests.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
         <PackageReference Include="xunit" Version="2.9.0"/>
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

UndertaleModTool/Editors/UndertaleEmbeddedTextureEditor.xaml.cs

@@ -69,6 +69,12 @@ public UndertaleEmbeddedTextureEditor()
 
         private void UpdateImage(UndertaleEmbeddedTexture texture)
         {
+            if (texture.TextureData?.Image is null)
+            {
+                TexturePageImage.Source = null;
+                return;
+            }
+
             GMImage image = texture.TextureData.Image;
             BitmapSource bitmap = mainWindow.GetBitmapSourceForImage(image);
             TexturePageImage.Source = bitmap;
@@ -88,8 +94,13 @@ private void SwitchDataContext(object sender, DependencyPropertyChangedEventArgs
             {
                 _textureDataContext.PropertyChanged -= ReloadTextureImage;
             }
+
             _textureDataContext = texture.TextureData;
-            _textureDataContext.PropertyChanged += ReloadTextureImage;
+
+            if (_textureDataContext is not null)
+            {
+                _textureDataContext.PropertyChanged += ReloadTextureImage;
+            }
         }
 
         private void ReloadTextureImage(object sender, PropertyChangedEventArgs e)

UndertaleModTool/Editors/UndertaleTexturePageItemEditor.xaml.cs

@@ -40,6 +40,13 @@ public UndertaleTexturePageItemEditor()
 
         private void UpdateImages(UndertaleTexturePageItem item)
         {
+            if (item.TexturePage?.TextureData?.Image is null)
+            {
+                ItemTextureBGImage.Source = null;
+                ItemTextureImage.Source = null;
+                return;
+            }
+
             GMImage image = item.TexturePage.TextureData.Image;
             BitmapSource bitmap = mainWindow.GetBitmapSourceForImage(image);
             ItemTextureBGImage.Source = bitmap;
@@ -68,8 +75,12 @@ private void SwitchDataContext(object sender, DependencyPropertyChangedEventArgs
             {
                 _textureDataContext.PropertyChanged -= ReloadTextureImage;
             }
-            _textureDataContext = item.TexturePage.TextureData;
-            _textureDataContext.PropertyChanged += ReloadTextureImage;
+
+            if (item.TexturePage?.TextureData is not null)
+            {
+                _textureDataContext = item.TexturePage.TextureData;
+                _textureDataContext.PropertyChanged += ReloadTextureImage;
+            }
         }
 
         private void ReloadTexturePage(object sender, PropertyChangedEventArgs e)

UndertaleModTool/MainWindow.xaml

@@ -141,7 +141,7 @@
             <Grid DockPanel.Dock="Bottom">
                 <local:TextBoxDark x:Name="CommandBox" AcceptsReturn="True" PreviewKeyDown="CommandBox_PreviewKeyDown" Margin="0,0,35,0"/>
                 <Label Content="None" HorizontalAlignment="Right" VerticalAlignment="Top" VerticalContentAlignment="Top" Name="ObjectLabel"
-                       ToolTip="This is an ID (index) of the currently open object. It starts from 0."
+                       ToolTip="This is an ID (index) of the currently open asset, item, or object. It starts from 0."
                        ToolTipService.InitialShowDelay="200"/>
             </Grid>
             <Grid>

UndertaleModTool/Windows/FindReferencesTypesDialog/UndertaleResourceReferenceMethodsMap.cs

@@ -1498,39 +1498,42 @@ public static async Task<Dictionary<string, List<object>>> GetUnreferencedObject
                 mainWindow.SetProgressBar(null, "Assets", 0, assets.Count);
                 mainWindow.StartProgressBarUpdater();
 
-                var assetsPart = Partitioner.Create(0, assets.Count);
-
                 List<Dictionary<string, List<object>>> dicts = new();
 
-                await Task.Run(() =>
+                if (assets.Count > 0) // A Partitioner can't be created on an empty list.
                 {
-                    Parallel.ForEach(assetsPart, (range) =>
-                    {
-                        var resultDict = new Dictionary<string, List<object>>();
+                    var assetsPart = Partitioner.Create(0, assets.Count);
 
-                        for (int i = range.Item1; i < range.Item2; i++)
+                    await Task.Run(() =>
+                    {
+                        Parallel.ForEach(assetsPart, (range) =>
                         {
-                            var asset = assets[i];
-                            var assetReferences = GetReferencesOfObject(asset.Item1, data,
-                                                                        new HashSetTypesOverride(true, data.Code is null), true);
-                            if (assetReferences is null)
+                            var resultDict = new Dictionary<string, List<object>>();
+
+                            for (int i = range.Item1; i < range.Item2; i++)
                             {
-                                if (resultDict.TryGetValue(asset.Item2, out var list))
+                                var asset = assets[i];
+                                var assetReferences = GetReferencesOfObject(asset.Item1, data,
+                                                                            new HashSetTypesOverride(true, data.Code is null), true);
+                                if (assetReferences is null)
                                 {
-                                    list.Add(asset.Item1);
-                                }
-                                else
-                                {
-                                    resultDict[asset.Item2] = new() { asset.Item1 };
+                                    if (resultDict.TryGetValue(asset.Item2, out var list))
+                                    {
+                                        list.Add(asset.Item1);
+                                    }
+                                    else
+                                    {
+                                        resultDict[asset.Item2] = new() { asset.Item1 };
+                                    }
                                 }
-                            }
 
-                            mainWindow.IncrementProgressParallel();
-                        }
+                                mainWindow.IncrementProgressParallel();
+                            }
 
-                        dicts.Add(resultDict);
+                            dicts.Add(resultDict);
+                        });
                     });
-                });
+                }
 
                 Dictionary<string, int> outArrSizes = new();
                 foreach (var dict in dicts)