- CN Offset Update

- Don't include extraneous files in old root when performing item conversions.
- Pause import timer during item selection process.

Author: Lunaretic

xivModdingFramework/Items/Categories/Gear.cs

@@ -76,10 +76,14 @@ public async Task<List<XivGear>> GetUnCachedGearList()
             const int iconDataOffset = 136;
             int slotDataOffset = 154;
 
-            if(_xivLanguage == XivLanguage.Chinese || _xivLanguage == XivLanguage.Korean)
+            if( _xivLanguage == XivLanguage.Korean)
             {
                 dataLength = 168;
                 slotDataOffset = 156;
+            } else if (_xivLanguage == XivLanguage.Chinese)
+            {
+                dataLength = 160;
+                slotDataOffset = 154;
             }
 
             var xivGearList = new List<XivGear>();

xivModdingFramework/Items/Categories/Housing.cs

@@ -92,9 +92,12 @@ private async Task<List<XivFurniture>> GetIndoorFurniture()
             int itemDataLength = 160;
             const int itemIconDataOffset = 136;
 
-            if(_xivLanguage == XivLanguage.Chinese || _xivLanguage == XivLanguage.Korean)
+            if(_xivLanguage == XivLanguage.Korean)
             {
                 itemDataLength = 168;
+            } else if (_xivLanguage == XivLanguage.Chinese)
+            {
+                itemDataLength = 160;
             }
 
             var ex = new Ex(_gameDirectory, _xivLanguage);
@@ -185,10 +188,14 @@ private async Task<List<XivFurniture>> GetPaintings()
             var pictureDictionary = await ex.ReadExData(XivEx.picture);
             var itemDictionary = await ex.ReadExData(XivEx.item);
 
-            if (_xivLanguage == XivLanguage.Chinese || _xivLanguage == XivLanguage.Korean)
+            if (_xivLanguage == XivLanguage.Korean)
             {
                 itemDataLength = 168;
             }
+            else if (_xivLanguage == XivLanguage.Chinese)
+            {
+                itemDataLength = 160;
+            }
 
 
             var furnitureList = new List<XivFurniture>();
@@ -259,10 +266,14 @@ private async Task<List<XivFurniture>> GetOutdoorFurniture()
             int itemDataLength = 160;
             const int itemIconDataOffset = 136;
 
-            if (_xivLanguage == XivLanguage.Chinese || _xivLanguage == XivLanguage.Korean)
+            if ( _xivLanguage == XivLanguage.Korean)
             {
                 itemDataLength = 168;
             }
+            else if (_xivLanguage == XivLanguage.Chinese)
+            {
+                itemDataLength = 160;
+            }
 
             var ex = new Ex(_gameDirectory, _xivLanguage);
             var housingDictionary = await ex.ReadExData(XivEx.housingyardobject);

xivModdingFramework/Mods/FileTypes/TTMP.cs

@@ -462,6 +462,9 @@ public string GetVersion(DirectoryInfo modPackDirectory)
             if (modsJson == null || modsJson.Count == 0) return (0, 0, "", 0);
 
             var startTime = DateTime.Now.Ticks;
+            long endTime = 0;
+            long part1Duration = 0;
+            long part2Duration = 0;
 
             var dat = new Dat(gameDirectory);
             var modding = new Modding(gameDirectory);
@@ -667,6 +670,13 @@ await Task.Run(async () =>
                         try
                         {
                             progress.Report((count, totalFiles, "Waiting on Destination Item Selection..."));
+
+                            endTime = DateTime.Now.Ticks;
+
+                            // Duration in ms
+                            part1Duration = (endTime - startTime) / 10000;
+
+
                             rootConversions = await GetRootConversionsFunction(filePaths, modifiedIndexFiles, modList);
                         } catch(OperationCanceledException ex)
                         {
@@ -679,6 +689,8 @@ await Task.Run(async () =>
                             return;
                         }
 
+                        startTime = DateTime.Now.Ticks;
+
                         if (rootConversions != null && rootConversions.Count > 0)
                         {
                             progress.Report((0, 0, "Updating Destination Items..."));
@@ -718,6 +730,19 @@ await Task.Run(async () =>
                                             mod.modPack = modPack;
                                         }
                                     }
+
+                                    // Remove any remaining lingering files which belong to this root.
+                                    // Ex. Extraneous unused files in the modpack.  This helps keep
+                                    // any unnecessary files from poluting the original destination item post conversion.
+                                    foreach(var file in filePaths.ToList())
+                                    {
+                                        var root = XivDependencyGraph.ExtractRootInfo(file);
+                                        if(root == source.Info)
+                                        {
+                                            filePaths.Remove(file);
+                                            filesToReset.Add(file);
+                                        }
+                                    }
                                 }
 
                                 // Reset the index pointers back to previous.
@@ -918,12 +943,12 @@ await Task.Run(async () =>
             var errorCount = ErroneousFiles.Count;
             var count = totalFiles - errorCount;
 
-            var endtime = DateTime.Now.Ticks;
+            endTime = DateTime.Now.Ticks;
 
             // Duration in ms
-            var duration = (endtime - startTime) / 10000;
+            part2Duration = (endTime - startTime) / 10000;
 
-            float seconds = duration / 1000f;
+            float seconds = (part1Duration + part2Duration) / 1000f;
 
             return (count, errorCount, importErrors, seconds);
         }