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

Unify static mod metadata collections.

Browse Source
This commit is contained in:
Paul Chote
2016-01-21 17:36:06 +00:00
parent d4aa28e221
commit 62402e0e2e
6 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenRA.Game/Manifest.cs
View File

@@ -12,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using OpenRA.FileSystem;
using OpenRA.Primitives;
namespace OpenRA
@@ -32,8 +33,6 @@ namespace OpenRA
/// <summary> Describes what is to be loaded in order to run a mod. </summary>
public class Manifest
{
public static readonly Dictionary<string, Manifest> AllMods = LoadMods();
public readonly ModMetadata Mod;
public readonly string[]
Packages, Rules, ServerTraits,
@@ -60,13 +59,11 @@ namespace OpenRA
readonly TypeDictionary modules = new TypeDictionary();
readonly Dictionary<string, MiniYaml> yaml;
public Manifest(string modId, string modPath = null)
public Manifest(string modId)
{
if (modPath == null)
modPath = ModMetadata.CandidateModPaths[modId];
var package = ModMetadata.AllMods[modId].Package;
var path = Path.Combine(modPath, "mod.yaml");
yaml = new MiniYaml(null, MiniYaml.FromFile(path)).ToDictionary();
yaml = new MiniYaml(null, MiniYaml.FromStream(package.GetStream("mod.yaml"))).ToDictionary();
Mod = FieldLoader.Load<ModMetadata>(yaml["Metadata"]);
Mod.Id = modId;
@@ -200,28 +197,5 @@ namespace OpenRA
return module;
}
static Dictionary<string, Manifest> LoadMods()
{
var ret = new Dictionary<string, Manifest>();
foreach (var mod in ModMetadata.CandidateModPaths)
{
if (!File.Exists(Path.Combine(mod.Value, "mod.yaml")))
continue;
try
{
var manifest = new Manifest(mod.Key, mod.Value);
ret.Add(mod.Key, manifest);
}
catch (Exception ex)
{
Log.Write("debug", "An exception occurred while trying to load mod {0}:", mod);
Log.Write("debug", ex.ToString());
}
}
return ret;
}
}
}