From 6a977fb59eaba1376fc2ce5e452be412b2966683 Mon Sep 17 00:00:00 2001
From: goaaats <16760685+goaaats@users.noreply.github.com>
Date: Sun, 5 Dec 2021 02:08:43 +0100
Subject: [PATCH] feat: show client structs hash in Game submenu

---
 Dalamud/Dalamud.csproj                        | 10 ++++++++
 .../Game/Network/Structures/MarketTaxRates.cs |  2 +-
 .../Interface/Internal/DalamudInterface.cs    |  1 +
 Dalamud/Utility/Util.cs                       | 23 +++++++++++++++++--
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index ee8abed6c..64b9ca4b7 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -105,16 +105,22 @@
         <PropertyGroup>
             <!-- temp file for the git version (lives in "obj" folder)-->
             <VerFile>$(IntermediateOutputPath)gitver</VerFile>
+            <VerFileClientStructs>$(IntermediateOutputPath)csver</VerFileClientStructs>
         </PropertyGroup>
         <!-- write the hash to the temp file.-->
         <Exec Command="git -C &quot;$(ProjectDir.Replace('\','\\'))&quot; describe --long --always --dirty &gt; $(VerFile)" />
+        <Exec Command="git -C &quot;$(ProjectDir.Replace('\','\\'))\..\lib\FFXIVClientStructs&quot; describe --long --always --dirty &gt; $(VerFileClientStructs)" />
         <!-- read the version into the GitVersion itemGroup-->
         <ReadLinesFromFile File="$(VerFile)">
             <Output TaskParameter="Lines" ItemName="GitVersion" />
         </ReadLinesFromFile>
+        <ReadLinesFromFile File="$(VerFileClientStructs)">
+            <Output TaskParameter="Lines" ItemName="GitVersionClientStructs" />
+        </ReadLinesFromFile>
         <!-- Set the BuildHash property to contain the GitVersion, if it wasn't already set.-->
         <PropertyGroup>
             <BuildHash>@(GitVersion)</BuildHash>
+            <BuildHashClientStructs>@(GitVersionClientStructs)</BuildHashClientStructs>
         </PropertyGroup>
     </Target>
     <Target Name="WriteGitHash" BeforeTargets="CoreCompile">
@@ -132,6 +138,10 @@
                 <_Parameter1>GitHash</_Parameter1>
                 <_Parameter2>$(BuildHash)</_Parameter2>
             </AssemblyAttributes>
+            <AssemblyAttributes Include="AssemblyMetadata">
+                <_Parameter1>GitHashClientStructs</_Parameter1>
+                <_Parameter2>$(BuildHashClientStructs)</_Parameter2>
+            </AssemblyAttributes>
         </ItemGroup>
         <!-- writes the attribute to the customAssemblyInfo file -->
         <WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
diff --git a/Dalamud/Game/Network/Structures/MarketTaxRates.cs b/Dalamud/Game/Network/Structures/MarketTaxRates.cs
index bdca8fe7d..0cb21e5d8 100644
--- a/Dalamud/Game/Network/Structures/MarketTaxRates.cs
+++ b/Dalamud/Game/Network/Structures/MarketTaxRates.cs
@@ -14,7 +14,7 @@ namespace Dalamud.Game.Network.Structures
         }
 
         /// <summary>
-        /// Category of this ResultDialog packet.
+        /// Gets the category of this ResultDialog packet.
         /// </summary>
         public uint Category { get; private set; }
 
diff --git a/Dalamud/Interface/Internal/DalamudInterface.cs b/Dalamud/Interface/Internal/DalamudInterface.cs
index 5663de879..4c51d108f 100644
--- a/Dalamud/Interface/Internal/DalamudInterface.cs
+++ b/Dalamud/Interface/Internal/DalamudInterface.cs
@@ -507,6 +507,7 @@ namespace Dalamud.Interface.Internal
                         var startInfo = Service<DalamudStartInfo>.Get();
                         ImGui.MenuItem(Util.AssemblyVersion, false);
                         ImGui.MenuItem(startInfo.GameVersion.ToString(), false);
+                        ImGui.MenuItem($"CS: {Util.GetGitHashClientStructs()}", false);
 
                         ImGui.EndMenu();
                     }
diff --git a/Dalamud/Utility/Util.cs b/Dalamud/Utility/Util.cs
index 8a39b7aea..658ebb79c 100644
--- a/Dalamud/Utility/Util.cs
+++ b/Dalamud/Utility/Util.cs
@@ -22,7 +22,8 @@ namespace Dalamud.Utility
     /// </summary>
     public static class Util
     {
-        private static string gitHashInternal;
+        private static string? gitHashInternal;
+        private static string? gitHashClientStructsInternal;
 
         /// <summary>
         /// Gets an httpclient for usage.
@@ -48,11 +49,29 @@ namespace Dalamud.Utility
             var asm = typeof(Util).Assembly;
             var attrs = asm.GetCustomAttributes<AssemblyMetadataAttribute>();
 
-            gitHashInternal = attrs.FirstOrDefault(a => a.Key == "GitHash")?.Value;
+            gitHashInternal = attrs.First(a => a.Key == "GitHash").Value;
 
             return gitHashInternal;
         }
 
+        /// <summary>
+        /// Gets the git hash value from the assembly
+        /// or null if it cannot be found.
+        /// </summary>
+        /// <returns>The git hash of the assembly.</returns>
+        public static string GetGitHashClientStructs()
+        {
+            if (gitHashClientStructsInternal != null)
+                return gitHashClientStructsInternal;
+
+            var asm = typeof(Util).Assembly;
+            var attrs = asm.GetCustomAttributes<AssemblyMetadataAttribute>();
+
+            gitHashClientStructsInternal = attrs.First(a => a.Key == "GitHashClientStructs").Value;
+
+            return gitHashClientStructsInternal;
+        }
+
         /// <summary>
         /// Read memory from an offset and hexdump them via Serilog.
         /// </summary>