epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Route content check via FileSystemLoader.

Browse Source 
This allows mods with custom content requirements
to use the default load screen implementations.
This commit is contained in:
Paul Chote
2024-09-29 13:02:02 +01:00
committed by Gustas
parent 720b925fd5
commit eac6d4b617
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRA.Mods.Common/FileSystem/DefaultFileSystemLoader.cs
View File

@@ -10,10 +10,19 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.FileSystem namespace OpenRA.Mods.Common.FileSystem
{ {
public class DefaultFileSystemLoader : IFileSystemLoader [RequireExplicitImplementation]
public interface IFileSystemExternalContent
{
public bool InstallContentIfRequired(ModData modData);
}
public class DefaultFileSystemLoader : IFileSystemLoader, IFileSystemExternalContent
{ {
public readonly Dictionary<string, string> Packages = null; public readonly Dictionary<string, string> Packages = null;
@@ -23,5 +32,24 @@ namespace OpenRA.Mods.Common.FileSystem
foreach (var kv in Packages) foreach (var kv in Packages)
fileSystem.Mount(kv.Key, kv.Value); fileSystem.Mount(kv.Key, kv.Value);
} }
bool IFileSystemExternalContent.InstallContentIfRequired(ModData modData)
{
// If a ModContent section is defined then we need to make sure that the
// required content is installed or switch to the defined content installer.
if (!modData.Manifest.Contains<ModContent>())
return false;
var content = modData.Manifest.Get<ModContent>();
var contentInstalled = content.Packages
.Where(p => p.Value.Required)
.All(p => p.Value.TestFiles.All(f => File.Exists(Platform.ResolvePath(f))));
if (contentInstalled)
return false;
Game.InitializeMod(content.ContentInstallerMod, new Arguments("Content.Mod=" + modData.Manifest.Id));
return true;
}
} }
} }

17
OpenRA.Mods.Common/LoadScreens/BlankLoadScreen.cs
View File

@@ -12,8 +12,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Mods.Common.FileSystem;
using OpenRA.Mods.Common.Widgets.Logic; using OpenRA.Mods.Common.Widgets.Logic;
using OpenRA.Widgets; using OpenRA.Widgets;
@@ -126,21 +126,10 @@ namespace OpenRA.Mods.Common.LoadScreens
if (graphicSettings.GLProfile != GLProfile.Automatic && graphicSettings.GLProfile != Game.Renderer.GLProfile) if (graphicSettings.GLProfile != GLProfile.Automatic && graphicSettings.GLProfile != Game.Renderer.GLProfile)
graphicSettings.GLProfile = GLProfile.Automatic; graphicSettings.GLProfile = GLProfile.Automatic;
// If a ModContent section is defined then we need to make sure that the if (ModData.FileSystemLoader is not IFileSystemExternalContent content)
// required content is installed or switch to the defined content installer.
if (!ModData.Manifest.Contains<ModContent>())
return true; return true;
var content = ModData.Manifest.Get<ModContent>(); return !content.InstallContentIfRequired(ModData);
var contentInstalled = content.Packages
.Where(p => p.Value.Required)
.All(p => p.Value.TestFiles.All(f => File.Exists(Platform.ResolvePath(f))));
if (contentInstalled)
return true;
Game.InitializeMod(content.ContentInstallerMod, new Arguments(new[] { "Content.Mod=" + ModData.Manifest.Id }));
return false;
} }
} }
} }