Fix LE default header. Lean on GameConstants more

Noggog · Noggog · commit 674f637a0a58 · 2025-12-30T14:43:24.000-06:00
closes #650
diff --git a/Mutagen.Bethesda.Core/Plugins/Meta/GameConstants.cs b/Mutagen.Bethesda.Core/Plugins/Meta/GameConstants.cs
@@ -190,9 +190,9 @@ public GameConstants(
         DataFolderRelativePath = Path.Combine("OblivionRemastered", "Content", "Dev", "ObvData", "Data")
     };
 
-    /// <summary> 
-    /// Readonly singleton of Skyrim LE game constants 
-    /// </summary> 
+    /// <summary>
+    /// Readonly singleton of Skyrim LE game constants
+    /// </summary>
     public static readonly GameConstants SkyrimLE = new GameConstants(
         release: GameRelease.SkyrimLE,
         modHeaderLength: 24,
@@ -255,7 +255,7 @@ public GameConstants(
         languageFormat: Strings.StringsLanguageFormat.FullName,
         hasEnabledMarkers: false,
         defaultFormVersion: 43,
-        defaultModHeaderVersion: 1.71f,
+        defaultModHeaderVersion: 1.70f,
         defaultHighRangeFormId: 0x800,
         useLowerRangeFormIdVersion: 1.71f,
         myDocumentsString: "Skyrim",
@@ -273,14 +273,15 @@ public GameConstants(
         IniName = "Enderal",
     };
     
-    /// <summary> 
-    /// Readonly singleton of Skyrim SE game constants 
-    /// </summary> 
+    /// <summary>
+    /// Readonly singleton of Skyrim SE game constants
+    /// </summary>
     public static readonly GameConstants SkyrimSE = SkyrimLE with
     {
         Release = GameRelease.SkyrimSE,
         HasEnabledMarkers = true,
         DefaultFormVersion = 44,
+        DefaultModHeaderVersion = 1.71f,
         MyDocumentsString = "Skyrim Special Edition",
     };
     
diff --git a/Mutagen.Bethesda.Fallout4/Records/Fallout4ModHeader.xml b/Mutagen.Bethesda.Fallout4/Records/Fallout4ModHeader.xml
@@ -24,7 +24,7 @@
   </Object>
   <Object name="ModStats" recordType="HEDR" objType="Subrecord">
     <Fields>
-      <Float name="Version" default="1f" />
+      <Float name="Version" />
       <UInt32 name="NumRecords" />
       <UInt32 name="NextFormID" default="0x0" />
     </Fields>
diff --git a/Mutagen.Bethesda.Fallout4/Records/Fallout4Mod_Generated.cs b/Mutagen.Bethesda.Fallout4/Records/Fallout4Mod_Generated.cs
@@ -5833,11 +5833,15 @@ public Fallout4Mod(
             bool? forceUseLowerFormIDRanges = false)
             : base(modKey)
         {
+            this.Fallout4Release = release;
             if (headerVersion != null)
             {
                 this.ModHeader.Stats.Version = headerVersion.Value;
             }
-            this.Fallout4Release = release;
+            else
+            {
+                this.ModHeader.Stats.Version = GameConstants.Get(release.ToGameRelease()).DefaultModHeaderVersion ?? 0f;
+            }
             this.ModHeader.Stats.NextFormID = GetDefaultInitialNextFormID(forceUseLowerFormIDRanges: forceUseLowerFormIDRanges);
             _GameSettings_Object = new Fallout4Group<GameSetting>(this);
             _Keywords_Object = new Fallout4Group<Keyword>(this);
diff --git a/Mutagen.Bethesda.Fallout4/Records/ModStats_Generated.cs b/Mutagen.Bethesda.Fallout4/Records/ModStats_Generated.cs
@@ -51,8 +51,7 @@ public ModStats()
         #endregion
 
         #region Version
-        public static readonly Single VersionDefault = 1f;
-        public Single Version { get; set; } = VersionDefault;
+        public Single Version { get; set; } = default(Single);
         #endregion
         #region NumRecords
         public UInt32 NumRecords { get; set; } = default(UInt32);
@@ -758,7 +757,7 @@ internal partial class ModStatsSetterCommon
         public void Clear(IModStats item)
         {
             ClearPartial();
-            item.Version = ModStats.VersionDefault;
+            item.Version = default(Single);
             item.NumRecords = default(UInt32);
             item.NextFormID = ModStats.NextFormIDDefault;
         }
diff --git a/Mutagen.Bethesda.Generation/Modules/Plugin/ModModule.cs b/Mutagen.Bethesda.Generation/Modules/Plugin/ModModule.cs
@@ -136,14 +136,27 @@ public override async Task GenerateInClass(ObjectGeneration obj, StructuredStrin
         }
         using (sb.CurlyBrace())
         {
+            if (objData.GameReleaseOptions != null)
+            {
+                sb.AppendLine($"this.{ReleaseEnumName(obj)} = release;");
+            }
+
             sb.AppendLine("if (headerVersion != null)");
             using (sb.CurlyBrace())
             {
                 sb.AppendLine($"this.ModHeader.Stats.Version = headerVersion.Value;");
             }
-            if (objData.GameReleaseOptions != null)
+            sb.AppendLine("else");
+            using (sb.CurlyBrace())
             {
-                sb.AppendLine($"this.{ReleaseEnumName(obj)} = release;");
+                if (objData.GameReleaseOptions != null)
+                {
+                    sb.AppendLine($"this.ModHeader.Stats.Version = {nameof(GameConstants)}.Get(release.ToGameRelease()).DefaultModHeaderVersion ?? 0f;");
+                }
+                else
+                {
+                    sb.AppendLine($"this.ModHeader.Stats.Version = {nameof(GameConstants)}.Get({nameof(GameRelease)}.{objData.GameCategory}).DefaultModHeaderVersion ?? 0f;");
+                }
             }
 
             using (var a = sb.Call("this.ModHeader.Stats.NextFormID = GetDefaultInitialNextFormID"))
diff --git a/Mutagen.Bethesda.Oblivion/Records/ModStats_Generated.cs b/Mutagen.Bethesda.Oblivion/Records/ModStats_Generated.cs
@@ -51,8 +51,7 @@ public ModStats()
         #endregion
 
         #region Version
-        public static readonly Single VersionDefault = 1.0f;
-        public Single Version { get; set; } = VersionDefault;
+        public Single Version { get; set; } = default(Single);
         #endregion
         #region NumRecords
         public UInt32 NumRecords { get; set; } = default(UInt32);
@@ -758,7 +757,7 @@ internal partial class ModStatsSetterCommon
         public void Clear(IModStats item)
         {
             ClearPartial();
-            item.Version = ModStats.VersionDefault;
+            item.Version = default(Single);
             item.NumRecords = default(UInt32);
             item.NextFormID = ModStats.NextFormIDDefault;
         }
diff --git a/Mutagen.Bethesda.Oblivion/Records/OblivionModHeader.xml b/Mutagen.Bethesda.Oblivion/Records/OblivionModHeader.xml
@@ -15,7 +15,7 @@
   </Object>
   <Object name="ModStats" recordType="HEDR" objType="Subrecord">
     <Fields>
-      <Float name="Version" default="1.0f" />
+      <Float name="Version" />
       <UInt32 name="NumRecords" />
       <UInt32 name="NextFormID" default="0x800" />
     </Fields>
diff --git a/Mutagen.Bethesda.Oblivion/Records/OblivionMod_Generated.cs b/Mutagen.Bethesda.Oblivion/Records/OblivionMod_Generated.cs
@@ -2823,11 +2823,15 @@ public OblivionMod(
             bool? forceUseLowerFormIDRanges = false)
             : base(modKey)
         {
+            this.OblivionRelease = release;
             if (headerVersion != null)
             {
                 this.ModHeader.Stats.Version = headerVersion.Value;
             }
-            this.OblivionRelease = release;
+            else
+            {
+                this.ModHeader.Stats.Version = GameConstants.Get(release.ToGameRelease()).DefaultModHeaderVersion ?? 0f;
+            }
             this.ModHeader.Stats.NextFormID = GetDefaultInitialNextFormID(forceUseLowerFormIDRanges: forceUseLowerFormIDRanges);
             _GameSettings_Object = new OblivionGroup<GameSetting>(this);
             _Globals_Object = new OblivionGroup<Global>(this);
diff --git a/Mutagen.Bethesda.Skyrim/Records/ModStats_Generated.cs b/Mutagen.Bethesda.Skyrim/Records/ModStats_Generated.cs
@@ -51,8 +51,7 @@ public ModStats()
         #endregion
 
         #region Version
-        public static readonly Single VersionDefault = 1.71f;
-        public Single Version { get; set; } = VersionDefault;
+        public Single Version { get; set; } = default(Single);
         #endregion
         #region NumRecords
         public UInt32 NumRecords { get; set; } = default(UInt32);
@@ -758,7 +757,7 @@ internal partial class ModStatsSetterCommon
         public void Clear(IModStats item)
         {
             ClearPartial();
-            item.Version = ModStats.VersionDefault;
+            item.Version = default(Single);
             item.NumRecords = default(UInt32);
             item.NextFormID = ModStats.NextFormIDDefault;
         }
diff --git a/Mutagen.Bethesda.Skyrim/Records/SkyrimModHeader.xml b/Mutagen.Bethesda.Skyrim/Records/SkyrimModHeader.xml
@@ -22,7 +22,7 @@
   </Object>
   <Object name="ModStats" recordType="HEDR" objType="Subrecord">
     <Fields>
-      <Float name="Version" default="1.71f" />
+      <Float name="Version" />
       <UInt32 name="NumRecords" />
       <UInt32 name="NextFormID" default="0x0" />
     </Fields>
diff --git a/Mutagen.Bethesda.Skyrim/Records/SkyrimMod_Generated.cs b/Mutagen.Bethesda.Skyrim/Records/SkyrimMod_Generated.cs
@@ -5317,11 +5317,15 @@ public SkyrimMod(
             bool? forceUseLowerFormIDRanges = false)
             : base(modKey)
         {
+            this.SkyrimRelease = release;
             if (headerVersion != null)
             {
                 this.ModHeader.Stats.Version = headerVersion.Value;
             }
-            this.SkyrimRelease = release;
+            else
+            {
+                this.ModHeader.Stats.Version = GameConstants.Get(release.ToGameRelease()).DefaultModHeaderVersion ?? 0f;
+            }
             this.ModHeader.Stats.NextFormID = GetDefaultInitialNextFormID(forceUseLowerFormIDRanges: forceUseLowerFormIDRanges);
             _GameSettings_Object = new SkyrimGroup<GameSetting>(this);
             _Keywords_Object = new SkyrimGroup<Keyword>(this);
diff --git a/Mutagen.Bethesda.Starfield/Records/ModStats_Generated.cs b/Mutagen.Bethesda.Starfield/Records/ModStats_Generated.cs
@@ -51,8 +51,7 @@ public ModStats()
         #endregion
 
         #region Version
-        public static readonly Single VersionDefault = 0.96f;
-        public Single Version { get; set; } = VersionDefault;
+        public Single Version { get; set; } = default(Single);
         #endregion
         #region NumRecords
         public UInt32 NumRecords { get; set; } = default(UInt32);
@@ -758,7 +757,7 @@ internal partial class ModStatsSetterCommon
         public void Clear(IModStats item)
         {
             ClearPartial();
-            item.Version = ModStats.VersionDefault;
+            item.Version = default(Single);
             item.NumRecords = default(UInt32);
             item.NextFormID = ModStats.NextFormIDDefault;
         }
diff --git a/Mutagen.Bethesda.Starfield/Records/StarfieldModHeader.xml b/Mutagen.Bethesda.Starfield/Records/StarfieldModHeader.xml
@@ -26,7 +26,7 @@
   </Object>
   <Object name="ModStats" recordType="HEDR" objType="Subrecord">
     <Fields>
-      <Float name="Version" default="0.96f" />
+      <Float name="Version" />
       <UInt32 name="NumRecords" />
       <UInt32 name="NextFormID" default="0x0" />
     </Fields>
diff --git a/Mutagen.Bethesda.Starfield/Records/StarfieldMod_Generated.cs b/Mutagen.Bethesda.Starfield/Records/StarfieldMod_Generated.cs
@@ -7983,11 +7983,15 @@ public StarfieldMod(
             bool? forceUseLowerFormIDRanges = false)
             : base(modKey)
         {
+            this.StarfieldRelease = release;
             if (headerVersion != null)
             {
                 this.ModHeader.Stats.Version = headerVersion.Value;
             }
-            this.StarfieldRelease = release;
+            else
+            {
+                this.ModHeader.Stats.Version = GameConstants.Get(release.ToGameRelease()).DefaultModHeaderVersion ?? 0f;
+            }
             this.ModHeader.Stats.NextFormID = GetDefaultInitialNextFormID(forceUseLowerFormIDRanges: forceUseLowerFormIDRanges);
             _GameSettings_Object = new StarfieldGroup<GameSetting>(this);
             _Keywords_Object = new StarfieldGroup<Keyword>(this);
diff --git a/Mutagen.Bethesda.UnitTests/Plugins/DefaultHeaderTests.cs b/Mutagen.Bethesda.UnitTests/Plugins/DefaultHeaderTests.cs
@@ -37,10 +37,25 @@ public void Starfield(ModKey modKey)
     }
 
     [Theory, MutagenAutoData]
-    public void Skyrim(ModKey modKey)
+    public void SkyrimSE(ModKey modKey)
     {
         var mod = new SkyrimMod(modKey, SkyrimRelease.SkyrimSE);
         mod.ModHeader.Stats.Version.ShouldBe(1.71f);
         mod.ModHeader.Stats.NextFormID.ShouldEqual(0x800);
     }
+
+    [Theory, MutagenAutoData]
+    public void SkyrimLE(ModKey modKey)
+    {
+        var mod = new SkyrimMod(modKey, SkyrimRelease.SkyrimLE);
+        mod.ModHeader.Stats.Version.ShouldBe(1.70f);
+        mod.ModHeader.Stats.NextFormID.ShouldEqual(0x800);
+    }
+    
+    [Theory, MutagenAutoData]
+    public void ExplicitHeaderVersionOverride_SkyrimSE(ModKey modKey)
+    {
+        var mod = new SkyrimMod(modKey, SkyrimRelease.SkyrimSE, headerVersion: 2.0f);
+        mod.ModHeader.Stats.Version.ShouldBe(2.0f);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -5833,11 +5833,15 @@ public Fallout4Mod(`
`5833`	`5833`	`bool? forceUseLowerFormIDRanges = false)`
`5834`	`5834`	`: base(modKey)`
`5835`	`5835`	`{`
	`5836`	`+ this.Fallout4Release = release;`
`5836`	`5837`	`if (headerVersion != null)`
`5837`	`5838`	`{`
`5838`	`5839`	`this.ModHeader.Stats.Version = headerVersion.Value;`
`5839`	`5840`	`}`
`5840`		`- this.Fallout4Release = release;`
	`5841`	`+ else`
	`5842`	`+ {`
	`5843`	`+ this.ModHeader.Stats.Version = GameConstants.Get(release.ToGameRelease()).DefaultModHeaderVersion ?? 0f;`
	`5844`	`+ }`
`5841`	`5845`	`this.ModHeader.Stats.NextFormID = GetDefaultInitialNextFormID(forceUseLowerFormIDRanges: forceUseLowerFormIDRanges);`
`5842`	`5846`	`_GameSettings_Object = new Fallout4Group<GameSetting>(this);`
`5843`	`5847`	`_Keywords_Object = new Fallout4Group<Keyword>(this);`
Original file line number	Diff line number	Diff line change
`@@ -136,14 +136,27 @@ public override async Task GenerateInClass(ObjectGeneration obj, StructuredStrin`
`136`	`136`	`}`
`137`	`137`	`using (sb.CurlyBrace())`
`138`	`138`	`{`
	`139`	`+ if (objData.GameReleaseOptions != null)`
	`140`	`+ {`
	`141`	`+ sb.AppendLine($"this.{ReleaseEnumName(obj)} = release;");`
	`142`	`+ }`
	`143`	`+`
`139`	`144`	`sb.AppendLine("if (headerVersion != null)");`
`140`	`145`	`using (sb.CurlyBrace())`
`141`	`146`	`{`
`142`	`147`	`sb.AppendLine($"this.ModHeader.Stats.Version = headerVersion.Value;");`
`143`	`148`	`}`
`144`		`- if (objData.GameReleaseOptions != null)`
	`149`	`+ sb.AppendLine("else");`
	`150`	`+ using (sb.CurlyBrace())`
`145`	`151`	`{`
`146`		`- sb.AppendLine($"this.{ReleaseEnumName(obj)} = release;");`
	`152`	`+ if (objData.GameReleaseOptions != null)`
	`153`	`+ {`
	`154`	`+ sb.AppendLine($"this.ModHeader.Stats.Version = {nameof(GameConstants)}.Get(release.ToGameRelease()).DefaultModHeaderVersion ?? 0f;");`
	`155`	`+ }`
	`156`	`+ else`
	`157`	`+ {`
	`158`	`+ sb.AppendLine($"this.ModHeader.Stats.Version = {nameof(GameConstants)}.Get({nameof(GameRelease)}.{objData.GameCategory}).DefaultModHeaderVersion ?? 0f;");`
	`159`	`+ }`
`147`	`160`	`}`
`148`	`161`
`149`	`162`	`using (var a = sb.Call("this.ModHeader.Stats.NextFormID = GetDefaultInitialNextFormID"))`
Original file line number	Diff line number	Diff line change
`@@ -2823,11 +2823,15 @@ public OblivionMod(`
`2823`	`2823`	`bool? forceUseLowerFormIDRanges = false)`
`2824`	`2824`	`: base(modKey)`
`2825`	`2825`	`{`
	`2826`	`+ this.OblivionRelease = release;`
`2826`	`2827`	`if (headerVersion != null)`
`2827`	`2828`	`{`
`2828`	`2829`	`this.ModHeader.Stats.Version = headerVersion.Value;`
`2829`	`2830`	`}`
`2830`		`- this.OblivionRelease = release;`
	`2831`	`+ else`
	`2832`	`+ {`
	`2833`	`+ this.ModHeader.Stats.Version = GameConstants.Get(release.ToGameRelease()).DefaultModHeaderVersion ?? 0f;`
	`2834`	`+ }`
`2831`	`2835`	`this.ModHeader.Stats.NextFormID = GetDefaultInitialNextFormID(forceUseLowerFormIDRanges: forceUseLowerFormIDRanges);`
`2832`	`2836`	`_GameSettings_Object = new OblivionGroup<GameSetting>(this);`
`2833`	`2837`	`_Globals_Object = new OblivionGroup<Global>(this);`