2.1.1.2 (#33)

Crauzer · Dec 13, 2019 · 58fe88f · 58fe88f
1 parent fd4332e
commit 58fe88f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/Obsidian/Fantome.Libraries.League.dll b/Obsidian/Fantome.Libraries.League.dll
diff --git a/Obsidian/MainWindow.xaml.cs b/Obsidian/MainWindow.xaml.cs
@@ -10,8 +10,8 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Forms;
+using Fantome.Libraries.League.Helpers;
 using Fantome.Libraries.League.Helpers.Cryptography;
-using Fantome.Libraries.League.Helpers.Utilities;
 using Fantome.Libraries.League.IO.WAD;
 using log4net;
 using log4net.Core;

diff --git a/Obsidian/Properties/AssemblyInfo.cs b/Obsidian/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.1.1")]
-[assembly: AssemblyFileVersion("2.1.1.1")]
+[assembly: AssemblyVersion("2.1.1.2")]
+[assembly: AssemblyFileVersion("2.1.1.2")]
diff --git a/Obsidian/Utils/WADHashGenerator.cs b/Obsidian/Utils/WADHashGenerator.cs
@@ -3,8 +3,8 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using Fantome.Libraries.League.Helpers;
 using Fantome.Libraries.League.Helpers.Cryptography;
-using Fantome.Libraries.League.Helpers.Utilities;
 using Fantome.Libraries.League.IO.BIN;
 using Fantome.Libraries.League.IO.WAD;
 using log4net;
@@ -65,31 +65,31 @@ private static IEnumerable<string> ProcessBINFile(BINFile bin)
         {
             List<string> strings = new List<string>();
 
-            foreach (BINFileEntry entry in bin.Entries)
+            foreach (BINEntry entry in bin.Entries)
             {
                 strings.AddRange(ProcessBINEntry(entry));
             }
 
             return strings;
         }
 
-        private static IEnumerable<string> ProcessBINEntry(BINFileEntry entry)
+        private static IEnumerable<string> ProcessBINEntry(BINEntry entry)
         {
             List<string> strings = new List<string>();
 
-            foreach (BINFileValue value in entry.Values)
+            foreach (BINValue value in entry.Values)
             {
                 strings.AddRange(ProcessBINValue(value));
             }
 
             return strings;
         }
 
-        private static IEnumerable<string> ProcessBINValue(BINFileValue value)
+        private static IEnumerable<string> ProcessBINValue(BINValue value)
         {
             List<string> strings = new List<string>();
 
-            if (value.Type == BINFileValueType.String)
+            if (value.Type == BINValueType.String)
             {
                 string valueString = value.Value as string;
                 strings.Add(valueString);
@@ -101,70 +101,70 @@ private static IEnumerable<string> ProcessBINValue(BINFileValue value)
                     strings.Add(valueString.Insert(index + 1, "4x_"));
                 }
             }
-            else if (value.Type == BINFileValueType.AdditionalOptionalData)
+            else if (value.Type == BINValueType.Optional)
             {
-                strings.AddRange(ProcessBINAdditionalData(value.Value as BINFileAdditionalData));
+                strings.AddRange(ProcessBINAdditionalData(value.Value as BINOptional));
             }
-            else if (value.Type == BINFileValueType.Container)
+            else if (value.Type == BINValueType.Container)
             {
-                strings.AddRange(ProcessBINContainer(value.Value as BINFileContainer));
+                strings.AddRange(ProcessBINContainer(value.Value as BINContainer));
             }
-            else if (value.Type == BINFileValueType.Embedded || value.Type == BINFileValueType.Structure)
+            else if (value.Type == BINValueType.Embedded || value.Type == BINValueType.Structure)
             {
-                strings.AddRange(ProcessBINStructure(value.Value as BINFileStructure));
+                strings.AddRange(ProcessBINStructure(value.Value as BINStructure));
             }
-            else if (value.Type == BINFileValueType.Map)
+            else if (value.Type == BINValueType.Map)
             {
-                strings.AddRange(ProcessBINMap(value.Value as BINFileMap));
+                strings.AddRange(ProcessBINMap(value.Value as BINMap));
             }
 
             return strings;
         }
 
-        private static IEnumerable<string> ProcessBINAdditionalData(BINFileAdditionalData additionalData)
+        private static IEnumerable<string> ProcessBINAdditionalData(BINOptional additionalData)
         {
             List<string> strings = new List<string>();
 
-            foreach (BINFileValue value in additionalData.Entries)
+            if(additionalData.Value != null)
             {
-                strings.AddRange(ProcessBINValue(value));
+                strings.AddRange(ProcessBINValue(additionalData.Value));
             }
 
             return strings;
         }
 
-        private static IEnumerable<string> ProcessBINContainer(BINFileContainer container)
+        private static IEnumerable<string> ProcessBINContainer(BINContainer container)
         {
             List<string> strings = new List<string>();
 
-            foreach (BINFileValue value in container.Entries)
+            foreach (BINValue value in container.Values)
             {
                 strings.AddRange(ProcessBINValue(value));
             }
 
             return strings;
         }
 
-        private static IEnumerable<string> ProcessBINStructure(BINFileStructure structure)
+        private static IEnumerable<string> ProcessBINStructure(BINStructure structure)
         {
             List<string> strings = new List<string>();
 
-            foreach (BINFileValue value in structure.Entries)
+            foreach (BINValue value in structure.Values)
             {
                 strings.AddRange(ProcessBINValue(value));
             }
 
             return strings;
         }
 
-        private static IEnumerable<string> ProcessBINMap(BINFileMap map)
+        private static IEnumerable<string> ProcessBINMap(BINMap map)
         {
             List<string> strings = new List<string>();
 
-            foreach (BINFileValuePair valuePair in map.Entries)
+            foreach (KeyValuePair<BINValue, BINValue> valuePair in map.Values)
             {
-                strings.AddRange(ProcessBINValue(valuePair.Pair.Key));
-                strings.AddRange(ProcessBINValue(valuePair.Pair.Value));
+                strings.AddRange(ProcessBINValue(valuePair.Key));
+                strings.AddRange(ProcessBINValue(valuePair.Value));
             }
 
             return strings;