From 23ba77c107516a9f373d8f88cb71f421184f75f2 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Fri, 28 Mar 2025 15:52:40 +0100
Subject: [PATCH] Update build step and check for pre 7.2 shps.

---
 Penumbra.GameData                               |  2 +-
 .../Interop/Processing/ShpkPathPreProcessor.cs  |  8 ++++----
 Penumbra/Penumbra.csproj                        | 17 +++++++----------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Penumbra.GameData b/Penumbra.GameData
index 1158cf40..85921598 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit 1158cf404a16979d0b7e12f7bbcbbc651da16add
+Subproject commit 859215989da41a4ccb59a5ce390223570a69c94e
diff --git a/Penumbra/Interop/Processing/ShpkPathPreProcessor.cs b/Penumbra/Interop/Processing/ShpkPathPreProcessor.cs
index 2fb35ae0..826771dd 100644
--- a/Penumbra/Interop/Processing/ShpkPathPreProcessor.cs
+++ b/Penumbra/Interop/Processing/ShpkPathPreProcessor.cs
@@ -56,8 +56,8 @@ public sealed class ShpkPathPreProcessor(ResourceManagerService resourceManager,
             using var file  = MmioMemoryManager.CreateFromFile(path, access: MemoryMappedFileAccess.Read);
             var       bytes = file.GetSpan();
 
-            return ShpkFile.FastIsLegacy(bytes)
-                ? SanityCheckResult.Legacy
+            return ShpkFile.FastIsObsolete(bytes)
+                ? SanityCheckResult.Obsolete
                 : SanityCheckResult.Success;
         }
         catch (FileNotFoundException)
@@ -75,7 +75,7 @@ public sealed class ShpkPathPreProcessor(ResourceManagerService resourceManager,
         {
             SanityCheckResult.IoError  => "Cannot read the modded file.",
             SanityCheckResult.NotFound => "The modded file does not exist.",
-            SanityCheckResult.Legacy   => "This mod is not compatible with Dawntrail. Get an updated version, if possible, or disable it.",
+            SanityCheckResult.Obsolete => "This mod is not compatible with Dawntrail post patch 7.2. Get an updated version, if possible, or disable it.",
             _                          => string.Empty,
         };
 
@@ -84,6 +84,6 @@ public sealed class ShpkPathPreProcessor(ResourceManagerService resourceManager,
         Success,
         IoError,
         NotFound,
-        Legacy,
+        Obsolete,
     }
 }
diff --git a/Penumbra/Penumbra.csproj b/Penumbra/Penumbra.csproj
index cc892fa8..f93b1815 100644
--- a/Penumbra/Penumbra.csproj
+++ b/Penumbra/Penumbra.csproj
@@ -23,6 +23,13 @@
         <Content Include="tsmLogo.png">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
+        <None Include="lib\DirectXTexC.dll">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <TargetPath>DirectXTexC.dll</TargetPath>
+        </None>
+        <None Include="Penumbra.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
     </ItemGroup>
 
     <ItemGroup>
@@ -64,16 +71,6 @@
         <ProjectReference Include="..\Penumbra.String\Penumbra.String.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <None Update="lib\DirectXTexC.dll">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <TargetPath>DirectXTexC.dll</TargetPath>
-        </None>
-        <None Update="Penumbra.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
     <Target Name="GetGitHash" BeforeTargets="GetAssemblyVersion" Returns="InformationalVersion">
         <Exec Command="git rev-parse --short HEAD" ConsoleToMSBuild="true" StandardOutputImportance="low" ContinueOnError="true">
             <Output TaskParameter="ExitCode" PropertyName="GitCommitHashSuccess" />