Replaced all references to the current working directory with the calculated directory based on the location of the executable file.

Author: Lunaretic

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -1161,7 +1161,8 @@ private Dictionary<string, SkeletonData> ResolveBoneHeirarchy(Action<bool, strin
             }
 
 
-            var skeletonFile = Directory.GetCurrentDirectory() + "/Skeletons/" + skelName + ".skel";
+            var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+            var skeletonFile = cwd + "/Skeletons/" + skelName + ".skel";
             var skeletonData = File.ReadAllLines(skeletonFile);
             var badBoneId = 900;
 

xivModdingFramework/Models/FileTypes/Dae.cs

@@ -94,7 +94,8 @@ public async Task MakeDaeFileFromModel(XivMdl xivModel, string path, string skel
 
             if (hasBones)
             {
-                var skeletonFile = Directory.GetCurrentDirectory() + "/Skeletons/" + skelName + ".skel";
+                var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+                var skeletonFile = cwd + "/Skeletons/" + skelName + ".skel";
                 var skeletonData = File.ReadAllLines(skeletonFile);
 
                 // Deserializes the json skeleton file and makes 2 dictionaries with names and numbers as keys

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -240,7 +240,8 @@ public async Task ExportModel(TTModel model, string outputFilePath, int mtrlVari
 
             // Save the DB file.
 
-            var converterFolder = Directory.GetCurrentDirectory() + "\\converters\\" + fileFormat;
+            var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+            var converterFolder = cwd + "\\converters\\" + fileFormat;
             Directory.CreateDirectory(converterFolder);
             var dbPath = converterFolder + "\\input.db";
             model.SaveToFile(dbPath);
@@ -1860,7 +1861,9 @@ public async Task<List<string>> GetReferencedMaterialNames(string mdlPath, bool
         /// <returns></returns>
         public List<string> GetAvailableImporters()
         {
-            const string importerPath = "converters/";
+            var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+            cwd = cwd.Replace("\\", "/");
+            string importerPath = cwd + "/converters/";
             var ret = new List<string>();
             ret.Add("dae"); // DAE handler is internal.
             ret.Add("db");  // Raw already-parsed DB files are fine.
@@ -1883,7 +1886,9 @@ public List<string> GetAvailableImporters()
         /// <returns></returns>
         public List<string> GetAvailableExporters()
         {
-            const string importerPath = "converters/";
+            var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+            cwd = cwd.Replace("\\", "/");
+            string importerPath = cwd + "/converters/";
             var ret = new List<string>();
             ret.Add("dae"); // DAE handler is internal.
             ret.Add("obj"); // OBJ handler is internal.
@@ -1911,7 +1916,8 @@ private void NoOp(bool isWarning, string message)
         private async Task<string> RunExternalImporter(string importerName, string filePath, Action<bool, string> loggingFunction = null)
         {
 
-            var importerFolder = Directory.GetCurrentDirectory() + "\\converters\\" + importerName;
+            var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+            string importerFolder = cwd + "\\converters\\" + importerName;
             if (loggingFunction == null)
             {
                 loggingFunction = NoOp;
@@ -4205,7 +4211,8 @@ public static void GetDeformationMatrices(XivRace race, out Dictionary<string, M
             var skelDict = new Dictionary<string, SkeletonData>();
 
             var skelName = "c" + race.GetRaceCode();
-            var skeletonFile = Directory.GetCurrentDirectory() + "/Skeletons/" + skelName + ".skel";
+            var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+            var skeletonFile = cwd + "/Skeletons/" + skelName + ".skel";
             var skeletonData = File.ReadAllLines(skeletonFile);
             var FullSkel = new Dictionary<string, SkeletonData>();
             var FullSkelNum = new Dictionary<int, SkeletonData>();

xivModdingFramework/Models/FileTypes/Sklb.cs

@@ -41,7 +41,7 @@ namespace xivModdingFramework.Models.FileTypes
     public class Sklb
     {
         private readonly DirectoryInfo _gameDirectory;
-        private const string SkeletonsFolder = ".\\Skeletons\\";
+        private const string SkeletonsFolder = "\\Skeletons\\";
         public Sklb(DirectoryInfo gameDirectory)
         {
             _gameDirectory = gameDirectory;
@@ -128,7 +128,8 @@ public async Task<string> CreateParsedSkelFile(string fullMdlPath)
 
 
             var externalSkelName = GetParsedSkelFilename(fullMdlPath);
-            var resultPath = SkeletonsFolder + externalSkelName + ".skel";
+            var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+            var resultPath = cwd + SkeletonsFolder + externalSkelName + ".skel";
 
             // If we already have a file, and it's not one of the special types we merge in, just return that.
             if (File.Exists(resultPath) && !IsHairHatFace(fullMdlPath))
@@ -138,24 +139,24 @@ public async Task<string> CreateParsedSkelFile(string fullMdlPath)
 
 
 
-            Directory.CreateDirectory(SkeletonsFolder);
+            Directory.CreateDirectory(cwd + SkeletonsFolder);
 
 
             // Generate a raw .sklb file, if one exists for it.
             var skelbFile = await ExtractSkelb(fullMdlPath, internalSkelName);
             if (skelbFile != null)
             {
 
-                var xmlFile = SkeletonsFolder + internalSkelName + ".xml";
+                var xmlFile = cwd + SkeletonsFolder + internalSkelName + ".xml";
                 File.Delete(xmlFile);
 
                 // And convert that extracted raw .sklb file to XML...
-                
+
                 var proc = new Process
                 {
                     StartInfo = new ProcessStartInfo
                     {
-                        FileName = Directory.GetCurrentDirectory() + "/NotAssetCc.exe",
+                        FileName = cwd + "/NotAssetCc.exe",
                         Arguments = "\"" + skelbFile + "\" \"" + xmlFile + "\"",
                         RedirectStandardOutput = true,
                         UseShellExecute = false,
@@ -313,7 +314,8 @@ private async Task<string> ExtractSkelb(string fullMdlPath, string internalSkelN
 
                 var havokData = br.ReadBytes(sklbData.Length - dataOffset);
 
-                var outputPath = Directory.GetCurrentDirectory() + "/Skeletons/" + internalSkelName + ".sklb";
+                var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+                var outputPath = cwd + "/Skeletons/" + internalSkelName + ".sklb";
                 File.WriteAllBytes(outputPath, havokData);
                 return outputPath;
             }
@@ -543,7 +545,8 @@ private void AddToRaceSkeleton(List<string> jsonBones, string fullMdlPath)
                 race = Path.GetFileNameWithoutExtension(fullMdlPath).Substring(0, 5);
             }
 
-            var skelLoc = Directory.GetCurrentDirectory() + SkeletonsFolder;
+            var cwd = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+            var skelLoc = cwd + SkeletonsFolder;
 
             if (File.Exists(skelLoc + race + ".skel"))
             {