fix update and relative config path

closes #15 and closes #14
ardittristan · Jul 7, 2023 · 920cb40 · 920cb40
1 parent 32ba545
commit 920cb40
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 15 deletions.
diff --git a/ExtractAllTexturesFromHS/ExtractAllTexturesFromHS.csproj b/ExtractAllTexturesFromHS/ExtractAllTexturesFromHS.csproj
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ThisAssembly.Project" Version="1.2.14">
+    <PackageReference Include="ThisAssembly.Project" Version="1.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -30,4 +30,8 @@
     <ProjectReference Include="..\TextureExtractor\TextureExtractor.csproj" />
   </ItemGroup>
 
+  <Target Name="CleanOutput" AfterTargets="Clean">
+    <RemoveDir Directories="obj\hs" />
+  </Target>
+
 </Project>
diff --git a/ExtractAllTexturesFromHS/Program.cs b/ExtractAllTexturesFromHS/Program.cs
@@ -9,10 +9,17 @@
 
 string extractDir = Path.Combine(ThisAssembly.Project.ProjectPath, @"obj\hs");
 
-IEnumerable<string> assetBundles = Directory.EnumerateFiles(assetBundleDir, "*.unity3d");
+string searchPattern = "*.unity3d";
+
+if (args.Length > 0 && args[0].Length > 0)
+    searchPattern = args[0];
+
+IEnumerable<string> assetBundles = Directory.EnumerateFiles(assetBundleDir, searchPattern);
 
 Extractor extractor = new(extractDir, "1");
 
+Console.WriteLine(extractor.FindBundle(assetBundleDir, "initial_base_global-*-texture-*.unity3d", "class_druid-icon", true));
+
 Task[] tasks = assetBundles.Select(bundle => extractor.ExtractAsync(bundle, true)).ToArray();
 
 Task whenAll = Task.WhenAll(tasks);

diff --git a/ExtractAllTexturesFromHS/Properties/launchSettings.json b/ExtractAllTexturesFromHS/Properties/launchSettings.json
@@ -0,0 +1,15 @@
+{
+  "profiles": {
+    "Extract[initial_base_global]TexturesFromHS": {
+      "commandName": "Project",
+      "commandLineArgs": "\"initial_base_global-*-texture-*.unity3d\""
+    },
+    "ExtractAllFromHS": {
+      "commandName": "Project"
+    },
+    "ExtractAllTexturesFromHS": {
+      "commandName": "Project",
+      "commandLineArgs": "\"*-texture-*.unity3d\""
+    }
+  }
+}
diff --git a/HearthMirrorGenerator/HearthMirrorGenerator.csproj b/HearthMirrorGenerator/HearthMirrorGenerator.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ICSharpCode.Decompiler" Version="8.0.0.7313-preview4" GeneratePathProperty="true" PrivateAssets="all" />
+    <PackageReference Include="ICSharpCode.Decompiler" Version="8.0.0.7345" GeneratePathProperty="true" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="[3.11.0,4.0.0-1)" PrivateAssets="all" />
   </ItemGroup>
 

diff --git a/QuestOverlayPlugin/Plugin.cs b/QuestOverlayPlugin/Plugin.cs
@@ -15,6 +15,7 @@
 using Hearthstone_Deck_Tracker.Utility.Logging;
 using Hearthstone_Deck_Tracker.Windows;
 using HearthWatcher.EventArgs;
+using HSReflection;
 using HSReflection.Enums;
 using MahApps.Metro.Controls;
 using QuestOverlayPlugin.Controls;
@@ -29,7 +30,7 @@ namespace QuestOverlayPlugin;
 // ReSharper disable once ClassNeverInstantiated.Global
 public class Plugin : IPlugin, Updater.IUpdater
 {
-    public const string QUEST_ICONS_LOC = "initial_base_global-07ca451d-texture-0";
+    public static string QUEST_ICONS_LOC { private set; get; } = string.Empty;
 
     internal Settings Settings = null!;
     private Flyout _settingsFlyout = null!;
@@ -72,6 +73,7 @@ public class Plugin : IPlugin, Updater.IUpdater
     private RecurringTask? _questListWindowRT;
 
     private static double ScreenRatio => (4.0 / 3.0) / (Core.OverlayWindow.Width / Core.OverlayWindow.Height);
+
     private static double QuestsButtonOffset
     {
         get
@@ -81,6 +83,7 @@ private static double QuestsButtonOffset
             return Core.OverlayWindow.Height * 0.05 + 74;
         }
     }
+
     private static double BattlegroundsQuestsButtonOffset
     {
         get
@@ -105,6 +108,14 @@ public void OnLoad()
 
         new Updater(this).CheckUpdate();
 
+        Extractor = new Extractor(
+            Path.Combine(Config.Instance.ConfigDir, "Plugins", "HearthstoneQuestOverlay", "TextureExtractor"),
+            Core.Game.MetaData.HearthstoneBuild.ToString());
+
+        QUEST_ICONS_LOC = Path.GetFileNameWithoutExtension(Extractor.FindBundle(
+            Path.Combine(Config.Instance.HearthstoneDirectory, @"Data\Win"),
+            "initial_base_global-*-texture-*.unity3d", "class_druid-icon"));
+
         _questListButton = new QuestListButton(QuestListVM);
         _questListButtonBehavior = new OverlayElementBehavior(_questListButton)
         {
@@ -163,23 +174,30 @@ public void OnLoad()
         GameEvents.OnModeChanged.Add(OnGameStart);
         GameEvents.OnModeChanged.Add(UpdateQuestWindow);
         Watchers.ExperienceWatcher.NewExperienceHandler += UpdateEventHandler;
+        Watchers.BaconWatcher.Change += UpdateEventHandler;
         if (Core.Game.IsRunning) Update();
         if (Core.Game.IsRunning) OnGameStart();
 
-        Extractor = new Extractor(
-            Path.Combine(Config.Instance.ConfigDir, "Plugins", "HearthstoneQuestOverlay", "TextureExtractor"),
-            Core.Game.MetaData.HearthstoneBuild.ToString());
-
         Extractor.ExtractAsync(CreateBundlePath(QUEST_ICONS_LOC));
+
+        Reflection.Exception += Reflection_Exception;
+    }
+
+    private void Reflection_Exception(Exception obj)
+    {
+        // ReSharper disable once ExplicitCallerInfoArgument
+        Log.Error(obj, sourceFilePath: "HSReflection/Reflection.cs");
     }
 
     private void UpdateQuestWindow(Mode mode) => UpdateQuestWindow();
+
     private void UpdateQuestWindow()
     {
         if (Settings.ShowPopupWindow) QuestListWindowVM.UpdateAsync();
     }
 
     private void OnGameStart(Mode mode) => OnGameStart();
+
     private void OnGameStart()
     {
         if (_gameRunning)
@@ -258,6 +276,7 @@ private void InitSettings()
     public void OnUnload()
     {
         Watchers.ExperienceWatcher.NewExperienceHandler -= UpdateEventHandler;
+        Watchers.BaconWatcher.Change -= UpdateEventHandler;
 
         RemoveOverlay();
         _questListWindow.Shutdown();
@@ -391,6 +410,11 @@ public static void UpdateEventHandler(object sender, ExperienceEventArgs args)
         if (args.IsChanged) Update();
     }
 
+    public static void UpdateEventHandler(object sender, BaconEventArgs args)
+    {
+        if (args.IsJournalOpen) Update();
+    }
+
     internal static void Update(Mode mode) => Update();
 
     internal static void Update()

diff --git a/QuestOverlayPlugin/Util/Icon.cs b/QuestOverlayPlugin/Util/Icon.cs
@@ -13,8 +13,9 @@ public class Icon
 
     public ImageSource ImageSource { get; }
 
-    public Icon(string? name, string assetBundle = Plugin.QUEST_ICONS_LOC)
+    public Icon(string? name, string? assetBundle = null)
     {
+        assetBundle ??= Plugin.QUEST_ICONS_LOC;
         Name = name;
         AssetBundle = assetBundle;
         try
@@ -101,9 +102,7 @@ private ImageSource NormalIcon
             WriteableBitmap wb = new(image);
 
             using (wb.GetBitmapContext())
-            {
                 wb = wb.Crop(0, 0, image.PixelWidth, image.PixelHeight / 2);
-            }
 
             return wb;
         }
@@ -142,9 +141,21 @@ private static string IconNameFilter(string name)
         }
     }
 
-    private ImageSource BrokenIcon => new BitmapImage(GetImageUri("3Class_Background-icon.png"));
+    private ImageSource BrokenIcon
+    {
+        get
+        {
+            BitmapImage image = new(GetImageUri("3Class_Background-icon.png"));
+            WriteableBitmap wb = new(image);
+
+            using (wb.GetBitmapContext())
+                wb = wb.Crop(0, 0, image.PixelWidth, image.PixelHeight / 2);
+
+            return wb;
+        }
+    }
 
     private Uri GetImageUri(string fileName) =>
         new(Path.Combine(Plugin.Instance.Extractor.OutputPath, AssetBundle, fileName),
-            UriKind.Absolute);
+            UriKind.RelativeOrAbsolute);
 }
diff --git a/TextureExtractor/Extractor.cs b/TextureExtractor/Extractor.cs
@@ -35,6 +35,57 @@ public async Task ExtractAsync(string bundlePath, bool force = false)
         await Task.WhenAll(t);
     }
 
+    public async Task<string> FindBundleAsync(string bundleFolderPath, string bundleFileFilter, string assetName,
+        bool force = false)
+    {
+        Task<string> t = new(() => FindBundle(bundleFolderPath, bundleFileFilter, assetName, force));
+        t.Start();
+        return (await Task.WhenAll(t))[0];
+    }
+
+    public string FindBundle(string bundleFolderPath, string bundleFileFilter, string assetName, bool force = false)
+    {
+        if (!Validate(bundleFolderPath, bundleFileFilter, assetName, force))
+            return Properties.Settings.Default.AssetNameStore[bundleFileFilter + assetName];
+
+        IEnumerable<string> bundleFiles = Directory.GetFiles(bundleFolderPath, bundleFileFilter);
+
+        AssetsManager manager = new();
+
+        string foundBundle = null;
+
+        Directory.CreateDirectory(OutputPath);
+
+        foreach (string bundlePath in bundleFiles)
+        {
+            BundleFileInstance bundleInst = manager.LoadBundleFile(bundlePath);
+            AssetsFileInstance assetsFileInst = manager.LoadAssetsFileFromBundle(bundleInst, 0);
+
+            foreach (AssetFileInfo assetFile in assetsFileInst.file.GetAssetsOfType(AssetClassID.Texture2D))
+            {
+                AssetTypeValueField baseField = manager.GetBaseField(assetsFileInst, assetFile);
+                TextureFile textureField = TextureFile.ReadTextureFile(baseField);
+
+                if (textureField.m_Name != assetName)
+                    continue;
+
+                foundBundle = bundlePath;
+                goto Break;
+            }
+
+            manager.UnloadAssetsFile(assetsFileInst);
+        }
+        Break:
+
+        manager.UnloadAll(true);
+
+        Properties.Settings.Default.VersionStore[bundleFileFilter + assetName] = HearthstoneBuild;
+        Properties.Settings.Default.AssetNameStore[bundleFileFilter + assetName] = foundBundle;
+        Properties.Settings.Default.Save();
+
+        return foundBundle;
+    }
+
     public void Extract(string bundlePath, bool force = false)
     {
         if (!Validate(bundlePath, force)) return;
@@ -75,6 +126,21 @@ public void Extract(string bundlePath, bool force = false)
         Properties.Settings.Default.Save();
     }
 
+    private bool Validate(string bundleFolderPath, string bundleFileFilter, string assetName, bool forced)
+    {
+        if (!Directory.EnumerateFiles(bundleFolderPath, bundleFileFilter).Any())
+            throw new FileDoesNotExitException();
+
+        bool hasUpdated = HasUpdated(bundleFileFilter + assetName, HearthstoneBuild);
+
+#if DEBUG
+        System.Diagnostics.Debug.WriteLine("Validate: " + !(forced || hasUpdated));
+        return true;
+#else
+			return !(forced || hasUpdated);
+#endif
+    }
+
     private bool Validate(string bundlePath, bool forced)
     {
         if (!File.Exists(bundlePath))

diff --git a/TextureExtractor/Properties/Settings.cs b/TextureExtractor/Properties/Settings.cs
@@ -16,4 +16,15 @@ public SerializableStringDictionary VersionStore
             return (SerializableStringDictionary)this[nameof(VersionStore)];
         }
     }
+
+    [UserScopedSetting]
+    [SettingsSerializeAs(SettingsSerializeAs.Xml)]
+    public SerializableStringDictionary AssetNameStore
+    {
+        get
+        {
+            this[nameof(AssetNameStore)] ??= new SerializableStringDictionary();
+            return (SerializableStringDictionary)this[nameof(AssetNameStore)];
+        }
+    }
 }
diff --git a/TextureExtractor/TextureExtractor.csproj b/TextureExtractor/TextureExtractor.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.18.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="PortableSettingsProvider" Version="0.2.4">
+    <PackageReference Include="PortableSettingsProvider" Version="0.2.5">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/Version.props b/Version.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>1.5.7</Version>
+    <Version>1.5.8</Version>
   </PropertyGroup>
 </Project>