Update v3.0.6.5

Author: Lunaretic

xivModdingFramework/Helpers/IOUtil.cs

@@ -799,17 +799,21 @@ public static byte[] GetImageSharpPixels(Image<Rgba32> img)
 
         public static string GetUniqueSubfolder(string basePath, string prefix = "")
         {
-            var id = 0;
-            var path = Path.GetFullPath(Path.Combine(basePath, prefix + id.ToString()));
-            while (Directory.Exists(path))
+            lock (_SubfolderLock)
             {
-                id++;
-                path = Path.GetFullPath(Path.Combine(basePath, prefix + id.ToString()));
+                var id = 0;
+                var path = Path.GetFullPath(Path.Combine(basePath, prefix + id.ToString()));
+                while (Directory.Exists(path))
+                {
+                    id++;
+                    path = Path.GetFullPath(Path.Combine(basePath, prefix + id.ToString()));
+                }
+                Directory.CreateDirectory(path);
+                return path;
             }
-            Directory.CreateDirectory(path);
-
-            return path;
         }
+
+        public static object _SubfolderLock = new object();
         public static string GetFrameworkTempSubfolder(string prefix = "")
         {
             var basePath = GetFrameworkTempFolder();

xivModdingFramework/Mods/FileTypes/PMP.cs

@@ -82,6 +82,24 @@ await IOUtil.UnzipFiles(path, tempFolder, (file) =>
                 });
                 path = tempFolder;
             }
+
+            var metaPath = Path.GetFullPath(Path.Combine(path, "meta.json"));
+            if (!File.Exists(metaPath))
+            {
+                if (Directory.Exists(path))
+                {
+                    var subs = Directory.EnumerateDirectories(path).ToList();
+                    if(subs.Count == 1)
+                    {
+                        metaPath = Path.GetFullPath(Path.Combine(path, subs[0], "meta.json"));
+                        if (File.Exists(metaPath))
+                        {
+                            path = Path.GetFullPath(Path.Combine(path, subs[0]));
+                        }
+                    }
+                }
+            }
+
             return path;
         }