Refactor - Use GetValueOrDefault

src/Config/PathResolver.cs

@@ -47,7 +47,7 @@ public string ResolvePathAbsolute(string relative)
             : path;
     }
 
-    public string GetPath(string pathName) => Paths.TryGetValue(pathName, out var result) ? result : null;
+    public string GetPath(string pathName) => Paths.GetValueOrDefault(pathName);
 
     public string ResolvePath(string relative)
     {

src/Core/Textures/CompositedTexture.cs

@@ -80,7 +80,7 @@ public int GetSubImageAtTime(int logicalId, int tick, bool backAndForth)
         }
         else frame = tick % logicalImage.Frames;
 
-        return _layerLookup.TryGetValue(new LayerKey(logicalId, frame), out var result) ? result : 0;
+        return _layerLookup.GetValueOrDefault(new LayerKey(logicalId, frame), 0);
     }
 
     public void AddTexture(

src/Editor/EditorAssetManager.cs

@@ -83,5 +83,5 @@ public int GetIdForAsset(object asset)
         return id;
     }
 
-    public EditorAsset GetAssetForId(int id) => _assetsById.TryGetValue(id, out var asset) ? asset : null;
+    public EditorAsset GetAssetForId(int id) => _assetsById.GetValueOrDefault(id);
 }

src/Formats/Assets/WaveLib.cs

@@ -35,7 +35,7 @@ public ISample this[int instrument]
                 .ToLookup(x => x.Instrument)
                 .ToDictionary(x => x.Key, x => x.First());
 
-            return _instrumentIndex.TryGetValue(instrument, out var sample) ? sample : null;
+            return _instrumentIndex.GetValueOrDefault(instrument);
         }
     }
 

src/Formats/Containers/SpellListContainer.cs

@@ -41,8 +41,7 @@ public void Write(string path, IList<(AssetLoadContext, byte[])> assets, ModCont
 
         for(int i = 0; i <= maxId; i++)
         {
-            if (!dict.TryGetValue(i, out var bytes))
-                bytes = Blank;
+            var bytes = dict.GetValueOrDefault(i, Blank);
 
             ApiUtil.Assert(bytes.Length == SpellData.SizeOnDisk,
                 $"Expected spell data for entry {i} to be {SpellData.SizeOnDisk} bytes, but was {bytes.Length}");

src/Formats/Parsers/ItemNameMetaLoader.cs

@@ -27,9 +27,7 @@ public ListStringSet Serdes(ListStringSet existing, ISerializer s, AssetLoadCont
         if (target is not Dictionary<string, ListStringSet> dict)
             throw new FormatException($"Expected target \"{targetId}\" to be a {nameof(Dictionary<string, ListStringSet>)} but it was {target?.GetType()}");
 
-        return dict.TryGetValue(context.Language, out var list)
-            ? list
-            : null;
+        return dict.GetValueOrDefault(context.Language);
     }
 
     public object Serdes(object existing, ISerializer s, AssetLoadContext context)

src/Scripting/ControlFlowGraph.cs

@@ -53,7 +53,7 @@ from end in kvp.Value
     public ImmutableArray<int> Parents(int i) => _edgesByEnd.TryGetValue(i, out var nodes) ? nodes : ImmutableArray<int>.Empty;
     IList<int> IGraph.Children(int i) => Children(i);
     IList<int> IGraph.Parents(int i) => Parents(i);
-    public CfgEdge GetEdgeLabel(int startNode, int endNode) => _labels.TryGetValue((startNode, endNode), out var label) ? label : CfgEdge.True;
+    public CfgEdge GetEdgeLabel(int startNode, int endNode) => CollectionExtensions.GetValueOrDefault(_labels, (startNode, endNode), CfgEdge.True);
     public DominatorTree GetDominatorTree() => this.GetDominatorTree(EntryIndex);
     public DominatorTree GetPostDominatorTree() => Reverse().GetDominatorTree();
     public bool IsCyclic() => GetBackEdges().Any();

src/Tests/UAlbion.TestCommon/MockSpellManager.cs

@@ -14,7 +14,7 @@ public SpellId GetSpellId(SpellClass school, byte number)
         => _lookup.TryGetValue((school, number), out var id) ? id : SpellId.None;
 
     public SpellData GetSpellOrDefault(SpellId id)
-        => _spells.TryGetValue(id, out var spell) ? spell : null;
+        => _spells.GetValueOrDefault(id);
 
     public MockSpellManager Add(SpellData spell)
     {