Merge remote-tracking branch 'upstream/develop'

Author: Squall-Leonhart

xivModdingFramework/General/XivModelChara.cs

@@ -55,14 +55,16 @@ public static async Task<XivModelInfo> GetModelInfo(DirectoryInfo gameDirectory,
 
             // These are the offsets to relevant data
             // These will need to be changed if data gets added or removed with a patch
-            const int modelDataOffset = 4;
+            int startOffset = 8;
+            int modelDataOffset = 12;
 
             var ex = new Ex(gameDirectory);
             var modelCharaEx = await ex.ReadExData(XivEx.modelchara);
 
             // Big Endian Byte Order 
             using (var br = new BinaryReaderBE(new MemoryStream(modelCharaEx[index])))
             {
+                br.BaseStream.Seek(startOffset, SeekOrigin.Begin);
                 xivModelInfo.PrimaryID = br.ReadInt16();
 
                 br.BaseStream.Seek(modelDataOffset, SeekOrigin.Begin);
@@ -99,8 +101,8 @@ public static XivModelInfo GetModelInfo(Dictionary<int, byte[]> modelCharaEx, in
 
             // These are the offsets to relevant data
             // These will need to be changed if data gets added or removed with a patch
-            int startOffset = 4;
-            int modelDataOffset = 8;
+            int startOffset = 8;
+            int modelDataOffset = 12;
             if (XivCache.GameInfo.GameLanguage == Enums.XivLanguage.Chinese)
             {
                 startOffset = 0;
@@ -115,8 +117,6 @@ public static XivModelInfo GetModelInfo(Dictionary<int, byte[]> modelCharaEx, in
             // Big Endian Byte Order 
             using (var br = new BinaryReaderBE(new MemoryStream(modelCharaEx[index])))
             {
-
-
                 br.BaseStream.Seek(startOffset, SeekOrigin.Begin);
                 xivModelInfo.PrimaryID = br.ReadInt16();