Attempt at cleaning up DBCDStorage.cs diff

wowdev · Aug 9, 2024 · fca6efb · fca6efb
1 parent 247c1cc
commit fca6efb
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/DBCD/DBCDStorage.cs b/DBCD/DBCDStorage.cs
@@ -108,11 +108,12 @@ public interface IDBCDStorage : IEnumerable<DynamicKeyValuePair<int>>, IDictiona
 
         DBCDRow ConstructRow(int index);
 
+        Dictionary<ulong, int> GetEncryptedSections();
+        Dictionary<ulong, int[]> GetEncryptedIDs();
+
         void ApplyingHotfixes(HotfixReader hotfixReader);
         void ApplyingHotfixes(HotfixReader hotfixReader, HotfixReader.RowProcessor processor);
 
-        Dictionary<ulong, int> GetEncryptedSections();
-
         void Save(string filename);
 
         Dictionary<int, DBCDRow> ToDictionary();
@@ -145,15 +146,6 @@ public DBCDStorage(DBParser parser, Storage<T> storage, DBCDInfo info) : base(ne
             storage.Clear();
         }
 
-        IEnumerator<DynamicKeyValuePair<int>> IEnumerable<DynamicKeyValuePair<int>>.GetEnumerator()
-        {
-            var enumerator = GetEnumerator();
-            while (enumerator.MoveNext())
-                yield return new DynamicKeyValuePair<int>(enumerator.Current.Key, enumerator.Current.Value);
-        }
-
-        public Dictionary<ulong, int> GetEncryptedSections() => this.parser.GetEncryptedSections();
-
         public void ApplyingHotfixes(HotfixReader hotfixReader)
         {
             this.ApplyingHotfixes(hotfixReader, null);
@@ -166,7 +158,7 @@ public void ApplyingHotfixes(HotfixReader hotfixReader, HotfixReader.RowProcesso
             hotfixReader.ApplyHotfixes(mutableStorage, this.parser, processor);
 
 #if NETSTANDARD2_0
-            foreach(var record in mutableStorage)
+            foreach (var record in mutableStorage)
                 base[record.Key] = new DBCDRow(record.Key, record.Value, fieldAccessor);
 #else
             foreach (var (id, row) in mutableStorage)
@@ -176,6 +168,16 @@ public void ApplyingHotfixes(HotfixReader hotfixReader, HotfixReader.RowProcesso
                 base.Remove(key);
         }
 
+        IEnumerator<DynamicKeyValuePair<int>> IEnumerable<DynamicKeyValuePair<int>>.GetEnumerator()
+        {
+            var enumerator = GetEnumerator();
+            while (enumerator.MoveNext())
+                yield return new DynamicKeyValuePair<int>(enumerator.Current.Key, enumerator.Current.Value);
+        }
+
+        public Dictionary<ulong, int> GetEncryptedSections() => this.parser.GetEncryptedSections();
+        public Dictionary<ulong, int[]> GetEncryptedIDs() => this.parser.GetEncryptedIDs();
+
         public void Save(string filename)
         {
 #if NETSTANDARD2_0
@@ -186,8 +188,6 @@ public void Save(string filename)
             foreach (var (id, record) in new SortedDictionary<int, DBCDRow>(this))
                 storage.Add(id, record.AsType<T>());
 #endif
-
-
             storage?.Save(filename);
         }