bug fix, invalidate data trinkets with tinker

Mushymato · Nov 11, 2024 · 30c5362 · 30c5362
1 parent 2bbfa4f
commit 30c5362
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 >
 > The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### 1.0.2
+
+#### Fixed
+
+- Correctly invalidate Data/Trinkets whenever the Tinker asset gets invalidated.
+
 ### 1.0.1
 
 #### Fixed

diff --git a/TrinketTinker/ModEntry.cs b/TrinketTinker/ModEntry.cs
@@ -78,9 +78,13 @@ private static void OnAssetRequested(object? sender, AssetRequestedEventArgs e)
         TrinketColorizer.OnAssetRequested(e);
     }
 
-    private static void OnAssetInvalidated(object? sender, AssetsInvalidatedEventArgs e)
+    private void OnAssetInvalidated(object? sender, AssetsInvalidatedEventArgs e)
     {
-        AssetManager.OnAssetInvalidated(e);
+        if (AssetManager.OnAssetInvalidated(e))
+        {
+            // need to invalidate this as well to ensure proper updates on Data/Trinkets
+            Helper.GameContent.InvalidateCache(AssetManager.TRINKET_TARGET);
+        }
     }
 
     private static void OnPlayerWarped(object? sender, WarpedEventArgs e)

diff --git a/TrinketTinker/TrinketTinker.csproj b/TrinketTinker/TrinketTinker.csproj
@@ -19,7 +19,7 @@
     <Description>Trinket &amp; Companion framework.</Description>
     <UniqueId>mushymato.TrinketTinker</UniqueId>
     <UpdateKeys>Nexus:29073;GitHub:Mushymato/TrinketTinker</UpdateKeys>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <MinimumApiVersion_Behavior>UpdateFull</MinimumApiVersion_Behavior>
     <MinimumGameVersion_Behavior>UpdateFull</MinimumGameVersion_Behavior>
     <Dependencies_VersionBehavior>UpdateFull</Dependencies_VersionBehavior>

diff --git a/TrinketTinker/Wheels/AssetManager.cs b/TrinketTinker/Wheels/AssetManager.cs
@@ -58,12 +58,16 @@ internal static void OnAssetRequested(AssetRequestedEventArgs e)
             e.Edit(Edit_Trinkets_EffectClass, AssetEditPriority.Late + 100);
     }
 
-    internal static void OnAssetInvalidated(AssetsInvalidatedEventArgs e)
+    internal static bool OnAssetInvalidated(AssetsInvalidatedEventArgs e)
     {
-        if (e.NamesWithoutLocale.Any(an => an.IsEquivalentTo(TinkerAsset)))
-            _tinkerData = null;
         if (e.NamesWithoutLocale.Any(an => an.IsEquivalentTo(TASAsset)))
             _tasData = null;
+        if (e.NamesWithoutLocale.Any(an => an.IsEquivalentTo(TinkerAsset)))
+        {
+            _tinkerData = null;
+            return true;
+        }
+        return false;
     }
 
     /// <summary>Ensure all trinkets that have a Tinker entry also have <see cref="EffectClass"/> </summary>