Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-04-15 05:56:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated faulty epicmanifestparser

Browse Source
This commit is contained in:
Marlon 2024-04-10 10:27:50 +02:00
parent eb9983bb18
commit a6eb13c0ab
No known key found for this signature in database
GPG Key ID: 5C65CA190C38792F
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit 50d5e06d421e2935cc4107df6352b36c341ec7c0
Subproject commit 08a5553ddec50aa6064278b424620e95aabf4048

2
FModel/FModel.csproj
View File

@ -150,7 +150,7 @@
<PackageReference Include="AvalonEdit" Version="6.3.0.90" />
<PackageReference Include="CSCore" Version="1.2.1.2" />
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
<PackageReference Include="EpicManifestParser" Version="2.2.0" />
<PackageReference Include="EpicManifestParser" Version="2.2.1" />
<PackageReference Include="ImGui.NET" Version="1.90.1.1" />
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

8
FModel/MainWindow.xaml.cs
View File

@ -61,8 +61,8 @@ public partial class MainWindow
break;
}
await _applicationView.InitOodle();
await _applicationView.InitZlib();
await ApplicationViewModel.InitOodle();
await ApplicationViewModel.InitZlib();
await _applicationView.CUE4Parse.Initialize();
await _applicationView.AesManager.InitAes();
await _applicationView.UpdateProvider(true);
@ -73,8 +73,8 @@ public partial class MainWindow
_applicationView.CUE4Parse.VerifyConsoleVariables(),
_applicationView.CUE4Parse.VerifyOnDemandArchives(),
_applicationView.CUE4Parse.InitMappings(),
_applicationView.InitVgmStream(),
_applicationView.InitImGuiSettings(newOrUpdated),
ApplicationViewModel.InitVgmStream(),
ApplicationViewModel.InitImGuiSettings(newOrUpdated),
Task.Run(() =>
{
if (UserSettings.Default.DiscordRpc == EDiscordRpc.Always)

14
FModel/ViewModels/ApplicationViewModel.cs
View File

@ -162,7 +162,7 @@ public class ApplicationViewModel : ViewModel
RaisePropertyChanged(nameof(GameDisplayName));
}
public async Task InitVgmStream()
public static async Task InitVgmStream()
{
var vgmZipFilePath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", "vgmstream-win.zip");
if (File.Exists(vgmZipFilePath)) return;
@ -188,7 +188,7 @@ public class ApplicationViewModel : ViewModel
}
}
public async Task InitImGuiSettings(bool forceDownload)
public static async Task InitImGuiSettings(bool forceDownload)
{
var imgui = "imgui.ini";
var imguiPath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", imgui);
@ -203,7 +203,7 @@ public class ApplicationViewModel : ViewModel
}
}
public async Task InitOodle()
public static async ValueTask InitOodle()
{
var oodlePath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", OodleHelper.OODLE_DLL_NAME);
if (File.Exists(OodleHelper.OODLE_DLL_NAME))
@ -218,14 +218,10 @@ public class ApplicationViewModel : ViewModel
OodleHelper.Initialize(oodlePath);
}
public async Task InitZlib()
public static async ValueTask InitZlib()
{
var zlibPath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", ZlibHelper.DLL_NAME);
if (File.Exists(ZlibHelper.DLL_NAME))
{
File.Move(ZlibHelper.DLL_NAME, zlibPath, true);
}
else if (!File.Exists(zlibPath))
if (!File.Exists(zlibPath))
{
await ZlibHelper.DownloadDllAsync(zlibPath);
}