IModMasterFlagsGetter

Mutagen-Modding · Sep 7, 2024 · d6975d3 · d6975d3
1 parent ce6ec4c
commit d6975d3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/Mutagen.Bethesda.Core/Plugins/Binary/Parameters/BinaryWriteParameters.cs b/Mutagen.Bethesda.Core/Plugins/Binary/Parameters/BinaryWriteParameters.cs
@@ -101,7 +101,7 @@ public sealed record BinaryWriteParameters
     /// <summary>
     /// Load order.  Required for games with Separated Load Order lists per master type
     /// </summary>
-    public ILoadOrderGetter<IModFlagsGetter>? LoadOrder { get; init; }
+    public ILoadOrderGetter<IModMasterFlagsGetter>? LoadOrder { get; init; }
 
     /// <summary>
     /// Whether to use multithreading when possible

diff --git a/Mutagen.Bethesda.Core/Plugins/Binary/Translations/ModHeaderWriteLogic.cs b/Mutagen.Bethesda.Core/Plugins/Binary/Translations/ModHeaderWriteLogic.cs
@@ -155,7 +155,7 @@ private void PostProcessAdjustments(
         MutagenWriter writer,
         IModGetter mod,
         IModHeaderCommon modHeader,
-        ILoadOrderGetter<IModFlagsGetter>? loadOrder)
+        ILoadOrderGetter<IModMasterFlagsGetter>? loadOrder)
     {
         HandleDisallowedLowerFormIDs();
         writer.MetaData.MasterReferences = ConstructWriteMasters(mod);

diff --git a/Mutagen.Bethesda.Core/Plugins/Masters/SeparatedMasterPackage.cs b/Mutagen.Bethesda.Core/Plugins/Masters/SeparatedMasterPackage.cs
@@ -51,7 +51,7 @@ public static IReadOnlySeparatedMasterPackage Factory(
         ModKey currentModKey,
         MasterStyle style,
         IReadOnlyMasterReferenceCollection masters,
-        ILoadOrderGetter<IModFlagsGetter>? loadOrder)
+        ILoadOrderGetter<IModMasterFlagsGetter>? loadOrder)
     {
         var constants = GameConstants.Get(release);
         if (constants.SeparateMasterLoadOrders)
@@ -151,13 +151,13 @@ internal static IReadOnlySeparatedMasterPackage Separate(
         ModKey currentModKey,
         MasterStyle style,
         IReadOnlyMasterReferenceCollection masters,
-        ILoadOrderGetter<IModFlagsGetter>? loadOrder)
+        ILoadOrderGetter<IModMasterFlagsGetter>? loadOrder)
     {
         var normal = new List<ModKey>();
         var medium = new List<ModKey>();
         var light = new List<ModKey>();
 
-        void AddToList(IModFlagsGetter mod, ModKey modKey)
+        void AddToList(IModMasterFlagsGetter mod, ModKey modKey)
         {
             if (mod.IsMediumMaster)
             {

diff --git a/Mutagen.Bethesda.Core/Plugins/Records/AMod.cs b/Mutagen.Bethesda.Core/Plugins/Records/AMod.cs
@@ -50,13 +50,13 @@ public AMod(ModKey modKey)
     public abstract bool UsingLocalization { get; set; }
     bool IModFlagsGetter.UsingLocalization => throw new NotImplementedException();
     public abstract bool IsMaster { get; set; }
-    bool IModFlagsGetter.IsMaster => throw new NotImplementedException();
+    bool IModMasterFlagsGetter.IsMaster => throw new NotImplementedException();
     public abstract bool CanBeSmallMaster { get; }
     public abstract bool IsSmallMaster { get; set; }
-    bool IModFlagsGetter.IsSmallMaster => throw new NotImplementedException();
+    bool IModMasterFlagsGetter.IsSmallMaster => throw new NotImplementedException();
     public abstract bool CanBeMediumMaster { get; }
     public abstract bool IsMediumMaster { get; set; }
-    bool IModFlagsGetter.IsMediumMaster => throw new NotImplementedException();
+    bool IModMasterFlagsGetter.IsMediumMaster => throw new NotImplementedException();
     public abstract bool ListsOverriddenForms { get; }
     IGroup<T>? IMod.TryGetTopLevelGroup<T>() => throw new NotImplementedException();
     IGroup? IMod.TryGetTopLevelGroup(Type t) => throw new NotImplementedException();

diff --git a/Mutagen.Bethesda.Core/Plugins/Records/ModFlags.cs b/Mutagen.Bethesda.Core/Plugins/Records/ModFlags.cs
@@ -1,6 +1,6 @@
 namespace Mutagen.Bethesda.Plugins.Records;
 
-public interface IModFlagsGetter : IModKeyed
+public interface IModFlagsGetter : IModMasterFlagsGetter, IModKeyed
 {
     /// <summary>
     /// Whether a mod supports localization features
@@ -12,6 +12,14 @@ public interface IModFlagsGetter : IModKeyed
     /// </summary>
     bool UsingLocalization { get; }
 
+    /// <summary>
+    /// Whether a mod lists overridden forms in its header
+    /// </summary>
+    bool ListsOverriddenForms { get; }
+}
+
+public interface IModMasterFlagsGetter : IModKeyed
+{
     /// <summary>
     /// Whether a mod supports Small Master features
     /// </summary>
@@ -36,11 +44,6 @@ public interface IModFlagsGetter : IModKeyed
     /// Whether a mod has Master flag enabled
     /// </summary>
     bool IsMaster { get; }
-
-    /// <summary>
-    /// Whether a mod lists overridden forms in its header
-    /// </summary>
-    bool ListsOverriddenForms { get; }
 }
 
 public record ModFlags : IModFlagsGetter