Merge branch 'dev'

mrudat · mrudat · commit 649fe17548bb · 2021-07-18T00:14:54.000+10:00
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@
 */obj/*
 
 .editorconfig
+
+UniquePlayer/Properties/launchSettings.json
diff --git a/Tests/TextureSets_Tests.cs b/Tests/TextureSets_Tests.cs
@@ -1,5 +1,8 @@
 ﻿using Moq;
 using Mutagen.Bethesda;
+using Mutagen.Bethesda.Plugins;
+using Mutagen.Bethesda.Plugins.Cache;
+using Mutagen.Bethesda.Plugins.Exceptions;
 using Mutagen.Bethesda.Skyrim;
 using System.Collections.Generic;
 using System.IO;
@@ -42,7 +45,7 @@ public void TestUpdateTextureSet()
                 EditorID = "oldTextureSet",
             };
 
-            linkCache.Setup(x => x.TryResolve<ITextureSetGetter>(textureSetFormKey, out oldTextureSet)).Returns(true);
+            linkCache.Setup(x => x.TryResolve<ITextureSetGetter>(textureSetFormKey, out oldTextureSet, ResolveTarget.Winner)).Returns(true);
 
             TextureSets program = new(patchMod.Object, linkCache.Object);
 
@@ -73,7 +76,7 @@ public void TestUpdateTextureSet2()
                 Diffuse = "replaced_d.dds",
             };
 
-            linkCache.Setup(x => x.TryResolve<ITextureSetGetter>(textureSetFormKey, out oldTextureSet)).Returns(true);
+            linkCache.Setup(x => x.TryResolve<ITextureSetGetter>(textureSetFormKey, out oldTextureSet, ResolveTarget.Winner)).Returns(true);
 
             var patchMod = new SkyrimMod(PatchModKey, SkyrimRelease.SkyrimSE);
 
diff --git a/Tests/UpdateHeadParts_Tests.cs b/Tests/UpdateHeadParts_Tests.cs
@@ -1,5 +1,8 @@
 using Moq;
 using Mutagen.Bethesda;
+using Mutagen.Bethesda.Plugins;
+using Mutagen.Bethesda.Plugins.Cache;
+using Mutagen.Bethesda.Plugins.Exceptions;
 using Mutagen.Bethesda.Skyrim;
 using System.Collections.Generic;
 using System.IO;
diff --git a/UniquePlayer/FormKeys/FormList.cs b/UniquePlayer/FormKeys/FormList.cs
@@ -1,5 +1,6 @@
 // Autogenerated by https://github.com/Mutagen-Modding/Mutagen.Bethesda.FormKeys
 
+using Mutagen.Bethesda.Plugins;
 using Mutagen.Bethesda.Skyrim;
 
 namespace Mutagen.Bethesda.FormKeys.SkyrimSE
@@ -8,7 +9,7 @@ public static partial class RaceCompatibility
     {
         public static class FormList
         {
-            private static FormLink<IFormListGetter> Construct(uint id) => new FormLink<IFormListGetter>(ModKey.MakeFormKey(id));
+            private static FormLink<IFormListGetter> Construct(uint id) => new(ModKey.MakeFormKey(id));
             public static FormLink<IFormListGetter> PlayableRaceList => Construct(0xd62);
             public static FormLink<IFormListGetter> PlayableVampireList => Construct(0xd63);
         }
diff --git a/UniquePlayer/FormKeys/Keyword.cs b/UniquePlayer/FormKeys/Keyword.cs
@@ -1,5 +1,6 @@
 // Autogenerated by https://github.com/Mutagen-Modding/Mutagen.Bethesda.FormKeys
 
+using Mutagen.Bethesda.Plugins;
 using Mutagen.Bethesda.Skyrim;
 
 namespace Mutagen.Bethesda.FormKeys.SkyrimSE
@@ -8,7 +9,7 @@ public static partial class RaceCompatibility
     {
         public static class Keyword
         {
-            private static FormLink<IKeywordGetter> Construct(uint id) => new FormLink<IKeywordGetter>(ModKey.MakeFormKey(id));
+            private static FormLink<IKeywordGetter> Construct(uint id) => new(ModKey.MakeFormKey(id));
             public static FormLink<IKeywordGetter> ActorProxyBreton => Construct(0x1d8a);
             public static FormLink<IKeywordGetter> ActorProxyArgonian => Construct(0x1d8b);
             public static FormLink<IKeywordGetter> ActorProxyKhajiit => Construct(0x1d8c);
diff --git a/UniquePlayer/FormKeys/ModKey.cs b/UniquePlayer/FormKeys/ModKey.cs
@@ -1,3 +1,4 @@
+using Mutagen.Bethesda.Plugins;
 using System.CodeDom.Compiler;
 
 namespace Mutagen.Bethesda.FormKeys.SkyrimSE
diff --git a/UniquePlayer/FormKeys/Quest.cs b/UniquePlayer/FormKeys/Quest.cs
@@ -1,5 +1,6 @@
 // Autogenerated by https://github.com/Mutagen-Modding/Mutagen.Bethesda.FormKeys
 
+using Mutagen.Bethesda.Plugins;
 using Mutagen.Bethesda.Skyrim;
 
 namespace Mutagen.Bethesda.FormKeys.SkyrimSE
@@ -8,7 +9,7 @@ public static partial class RaceCompatibility
     {
         public static class Quest
         {
-            private static FormLink<IQuestGetter> Construct(uint id) => new FormLink<IQuestGetter>(ModKey.MakeFormKey(id));
+            private static FormLink<IQuestGetter> Construct(uint id) => new(ModKey.MakeFormKey(id));
             public static FormLink<IQuestGetter> RaceDispatcher => Construct(0x9f27);
         }
     }
diff --git a/UniquePlayer/HeadParts.cs b/UniquePlayer/HeadParts.cs
@@ -1,4 +1,8 @@
 ﻿using Mutagen.Bethesda;
+using Mutagen.Bethesda.Plugins;
+using Mutagen.Bethesda.Plugins.Cache;
+using Mutagen.Bethesda.Plugins.Exceptions;
+using Mutagen.Bethesda.Plugins.Records;
 using Mutagen.Bethesda.Skyrim;
 using Noggog;
 using System;
@@ -71,10 +75,13 @@ public void UpdateHeadPart(IFormLinkGetter<IHeadPartGetter> headPartItem, string
                 };
 
                 var newHeadPart = PatchMod.HeadParts.AddNew($"{headPart.EditorID}_UniquePlayer");
-                newHeadPart.DeepCopyIn(headPart, new HeadPart.TranslationMask(defaultOn: true)
+
+                newHeadPart.DeepCopyIn(headPart, out var foo, new HeadPart.TranslationMask(defaultOn: true)
                 {
                     EditorID = false
                 });
+                if (foo.IsInError() && foo.Overall is Exception e) throw e;
+                
                 // TODO duplicate headPart FormList and restrict to player only?
 
                 newHeadPart.Parts.ForEach(x =>
@@ -90,7 +97,7 @@ public void UpdateHeadPart(IFormLinkGetter<IHeadPartGetter> headPartItem, string
             }
             catch (Exception e)
             {
-                throw RecordException.Factory(e, headPart);
+                throw RecordException.Enrich(e, headPart);
             }
         }
     }
diff --git a/UniquePlayer/Program.cs b/UniquePlayer/Program.cs
@@ -1,5 +1,9 @@
 using Mutagen.Bethesda;
 using Mutagen.Bethesda.FormKeys.SkyrimSE;
+using Mutagen.Bethesda.Plugins;
+using Mutagen.Bethesda.Plugins.Cache;
+using Mutagen.Bethesda.Plugins.Exceptions;
+using Mutagen.Bethesda.Plugins.Order;
 using Mutagen.Bethesda.Skyrim;
 using Mutagen.Bethesda.Synthesis;
 using Noggog;
@@ -21,7 +25,7 @@ public class Program
 
         private readonly ILinkCache<ISkyrimMod, ISkyrimModGetter> LinkCache;
 
-        private readonly LoadOrder<IModListing<ISkyrimModGetter>> LoadOrder;
+        private readonly ILoadOrder<IModListing<ISkyrimModGetter>> LoadOrder;
 
         private readonly IFileSystem _fileSystem;
         private readonly System.IO.Abstractions.IPath Path;
@@ -112,12 +116,12 @@ public void RunPatch()
 
             var victimRaceFormKeys = playableRaceFormLinks.Select(x => x.FormKey.AsLinkGetter<IRaceGetter>()).Concat(playableVampireRaceFormLinks.Select(x => x.FormKey.AsLinkGetter<IRaceGetter>())).ToHashSet();
 
-            var otherFormLists =
+            var otherFormLists = (
                 from x in LoadOrder.PriorityOrder.WinningOverrides<IFormListGetter>()
                 where !x.Equals(RaceCompatibility.FormList.PlayableRaceList)
                 && !x.Equals(RaceCompatibility.FormList.PlayableVampireList)
                 && x.ContainedFormLinks.Any(y => victimRaceFormKeys.Contains(y.FormKey.AsLink<IRaceGetter>()))
-                select PatchMod.FormLists.GetOrAddAsOverride(x);
+                select PatchMod.FormLists.GetOrAddAsOverride(x)).ToList();
 
             var modifiedPlayableRaceFormList = PatchMod.FormLists.GetOrAddAsOverride(playableRaceFormList);
             var modifiedPlayableVampireRaceFormList = PatchMod.FormLists.GetOrAddAsOverride(playableVampireRaceFormList);
@@ -132,7 +136,7 @@ from x in LoadOrder.PriorityOrder.WinningOverrides<IFormListGetter>()
                 var vampireRace = vampireRaceLink.Resolve(LinkCache);
 
                 if (!race.Flags.HasFlag(Race.Flag.Playable))
-                    throw RecordException.Factory(new Exception("Race in PlayableRaceList was not playable"), race);
+                    throw RecordException.Create("Race in PlayableRaceList was not playable", race);
 
                 var newRace = CopyRace(race, texturesPath, meshesPath);
 
@@ -203,12 +207,13 @@ void applyModelEdit(Model? model)
                 if (needsEdit)
                 {
                     var newArmorAddon = PatchMod.ArmorAddons.AddNew($"{armorAddon.EditorID}_UniquePlayer");
-                    newArmorAddon.DeepCopyIn(armorAddon, new ArmorAddon.TranslationMask(defaultOn: true)
+                    newArmorAddon.DeepCopyIn(armorAddon, out var ex, new ArmorAddon.TranslationMask(defaultOn: true)
                     {
                         EditorID = false,
                         Race = false,
                         AdditionalRaces = false
                     });
+                    if (ex.Overall is Exception e) throw e;
                     newArmorAddon.Race.SetTo(replacementRaces.First());
                     replacementRaces.Skip(1).ForEach(x => newArmorAddon.AdditionalRaces.Add(x));
 
@@ -258,11 +263,12 @@ from armor in LoadOrder.PriorityOrder.WinningOverrides<IArmorGetter>()
         public Race CopyRace(IRaceGetter oldRace, string texturesPath, string meshesPath)
         {
             var newRace = PatchMod.Races.AddNew($"{oldRace.EditorID}_UniquePlayer");
-            newRace.DeepCopyIn(oldRace, new Race.TranslationMask(defaultOn: true)
+            newRace.DeepCopyIn(oldRace, out var ex, new Race.TranslationMask(defaultOn: true)
             {
                 EditorID = false,
                 ArmorRace = false
             });
+            if (ex.Overall is Exception e) throw e;
             newRace.MorphRace.SetTo(oldRace);
             replacementPlayableRacesDict.Add(oldRace.FormKey, newRace.FormKey);
 
diff --git a/UniquePlayer/TextureSets.cs b/UniquePlayer/TextureSets.cs
@@ -1,4 +1,7 @@
 ﻿using Mutagen.Bethesda;
+using Mutagen.Bethesda.Plugins;
+using Mutagen.Bethesda.Plugins.Cache;
+using Mutagen.Bethesda.Plugins.Exceptions;
 using Mutagen.Bethesda.Skyrim;
 using System;
 using System.Collections.Generic;
@@ -51,10 +54,11 @@ public bool UpdateTextureSet(IFormLinkGetter<ITextureSetGetter> textureSetFormLi
                 }
 
                 var newTxst = PatchMod.TextureSets.AddNew($"{txst.EditorID}_UniquePlayer");
-                newTxst.DeepCopyIn(txst, new TextureSet.TranslationMask(defaultOn: true)
+                newTxst.DeepCopyIn(txst, out var ex, new TextureSet.TranslationMask(defaultOn: true)
                 {
                     EditorID = false
                 });
+                if (ex.Overall is Exception e) throw e;
                 replacementTextureSets.Add(textureSetFormKey, newTxst.FormKey);
 
                 newTxst.Diffuse = TexturePaths.ChangeTexturePath(txst.Diffuse, ref changed, texturesPath);
@@ -69,7 +73,7 @@ public bool UpdateTextureSet(IFormLinkGetter<ITextureSetGetter> textureSetFormLi
             }
             catch (Exception e)
             {
-                throw RecordException.Factory("UpdatTextureSet", txst, e);
+                throw RecordException.Enrich(e, txst);
             }
         }
 
diff --git a/UniquePlayer/UniquePlayer.csproj b/UniquePlayer/UniquePlayer.csproj
@@ -12,8 +12,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda" Version="0.29.3" />
-    <PackageReference Include="Mutagen.Bethesda.Synthesis" Version="0.18.3" />
-    <PackageReference Include="Mutagen.Bethesda.FormKeys.SkyrimSE" Version="2.0.0" />
+    <PackageReference Include="Mutagen.Bethesda" Version="0.30.6" />
+    <PackageReference Include="Mutagen.Bethesda.Synthesis" Version="0.19.2" />
+    <PackageReference Include="Mutagen.Bethesda.FormKeys.SkyrimSE" Version="2.1.0" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`// Autogenerated by https://github.com/Mutagen-Modding/Mutagen.Bethesda.FormKeys`
`2`	`2`
	`3`	`+using Mutagen.Bethesda.Plugins;`
`3`	`4`	`using Mutagen.Bethesda.Skyrim;`
`4`	`5`
`5`	`6`	`namespace Mutagen.Bethesda.FormKeys.SkyrimSE`
`@@ -8,7 +9,7 @@ public static partial class RaceCompatibility`
`8`	`9`	`{`
`9`	`10`	`public static class FormList`
`10`	`11`	`{`
`11`		`- private static FormLink<IFormListGetter> Construct(uint id) => new FormLink<IFormListGetter>(ModKey.MakeFormKey(id));`
	`12`	`+ private static FormLink<IFormListGetter> Construct(uint id) => new(ModKey.MakeFormKey(id));`
`12`	`13`	`public static FormLink<IFormListGetter> PlayableRaceList => Construct(0xd62);`
`13`	`14`	`public static FormLink<IFormListGetter> PlayableVampireList => Construct(0xd63);`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using Mutagen.Bethesda.Plugins;`
`1`	`2`	`using System.CodeDom.Compiler;`
`2`	`3`
`3`	`4`	`namespace Mutagen.Bethesda.FormKeys.SkyrimSE`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`	`1`	`using Mutagen.Bethesda;`
	`2`	`+using Mutagen.Bethesda.Plugins;`
	`3`	`+using Mutagen.Bethesda.Plugins.Cache;`
	`4`	`+using Mutagen.Bethesda.Plugins.Exceptions;`
	`5`	`+using Mutagen.Bethesda.Plugins.Records;`
`2`	`6`	`using Mutagen.Bethesda.Skyrim;`
`3`	`7`	`using Noggog;`
`4`	`8`	`using System;`
`@@ -71,10 +75,13 @@ public void UpdateHeadPart(IFormLinkGetter<IHeadPartGetter> headPartItem, string`
`71`	`75`	`};`
`72`	`76`
`73`	`77`	`var newHeadPart = PatchMod.HeadParts.AddNew($"{headPart.EditorID}_UniquePlayer");`
`74`		`- newHeadPart.DeepCopyIn(headPart, new HeadPart.TranslationMask(defaultOn: true)`
	`78`	`+`
	`79`	`+ newHeadPart.DeepCopyIn(headPart, out var foo, new HeadPart.TranslationMask(defaultOn: true)`
`75`	`80`	`{`
`76`	`81`	`EditorID = false`
`77`	`82`	`});`
	`83`	`+ if (foo.IsInError() && foo.Overall is Exception e) throw e;`
	`84`	`+`
`78`	`85`	`// TODO duplicate headPart FormList and restrict to player only?`
`79`	`86`
`80`	`87`	`newHeadPart.Parts.ForEach(x =>`
`@@ -90,7 +97,7 @@ public void UpdateHeadPart(IFormLinkGetter<IHeadPartGetter> headPartItem, string`
`90`	`97`	`}`
`91`	`98`	`catch (Exception e)`
`92`	`99`	`{`
`93`		`- throw RecordException.Factory(e, headPart);`
	`100`	`+ throw RecordException.Enrich(e, headPart);`
`94`	`101`	`}`
`95`	`102`	`}`
`96`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`using Mutagen.Bethesda;`
	`2`	`+using Mutagen.Bethesda.Plugins;`
	`3`	`+using Mutagen.Bethesda.Plugins.Cache;`
	`4`	`+using Mutagen.Bethesda.Plugins.Exceptions;`
`2`	`5`	`using Mutagen.Bethesda.Skyrim;`
`3`	`6`	`using System;`
`4`	`7`	`using System.Collections.Generic;`
`@@ -51,10 +54,11 @@ public bool UpdateTextureSet(IFormLinkGetter<ITextureSetGetter> textureSetFormLi`
`51`	`54`	`}`
`52`	`55`
`53`	`56`	`var newTxst = PatchMod.TextureSets.AddNew($"{txst.EditorID}_UniquePlayer");`
`54`		`- newTxst.DeepCopyIn(txst, new TextureSet.TranslationMask(defaultOn: true)`
	`57`	`+ newTxst.DeepCopyIn(txst, out var ex, new TextureSet.TranslationMask(defaultOn: true)`
`55`	`58`	`{`
`56`	`59`	`EditorID = false`
`57`	`60`	`});`
	`61`	`+ if (ex.Overall is Exception e) throw e;`
`58`	`62`	`replacementTextureSets.Add(textureSetFormKey, newTxst.FormKey);`
`59`	`63`
`60`	`64`	`newTxst.Diffuse = TexturePaths.ChangeTexturePath(txst.Diffuse, ref changed, texturesPath);`
`@@ -69,7 +73,7 @@ public bool UpdateTextureSet(IFormLinkGetter<ITextureSetGetter> textureSetFormLi`
`69`	`73`	`}`
`70`	`74`	`catch (Exception e)`
`71`	`75`	`{`
`72`		`- throw RecordException.Factory("UpdatTextureSet", txst, e);`
	`76`	`+ throw RecordException.Enrich(e, txst);`
`73`	`77`	`}`
`74`	`78`	`}`
`75`	`79`