Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-10-02 14:09:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

use epicmanifestparser v3 preview

Browse Source
This commit is contained in:
Marlon
2026-06-06 19:09:07 +02:00
parent 041fd4382e
commit e7b3eefd76
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

Submodule CUE4Parse updated: 3b456a3e44...86baae5c47

3
FModel/FModel.csproj
View File

@@ -156,8 +156,7 @@
<PackageReference Include="AvalonEdit" Version="6.3.1.120" /> <PackageReference Include="AvalonEdit" Version="6.3.1.120" />
<PackageReference Include="CSCore" Version="1.2.1.2" /> <PackageReference Include="CSCore" Version="1.2.1.2" />
<PackageReference Include="DiscordRichPresence" Version="1.6.1.70" /> <PackageReference Include="DiscordRichPresence" Version="1.6.1.70" />
<PackageReference Include="EpicManifestParser" Version="2.4.1" /> <PackageReference Include="EpicManifestParser" Version="3.0.0-preview.1" />
<PackageReference Include="EpicManifestParser.ZlibngDotNetDecompressor" Version="1.0.1" />
<PackageReference Include="FModel.AdonisUI" Version="1.18.0" /> <PackageReference Include="FModel.AdonisUI" Version="1.18.0" />
<PackageReference Include="FModel.AdonisUI.ClassicTheme" Version="1.18.0" /> <PackageReference Include="FModel.AdonisUI.ClassicTheme" Version="1.18.0" />
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" /> <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />

15
FModel/ViewModels/CUE4ParseViewModel.cs
View File

@@ -66,7 +66,6 @@ using CUE4Parse_Conversion;
using CUE4Parse_Conversion.Sounds; using CUE4Parse_Conversion.Sounds;
using EpicManifestParser; using EpicManifestParser;
using EpicManifestParser.UE; using EpicManifestParser.UE;
using EpicManifestParser.ZlibngDotNetDecompressor;
using FModel.Creator; using FModel.Creator;
using FModel.Extensions; using FModel.Extensions;
using FModel.Framework; using FModel.Framework;
@@ -95,6 +94,8 @@ public class CUE4ParseViewModel : ViewModel
private readonly Regex _fnLiveRegex = new(@"^FortniteGame[/\\]Content[/\\]Paks[/\\]", private readonly Regex _fnLiveRegex = new(@"^FortniteGame[/\\]Content[/\\]Paks[/\\]",
RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
private static readonly HttpClient _chunkClient = ManifestParseOptions.CreateDefaultClient();
private bool _modelIsOverwritingMaterial; private bool _modelIsOverwritingMaterial;
public bool ModelIsOverwritingMaterial public bool ModelIsOverwritingMaterial
{ {
@@ -225,9 +226,9 @@ public class CUE4ParseViewModel : ViewModel
{ {
Provider.OnDemandOptions = new IoStoreOnDemandOptions Provider.OnDemandOptions = new IoStoreOnDemandOptions
{ {
ChunkHostUri = new Uri("https://download.epicgames.com/", UriKind.Absolute), ChunkHostUri = new Uri("https://egdownload.fastly-edge.com/", UriKind.Absolute),
ChunkCacheDirectory = Directory.CreateDirectory(Path.Combine(UserSettings.Default.OutputDirectory, ".data")), ChunkCacheDirectory = Directory.CreateDirectory(Path.Combine(UserSettings.Default.OutputDirectory, ".data")),
Timeout = TimeSpan.FromSeconds(30) DownloaderClient = _chunkClient
}; };
switch (Provider) switch (Provider)
@@ -248,9 +249,9 @@ public class CUE4ParseViewModel : ViewModel
{ {
ChunkCacheDirectory = cacheDir, ChunkCacheDirectory = cacheDir,
ManifestCacheDirectory = cacheDir, ManifestCacheDirectory = cacheDir,
ChunkBaseUrl = "http://download.epicgames.com/Builds/Fortnite/CloudDir/", ChunkBaseUrl = "https://egdownload.fastly-edge.com/Builds/Fortnite/CloudDir/",
Decompressor = ManifestZlibngDotNetDecompressor.Decompress, Decompressor = Compression.Decompressor,
DecompressorState = ZlibHelper.Instance, Client = _chunkClient,
CacheChunksAsIs = false CacheChunksAsIs = false
}; };
@@ -261,7 +262,7 @@ public class CUE4ParseViewModel : ViewModel
{ {
(manifest, _) = manifestInfo.DownloadAndParseAsync(manifestOptions, (manifest, _) = manifestInfo.DownloadAndParseAsync(manifestOptions,
cancellationToken: cancellationToken, cancellationToken: cancellationToken,
elementManifestPredicate: static x => x.Uri.Host == "download.epicgames.com" || x.Uri.Host == "epicgames-download1.akamaized.net" elementDownloadPredicate: static x => x.Uri.Host is "egdownload.fastly-edge.com" or "epicgames-download1.akamaized.net" or "download.epicgames.com"
).GetAwaiter().GetResult(); ).GetAwaiter().GetResult();
} }
catch (HttpRequestException ex) catch (HttpRequestException ex)