Move file system mounting into mod code.

OpenRA.Game/FileSystem/FileSystem.cs

@@ -181,12 +181,8 @@ namespace OpenRA.FileSystem
 			fileIndex = new Cache<string, List<IReadOnlyPackage>>(_ => new List<IReadOnlyPackage>());
 		}
 
-		public void LoadFromManifest(Manifest manifest)
+		public void TrimExcess()
 		{
-			UnmountAll();
-			foreach (var kv in manifest.Packages)
-				Mount(kv.Key, kv.Value);
-
 			mountedPackages.TrimExcess();
 			explicitMounts.TrimExcess();
 			modPackages.TrimExcess();

OpenRA.Game/Manifest.cs

@@ -65,8 +65,8 @@ namespace OpenRA
 			Weapons, Voices, Notifications, Music, Translations, TileSets,
 			ChromeMetrics, MapCompatibility, Missions, Hotkeys;
 
-		public readonly IReadOnlyDictionary<string, string> Packages;
 		public readonly IReadOnlyDictionary<string, string> MapFolders;
+		public readonly MiniYaml FileSystem;
 		public readonly MiniYaml LoadScreen;
 		public readonly string DefaultOrderGenerator;
 
@@ -81,7 +81,7 @@ namespace OpenRA
 
 		readonly string[] reservedModuleNames =
 		{
-			"Include", "Metadata", "Folders", "MapFolders", "Packages", "Rules",
+			"Include", "Metadata", "FileSystem", "MapFolders", "Rules",
 			"Sequences", "ModelSequences", "Cursors", "Chrome", "Assemblies", "ChromeLayout", "Weapons",
 			"Voices", "Notifications", "Music", "Translations", "TileSets", "ChromeMetrics", "Missions", "Hotkeys",
 			"ServerTraits", "LoadScreen", "DefaultOrderGenerator", "SupportsMapsFrom", "SoundFormats", "SpriteFormats", "VideoFormats",
@@ -123,8 +123,8 @@ namespace OpenRA
 			// TODO: Use fieldloader
 			MapFolders = YamlDictionary(yaml, "MapFolders");
 
-			if (yaml.TryGetValue("Packages", out var packages))
-				Packages = packages.ToDictionary(x => x.Value);
+			if (!yaml.TryGetValue("FileSystem", out FileSystem))
+				throw new InvalidDataException("`FileSystem` section is not defined.");
 
 			Rules = YamlList(yaml, "Rules");
 			Sequences = YamlList(yaml, "Sequences");

OpenRA.Game/ModData.cs

@@ -35,6 +35,8 @@ namespace OpenRA
 		public readonly ISpriteSequenceLoader SpriteSequenceLoader;
 		public readonly IVideoLoader[] VideoLoaders;
 		public readonly HotkeyManager Hotkeys;
+		public readonly IFileSystemLoader FileSystemLoader;
+
 		public ILoadScreen LoadScreen { get; }
 		public CursorProvider CursorProvider { get; private set; }
 		public FS ModFiles;
@@ -54,9 +56,13 @@ namespace OpenRA
 			Manifest = new Manifest(mod.Id, mod.Package);
 			ObjectCreator = new ObjectCreator(Manifest, mods);
 			PackageLoaders = ObjectCreator.GetLoaders<IPackageLoader>(Manifest.PackageFormats, "package");
-
 			ModFiles = new FS(mod.Id, mods, PackageLoaders);
-			ModFiles.LoadFromManifest(Manifest);
+
+			FileSystemLoader = ObjectCreator.GetLoader<IFileSystemLoader>(Manifest.FileSystem.Value, "filesystem");
+			FieldLoader.Load(FileSystemLoader, Manifest.FileSystem);
+			FileSystemLoader.Mount(ModFiles, ObjectCreator);
+			ModFiles.TrimExcess();
+
 			Manifest.LoadCustomData(ObjectCreator);
 
 			if (useLoadScreen)
@@ -190,4 +196,9 @@ namespace OpenRA
 		/// <summary>Called when the engine expects to connect to a server/replay or load the shellmap.</summary>
 		void StartGame(Arguments args);
 	}
+
+	public interface IFileSystemLoader
+	{
+		void Mount(FS fileSystem, ObjectCreator objectCreator);
+	}
 }

OpenRA.Mods.Common/FileSystem/DefaultFileSystemLoader.cs

@@ -0,0 +1,27 @@
+#region Copyright & License Information
+/*
+ * Copyright (c) The OpenRA Developers and Contributors
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+
+namespace OpenRA.Mods.Common.FileSystem
+{
+	public class DefaultFileSystemLoader : IFileSystemLoader
+	{
+		public readonly Dictionary<string, string> Packages = null;
+
+		public void Mount(OpenRA.FileSystem.FileSystem fileSystem, ObjectCreator objectCreator)
+		{
+			if (Packages != null)
+				foreach (var kv in Packages)
+					fileSystem.Mount(kv.Key, kv.Value);
+		}
+	}
+}

OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentLogic.cs

@@ -42,7 +42,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var modObjectCreator = new ObjectCreator(mod, Game.Mods);
 			var modPackageLoaders = modObjectCreator.GetLoaders<IPackageLoader>(mod.PackageFormats, "package");
 			var modFileSystem = new FS(mod.Id, Game.Mods, modPackageLoaders);
-			modFileSystem.LoadFromManifest(mod);
+
+			var modFileSystemLoader = modObjectCreator.GetLoader<IFileSystemLoader>(mod.FileSystem.Value, "filesystem");
+			FieldLoader.Load(modFileSystemLoader, mod.FileSystem);
+			modFileSystemLoader.Mount(modFileSystem, modObjectCreator);
+			modFileSystem.TrimExcess();
 
 			var sourceYaml = MiniYaml.Load(modFileSystem, content.Sources, null);
 			foreach (var s in sourceYaml)

OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentPromptLogic.cs

@@ -78,7 +78,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				var modObjectCreator = new ObjectCreator(mod, Game.Mods);
 				var modPackageLoaders = modObjectCreator.GetLoaders<IPackageLoader>(mod.PackageFormats, "package");
 				var modFileSystem = new FS(mod.Id, Game.Mods, modPackageLoaders);
-				modFileSystem.LoadFromManifest(mod);
+
+				var modFileSystemLoader = modObjectCreator.GetLoader<IFileSystemLoader>(mod.FileSystem.Value, "filesystem");
+				FieldLoader.Load(modFileSystemLoader, mod.FileSystem);
+				modFileSystemLoader.Mount(modFileSystem, modObjectCreator);
+				modFileSystem.TrimExcess();
 
 				var downloadYaml = MiniYaml.Load(modFileSystem, content.Downloads, null);
 				modFileSystem.UnmountAll();

mods/all/mod.yaml

@@ -3,6 +3,7 @@ Metadata:
 	Version: {DEV_VERSION}
 	Hidden: true
 
+FileSystem: DefaultFileSystem
     Packages:
 		^EngineDir
 

mods/cnc/mod.yaml

@@ -7,6 +7,7 @@ Metadata:
 
 PackageFormats: Mix
 
+FileSystem: DefaultFileSystem
     Packages:
 		~^SupportDir|Content/cnc
 		~^SupportDir|Content/cnc/movies

mods/d2k/mod.yaml

@@ -7,6 +7,7 @@ Metadata:
 
 PackageFormats: D2kSoundResources
 
+FileSystem: DefaultFileSystem
     Packages:
 		~^SupportDir|Content/d2k/v3/
 		~^SupportDir|Content/d2k/v3/GAMESFX
@@ -15,7 +16,6 @@ Packages:
 		^EngineDir
 		$d2k: d2k
 		^EngineDir|mods/common: common
-
 		~SOUND.RS
 		d2k|bits
 		d2k|scripts

mods/modcontent/mod.yaml

@@ -3,6 +3,7 @@ Metadata:
 	Version: {DEV_VERSION}
 	Hidden: true
 
+FileSystem: DefaultFileSystem
     Packages:
 		^EngineDir
 		^EngineDir|mods/modcontent: modcontent

mods/ra/mod.yaml

@@ -7,6 +7,7 @@ Metadata:
 
 PackageFormats: Mix
 
+FileSystem: DefaultFileSystem
     Packages:
 		~^SupportDir|Content/ra/v2/
 		~^SupportDir|Content/ra/v2/expand

mods/ts/mod.yaml

@@ -7,6 +7,7 @@ Metadata:
 
 PackageFormats: Mix
 
+FileSystem: DefaultFileSystem
     Packages:
 		~^SupportDir|Content/ts
 		~^SupportDir|Content/ts/firestorm