Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix JSON file lookup for Proton (#364)

Browse Source 
## Minor features

Added a warning when an empty systems or planets folder is found.

## Bug fixes

Fixes
https://github.com/Outer-Wilds-New-Horizons/new-horizons/issues/353

Should behave identical to current solution for JSON and JSONC files,
maybe someone on Windows can test. Worked flawlessly on Linux with Real
Solar System, The Vision and Carson System.
This commit is contained in:
Nick 2022-09-09 12:52:40 -04:00 committed by GitHub
commit 9e646753f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
NewHorizons/Main.cs
View File

@ -490,10 +490,22 @@ namespace NewHorizons
} }
var folder = mod.ModHelper.Manifest.ModFolderPath; var folder = mod.ModHelper.Manifest.ModFolderPath;
var systemsFolder = Path.Combine(folder, "systems");
var planetsFolder = Path.Combine(folder, "planets");
// Load systems first so that when we load bodies later we can check for missing ones // Load systems first so that when we load bodies later we can check for missing ones
if (Directory.Exists(folder + @"systems\")) if (Directory.Exists(systemsFolder))
{ {
foreach (var file in Directory.GetFiles(folder + @"systems\", "*.json?", SearchOption.AllDirectories)) var systemFiles = Directory.GetFiles(systemsFolder, "*.json", SearchOption.AllDirectories)
.Concat(Directory.GetFiles(systemsFolder, "*.jsonc", SearchOption.AllDirectories))
.ToArray();
if(systemFiles.Length == 0)
{
Logger.LogVerbose($"Found no JSON files in systems folder: {systemsFolder}");
}
foreach (var file in systemFiles)
{ {
var name = Path.GetFileNameWithoutExtension(file); var name = Path.GetFileNameWithoutExtension(file);
@ -526,9 +538,18 @@ namespace NewHorizons
} }
} }
} }
if (Directory.Exists(folder + "planets")) if (Directory.Exists(planetsFolder))
{ {
foreach (var file in Directory.GetFiles(folder + @"planets\", "*.json?", SearchOption.AllDirectories)) var planetFiles = Directory.GetFiles(planetsFolder, "*.json", SearchOption.AllDirectories)
.Concat(Directory.GetFiles(planetsFolder, "*.jsonc", SearchOption.AllDirectories))
.ToArray();
if(planetFiles.Length == 0)
{
Logger.LogVerbose($"Found no JSON files in planets folder: {planetsFolder}");
}
foreach (var file in planetFiles)
{ {
var relativeDirectory = file.Replace(folder, ""); var relativeDirectory = file.Replace(folder, "");
var body = LoadConfig(mod, relativeDirectory); var body = LoadConfig(mod, relativeDirectory);