ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update build step and check for pre 7.2 shps.

Browse source
This commit is contained in:
Ottermandias 2025-03-28 15:52:40 +01:00
parent 1a1d1c1840
commit 23ba77c107
3 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit 1158cf404a16979d0b7e12f7bbcbbc651da16add Subproject commit 859215989da41a4ccb59a5ce390223570a69c94e

8
Penumbra/Interop/Processing/ShpkPathPreProcessor.cs
View file

@ -56,8 +56,8 @@ public sealed class ShpkPathPreProcessor(ResourceManagerService resourceManager,
using var file = MmioMemoryManager.CreateFromFile(path, access: MemoryMappedFileAccess.Read); using var file = MmioMemoryManager.CreateFromFile(path, access: MemoryMappedFileAccess.Read);
var bytes = file.GetSpan(); var bytes = file.GetSpan();
return ShpkFile.FastIsLegacy(bytes) return ShpkFile.FastIsObsolete(bytes)
? SanityCheckResult.Legacy ? SanityCheckResult.Obsolete
: SanityCheckResult.Success; : SanityCheckResult.Success;
} }
catch (FileNotFoundException) catch (FileNotFoundException)
@ -75,7 +75,7 @@ public sealed class ShpkPathPreProcessor(ResourceManagerService resourceManager,
{ {
SanityCheckResult.IoError => "Cannot read the modded file.", SanityCheckResult.IoError => "Cannot read the modded file.",
SanityCheckResult.NotFound => "The modded file does not exist.", 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, _ => string.Empty,
}; };
@ -84,6 +84,6 @@ public sealed class ShpkPathPreProcessor(ResourceManagerService resourceManager,
Success, Success,
IoError, IoError,
NotFound, NotFound,
Legacy, Obsolete,
} }
} }

17
Penumbra/Penumbra.csproj
View file

@ -23,6 +23,13 @@
<Content Include="tsmLogo.png"> <Content Include="tsmLogo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="lib\DirectXTexC.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<TargetPath>DirectXTexC.dll</TargetPath>
</None>
<None Include="Penumbra.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -64,16 +71,6 @@
<ProjectReference Include="..\Penumbra.String\Penumbra.String.csproj" /> <ProjectReference Include="..\Penumbra.String\Penumbra.String.csproj" />
</ItemGroup> </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"> <Target Name="GetGitHash" BeforeTargets="GetAssemblyVersion" Returns="InformationalVersion">
<Exec Command="git rev-parse --short HEAD" ConsoleToMSBuild="true" StandardOutputImportance="low" ContinueOnError="true"> <Exec Command="git rev-parse --short HEAD" ConsoleToMSBuild="true" StandardOutputImportance="low" ContinueOnError="true">
<Output TaskParameter="ExitCode" PropertyName="GitCommitHashSuccess" /> <Output TaskParameter="ExitCode" PropertyName="GitCommitHashSuccess" />