use Argument.ThrowIfNull

Author: LeftofZen

Dat/FileParsing/ByteReader.cs

@@ -239,7 +239,7 @@ public static ILocoStruct ReadLocoStruct(ReadOnlySpan<byte> data, Type t)
 					else
 					{
 						var newInstance = Activator.CreateInstance(p.PropertyType);
-						Verify.NotNull(newInstance, paramName: p.PropertyType.Name);
+						ArgumentNullException.ThrowIfNull(newInstance, paramName: p.PropertyType.Name);
 						args.Add(newInstance!);
 					}
 

Dat/FileParsing/ByteWriter.cs

@@ -1,5 +1,4 @@
 using OpenLoco.Dat.Types;
-using Zenith.Core;
 
 namespace OpenLoco.Dat.FileParsing
 {
@@ -75,7 +74,7 @@ public static void WriteT(Span<byte> data, Type t, int offset, object val)
 
 		public static ReadOnlySpan<byte> WriteLocoStruct(ILocoStruct obj)
 		{
-			Verify.NotNull(obj);
+			ArgumentNullException.ThrowIfNull(obj);
 
 			var t = obj.GetType();
 			var objSize = ByteHelpers.GetObjectSize(t);

Dat/FileParsing/ObjectAnnotator.cs

@@ -3,7 +3,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
-using Zenith.Core;
 
 namespace OpenLoco.Dat.FileParsing
 {
@@ -40,7 +39,7 @@ .. SawyerStreamReader.Decode(objectHeader.Encoding, byteList[runningCount..(int)
 			];
 
 			var locoStruct = SawyerStreamReader.GetLocoStruct(s5Header.ObjectType, fullData.AsSpan()[runningCount..]);
-			Verify.NotNull(locoStruct);
+			ArgumentNullException.ThrowIfNull(locoStruct);
 
 			var structSize = AttributeHelper.Get<LocoStructSizeAttribute>(locoStruct.GetType());
 			var locoStructSize = structSize!.Size;

Dat/FileParsing/SawyerStreamReader.cs

@@ -5,7 +5,6 @@
 using OpenLoco.Dat.Types;
 using OpenLoco.Dat.Types.SCV5;
 using System.Text;
-using Zenith.Core;
 
 namespace OpenLoco.Dat.FileParsing
 {
@@ -151,7 +150,7 @@ public static (DatFileInfo DatFileInfo, ILocoObject? LocoObject) LoadFullObjectF
 			ReadOnlySpan<byte> remainingData = decodedData;
 
 			var locoStruct = GetLocoStruct(s5Header.ObjectType, remainingData);
-			Verify.NotNull(locoStruct, paramName: filename);
+			ArgumentNullException.ThrowIfNull(locoStruct, paramName: filename);
 
 			var structSize = AttributeHelper.Get<LocoStructSizeAttribute>(locoStruct.GetType());
 			var locoStructSize = structSize!.Size;

Gui/Gui.csproj

@@ -55,7 +55,6 @@
     <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageReference Include="ReactiveUI.Validation" Version="4.1.1" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
-    <PackageReference Include="Zenith.Core" Version="1.0.20" />
   </ItemGroup>
 
   <ItemGroup>

Gui/Models/ObjectEditorModel.cs

@@ -18,7 +18,6 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Zenith.Core;
 
 namespace OpenLoco.Gui.Models
 {
@@ -95,7 +94,7 @@ public void LoadSettings()
 
 			var text = File.ReadAllText(SettingsFile);
 			var settings = JsonSerializer.Deserialize<EditorSettings>(text, options: new() { WriteIndented = true }); // todo: try-catch this for invalid settings files
-			Verify.NotNull(settings);
+			ArgumentNullException.ThrowIfNull(settings);
 
 			Settings = settings!;
 			InitialiseDownloadDirectory();

Tests/LoadSaveTests.cs

@@ -919,7 +919,7 @@ void assertFunc(ILocoObject obj, TreeObject struc) => Assert.Multiple(() =>
 				Assert.That(struc.ShadowImageOffset, Is.EqualTo(0), nameof(struc.ShadowImageOffset));
 				Assert.That(struc.var_3C, Is.EqualTo(15), nameof(struc.var_3C));
 				Assert.That(struc.SeasonState, Is.EqualTo(3), nameof(struc.SeasonState));
-				Assert.That(struc.var_3E, Is.EqualTo(2), nameof(struc.var_3E));
+				Assert.That(struc.Season, Is.EqualTo(2), nameof(struc.Season));
 				Assert.That(struc.CostIndex, Is.EqualTo(3), nameof(struc.CostIndex));
 				Assert.That(struc.BuildCostFactor, Is.EqualTo(8), nameof(struc.BuildCostFactor));
 				Assert.That(struc.ClearCostFactor, Is.EqualTo(4), nameof(struc.ClearCostFactor));