Update v2.3.5.10

Author: Lunaretic

xivModdingFramework/Exd/FileTypes/Ex.cs

@@ -179,8 +179,17 @@ public async Task<Dictionary<int, byte[]>> ReadExData(XivEx exFile)
 
                 var exdFolderHash = HashGenerator.GetHash("exd");
                 var exdFileHash = HashGenerator.GetHash(exdFile);
+                var offset = await _index.GetDataOffset(exdFolderHash, exdFileHash, XivDataFile._0A_Exd);
 
-                exdNameOffsetDictionary.Add(await _index.GetDataOffset(exdFolderHash, exdFileHash, XivDataFile._0A_Exd), exdFile);
+                try
+                {
+                    exdNameOffsetDictionary.Add(offset, exdFile);
+                }
+                catch (Exception ex)
+                {
+                    var zz = "zz";
+                    throw ex;
+                }
             }
 
             await Task.Run(async () =>

xivModdingFramework/Items/Categories/Gear.cs

@@ -63,6 +63,21 @@ public async Task<List<XivGear>> GetGearList(string substring = null)
             return await XivCache.GetCachedGearList(substring);
         }
 
+        private static Dictionary<string, int> DataLengthByPatch = new Dictionary<string, int>()
+        {
+            { "5.3", 160 },
+            { "5.4", 168 },
+            { "5.5", 160 },
+        };
+
+        private static Dictionary<string, int> SlotDataOffsetByPatch = new Dictionary<string, int>()
+        {
+            { "5.3", 154 },
+            { "5.4", 156 },
+            { "5.5", 154 },
+        };
+
+
         /// <summary>
         /// A getter for available gear in the Item exd files
         /// </summary>
@@ -72,21 +87,21 @@ public async Task<List<XivGear>> GetUnCachedGearList()
             // These are the offsets to relevant data
             // These will need to be changed if data gets added or removed with a patch
             const int modelDataCheckOffset = 30;
-            int dataLength = 160;
+            int dataLength = DataLengthByPatch["5.5"];
             const int nameDataOffset = 14;
             const int modelDataOffset = 24;
             const int iconDataOffset = 136;
-            int slotDataOffset = 154;
+            int slotDataOffset = SlotDataOffsetByPatch["5.5"];
 
 
             if( _xivLanguage == XivLanguage.Korean)
             {
-                dataLength = 160;
-                slotDataOffset = 154;
+                dataLength = DataLengthByPatch["5.4"];
+                slotDataOffset = SlotDataOffsetByPatch["5.4"];
             } else if (_xivLanguage == XivLanguage.Chinese)
             {
-                dataLength = 168;
-                slotDataOffset = 156;
+                dataLength = DataLengthByPatch["5.4"];
+                slotDataOffset = SlotDataOffsetByPatch["5.4"];
             }
 
             var xivGearList = new List<XivGear>();

xivModdingFramework/Items/Categories/Housing.cs

@@ -71,6 +71,14 @@ public async Task<List<XivFurniture>> GetUncachedFurnitureList()
             return furnitureList;
         }
 
+        private static Dictionary<string, int> DataLengthByPatch = new Dictionary<string, int>()
+        {
+            { "5.3", 160 },
+            { "5.4", 168 },
+            { "5.5", 160 },
+        };
+
+
         /// <summary>
         /// Gets the list of indoor furniture
         /// </summary>
@@ -91,15 +99,15 @@ private async Task<List<XivFurniture>> GetIndoorFurniture()
             const int itemCategoryOffset = 14;
 
             const int itemNameDataOffset = 14;
-            int itemDataLength = 160;
+            int itemDataLength = DataLengthByPatch["5.5"];
             const int itemIconDataOffset = 136;
 
             if(_xivLanguage == XivLanguage.Korean)
             {
-                itemDataLength = 160;
+                itemDataLength = DataLengthByPatch["5.4"];
             } else if (_xivLanguage == XivLanguage.Chinese)
             {
-                itemDataLength = 168;
+                itemDataLength = DataLengthByPatch["5.4"];
             }
 
             var ex = new Ex(_gameDirectory, _xivLanguage);
@@ -183,20 +191,21 @@ private async Task<List<XivFurniture>> GetPaintings()
 
             const int itemNameDataOffset = 14;
             const int housingIndexOffset = 112;
-            int itemDataLength = 160;
+            int itemDataLength = DataLengthByPatch["5.5"];
             const int itemIconDataOffset = 136;
 
             var ex = new Ex(_gameDirectory, _xivLanguage);
             var pictureDictionary = await ex.ReadExData(XivEx.picture);
             var itemDictionary = await ex.ReadExData(XivEx.item);
 
+
             if (_xivLanguage == XivLanguage.Korean)
             {
-                itemDataLength = 160;
+                itemDataLength = DataLengthByPatch["5.4"];
             }
             else if (_xivLanguage == XivLanguage.Chinese)
             {
-                itemDataLength = 168;
+                itemDataLength = DataLengthByPatch["5.4"];
             }
 
 
@@ -265,18 +274,20 @@ private async Task<List<XivFurniture>> GetOutdoorFurniture()
             const int itemCategoryOffset = 13;
 
             const int itemNameDataOffset = 14;
-            int itemDataLength = 160;
+            int itemDataLength = DataLengthByPatch["5.5"];
             const int itemIconDataOffset = 136;
 
-            if ( _xivLanguage == XivLanguage.Korean)
+
+            if (_xivLanguage == XivLanguage.Korean)
             {
-                itemDataLength = 160;
+                itemDataLength = DataLengthByPatch["5.4"];
             }
             else if (_xivLanguage == XivLanguage.Chinese)
             {
-                itemDataLength = 168;
+                itemDataLength = DataLengthByPatch["5.4"];
             }
 
+
             var ex = new Ex(_gameDirectory, _xivLanguage);
             var housingDictionary = await ex.ReadExData(XivEx.housingyardobject);
             var itemDictionary = await ex.ReadExData(XivEx.item);

xivModdingFramework/Items/DataContainers/XivUi.cs

@@ -159,6 +159,9 @@ public async Task<Dictionary<string, string>> GetTexPaths(bool addLowRes = true,
                 {
                     resPaths.Add(Name, "ui/uld/" + Name.ToLower() + ".tex");
                 }
+            } else if(SecondaryCategory == XivStrings.LoadingScreen)
+            {
+                resPaths.Add(Name, UiPath + '/' + Name + ".tex");
             }
             else
             {

xivModdingFramework/Items/ItemType.cs

@@ -209,6 +209,19 @@ public static string GetItemSlotAbbreviation(this IItem item)
                         if(match.Success)
                         {
                             return match.Groups[1].Value;
+                        } else
+                        {
+                            // Hackhack fallback for cases where we have mounts listed in the item list
+                            // with no actual specific equipment slot assigned, such as the Company Chocobo.
+                            if(mi.PrimaryID == 1 && mi.SecondaryID == 1)
+                            {
+                                // Company chocobo
+                                return "dwn";
+                            } else
+                            {
+                                // Other mounts
+                                return "top";
+                            }
                         }
                     }
                 }