UopPacker: fix unpacking gumps and sizing of index; add progress bars and update UI slightly.

Author: AsYlum-

UoFiddler.Plugin.UopPacker/Classes/LegacyMulFileConverter.cs

@@ -56,7 +56,7 @@ private static BinaryWriter OpenOutput(string path)
         //
         // MUL -> UOP
         //
-        public static void ToUop(string inFile, string inFileIdx, string outFile, FileType type, int typeIndex, CompressionFlag compressionFlag = CompressionFlag.None, string housingBinFile = "")
+        public static void ToUop(string inFile, string inFileIdx, string outFile, FileType type, int typeIndex, CompressionFlag compressionFlag = CompressionFlag.None, string housingBinFile = "", IProgress<int> progress = null)
         {
             // Same for all UOP files
             const long firstTable = 0x200;
@@ -163,6 +163,10 @@ public static void ToUop(string inFile, string inFileIdx, string outFile, FileTy
 
                 string[] hashFormat = GetHashFormat(type, typeIndex, out int _);
 
+                int totalEntries = idxEntries.Count;
+                int lastReportedPct = -1;
+                progress?.Report(0);
+
                 for (int i = 0; i < tableCount; ++i)
                 {
                     long thisTable = writer.BaseStream.Position;
@@ -308,6 +312,16 @@ public static void ToUop(string inFile, string inFileIdx, string outFile, FileTy
                             tableEntries[tableIdx].Hash = HashAdler32(data);
                             writer.Write(data);
                         }
+
+                        if (totalEntries > 0)
+                        {
+                            int pct = (j + 1) * 100 / totalEntries;
+                            if (pct != lastReportedPct)
+                            {
+                                lastReportedPct = pct;
+                                progress?.Report(pct);
+                            }
+                        }
                     }
 
                     long nextTable = writer.BaseStream.Position;
@@ -354,7 +368,7 @@ public static void ToUop(string inFile, string inFileIdx, string outFile, FileTy
         //
         // UOP -> MUL
         //
-        public void FromUop(string inFile, string outFile, string outFileIdx, FileType type, int typeIndex, string housingBinFile = "")
+        public void FromUop(string inFile, string outFile, string outFileIdx, FileType type, int typeIndex, string housingBinFile = "", IProgress<int> progress = null)
         {
             Dictionary<ulong, int> chunkIds = new Dictionary<ulong, int>();
             Dictionary<ulong, int> chunkIds2 = new Dictionary<ulong, int>();
@@ -391,6 +405,11 @@ public void FromUop(string inFile, string outFile, string outFileIdx, FileType t
                 reader.ReadInt32(); // format timestamp? 0xFD23EC43
 
                 long nextTable = reader.ReadInt64();
+                reader.ReadInt32(); // table size (unused)
+                int totalFileCount = reader.ReadInt32();
+                int processedCount = 0;
+                int lastReportedPct = -1;
+                progress?.Report(0);
 
                 do
                 {
@@ -414,7 +433,8 @@ public void FromUop(string inFile, string outFile, string outFileIdx, FileType t
                         offsets[i].DecompressedSize = reader.ReadInt32(); // decompressed size
                         offsets[i].Identifier = reader.ReadUInt64(); // filename hash (HashLittle2)
                         offsets[i].Hash = reader.ReadUInt32(); // data hash (Adler32)
-                        offsets[i].Compressed = reader.ReadInt16() != 0; // compression method (0 = none, 1 = zlib)
+                        offsets[i].CompressionFlag = reader.ReadInt16(); // compression method (0 = none, 1 = zlib, 3 = mythic)
+                        offsets[i].Compressed = offsets[i].CompressionFlag != 0;
                     }
 
                     // Copy chunks
@@ -452,6 +472,17 @@ public void FromUop(string inFile, string outFile, string outFileIdx, FileType t
                                 writerBin.Write(binDataToWrite, 0, binDataToWrite.Length);
                             }
 
+                            if (totalFileCount > 0)
+                            {
+                                ++processedCount;
+                                int pct = processedCount * 100 / totalFileCount;
+                                if (pct != lastReportedPct)
+                                {
+                                    lastReportedPct = pct;
+                                    progress?.Report(pct);
+                                }
+                            }
+
                             continue;
                         }
 
@@ -480,6 +511,11 @@ public void FromUop(string inFile, string outFile, string outFileIdx, FileType t
                             chunkData = decompressed;
                         }
 
+                        if (offsets[i].CompressionFlag == (short)CompressionFlag.Mythic)
+                        {
+                            chunkData = MythicDecompress.Decompress(chunkData);
+                        }
+
                         if (type == FileType.MapLegacyMul)
                         {
                             // Write this chunk on the right position (no IDX file to point to it)
@@ -541,6 +577,17 @@ public void FromUop(string inFile, string outFile, string outFileIdx, FileType t
                                 mulWriter.Write(chunkData, dataOffset, chunkData.Length - dataOffset);
                             }
                         }
+
+                        if (totalFileCount > 0)
+                        {
+                            ++processedCount;
+                            int pct = processedCount * 100 / totalFileCount;
+                            if (pct != lastReportedPct)
+                            {
+                                lastReportedPct = pct;
+                                progress?.Report(pct);
+                            }
+                        }
                     }
 
                     // Move to next table
@@ -551,10 +598,22 @@ public void FromUop(string inFile, string outFile, string outFileIdx, FileType t
                 }
                 while (nextTable != 0);
 
-                // Fix index
+                // Fix index. Only pad up to the highest used entry — `used.Length` is the hash-lookup
+                // upper bound (often 0x7FFFF), which would otherwise produce a multi-megabyte idx file
+                // padded with sentinel rows beyond any real entry.
                 if (idxWriter != null)
                 {
-                    for (int i = 0; i < used.Length; ++i)
+                    int padCount = 0;
+                    for (int i = used.Length - 1; i >= 0; --i)
+                    {
+                        if (used[i])
+                        {
+                            padCount = i + 1;
+                            break;
+                        }
+                    }
+
+                    for (int i = 0; i < padCount; ++i)
                     {
                         if (used[i])
                         {