Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-21 17:24:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

disabled fortnite live + reset settings in message box

Browse Source
This commit is contained in:
iAmAsval 2020-11-10 20:20:13 +01:00
parent 3c90458749
commit 67cc87f8f8
10 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FModel/FModel.csproj
View File

@ -133,10 +133,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autoupdater.NET.Official" Version="1.6.3" />
<PackageReference Include="Autoupdater.NET.Official" Version="1.6.4" />
<PackageReference Include="AvalonEdit" Version="6.0.1" />
<PackageReference Include="CSCore" Version="1.2.1.2" />
<PackageReference Include="DiscordRichPresence" Version="1.0.150" />
<PackageReference Include="DiscordRichPresence" Version="1.0.166" />
<PackageReference Include="DotNetZip" Version="1.14.0" />
<PackageReference Include="EpicManifestParser" Version="1.2.0" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.1" />
@ -146,7 +146,7 @@
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NVorbis" Version="0.10.1" />
<PackageReference Include="Ookii.Dialogs.Wpf" Version="1.1.0" />
<PackageReference Include="Ookii.Dialogs.Wpf" Version="1.2.0" />
<PackageReference Include="SkiaSharp" Version="2.80.2" />
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2" />
<PackageReference Include="System.Data.HashFunction.CityHash" Version="2.0.0" />

3
FModel/PakReader/Parsers/Class/UObject.cs
View File

@ -46,6 +46,9 @@ namespace FModel.PakReader.Parsers.Class
var (val, isNonZero) = it.Current;
if (properties.TryGetValue(val, out var propertyInfo))
{
if (propertyInfo.Name == "AuthoredVFXData_ByPart" || propertyInfo.Name == "RequestedDataStores")
continue;
if (isNonZero)
{
var obj = BaseProperty.ReadAsObject(reader, new FPropertyTag(propertyInfo), new FName(propertyInfo.Type), ReadType.NORMAL);

15
FModel/PakReader/Parsers/Objects/FByteBulkData.cs
View File

@ -8,11 +8,15 @@ namespace FModel.PakReader.Parsers.Objects
internal FByteBulkData(BinaryReader reader, Stream ubulk, long ubulkOffset)
{
var BulkDataFlags = reader.ReadUInt32();
var BulkDataFlags = reader.ReadInt32();
var ElementCount = reader.ReadInt32();
_ = reader.ReadInt32(); //BulkDataSizeOnDisk
var BulkDataOffsetInFile = reader.ReadInt64();
if ((BulkDataFlags & (uint)EBulkDataFlags.BULKDATA_NoOffsetFixUp) == 0) // UE4.26 flag
{
BulkDataOffsetInFile += ubulkOffset;
}
Data = null;
if ((BulkDataFlags & 0x20) != 0 || ElementCount == 0)
@ -21,7 +25,6 @@ namespace FModel.PakReader.Parsers.Objects
return;
if ((BulkDataFlags & (uint)EBulkDataFlags.BULKDATA_PayloadAtEndOfFile) != 0 &&
BulkDataOffsetInFile > 0 && ElementCount > 0 &&
BulkDataOffsetInFile + ElementCount <= reader.BaseStream.Length) //.uasset
{
long rememberMe = reader.BaseStream.Position;
@ -33,13 +36,9 @@ namespace FModel.PakReader.Parsers.Objects
{
Data = reader.ReadBytes(ElementCount);
}
else if ((BulkDataFlags & (uint)EBulkDataFlags.BULKDATA_PayloadInSeperateFile) != 0 &&
ubulk != null && BulkDataOffsetInFile + ubulkOffset >= 0) //.ubulk
else if ((BulkDataFlags & (uint)EBulkDataFlags.BULKDATA_PayloadInSeperateFile) != 0 && ubulk != null) //.ubulk
{
if ((BulkDataFlags & (uint)EBulkDataFlags.BULKDATA_NoOffsetFixUp) == 0) // UE4.26 flag
{
ubulk.Position = BulkDataOffsetInFile + ubulkOffset;
}
ubulk.Position = BulkDataOffsetInFile;
Data = new byte[ElementCount];
ubulk.Read(Data, 0, (int)ElementCount);
}

7
FModel/Properties/Resources.Designer.cs generated
View File

@ -775,9 +775,10 @@ namespace FModel.Properties {
/// Recherche une chaîne localisée semblable à • Maiky ♥ • HYPEX ♥
///• VenomLeaks ♥ • JayKeyFN ♥
///• Fevers ♥ • Netu ♥
///• Quentin • Yanteh
///• Shiina • SexyNutella
///• Alexander • imatrix
///• TheGameVlog ♥ • Quentin
///• Yanteh • Shiina
///• SexyNutella • Alexander
///• Jinx • imatrix
///• Frenzy Leaks • LlamaLeaks
///• XTigerHyperX • FunGames
///• WeLoveFortnite.

7
FModel/Properties/Resources.resx
View File

@ -354,9 +354,10 @@ It's now the most used free software to leak on Fortnite.</value>
<value>• Maiky ♥ • HYPEX ♥
• VenomLeaks ♥ • JayKeyFN ♥
• Fevers ♥ • Netu ♥
• Quentin • Yanteh
• Shiina • SexyNutella
• Alexander • imatrix
• TheGameVlog ♥ • Quentin
• Yanteh • Shiina
• SexyNutella • Alexander
• Jinx • imatrix
• Frenzy Leaks • LlamaLeaks
• XTigerHyperX • FunGames
• WeLoveFortnite</value>

6
FModel/Windows/DarkMessageBox/DarkMessageBox.xaml
View File

@ -25,9 +25,13 @@
</DockPanel>
</Grid>
<Grid Grid.Row="1" MinHeight="49">
<Grid Grid.Row="1" MinHeight="45">
<DockPanel Margin="5,0">
<Button Grid.Row="6" Grid.Column="1" DockPanel.Dock="Left" Height="20" Margin="5,0"
Content="{x:Static properties:Resources.ResetSettings}" Padding="5,2,5,2"
HorizontalAlignment="Left" Style="{StaticResource RedButton}" Click="OnDeleteSettings"/>
<!-- Cancel Button -->
<Button Name="Button_Cancel" MinWidth="88" MaxWidth="160" Height="20" Margin="5,0" HorizontalAlignment="Right" Visibility="Collapsed" IsCancel="True"
DockPanel.Dock="Right" Click="Button_Cancel_Click">

13
FModel/Windows/DarkMessageBox/DarkMessageBox.xaml.cs
View File

@ -1,4 +1,6 @@
using System.Drawing;
using FModel.Logger;
using System.Diagnostics;
using System.Drawing;
using System.Windows;
using System.Windows.Media;
@ -219,5 +221,14 @@ namespace FModel.Windows.DarkMessageBox
Result = MessageBoxResult.No;
Close();
}
private void OnDeleteSettings(object sender, RoutedEventArgs e)
{
Properties.Settings.Delete();
DarkMessageBoxHelper.Show(Properties.Resources.PathChangedRestart, Properties.Resources.PathChanged, MessageBoxButton.OK, MessageBoxImage.Information);
DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[Restarting]", "Settings reset");
Process.Start(Process.GetCurrentProcess().MainModule.FileName);
Application.Current.Shutdown();
}
}
}

2
FModel/Windows/Launcher/FLauncher.xaml.cs
View File

@ -48,7 +48,7 @@ namespace FModel.Windows.Launcher
ComboBoxVm.gamesCbViewModel.Add(new ComboBoxViewModel { Id = i++, Content = Properties.Resources.GameName_Fortnite + " [EGL2]", Property = egl2FilesPath });
}
ComboBoxVm.gamesCbViewModel.Add(new ComboBoxViewModel { Id = i++, Content = Properties.Resources.GameName_Fortnite + " [LIVE]", Property = "donotedit-youcanteditanyway-fn.manifest" });
//ComboBoxVm.gamesCbViewModel.Add(new ComboBoxViewModel { Id = i++, Content = Properties.Resources.GameName_Fortnite + " [LIVE]", Property = "donotedit-youcanteditanyway-fn.manifest" });
string valorantFilesPath = Paks.GetValorantPakFilesPath();
if (!string.IsNullOrEmpty(valorantFilesPath))

9
FModel/Windows/SoundPlayer/NVorbisSource.cs
View File

@ -38,14 +38,7 @@ namespace FModel.Windows.SoundPlayer
{
get
{
try
{
return CanSeek ? (long)(_vorbisReader.TotalTime.TotalSeconds * _waveFormat.SampleRate * _waveFormat.Channels) : 0;
}
catch (Exception)
{
return 0;
}
return CanSeek ? (long)(_vorbisReader.TotalTime.TotalSeconds * _waveFormat.SampleRate * _waveFormat.Channels) : 0;
}
}

5
README.md
View File

@ -11,7 +11,7 @@ Over time, new features got added and new users discovered the program.
- [Features](#features)
- [Installation](#installation)
- [Acknowledgments](#acknowledgments)
- [Support](#support-)
- [Support](#support)
## Introduction
@ -168,12 +168,13 @@ This software uses the following open source packages:
- [MaterialDesignIcons](https://materialdesignicons.com/)
- [Microsoft.Windows.SDK.Contracts](https://www.nuget.org/packages/Microsoft.Windows.SDK.Contracts)
## Support [![](https://wakatime.com/badge/github/iAmAsval/FModel.svg)](https://wakatime.com/badge/github/iAmAsval/FModel)
## Support
This project is not my full time job, donations and stars are greatly appreciated.
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EP9SSWG8MW4UC&source=url">
<img src="https://img.shields.io/badge/Paypal-Donate-00457C.svg?logo=paypal">
<img src="https://wakatime.com/badge/github/iAmAsval/FModel.svg">
</a>
<a href="https://starchart.cc/iamasval/fmodel.svg">
<img src="https://starchart.cc/iamasval/fmodel.svg">