Skip to content

Commit bc7338d

Browse files
LeftofZenLeftofZen
committed
replace Zenith with .NET exceptions
1 parent 518dd15 commit bc7338d

File tree

7 files changed

+21
-29
lines changed

7 files changed

+21
-29
lines changed

‎Dat/Dat.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
14-
<PackageReference Include="Zenith.Core" Version="1.0.20" />
1514
</ItemGroup>
1615

1716
<ItemGroup>

‎Dat/FileParsing/ByteHelpers.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Zenith.Core;
2-
31
namespace OpenLoco.Dat.FileParsing
42
{
53
public static class ByteHelpers
@@ -25,7 +23,7 @@ public static int GetObjectSize(Type type)
2523
size = sizeAttr.Size;
2624
}
2725

28-
Verify.Positive(size, message: $"type {type.Name} has no size data associated with it");
26+
ArgumentOutOfRangeException.ThrowIfNegativeOrZero(size, nameof(size));
2927

3028
return size;
3129
}

‎Dat/PaletteMap.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using OpenLoco.Dat.Types;
22
using SixLabors.ImageSharp;
33
using SixLabors.ImageSharp.PixelFormats;
4-
using Zenith.Core;
54

65
namespace OpenLoco.Dat
76
{
@@ -13,8 +12,8 @@ public PaletteMap(string filename)
1312

1413
public PaletteMap(Image<Rgba32> img)
1514
{
16-
Verify.AreEqual(16, img.Height);
17-
Verify.AreEqual(16, img.Height);
15+
ArgumentOutOfRangeException.ThrowIfNotEqual(16, img.Height);
16+
ArgumentOutOfRangeException.ThrowIfNotEqual(16, img.Height);
1817

1918
Palette = new (Color, byte)[img.Width * img.Height];
2019
for (var y = 0; y < img.Height; ++y)
@@ -29,7 +28,7 @@ public PaletteMap(Image<Rgba32> img)
2928

3029
public PaletteMap(Color[] _palette)
3130
{
32-
Verify.AreEqual(256, _palette.Length);
31+
ArgumentOutOfRangeException.ThrowIfNotEqual(256, _palette.Length);
3332
Palette = new (Color, byte)[_palette.Length];
3433

3534
for (var i = 0; i < _palette.Length; ++i)

‎Dat/Types/ObjectHeader.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using OpenLoco.Dat.Data;
22
using OpenLoco.Dat.FileParsing;
33
using System.ComponentModel;
4-
using Zenith.Core;
54

65
namespace OpenLoco.Dat.Types
76
{
@@ -19,7 +18,7 @@ public bool IsValid()
1918

2019
public static ObjectHeader Read(ReadOnlySpan<byte> data)
2120
{
22-
Verify.AreEqual(data.Length, StructLength);
21+
ArgumentOutOfRangeException.ThrowIfNotEqual(data.Length, StructLength);
2322

2423
var encoding = (SawyerEncoding)data[0];
2524
var dataLength = BitConverter.ToUInt32(data[1..5]);

‎Dat/Types/S5Header.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using OpenLoco.Dat.Data;
22
using OpenLoco.Dat.FileParsing;
33
using System.ComponentModel;
4-
using Zenith.Core;
54

65
namespace OpenLoco.Dat.Types
76
{
@@ -51,7 +50,7 @@ public static bool IsValid(int sourceGame, int objectType)
5150

5251
public static S5Header Read(ReadOnlySpan<byte> data)
5352
{
54-
Verify.AreEqual(data.Length, StructLength);
53+
ArgumentOutOfRangeException.ThrowIfNotEqual(data.Length, StructLength);
5554

5655
var flags = BitConverter.ToUInt32(data[0..4]);
5756
var name = System.Text.Encoding.ASCII.GetString(data[4..12]);

‎Dat/Types/SCV5/TileElement.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using OpenLoco.Dat.FileParsing;
2-
using Zenith.Core;
32

43
namespace OpenLoco.Dat.Types.SCV5
54
{
@@ -52,7 +51,7 @@ void SetLast(bool value)
5251

5352
public static TileElement Read(ReadOnlySpan<byte> data)
5453
{
55-
Verify.AreEqual(data.Length, StructLength);
54+
ArgumentOutOfRangeException.ThrowIfNotEqual(data.Length, StructLength);
5655
return new TileElement
5756
{
5857
Type = (ElementType)data[0],

‎ObjectService/ServerFolderManager.cs‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using OpenLoco.Common.Logging;
22
using OpenLoco.Dat;
3-
using Zenith.Core;
43

54
namespace OpenLoco.ObjectService
65
{
@@ -42,25 +41,25 @@ public ServerFolderManager(string rootDirectory)
4241
var logger = new Logger();
4342
ObjectIndex = ObjectIndex.LoadOrCreateIndex(Path.Combine(rootDirectory, ObjectsFolderName), logger)!;
4443

45-
Verify.AreEqual(true, Directory.Exists(ObjectsOriginalFolder), message: $"OrignalObjectsFolder: {ObjectsOriginalFolder} didn't exist");
46-
Verify.AreEqual(true, Directory.Exists(ObjectsCustomFolder), message: $"ObjectsCustomFolder: {ObjectsCustomFolder} didn't exist");
44+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(ObjectsOriginalFolder));
45+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(ObjectsCustomFolder));
4746

48-
Verify.AreEqual(true, Directory.Exists(GraphicsOriginalFolder), message: $"GraphicsOriginalFolder: {GraphicsOriginalFolder} didn't exist");
49-
Verify.AreEqual(true, Directory.Exists(GraphicsCustomFolder), message: $"GraphicsCustomFolder: {GraphicsCustomFolder} didn't exist");
47+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(GraphicsOriginalFolder));
48+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(GraphicsCustomFolder));
5049

51-
Verify.AreEqual(true, Directory.Exists(MusicOriginalFolder), message: $"MusicOriginalFolder: {MusicOriginalFolder} didn't exist");
52-
Verify.AreEqual(true, Directory.Exists(MusicCustomFolder), message: $"MusicCustomFolder: {MusicCustomFolder} didn't exist");
50+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(MusicOriginalFolder));
51+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(MusicCustomFolder));
5352

54-
Verify.AreEqual(true, Directory.Exists(SoundEffectsOriginalFolder), message: $"SoundEffectsOriginalFolder: {SoundEffectsOriginalFolder} didn't exist");
55-
Verify.AreEqual(true, Directory.Exists(SoundEffectsCustomFolder), message: $"SoundEffectsCustomFolder: {SoundEffectsCustomFolder} didn't exist");
53+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(SoundEffectsOriginalFolder));
54+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(SoundEffectsCustomFolder));
5655

57-
Verify.AreEqual(true, Directory.Exists(TutorialsOriginalFolder), message: $"TutorialsOriginalFolder: {TutorialsOriginalFolder} didn't exist");
58-
Verify.AreEqual(true, Directory.Exists(TutorialsCustomFolder), message: $"TutorialsCustomFolder: {TutorialsCustomFolder} didn't exist");
56+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(TutorialsOriginalFolder));
57+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(TutorialsCustomFolder));
5958

60-
Verify.AreEqual(true, Directory.Exists(ScenariosOriginalFolder), message: $"ScenariosOriginalFolder: {ScenariosOriginalFolder} didn't exist");
61-
Verify.AreEqual(true, Directory.Exists(ScenariosCustomFolder), message: $"ScenariosCustomFolder: {ScenariosCustomFolder} didn't exist");
62-
Verify.AreEqual(true, Directory.Exists(ScenariosGoGFolder), message: $"ScenariosGoGFolder: {ScenariosGoGFolder} didn't exist");
63-
Verify.AreEqual(true, Directory.Exists(ScenariosSteamFolder), message: $"ScenariosSteamFolder: {ScenariosSteamFolder} didn't exist");
59+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(ScenariosOriginalFolder));
60+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(ScenariosCustomFolder));
61+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(ScenariosGoGFolder));
62+
ArgumentOutOfRangeException.ThrowIfNotEqual(true, Directory.Exists(ScenariosSteamFolder));
6463
}
6564

6665
public ObjectIndex ObjectIndex { get; init; }

0 commit comments

Comments
 (0)