Refactor Filesystem, get rid of JSONPathProvider

Author: LazyDuchess

Assets/Editor/OpenTS2/Engine/Tests/LotLoadingTestEditor.cs

@@ -28,7 +28,7 @@ private void PopulateNhoodList()
         {
             NhoodNames.Clear();
 
-            var nhoodFolderPath = Path.Combine(Filesystem.GetUserPath(), $"Neighborhoods");
+            var nhoodFolderPath = Path.Combine(Filesystem.UserDataDirectory, $"Neighborhoods");
 
             foreach (var nhood in Directory.GetDirectories(nhoodFolderPath))
             {
@@ -44,7 +44,7 @@ private void PopulateNhoodList()
         private void PopulateLotList(string nhood)
         {
             _cachedNhood = nhood;
-            var lotsFolderPath = Path.Combine(Filesystem.GetUserPath(), $"Neighborhoods/{nhood}/Lots");
+            var lotsFolderPath = Path.Combine(Filesystem.UserDataDirectory, $"Neighborhoods/{nhood}/Lots");
 
             LotIds.Clear();
 

Assets/Editor/OpenTS2/SPXConverter.cs

@@ -33,12 +33,12 @@ private static void ConvertSPX()
             if (baseGameOnly)
                 EPManager.Instance.InstalledProducts = (int)ProductFlags.BaseGame;
             var epManager = EPManager.Instance;
-            var products = epManager.GetInstalledProducts();
+            var products = Filesystem.GetProductDirectories();
             var contentManager = ContentManager.Instance;
 
             foreach (var product in products)
             {
-                var packages = Filesystem.GetPackagesInDirectory(Path.Combine(Filesystem.GetDataPathForProduct(product), "Res/Sound"));
+                var packages = Filesystem.GetPackagesInDirectory(Path.Combine(product, "TSData/Res/Sound"));
                 contentManager.AddPackages(packages);
             }
 

Assets/Scripts/OpenTS2/Audio/AudioManager.cs

@@ -57,7 +57,7 @@ private void OnFinishedLoading()
         private void LoadCustomMusic()
         {
             CustomSongNames = new Dictionary<ResourceKey, string>();
-            var musicDir = Path.Combine(Filesystem.GetUserPath(), "Music");
+            var musicDir = Path.Combine(Filesystem.UserDataDirectory, "Music");
             var stationDirs = Directory.GetDirectories(musicDir);
             foreach(var stationDir in stationDirs)
             {

Assets/Scripts/OpenTS2/Audio/MusicManager.cs

@@ -141,11 +141,11 @@ private void LocalizeMusicCategories(List<ResourceKey> musicTitles)
 
         private void LoadIniMusicCategories()
         {
-            var epManager = EPManager.Instance;
-            var products = epManager.GetInstalledProducts();
+            var products = Filesystem.GetProductDirectories();
             foreach(var product in products)
             {
-                var sysFolder = Path.Combine(Filesystem.GetDataPathForProduct(product), "Sys");
+                var sysFolder = Path.Combine(product, "TSData/Sys");
+                if (!Directory.Exists(sysFolder)) continue;
                 var unpackedAudioIni = Directory.GetFiles(sysFolder, "TSAudioUnpacked*.ini", SearchOption.TopDirectoryOnly).FirstOrDefault();
                 if (!string.IsNullOrEmpty(unpackedAudioIni))
                 {

Assets/Scripts/OpenTS2/Content/ContentManager.cs

@@ -42,7 +42,7 @@ public ContentManager()
 
         public void MapFileToResource(string path, ResourceKey key)
         {
-            _fileMap[key] = Filesystem.GetRealPath(path);
+            _fileMap[key] = FileUtils.CleanPath(path);
             var entry = new DBPFEntry();
             entry.TGI = key;
             ResourceMap[key] = entry;
@@ -217,7 +217,7 @@ await Task.WhenAll(tasks).ContinueWith((task) =>
         /// <returns>Package.</returns>
         public DBPFFile AddPackage(string path)
         {
-            path = Filesystem.GetRealPath(path);
+            path = FileUtils.CleanPath(path);
             if (_entryByPath.ContainsKey(path))
                 return _entryByPath[path];
             var package = new DBPFFile(path);
@@ -436,7 +436,7 @@ public DBPFFile GetPackageByGroup(string groupName)
         /// <returns>Content entry for package.</returns>
         public DBPFFile GetPackageByPath(string path)
         {
-            path = Filesystem.GetRealPath(path);
+            path = FileUtils.CleanPath(path);
             if (_entryByPath.ContainsKey(path))
                 return _entryByPath[path];
             else

Assets/Scripts/OpenTS2/Content/EffectsManager.cs

@@ -28,8 +28,8 @@ public void Initialize()
         {
             // Load effects package.
             _manager.AddPackages(
-                Filesystem.GetPackagesInDirectory(Filesystem.GetDataPathForProduct(ProductFlags.BaseGame) +
-                                                  "/Res/Effects"));
+                Filesystem.GetPackagesInDirectory(Filesystem.GetPathForProduct(ProductFlags.BaseGame) +
+                                                  "TSData/Res/Effects"));
             _effects = _manager.GetAsset<EffectsAsset>(new ResourceKey(instanceID: 1, groupID: GroupIDs.Effects,
                 typeID: TypeIDs.EFFECTS));
 

Assets/Scripts/OpenTS2/Engine/Core.cs

@@ -47,7 +47,7 @@ public static void InitializeCore()
 
             TerrainManager.Initialize();
             MaterialManager.Initialize();
-            Filesystem.Initialize(new JSONPathManager(), epManager);
+            Filesystem.InitializeFromJSON("config.json");
             CodecAttribute.Initialize();
             CheatSystem.Initialize();
             VMPrimitiveRegistry.Initialize();

Assets/Scripts/OpenTS2/Engine/JSONPathProvider.cs

@@ -12,7 +12,7 @@ private void Start()
 
         // Load base game assets.
         contentManager.AddPackages(
-            Filesystem.GetPackagesInDirectory(Filesystem.GetDataPathForProduct(ProductFlags.BaseGame) + "/Res/Sims3D"));
+            Filesystem.GetPackagesInDirectory(Filesystem.GetPathForProduct(ProductFlags.BaseGame) + "TSData/Res/Sims3D"));
 
         // Initialize effects manager manually since we aren't using startup controller.
         EffectsManager.Instance.Initialize();

Assets/Scripts/OpenTS2/Engine/JSONPathProvider.cs.meta

@@ -17,7 +17,7 @@ public class LotImposterGMDCTest : MonoBehaviour
     private void Start()
     {
         var contentManager = ContentManager.Instance;
-        var lotsFolderPath = Path.Combine(Filesystem.GetUserPath(), $"Neighborhoods/{NeighborhoodPrefix}/Lots");
+        var lotsFolderPath = Path.Combine(Filesystem.UserDataDirectory, $"Neighborhoods/{NeighborhoodPrefix}/Lots");
         var lotFilename = $"{NeighborhoodPrefix}_Lot{LotID}.package";
         var lotFullPath = Path.Combine(lotsFolderPath, lotFilename);
         contentManager.AddPackage(lotFullPath);

Assets/Scripts/OpenTS2/Engine/Tests/EffectsTest.cs

@@ -120,7 +120,7 @@ private void LoadLot(string neighborhoodPrefix, int id)
 
             var contentManager = ContentManager.Instance;
 
-            var lotsFolderPath = Path.Combine(Filesystem.GetUserPath(), $"Neighborhoods/{NeighborhoodPrefix}/Lots");
+            var lotsFolderPath = Path.Combine(Filesystem.UserDataDirectory, $"Neighborhoods/{NeighborhoodPrefix}/Lots");
             var lotFilename = $"{NeighborhoodPrefix}_Lot{LotID}.package";
             var lotFullPath = Path.Combine(lotsFolderPath, lotFilename);
 

Assets/Scripts/OpenTS2/Engine/Tests/LotImposterGMDCTest.cs

@@ -40,7 +40,7 @@ void Start()
 
             if (DumpLuaScripts)
             {
-                var objectScriptsPath = Filesystem.GetLatestFilePath("Res/ObjectScripts/ObjectScripts.package");
+                var objectScriptsPath = Filesystem.GetLatestFilePath("TSData/Res/ObjectScripts/ObjectScripts.package");
                 var objectScriptsFile = new DBPFFile(objectScriptsPath);
 
                 foreach(var entry in objectScriptsFile.Entries)

Assets/Scripts/OpenTS2/Engine/Tests/LotLoadingTest.cs

@@ -29,16 +29,14 @@ public class ReiaTest : MonoBehaviour
 
         private void Start()
         {
-            var realPath = Filesystem.GetRealPath(reiaPath);
-            var streamFs = File.OpenRead(realPath);
+            var streamFs = File.OpenRead(reiaPath);
             reia = ReiaFile.Read(streamFs, stream);
         }
 
         void Reload()
         {
             reia.Dispose();
-            var realPath = Filesystem.GetRealPath(reiaPath);
-            var streamFs = File.OpenRead(realPath);
+            var streamFs = File.OpenRead(reiaPath);
             reia = ReiaFile.Read(streamFs, stream);
             reload = false;
             frameCounter = 0f;

Assets/Scripts/OpenTS2/Engine/Tests/LuaTestController.cs

@@ -14,7 +14,7 @@ private void Start()
 
         // Load base game assets.
         contentManager.AddPackages(
-            Filesystem.GetPackagesInDirectory(Filesystem.GetDataPathForProduct(ProductFlags.BaseGame) + "/Res/Sims3D"));
+            Filesystem.GetPackagesInDirectory(Filesystem.GetPathForProduct(ProductFlags.BaseGame) + "TSData/Res/Sims3D"));
 
         //var resourceName = "vehiclePizza_cres";
         var resourceName = "chairReclinerPuffy_cres";

Assets/Scripts/OpenTS2/Engine/Tests/ReiaTest.cs

@@ -28,8 +28,8 @@ private void Start()
 
             // Load base game assets.
             contentManager.AddPackages(
-                Filesystem.GetPackagesInDirectory(Filesystem.GetDataPathForProduct(ProductFlags.BaseGame) +
-                                                  "/Res/Sims3D"));
+                Filesystem.GetPackagesInDirectory(Filesystem.GetPathForProduct(ProductFlags.BaseGame) +
+                                                  "TSData/Res/Sims3D"));
 
             // Load all animations involving auskel and put them in the dictionary.
             foreach (var animationAsset in contentManager.GetAssetsOfType<ScenegraphAnimationAsset>(TypeIDs.SCENEGRAPH_ANIM))