Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-22 01:34:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #198 from sirvibegodlol/master

Browse Source 
Fixes Minecraft Dungeons detection and adds more Quick Directories.
This commit is contained in:
Valentin 2021-09-08 09:28:07 +02:00 committed by GitHub
commit bf79ca5f12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FModel/Settings/UserSettings.cs
View File

@ -354,7 +354,11 @@ namespace FModel.Settings
{
FGame.Dungeons, new List<CustomDirectory>
{
new("Levels"), "Dungeons/Content/data/Lovika/Levels"),
new("Friendlies"), "Dungeons/Content/Actor/Characters/Friendlies",
new("Skins"), "Dungeons/Content/Actor/Characters/Player/Master/Skins",
new("Strings", "Dungeons/Content/Localization/")
}
},
{
@ -532,4 +536,4 @@ namespace FModel.Settings
set => SetProperty(ref _textureExportFormat, value);
}
}
}
}

4
FModel/ViewModels/GameSelectorViewModel.cs
View File

@ -104,7 +104,7 @@ namespace FModel.ViewModels
private DetectedGame GetMojangGame(string gameName, string pakDirectory)
{
_launcherSettings ??= GetDataLauncherInstalls<LauncherSettings>("\\.minecraft_dungeons\\launcher_settings.json");
_launcherSettings ??= GetDataLauncherInstalls<LauncherSettings>("\\.minecraft\\launcher_settings.json");
if (_launcherSettings is {ProductLibraryDir: { }})
return new DetectedGame {GameName = gameName, GameDirectory = $"{_launcherSettings.ProductLibraryDir}{pakDirectory}"};
@ -183,4 +183,4 @@ namespace FModel.ViewModels
}
#pragma warning restore 649
}
}
}