refactor ctors

AnakinRaW · AnakinRaW · commit bac693b5b6e7 · 2026-03-17T12:41:37.000+01:00
diff --git a/src/ModVerify/Verifiers/CommandBar/CommandBarVerifier.Components.cs b/src/ModVerify/Verifiers/CommandBar/CommandBarVerifier.Components.cs
diff --git a/src/ModVerify/Verifiers/CommandBar/CommandBarVerifier.Groups.cs b/src/ModVerify/Verifiers/CommandBar/CommandBarVerifier.Groups.cs
diff --git a/src/ModVerify/Verifiers/CommandBar/CommandBarVerifier.cs b/src/ModVerify/Verifiers/CommandBar/CommandBarVerifier.cs
@@ -6,7 +6,7 @@
 namespace AET.ModVerify.Verifiers.CommandBar;
 
 public partial class CommandBarVerifier(IStarWarsGameEngine gameEngine, GameVerifySettings settings, IServiceProvider serviceProvider)
-    : GameVerifier(null, gameEngine, settings, serviceProvider)
+    : GameVerifier(gameEngine, settings, serviceProvider)
 {
     public const string CommandBarNoShellsGroup = "CMDBAR00";
     public const string CommandBarManyShellsGroup = "CMDBAR01";
diff --git a/src/ModVerify/Verifiers/Commons/AudioFileVerifier.cs b/src/ModVerify/Verifiers/Commons/AudioFileVerifier.cs
@@ -9,14 +9,22 @@
 
 namespace AET.ModVerify.Verifiers.Commons;
 
-public class AudioFileVerifier(
-    IGameVerifierInfo? parent,
-    IStarWarsGameEngine gameEngine,
-    GameVerifySettings settings,
-    IServiceProvider serviceProvider)
-    : GameVerifier<AudioFileInfo>(parent, gameEngine, settings, serviceProvider)
+public class AudioFileVerifier : GameVerifier<AudioFileInfo>
 {
-    private readonly IAlreadyVerifiedCache? _alreadyVerifiedCache = serviceProvider.GetService<IAlreadyVerifiedCache>();
+    private readonly IAlreadyVerifiedCache? _alreadyVerifiedCache;
+
+    public AudioFileVerifier(GameVerifierBase parent) : base(parent)
+    {
+        _alreadyVerifiedCache = Services.GetService<IAlreadyVerifiedCache>();
+    }
+
+    public AudioFileVerifier(IGameVerifierInfo? parent,
+        IStarWarsGameEngine gameEngine,
+        GameVerifySettings settings,
+        IServiceProvider serviceProvider) : base(parent, gameEngine, settings, serviceProvider)
+    {
+        _alreadyVerifiedCache = serviceProvider.GetService<IAlreadyVerifiedCache>();
+    }
 
     public override string FriendlyName => "Audio File format";
 
diff --git a/src/ModVerify/Verifiers/Commons/DuplicateVerifier.cs b/src/ModVerify/Verifiers/Commons/DuplicateVerifier.cs
@@ -7,13 +7,21 @@
 
 namespace AET.ModVerify.Verifiers.Commons;
 
-public sealed class DuplicateVerifier(
-    IGameVerifierInfo? parent,
-    IStarWarsGameEngine gameEngine,
-    GameVerifySettings settings,
-    IServiceProvider serviceProvider)
-    : GameVerifier<IDuplicateVerificationContext>(parent, gameEngine, settings, serviceProvider)
+public sealed class DuplicateVerifier : GameVerifier<IDuplicateVerificationContext>
 {
+    public DuplicateVerifier(GameVerifierBase parent) : base(parent)
+    {
+    }
+
+    public DuplicateVerifier(
+        IGameVerifierInfo? parent,
+        IStarWarsGameEngine gameEngine,
+        GameVerifySettings settings,
+        IServiceProvider serviceProvider) 
+        : base(parent, gameEngine, settings, serviceProvider)
+    {
+    }
+
     public override string FriendlyName => "Duplicates";
 
     public override void Verify(IDuplicateVerificationContext toVerify, IReadOnlyCollection<string> contextInfo, CancellationToken token)
diff --git a/src/ModVerify/Verifiers/Commons/ModelVerifier.cs b/src/ModVerify/Verifiers/Commons/ModelVerifier.cs
@@ -25,13 +25,19 @@ public sealed class SingleModelVerifier : GameVerifier<string>
     private readonly TextureVeifier _textureVerifier;
     private readonly IAlreadyVerifiedCache? _cache;
 
+    public SingleModelVerifier(GameVerifierBase parent) : base(parent)
+    {
+        _textureVerifier = new TextureVeifier(this);
+        _cache = Services.GetService<IAlreadyVerifiedCache>();
+    }
+
     public SingleModelVerifier(
         IGameVerifierInfo? parent,
         IStarWarsGameEngine engine,
         GameVerifySettings settings,
         IServiceProvider serviceProvider) : base(parent, engine, settings, serviceProvider)
     {
-        _textureVerifier = new TextureVeifier(this, engine, settings, serviceProvider);
+        _textureVerifier = new TextureVeifier(this);
         _cache = serviceProvider.GetService<IAlreadyVerifiedCache>();
     }
 
diff --git a/src/ModVerify/Verifiers/Commons/TextureVeifier.cs b/src/ModVerify/Verifiers/Commons/TextureVeifier.cs
@@ -8,13 +8,21 @@
 
 namespace AET.ModVerify.Verifiers.Commons;
 
-public sealed class TextureVeifier(
-    IGameVerifierInfo? parent,
-    IStarWarsGameEngine gameEngine, 
-    GameVerifySettings settings, 
-    IServiceProvider serviceProvider) 
-    : GameVerifier<string>(parent, gameEngine, settings, serviceProvider)
+public sealed class TextureVeifier : GameVerifier<string>
 {
+    public TextureVeifier(GameVerifierBase parent) : base(parent)
+    {
+    }
+
+    public TextureVeifier(
+        IGameVerifierInfo? parent,
+        IStarWarsGameEngine gameEngine, 
+        GameVerifySettings settings, 
+        IServiceProvider serviceProvider) :
+        base(parent, gameEngine, settings, serviceProvider)
+    {
+    }
+
     public override void Verify(string texturePath, IReadOnlyCollection<string> contextInfo, CancellationToken token)
     {
         Verify(texturePath.AsSpan(), contextInfo, token);
diff --git a/src/ModVerify/Verifiers/Engine/GameEngineErrorCollector.cs b/src/ModVerify/Verifiers/Engine/GameEngineErrorCollector.cs
@@ -13,7 +13,7 @@ public sealed class GameEngineErrorCollector(
     IStarWarsGameEngine gameEngine,
     GameVerifySettings settings,
     IServiceProvider serviceProvider)
-    : GameVerifier(null, gameEngine, settings, serviceProvider)
+    : GameVerifier(gameEngine, settings, serviceProvider)
 {
     public override string FriendlyName => "Game Engine Initialization";
 
diff --git a/src/ModVerify/Verifiers/GameObjects/GameObjectTypeVerifier.cs b/src/ModVerify/Verifiers/GameObjects/GameObjectTypeVerifier.cs
@@ -24,7 +24,7 @@ public GameObjectTypeVerifier(
         IServiceProvider serviceProvider) 
         : base(gameEngine, settings, serviceProvider)
     {
-        _singleModelVerifier = new SingleModelVerifier(this, gameEngine, settings, serviceProvider);
+        _singleModelVerifier = new SingleModelVerifier(this);
     }
 
     protected override void VerifyEntity(GameObject entity, string[] context, double progress, CancellationToken token)
diff --git a/src/ModVerify/Verifiers/GameVerifier.cs b/src/ModVerify/Verifiers/GameVerifier.cs
@@ -6,22 +6,50 @@
 
 namespace AET.ModVerify.Verifiers;
 
-public abstract class GameVerifier<T>(
-    IGameVerifierInfo? parent,
-    IStarWarsGameEngine gameEngine,
-    GameVerifySettings settings,
-    IServiceProvider serviceProvider)
-    : GameVerifierBase(parent, gameEngine, settings, serviceProvider) where T : notnull
+public abstract class GameVerifier<T> : GameVerifierBase where T : notnull
 {
+    protected GameVerifier(
+        IGameVerifierInfo? parent,
+        IStarWarsGameEngine gameEngine,
+        GameVerifySettings settings,
+        IServiceProvider serviceProvider) : base(parent, gameEngine, settings, serviceProvider)
+    {
+    }
+    protected GameVerifier(GameVerifierBase parent) : base(parent)
+    {
+    }
+
+    protected GameVerifier(
+        IStarWarsGameEngine gameEngine,
+        GameVerifySettings settings,
+        IServiceProvider serviceProvider) : base(gameEngine, settings, serviceProvider)
+    {
+    }
+
     public abstract void Verify(T toVerify, IReadOnlyCollection<string> contextInfo, CancellationToken token);
 }
 
-public abstract class GameVerifier(
-    IGameVerifierInfo? parent,
-    IStarWarsGameEngine gameEngine,
-    GameVerifySettings settings,
-    IServiceProvider serviceProvider)
-    : GameVerifierBase(parent, gameEngine, settings, serviceProvider)
+public abstract class GameVerifier : GameVerifierBase
 {
+    protected GameVerifier(
+        IGameVerifierInfo? parent,
+        IStarWarsGameEngine gameEngine,
+        GameVerifySettings settings,
+        IServiceProvider serviceProvider) 
+        : base(parent, gameEngine, settings, serviceProvider)
+    {
+    }
+    protected GameVerifier(GameVerifierBase parent) : base(parent)
+    {
+    }
+
+    protected GameVerifier(
+        IStarWarsGameEngine gameEngine,
+        GameVerifySettings settings,
+        IServiceProvider serviceProvider)
+        : base(gameEngine, settings, serviceProvider)
+    {
+    }
+
     public abstract void Verify(CancellationToken token);
 }
diff --git a/src/ModVerify/Verifiers/GameVerifierBase.cs b/src/ModVerify/Verifiers/GameVerifierBase.cs
@@ -40,6 +40,28 @@ public abstract class GameVerifierBase : IGameVerifierInfo
 
     protected IReadOnlyList<IGameVerifierInfo> VerifierChain { get; }
 
+
+    protected GameVerifierBase(GameVerifierBase parent)
+    {
+        if (parent == null)
+            throw new ArgumentNullException(nameof(parent));
+        Services = parent.Services;
+        Logger = Services.GetService<ILoggerFactory>()?.CreateLogger(GetType()) ?? NullLogger.Instance;
+        FileSystem = Services.GetRequiredService<IFileSystem>();
+        Parent = parent;
+        Settings = parent.Settings;
+        GameEngine = parent.GameEngine;
+        VerifierChain = CreateVerifierChain();
+    }
+
+    protected GameVerifierBase(
+        IStarWarsGameEngine gameEngine,
+        GameVerifySettings settings,
+        IServiceProvider serviceProvider)
+    : this (null, gameEngine, settings, serviceProvider)
+    {
+    }
+
     protected GameVerifierBase(
         IGameVerifierInfo? parent,
         IStarWarsGameEngine gameEngine,
diff --git a/src/ModVerify/Verifiers/GuiDialogs/GuiDialogsVerifier.cs b/src/ModVerify/Verifiers/GuiDialogs/GuiDialogsVerifier.cs
@@ -22,12 +22,14 @@ sealed class GuiDialogsVerifier : GameVerifier
     private readonly IAlreadyVerifiedCache? _cache;
     private readonly TextureVeifier _textureVerifier;
 
-    public GuiDialogsVerifier(IStarWarsGameEngine gameEngine,
+    public GuiDialogsVerifier(
+        IStarWarsGameEngine gameEngine,
         GameVerifySettings settings,
-        IServiceProvider serviceProvider) : base(null, gameEngine, settings, serviceProvider)
+        IServiceProvider serviceProvider) 
+        : base(gameEngine, settings, serviceProvider)
     {
         _cache = serviceProvider.GetService<IAlreadyVerifiedCache>();
-        _textureVerifier = new TextureVeifier(this, gameEngine, settings, serviceProvider);
+        _textureVerifier = new TextureVeifier(this);
     }
 
     public override void Verify(CancellationToken token)
diff --git a/src/ModVerify/Verifiers/SfxEvents/SfxEventVerifier.cs b/src/ModVerify/Verifiers/SfxEvents/SfxEventVerifier.cs
@@ -30,13 +30,16 @@ public sealed partial class SfxEventVerifier : NamedGameEntityVerifier<SfxEvent>
     public override string FriendlyName => "SFX Events";
     public override string EntityTypeName => "SFXEvent";
 
-    public SfxEventVerifier(IStarWarsGameEngine gameEngine, GameVerifySettings settings, IServiceProvider serviceProvider) 
-        : base( gameEngine, settings, serviceProvider)
+    public SfxEventVerifier(
+        IStarWarsGameEngine gameEngine,
+        GameVerifySettings settings, 
+        IServiceProvider serviceProvider) 
+        : base(gameEngine, settings, serviceProvider)
     {
         _languageManager = serviceProvider.GetRequiredService<IGameLanguageManagerProvider>()
             .GetLanguageManager(Repository.EngineType);
         _fileSystem = serviceProvider.GetRequiredService<IFileSystem>();
-        _audioFileVerifier = new AudioFileVerifier(this, gameEngine, settings, serviceProvider);
+        _audioFileVerifier = new AudioFileVerifier(this);
         _languagesToVerify = GetLanguagesToVerify();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`namespace AET.ModVerify.Verifiers.CommandBar;`
`7`	`7`
`8`	`8`	`public partial class CommandBarVerifier(IStarWarsGameEngine gameEngine, GameVerifySettings settings, IServiceProvider serviceProvider)`
`9`		`- : GameVerifier(null, gameEngine, settings, serviceProvider)`
	`9`	`+ : GameVerifier(gameEngine, settings, serviceProvider)`
`10`	`10`	`{`
`11`	`11`	`public const string CommandBarNoShellsGroup = "CMDBAR00";`
`12`	`12`	`public const string CommandBarManyShellsGroup = "CMDBAR01";`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public sealed class GameEngineErrorCollector(`
`13`	`13`	`IStarWarsGameEngine gameEngine,`
`14`	`14`	`GameVerifySettings settings,`
`15`	`15`	`IServiceProvider serviceProvider)`
`16`		`- : GameVerifier(null, gameEngine, settings, serviceProvider)`
	`16`	`+ : GameVerifier(gameEngine, settings, serviceProvider)`
`17`	`17`	`{`
`18`	`18`	`public override string FriendlyName => "Game Engine Initialization";`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public GameObjectTypeVerifier(`
`24`	`24`	`IServiceProvider serviceProvider)`
`25`	`25`	`: base(gameEngine, settings, serviceProvider)`
`26`	`26`	`{`
`27`		`- _singleModelVerifier = new SingleModelVerifier(this, gameEngine, settings, serviceProvider);`
	`27`	`+ _singleModelVerifier = new SingleModelVerifier(this);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`protected override void VerifyEntity(GameObject entity, string[] context, double progress, CancellationToken token)`