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

fixed dict error + fixed battle breaker sounds + updated readme

Browse Source
This commit is contained in:
iAmAsval 2020-06-18 19:07:05 +02:00
parent a6c2f19d8f
commit d960a63996
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FModel/Globals.cs
View File

@ -55,6 +55,7 @@ namespace FModel
EGame.DeadByDaylight => "Dead By Daylight",
EGame.Borderlands3 => "Borderlands 3",
EGame.MinecraftDungeons => "Minecraft Dungeons",
EGame.BattleBreakers => "Battle Breakers",
EGame.Unknown => "Unknown",
_ => "Unknown",
};

4
FModel/Grabber/Cdn/CdnDataGrabber.cs
View File

@ -67,9 +67,9 @@ namespace FModel.Grabber.Cdn
if (_data == null)
_data = await CdnData.GetData().ConfigureAwait(false);
if (_data != null)
if (_data != null && _data.Backups.TryGetValue(Globals.Game.ActualGame.ToString(), out var backups))
{
return JsonConvert.DeserializeObject<List<BackupMenuItemViewModel>>(JsonConvert.SerializeObject(_data.Backups[Globals.Game.ActualGame.ToString()]));
return JsonConvert.DeserializeObject<List<BackupMenuItemViewModel>>(JsonConvert.SerializeObject(backups));
}
return new List<BackupMenuItemViewModel>();
}

5
FModel/PakReader/Parsers/Class/USoundWave.cs
View File

@ -10,7 +10,7 @@ namespace PakReader.Parsers.Class
{
public bool bCooked;
/** Whether this sound can be streamed to avoid increased memory usage. If using Stream Caching, use Loading Behavior instead to control memory usage. */
public bool bStreaming = true;
public bool bStreaming;
/** Uncompressed wav data 16 bit in mono or stereo - stereo not allowed for multichannel data */
public FByteBulkData RawData;
/** GUID used to uniquely identify this node so it can be found in the DDC */
@ -53,6 +53,9 @@ namespace PakReader.Parsers.Class
internal USoundWave(PackageReader reader, Stream ubulk, long ubulkOffset) : base(reader)
{
// if UE4.25+ && Windows -> True
bStreaming = FModel.Globals.Game.Version >= EPakVersion.PATH_HASH_INDEX ? true : false;
bCooked = reader.ReadInt32() != 0;
if (this.TryGetValue("bStreaming", out var v) && v is BoolProperty b)
bStreaming = b.Value;

7
FModel/Utils/Paks.cs
View File

@ -34,6 +34,7 @@ namespace FModel.Utils
}
DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[LauncherInstalled.dat]", $"{game} not found");
return (string.Empty, string.Empty, string.Empty);
}
}
}
@ -93,9 +94,9 @@ namespace FModel.Utils
DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[launcher_settings.json]", install);
var launcherSettings = JsonConvert.DeserializeObject<LauncherSettings>(File.ReadAllText(install));
if (launcherSettings.productLibraryDir != null)
if(!string.IsNullOrEmpty(launcherSettings.productLibraryDir))
return $"{launcherSettings.productLibraryDir}\\dungeons\\dungeons\\Dungeons\\Content\\Paks";
if (launcherSettings.productLibraryDir != null && !string.IsNullOrEmpty(launcherSettings.productLibraryDir))
return $"{launcherSettings.productLibraryDir}\\dungeons\\dungeons\\Dungeons\\Content\\Paks";
DebugHelper.WriteLine("{0} {1} {2}", "[FModel]", "[launcher_settings.json]", "Minecraft Dungeons not found");
}
return string.Empty;

16
README.md
View File

@ -104,6 +104,22 @@ To use FModel, you need to have [.NET Core 3.1](https://dotnet.microsoft.com/dow
<a href="https://github.com/AyeTSG" title="Github">🔧</a>
<a href="https://twitter.com/AyeTSG" title="Twitter">🐦</a>
</td>
<td align="center">
<a href="https://github.com/JacksonPlayz">
<img src="https://avatars2.githubusercontent.com/u/18062275?s=200&v=4" width="100px;" alt="Jackson"/><br/>
<sub><b>Jackson</b></sub>
</a><br>
<a href="https://github.com/JacksonPlayz" title="Github">🔧</a>
<a href="https://twitter.com/NotJaackson" title="Twitter">🐦</a>
</td>
<td align="center">
<a href="https://github.com/GMatrixGames">
<img src="https://avatars2.githubusercontent.com/u/25112532?s=200&v=4" width="100px;" alt="GMatrixGames"/><br/>
<sub><b>GMatrixGames</b></sub>
</a><br>
<a href="https://github.com/GMatrixGames" title="Github">🔧</a>
<a href="https://twitter.com/GMatrixGames" title="Twitter">🐦</a>
</td>
<td align="center">
<a href="https://github.com/XTigerHyperX">
<img src="https://avatars2.githubusercontent.com/u/49372767?s=200&v=4" width="100px;" alt="XTigerHyperX"/><br/>