update packages

LeftofZen · LeftofZen · commit 9c8149d7018a · 2024-04-08T15:29:30.000+10:00
diff --git a/Core/Objects/InterfaceSkinObject.cs b/Core/Objects/InterfaceSkinObject.cs
@@ -509,6 +509,5 @@ public bool TryGetImageName(int id, out string? value)
 			{ 468, "toolbar_menu_map_south" },
 			{ 469, "toolbar_menu_map_east" },
 		};
-
 	}
 }
diff --git a/Core/Objects/RoadObject.cs b/Core/Objects/RoadObject.cs
@@ -62,7 +62,6 @@ public record RoadObject(
 		[property: LocoStructOffset(0x2F)] uint8_t pad_2F
 		) : ILocoStruct, ILocoStructVariableData
 	{
-
 		public List<S5Header> Compatible { get; set; } = [];
 		public List<S5Header> Mods { get; set; } = [];
 		public S5Header Tunnel { get; set; }
diff --git a/Core/Objects/ScaffoldingObject.cs b/Core/Objects/ScaffoldingObject.cs
@@ -61,5 +61,4 @@ public bool TryGetImageName(int id, out string? value)
 			{ 35, "type22x2RoofNW" },
 		};
 	}
-
 }
diff --git a/Core/Objects/TrackObject.cs b/Core/Objects/TrackObject.cs
@@ -577,7 +577,6 @@ public bool Validate()
 			{ 411, "rightCurveVerySmall0RailNW" },
 		};
 
-
 		// ai generated - nice idea, maybe implement?
 		//public static TrackObject FromDatFile(DatFile datFile, int index)
 		//{
diff --git a/Core/Objects/Vehicle/VehicleObject.cs b/Core/Objects/Vehicle/VehicleObject.cs
@@ -452,7 +452,6 @@ public void PostLoad()
 						var numSteepFrames = bogieSprite.NumRollSprites * 64;
 						offset += numSteepFrames / (bogieSprite.Flags.HasFlag(BogieSpriteFlags.RotationalSymmetry) ? 2 : 1);
 						bogieSprite.ImageIds[BogieSpriteSlopeType.Steep] = Enumerable.Range(curr, offset - curr).ToList();
-
 					}
 				}
 
diff --git a/Core/Types/LocoObject.cs b/Core/Types/LocoObject.cs
@@ -4,7 +4,6 @@
 
 namespace OpenLoco.ObjectEditor.Types
 {
-
 	[TypeConverter(typeof(ExpandableObjectConverter))]
 	public class LocoObject : ILocoObject
 	{
diff --git a/Gui/Gui.csproj b/Gui/Gui.csproj
@@ -42,7 +42,7 @@
 
   <ItemGroup>
     <PackageReference Include="NAudio" Version="2.2.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Gui/MainForm.cs b/Gui/MainForm.cs
@@ -82,8 +82,8 @@ int CurrentUIImagePageNumber
 		const string ApplicationName = "OpenLoco Object Editor";
 
 		const string GithubApplicationName = "ObjectEditor";
-		const string GithubLatestReleaseDownloadPage = @"https://github.com/OpenLoco/ObjectEditor/releases";
-		const string GithubLatestReleaseAPI = @"https://api.github.com/repos/OpenLoco/ObjectEditor/releases/latest";
+		const string GithubLatestReleaseDownloadPage = "https://github.com/OpenLoco/ObjectEditor/releases";
+		const string GithubLatestReleaseAPI = "https://api.github.com/repos/OpenLoco/ObjectEditor/releases/latest";
 
 		string SettingsPath => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), ApplicationName);
 		string SettingsFile => Path.Combine(SettingsPath, "settings.json");
@@ -535,7 +535,6 @@ void LoadDataDump(string path, bool isG1 = false)
 
 		void LoadDataDumpCore(string path, bool isG1 = false)
 		{
-
 			if (File.Exists(path))
 			{
 				var byteList = File.ReadAllBytes(path);
@@ -612,7 +611,7 @@ void LoadAndPlaySound(byte[] data, string soundName)
 			if (!header.Validate())
 			{
 				// invalid file
-				logger?.Warning($"Invalid music track");
+				logger?.Warning("Invalid music track");
 				return;
 			}
 		}
@@ -714,7 +713,6 @@ public void ImportImages()
 						currentUIObjectImages = CreateImages(uiObjHasGraphics.G1Elements, model.PaletteMap).ToList();
 						RefreshImageControls();
 					}
-
 				}
 			}
 		}
@@ -749,7 +747,7 @@ public string GetImageName(IUiObject? uiObj, int counter)
 			ILocoImageTableNames? its = null;
 			var objectName = string.Empty;
 
-			if (uiObj is UiLocoObject uiLocoObj && uiLocoObj.LocoObject != null && uiLocoObj.LocoObject.Object is ILocoImageTableNames itss)
+			if (uiObj is UiLocoObject uiLocoObj && uiLocoObj?.LocoObject != null && uiLocoObj.LocoObject.Object is ILocoImageTableNames itss)
 			{
 				its = itss;
 				objectName = uiLocoObj.DatFileInfo.S5Header.Name;
@@ -769,7 +767,6 @@ public string GetImageName(IUiObject? uiObj, int counter)
 				}
 
 				return $"{counter}-{value}";
-
 			}
 
 			return $"{counter}-image";
@@ -793,7 +790,6 @@ public void ExportMusic(UiSoundObject uiSoundObj)
 				{
 					SawyerStreamWriter.ExportMusicAsWave(sfDialog.FileName, uiSoundObj.Header, uiSoundObj.Data);
 					logger.Info($"Saved music to {sfDialog.FileName}");
-
 				}
 			}
 		}
@@ -1053,7 +1049,7 @@ IEnumerable<Control> CreateImageControls(IEnumerable<Bitmap> images)
 
 			var uiObjHasGraphics = CurrentUIObject as IUiObjectWithGraphics;
 
-			int counter = 0;
+			var counter = 0;
 			foreach (var img in images)
 			{
 				var ele = uiObjHasGraphics.G1Elements[counter++];
@@ -1330,7 +1326,7 @@ void btnPageNext_Click(object sender, EventArgs e)
 		}
 
 		void btnPageLast_Click(object sender, EventArgs e)
-			=> CurrentUIImagePageNumber = (CurrentUIImages.Count / ImagesPerPage);
+			=> CurrentUIImagePageNumber = CurrentUIImages.Count / ImagesPerPage;
 
 		void dataDumpAnnotations_AfterSelect(object sender, TreeViewEventArgs e)
 		{
@@ -1441,7 +1437,7 @@ void btnSave_Click(object sender, EventArgs e)
 				var validation = obji.LocoObject.Object.Validate();
 				if (!validation)
 				{
-					logger.Error($"Object failed validation checks; cannot save");
+					logger.Error("Object failed validation checks; cannot save");
 					return;
 				}
 			}
@@ -1465,7 +1461,7 @@ void btnSave_Click(object sender, EventArgs e)
 					{
 						if (tvObjType.SelectedNode.Name == "css1.dat")
 						{
-							var rawBytes = SawyerStreamWriter.SaveSoundEffectsToCSS(uiSoundObjList.Audio.Select(uis => (uis.Header, uis.Data)).ToList());
+							var rawBytes = SawyerStreamWriter.SaveSoundEffectsToCSS(uiSoundObjList.Audio.ConvertAll(uis => (uis.Header, uis.Data)));
 							File.WriteAllBytes(filename, rawBytes);
 						}
 						else
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -11,13 +11,13 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-		<PackageReference Include="NUnit" Version="4.0.1" />
+		<PackageReference Include="NUnit" Version="4.1.0" />
 		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="NUnit.Analyzers" Version="4.0.1">
+		<PackageReference Include="NUnit.Analyzers" Version="4.1.0">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
+		<PackageReference Include="coverlet.collector" Version="6.0.2">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -509,6 +509,5 @@ public bool TryGetImageName(int id, out string? value)`
`509`	`509`	`{ 468, "toolbar_menu_map_south" },`
`510`	`510`	`{ 469, "toolbar_menu_map_east" },`
`511`	`511`	`};`
`512`		`-`
`513`	`512`	`}`
`514`	`513`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@ public record RoadObject(`
`62`	`62`	`[property: LocoStructOffset(0x2F)] uint8_t pad_2F`
`63`	`63`	`) : ILocoStruct, ILocoStructVariableData`
`64`	`64`	`{`
`65`		`-`
`66`	`65`	`public List<S5Header> Compatible { get; set; } = [];`
`67`	`66`	`public List<S5Header> Mods { get; set; } = [];`
`68`	`67`	`public S5Header Tunnel { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -61,5 +61,4 @@ public bool TryGetImageName(int id, out string? value)`
`61`	`61`	`{ 35, "type22x2RoofNW" },`
`62`	`62`	`};`
`63`	`63`	`}`
`64`		`-`
`65`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,6 @@ public void PostLoad()`
`452`	`452`	`var numSteepFrames = bogieSprite.NumRollSprites * 64;`
`453`	`453`	`offset += numSteepFrames / (bogieSprite.Flags.HasFlag(BogieSpriteFlags.RotationalSymmetry) ? 2 : 1);`
`454`	`454`	`bogieSprite.ImageIds[BogieSpriteSlopeType.Steep] = Enumerable.Range(curr, offset - curr).ToList();`
`455`		`-`
`456`	`455`	`}`
`457`	`456`	`}`
`458`	`457`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`namespace OpenLoco.ObjectEditor.Types`
`6`	`6`	`{`
`7`		`-`
`8`	`7`	`[TypeConverter(typeof(ExpandableObjectConverter))]`
`9`	`8`	`public class LocoObject : ILocoObject`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ int CurrentUIImagePageNumber`
`82`	`82`	`const string ApplicationName = "OpenLoco Object Editor";`
`83`	`83`
`84`	`84`	`const string GithubApplicationName = "ObjectEditor";`
`85`		`- const string GithubLatestReleaseDownloadPage = @"https://github.com/OpenLoco/ObjectEditor/releases";`
`86`		`- const string GithubLatestReleaseAPI = @"https://api.github.com/repos/OpenLoco/ObjectEditor/releases/latest";`
	`85`	`+ const string GithubLatestReleaseDownloadPage = "https://github.com/OpenLoco/ObjectEditor/releases";`
	`86`	`+ const string GithubLatestReleaseAPI = "https://api.github.com/repos/OpenLoco/ObjectEditor/releases/latest";`
`87`	`87`
`88`	`88`	`string SettingsPath => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), ApplicationName);`
`89`	`89`	`string SettingsFile => Path.Combine(SettingsPath, "settings.json");`
`@@ -535,7 +535,6 @@ void LoadDataDump(string path, bool isG1 = false)`
`535`	`535`
`536`	`536`	`void LoadDataDumpCore(string path, bool isG1 = false)`
`537`	`537`	`{`
`538`		`-`
`539`	`538`	`if (File.Exists(path))`
`540`	`539`	`{`
`541`	`540`	`var byteList = File.ReadAllBytes(path);`
`@@ -612,7 +611,7 @@ void LoadAndPlaySound(byte[] data, string soundName)`
`612`	`611`	`if (!header.Validate())`
`613`	`612`	`{`
`614`	`613`	`// invalid file`
`615`		`- logger?.Warning($"Invalid music track");`
	`614`	`+ logger?.Warning("Invalid music track");`
`616`	`615`	`return;`
`617`	`616`	`}`
`618`	`617`	`}`
`@@ -714,7 +713,6 @@ public void ImportImages()`
`714`	`713`	`currentUIObjectImages = CreateImages(uiObjHasGraphics.G1Elements, model.PaletteMap).ToList();`
`715`	`714`	`RefreshImageControls();`
`716`	`715`	`}`
`717`		`-`
`718`	`716`	`}`
`719`	`717`	`}`
`720`	`718`	`}`
`@@ -749,7 +747,7 @@ public string GetImageName(IUiObject? uiObj, int counter)`
`749`	`747`	`ILocoImageTableNames? its = null;`
`750`	`748`	`var objectName = string.Empty;`
`751`	`749`
`752`		`- if (uiObj is UiLocoObject uiLocoObj && uiLocoObj.LocoObject != null && uiLocoObj.LocoObject.Object is ILocoImageTableNames itss)`
	`750`	`+ if (uiObj is UiLocoObject uiLocoObj && uiLocoObj?.LocoObject != null && uiLocoObj.LocoObject.Object is ILocoImageTableNames itss)`
`753`	`751`	`{`
`754`	`752`	`its = itss;`
`755`	`753`	`objectName = uiLocoObj.DatFileInfo.S5Header.Name;`
`@@ -769,7 +767,6 @@ public string GetImageName(IUiObject? uiObj, int counter)`
`769`	`767`	`}`
`770`	`768`
`771`	`769`	`return $"{counter}-{value}";`
`772`		`-`
`773`	`770`	`}`
`774`	`771`
`775`	`772`	`return $"{counter}-image";`
`@@ -793,7 +790,6 @@ public void ExportMusic(UiSoundObject uiSoundObj)`
`793`	`790`	`{`
`794`	`791`	`SawyerStreamWriter.ExportMusicAsWave(sfDialog.FileName, uiSoundObj.Header, uiSoundObj.Data);`
`795`	`792`	`logger.Info($"Saved music to {sfDialog.FileName}");`
`796`		`-`
`797`	`793`	`}`
`798`	`794`	`}`
`799`	`795`	`}`
`@@ -1053,7 +1049,7 @@ IEnumerable<Control> CreateImageControls(IEnumerable<Bitmap> images)`
`1053`	`1049`
`1054`	`1050`	`var uiObjHasGraphics = CurrentUIObject as IUiObjectWithGraphics;`
`1055`	`1051`
`1056`		`- int counter = 0;`
	`1052`	`+ var counter = 0;`
`1057`	`1053`	`foreach (var img in images)`
`1058`	`1054`	`{`
`1059`	`1055`	`var ele = uiObjHasGraphics.G1Elements[counter++];`
`@@ -1330,7 +1326,7 @@ void btnPageNext_Click(object sender, EventArgs e)`
`1330`	`1326`	`}`
`1331`	`1327`
`1332`	`1328`	`void btnPageLast_Click(object sender, EventArgs e)`
`1333`		`- => CurrentUIImagePageNumber = (CurrentUIImages.Count / ImagesPerPage);`
	`1329`	`+ => CurrentUIImagePageNumber = CurrentUIImages.Count / ImagesPerPage;`
`1334`	`1330`
`1335`	`1331`	`void dataDumpAnnotations_AfterSelect(object sender, TreeViewEventArgs e)`
`1336`	`1332`	`{`
`@@ -1441,7 +1437,7 @@ void btnSave_Click(object sender, EventArgs e)`
`1441`	`1437`	`var validation = obji.LocoObject.Object.Validate();`
`1442`	`1438`	`if (!validation)`
`1443`	`1439`	`{`
`1444`		`- logger.Error($"Object failed validation checks; cannot save");`
	`1440`	`+ logger.Error("Object failed validation checks; cannot save");`
`1445`	`1441`	`return;`
`1446`	`1442`	`}`
`1447`	`1443`	`}`
`@@ -1465,7 +1461,7 @@ void btnSave_Click(object sender, EventArgs e)`
`1465`	`1461`	`{`
`1466`	`1462`	`if (tvObjType.SelectedNode.Name == "css1.dat")`
`1467`	`1463`	`{`
`1468`		`- var rawBytes = SawyerStreamWriter.SaveSoundEffectsToCSS(uiSoundObjList.Audio.Select(uis => (uis.Header, uis.Data)).ToList());`
	`1464`	`+ var rawBytes = SawyerStreamWriter.SaveSoundEffectsToCSS(uiSoundObjList.Audio.ConvertAll(uis => (uis.Header, uis.Data)));`
`1469`	`1465`	`File.WriteAllBytes(filename, rawBytes);`
`1470`	`1466`	`}`
`1471`	`1467`	`else`