Simplify path settings

DarwinBaker · Feb 18, 2022 · 7bd06dd · 7bd06dd
1 parent 9d41df1
commit 7bd06dd
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 57 deletions.
diff --git a/AATool/Enums.cs b/AATool/Enums.cs
@@ -3,7 +3,6 @@
     public enum TrackerSource
     {
         ActiveInstance,
-        DefaultAppData,
         CustomSavesPath,
         SpecificWorld,
     }

diff --git a/AATool/Exceptions/NoSavesFolderException.cs b/AATool/Exceptions/NoSavesFolderException.cs
@@ -24,9 +24,7 @@ private static string GetMessage()
                     : "Active instance missing saves folder";
             }
 
-            return Config.Tracking.Source == TrackerSource.DefaultAppData
-                ? "Default .minecraft saves folder doesn't exist"
-                : "Custom saves path doesn't exist";
+            return "Custom saves path doesn't exist";
         }
     }
 }
diff --git a/AATool/Exceptions/NoWorldException.cs b/AATool/Exceptions/NoWorldException.cs
@@ -34,10 +34,7 @@ private static string GetMessage()
                     return $"Specified world invalid";
                 }
             }
-
-            return Config.Tracking.Source == TrackerSource.DefaultAppData
-                ? "No worlds in default .minecraft path"
-                : "No worlds in custom save path";
+            return "No worlds in custom save path";
         }
     }
 }
diff --git a/AATool/Paths.cs b/AATool/Paths.cs
@@ -110,12 +110,9 @@ public static string CurrentFolder()
                 }
                 else
                 {
-                    return Config.Tracking.Source.Value switch {
-                        TrackerSource.ActiveInstance => ActiveInstance.SavesPath,
-                        TrackerSource.DefaultAppData => DefaultAppDataSavesPath,
-                        TrackerSource.CustomSavesPath => Config.Tracking.CustomSavesPath,
-                        _ => string.Empty,
-                    };
+                    return Tracker.Source is TrackerSource.CustomSavesPath
+                        ? Config.Tracking.CustomSavesPath
+                        : ActiveInstance.SavesPath;
                 }
             }
 

diff --git a/AATool/Winforms/Controls/CTrackerSettings.Designer.cs b/AATool/Winforms/Controls/CTrackerSettings.Designer.cs
diff --git a/AATool/Winforms/Controls/CTrackerSettings.cs b/AATool/Winforms/Controls/CTrackerSettings.cs
@@ -29,7 +29,6 @@ public void LoadSettings()
             this.worldLocal.Checked   = !Config.Tracking.UseSftp;
 
             this.trackActiveInstance.Checked = Tracker.Source is TrackerSource.ActiveInstance;
-            this.trackDefaultSaves.Checked = Tracker.Source is TrackerSource.DefaultAppData;
             this.trackCustomSavesFolder.Checked = Tracker.Source is TrackerSource.CustomSavesPath;
             this.TrackSpecificWorld.Checked = Tracker.Source is TrackerSource.SpecificWorld;
 
@@ -58,8 +57,6 @@ private void SaveSettings()
             {
                 if (this.trackActiveInstance.Checked)
                     Config.Tracking.Source.Set(TrackerSource.ActiveInstance);
-                else if (this.trackDefaultSaves.Checked)
-                    Config.Tracking.Source.Set(TrackerSource.DefaultAppData);
                 else if (this.trackCustomSavesFolder.Checked)
                     Config.Tracking.Source.Set(TrackerSource.CustomSavesPath);
                 else if (this.TrackSpecificWorld.Checked)
@@ -68,7 +65,13 @@ private void SaveSettings()
                 Config.Tracking.CustomSavesPath.Set(this.customSavesPath.Text);
                 Config.Tracking.CustomWorldPath.Set(this.customWorldPath.Text);
 
-                Config.Tracking.Source.Set(this.trackDefaultSaves.Checked);
+                TrackerSource source = this.trackActiveInstance.Checked
+                    ? TrackerSource.ActiveInstance
+                    : this.trackCustomSavesFolder.Checked
+                        ? TrackerSource.CustomSavesPath
+                        : TrackerSource.SpecificWorld;
+                Config.Tracking.Source.Set(source);
+
                 Config.Tracking.UseSftp.Set(this.worldRemote.Checked);
                 Config.Tracking.AutoDetectVersion.Set(this.autoVersion.Checked);
                 Config.Tracking.BroadcastProgress.Set(this.enableOpenTracker.Checked);