Fix stale reference issue and clean stuff up

DarwinBaker · Mar 5, 2022 · b8fe612 · b8fe612
1 parent e20185e
commit b8fe612
Show file tree

Hide file tree

Showing 25 changed files with 95 additions and 418 deletions.
diff --git a/AATool/Configuration/ConfigStatic.cs b/AATool/Configuration/ConfigStatic.cs
@@ -88,8 +88,8 @@ public static void Save(Config config)
                         Formatting = Newtonsoft.Json.Formatting.Indented
                     }.Deserialize(stream, typeof(T));
 
-                    if (config is null)
-                        throw new InvalidDataException();
+                    //if (config is null)
+                    //    throw new InvalidDataException();
                 }
             }
             catch (Exception e)

diff --git a/AATool/Configuration/MainConfig.cs b/AATool/Configuration/MainConfig.cs
@@ -50,9 +50,13 @@ public class MainConfig : Config
             [JsonProperty] public readonly Setting<Color> TextColor = new (Hex("DCDDDE"));
             [JsonProperty] public readonly Setting<Color> BorderColor = new (Hex("4E5156"));
 
+            [JsonIgnore]
             public bool RelaxedMode => !this.CompactMode;
+
+            [JsonIgnore]
             public string ViewMode => this.CompactMode ? "compact" : "relaxed";
 
+            [JsonIgnore]
             public bool StyleChanged => this.FrameStyle.Changed
                 || this.BorderColor.Changed
                 || this.BackColor.Changed

diff --git a/AATool/Configuration/MainConfig.cs.bak b/AATool/Configuration/MainConfig.cs.bak
diff --git a/AATool/Configuration/TrackingConfig.cs b/AATool/Configuration/TrackingConfig.cs
@@ -14,7 +14,7 @@ public class TrackingConfig : Config
             [JsonProperty] public readonly Setting<string> LastSession = new (string.Empty);
 
             [JsonProperty] public readonly Setting<string> GameCategory = new ("All Advancements");
-            [JsonProperty] public readonly Setting<string> GameVersion = new ("1.16");
+            [JsonProperty] public readonly Setting<string> GameVersion = new ("1.18");
 
             [JsonProperty] public readonly Setting<bool> AutoDetectVersion = new (true);
             [JsonProperty] public readonly Setting<bool> UseSftp = new (false);
@@ -30,9 +30,11 @@ public class TrackingConfig : Config
             protected override string GetId() => "tracking";
             protected override string GetLegacyId() => "tracker";
 
+            [JsonIgnore]
             public bool WatchActiveInstance => !this.UseSftp 
                 && (this.Source == TrackerSource.ActiveInstance || this.AutoDetectVersion || Tracker.Category is AllDeaths);
-
+
+            [JsonIgnore]
             public bool SourceChanged => this.UseSftp.Changed || this.Source.Changed
                 || (this.Source == TrackerSource.CustomSavesPath && this.CustomSavesPath.Changed)
                 || (this.Source == TrackerSource.SpecificWorld && this.CustomWorldPath.Changed);

diff --git a/AATool/Data/Categories/AdventuringTime.cs b/AATool/Data/Categories/AdventuringTime.cs
@@ -12,7 +12,7 @@ public class AdventuringTime : SingleAdvancement
         };
 
         public override IEnumerable<string> GetSupportedVersions() => SupportedVersions;
-        public override IEnumerable<Objective> GetOverlayObjectives() => this.Achievements.All.Values;
+        public override IEnumerable<Objective> GetOverlayObjectives() => Tracker.Achievements.All.Values;
 
         public override int GetTargetCount() => this.Requirement?.Criteria.Count ?? 0;
         public override int GetCompletedCount() => this.Requirement?.Criteria.MostCompleted ?? 0;
@@ -27,8 +27,8 @@ public AdventuringTime() : base()
 
         public override void LoadObjectives()
         {
-            this.Advancements.RefreshObjectives();
-            this.Advancements.TryGet(Id, out Advancement adventuringTime);
+            Tracker.Advancements.RefreshObjectives();
+            Tracker.Advancements.TryGet(Id, out Advancement adventuringTime);
             this.Requirement = adventuringTime;
         }
     }

diff --git a/AATool/Data/Categories/AllAchievements.cs b/AATool/Data/Categories/AllAchievements.cs
@@ -11,10 +11,10 @@ public class AllAchievements : Category
         };
 
         public override IEnumerable<string> GetSupportedVersions() => SupportedVersions;
-        public override IEnumerable<Objective> GetOverlayObjectives() => this.Achievements.All.Values;
+        public override IEnumerable<Objective> GetOverlayObjectives() => Tracker.Achievements.All.Values;
 
-        public override int GetTargetCount() => this.Achievements.Count;
-        public override int GetCompletedCount() => this.Achievements.CompletedCount;
+        public override int GetTargetCount() => Tracker.Achievements.Count;
+        public override int GetCompletedCount() => Tracker.Achievements.CompletedCount;
 
         public AllAchievements() : base ()
         {
@@ -26,8 +26,8 @@ public AllAchievements() : base ()
 
         public override void LoadObjectives()
         {
-            this.Achievements.RefreshObjectives();
-            this.Pickups.RefreshObjectives();
+            Tracker.Achievements.RefreshObjectives();
+            Tracker.Pickups.RefreshObjectives();
         }
     }
 }
diff --git a/AATool/Data/Categories/AllAdvancements.cs b/AATool/Data/Categories/AllAdvancements.cs
@@ -17,10 +17,10 @@ public class AllAdvancements : Category
         };
 
         public override IEnumerable<string> GetSupportedVersions() => SupportedVersions;
-        public override IEnumerable<Objective> GetOverlayObjectives() => this.Advancements.All.Values;        
+        public override IEnumerable<Objective> GetOverlayObjectives() => Tracker.Advancements.All.Values;        
 
-        public override int GetCompletedCount() => this.Advancements.CompletedCount;
-        public override int GetTargetCount() => this.Advancements.Count;
+        public override int GetCompletedCount() => Tracker.Advancements.CompletedCount;
+        public override int GetTargetCount() => Tracker.Advancements.Count;
 
         public AllAdvancements() : base ()
         {
@@ -32,8 +32,8 @@ public AllAdvancements() : base ()
 
         public override void LoadObjectives()
         {
-            this.Advancements.RefreshObjectives();
-            this.Pickups.RefreshObjectives();
+            Tracker.Advancements.RefreshObjectives();
+            Tracker.Pickups.RefreshObjectives();
         }
     }
 }
diff --git a/AATool/Data/Categories/AllBlocks.cs b/AATool/Data/Categories/AllBlocks.cs
@@ -11,10 +11,10 @@ public class AllBlocks : Category
         };
 
         public override IEnumerable<string> GetSupportedVersions() => SupportedVersions;
-        public override IEnumerable<Objective> GetOverlayObjectives() => this.Blocks.All.Values;
+        public override IEnumerable<Objective> GetOverlayObjectives() => Tracker.Blocks.All.Values;
 
-        public override int GetTargetCount() => this.Blocks.Count;
-        public override int GetCompletedCount() => this.Blocks.PlacedCount;
+        public override int GetTargetCount() => Tracker.Blocks.Count;
+        public override int GetCompletedCount() => Tracker.Blocks.PlacedCount;
 
         public AllBlocks() : base()
         {
@@ -28,8 +28,8 @@ public AllBlocks() : base()
 
         public override void LoadObjectives()
         {
-            this.Blocks.RefreshObjectives();
-            this.Pickups.RefreshObjectives();
+            Tracker.Blocks.RefreshObjectives();
+            Tracker.Pickups.RefreshObjectives();
         }
     }
 }
diff --git a/AATool/Data/Categories/AllDeaths.cs b/AATool/Data/Categories/AllDeaths.cs
@@ -12,10 +12,10 @@ public class AllDeaths : Category
         };
 
         public override IEnumerable<string> GetSupportedVersions() => SupportedVersions;
-        public override IEnumerable<Objective> GetOverlayObjectives() => this.Deaths.All.Values;
+        public override IEnumerable<Objective> GetOverlayObjectives() => Tracker.Deaths.All.Values;
 
-        public override int GetTargetCount() => this.Deaths.Count;
-        public override int GetCompletedCount() => this.Deaths.TotalExperienced;
+        public override int GetTargetCount() => Tracker.Deaths.Count;
+        public override int GetCompletedCount() => Tracker.Deaths.TotalExperienced;
 
         public AllDeaths() : base()
         {
@@ -30,8 +30,8 @@ public AllDeaths() : base()
 
         public override void LoadObjectives()
         {
-            this.Deaths.RefreshObjectives();
-            this.Pickups.RefreshObjectives();
+            Tracker.Deaths.RefreshObjectives();
+            Tracker.Pickups.RefreshObjectives();
         }
     }
 }
diff --git a/AATool/Data/Categories/BalancedDiet.cs b/AATool/Data/Categories/BalancedDiet.cs
@@ -24,8 +24,8 @@ public BalancedDiet() : base()
 
         public override void LoadObjectives()
         {
-            this.Advancements.RefreshObjectives();
-            this.Advancements.TryGet(Id, out Advancement balancedDiet);
+            Tracker.Advancements.RefreshObjectives();
+            Tracker.Advancements.TryGet(Id, out Advancement balancedDiet);
             this.Requirement = balancedDiet;
         }
     }

diff --git a/AATool/Data/Categories/Category.cs b/AATool/Data/Categories/Category.cs
@@ -9,12 +9,6 @@ namespace AATool.Data.Categories
 {
     public abstract class Category : ICategory
     {
-        public readonly AdvancementManifest Advancements = new ();
-        public readonly AchievementManifest Achievements = new ();
-        public readonly PickupManifest Pickups = new ();
-        public readonly BlockManifest Blocks = new ();
-        public readonly DeathManifest Deaths = new ();
-
         public string Name      { get; protected set; }
         public string Acronym   { get; protected set; }
         public string Action    { get; protected set; }
@@ -56,7 +50,7 @@ public bool TrySetVersion(string version)
                 this.CurrentVersion = version;
                 this.CurrentMajorVersion = $"{number.Major}.{number.Minor}";
                 Config.Tracking.GameVersion.Set(this.CurrentVersion);
-                this.LoadObjectives();
+                Config.Tracking.Save();
                 return true;
             }
             return false;
@@ -74,13 +68,5 @@ public float GetCompletionRatio()
             int clamped = Math.Min(this.GetCompletedCount(), target);
             return (float)clamped / this.GetTargetCount();
         }
-
-        public void SetState(WorldState state)
-        {
-            this.Advancements.SetState(state);
-            this.Achievements.SetState(state);
-            this.Blocks.SetState(state);
-            this.Pickups.SetState(state);
-        }
     }
 }
diff --git a/AATool/Data/Categories/HalfDeaths.cs b/AATool/Data/Categories/HalfDeaths.cs
@@ -23,8 +23,8 @@ public HalfDeaths() : base()
 
         public override void LoadObjectives()
         {
-            this.Deaths.RefreshObjectives();
-            this.Pickups.RefreshObjectives();
+            Tracker.Deaths.RefreshObjectives();
+            Tracker.Pickups.RefreshObjectives();
         }
     }
 }
diff --git a/AATool/Data/Categories/MonstersHunted.cs b/AATool/Data/Categories/MonstersHunted.cs
@@ -24,8 +24,8 @@ public MonstersHunted() : base()
 
         public override void LoadObjectives()
         {
-            this.Advancements.RefreshObjectives();
-            this.Advancements.TryGet(Id, out Advancement monstersHunted);
+            Tracker.Advancements.RefreshObjectives();
+            Tracker.Advancements.TryGet(Id, out Advancement monstersHunted);
             this.Requirement = monstersHunted;
         }
     }

diff --git a/AATool/Data/Objectives/Block.cs b/AATool/Data/Objectives/Block.cs
@@ -31,7 +31,7 @@ public Block(XmlNode node) : base (node)
         public void ToggleManualOverride()
         {
             this.ManuallyCompleted ^= true;
-            Tracker.Category.Blocks.UpdateTotal();
+            Tracker.Blocks.UpdateTotal();
         }
 
         public override void UpdateState(WorldState progress)

diff --git a/AATool/Data/Objectives/Death.cs b/AATool/Data/Objectives/Death.cs
@@ -40,7 +40,7 @@ public void Clear()
         public void ToggleManualOverride()
         {
             this.ManuallyCompleted ^= true;
-            Tracker.Category.Deaths.UpdateTotal();
+            Tracker.Deaths.UpdateTotal();
         }
 
         public override void UpdateState(WorldState progress)