diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-06-28 20:51:49 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2018-06-28 20:51:49 -0400 |
| commit | db7247f36d11c870ec7b54bf6ea8b5b036065288 (patch) | |
| tree | 39acd05ce743e52a3779fc0280f1d35eed3066d2 /src | |
| parent | 3e5c109df1f90904c2dcb177e35b35f003e90fd9 (diff) | |
| download | SMAPI-db7247f36d11c870ec7b54bf6ea8b5b036065288.tar.gz SMAPI-db7247f36d11c870ec7b54bf6ea8b5b036065288.tar.bz2 SMAPI-db7247f36d11c870ec7b54bf6ea8b5b036065288.zip | |
simplify mod DB method (#532)
Diffstat (limited to 'src')
| -rw-r--r-- | src/SMAPI/Program.cs | 2 | ||||
| -rw-r--r-- | src/StardewModdingAPI.Toolkit/ModToolkit.cs | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/SMAPI/Program.cs b/src/SMAPI/Program.cs index 6f1fe761..150ed34a 100644 --- a/src/SMAPI/Program.cs +++ b/src/SMAPI/Program.cs @@ -415,7 +415,7 @@ namespace StardewModdingAPI // load mod data ModToolkit toolkit = new ModToolkit(); - ModDatabase modDatabase = toolkit.GetModDatabase(Constants.ApiMetadataPath, toolkit.GetUpdateUrl); + ModDatabase modDatabase = toolkit.GetModDatabase(Constants.ApiMetadataPath); // load mods { diff --git a/src/StardewModdingAPI.Toolkit/ModToolkit.cs b/src/StardewModdingAPI.Toolkit/ModToolkit.cs index 7b678f3d..18fe1ff3 100644 --- a/src/StardewModdingAPI.Toolkit/ModToolkit.cs +++ b/src/StardewModdingAPI.Toolkit/ModToolkit.cs @@ -46,17 +46,16 @@ namespace StardewModdingAPI.Toolkit /// <summary>Get SMAPI's internal mod database.</summary> /// <param name="metadataPath">The file path for the SMAPI metadata file.</param> - /// <param name="getUpdateUrl">Get an update URL for an update key (if valid).</param> - public ModDatabase GetModDatabase(string metadataPath, Func<string, string> getUpdateUrl) + public ModDatabase GetModDatabase(string metadataPath) { MetadataModel metadata = JsonConvert.DeserializeObject<MetadataModel>(File.ReadAllText(metadataPath)); ModDataRecord[] records = metadata.ModData.Select(pair => new ModDataRecord(pair.Key, pair.Value)).ToArray(); - return new ModDatabase(records, getUpdateUrl); + return new ModDatabase(records, this.GetUpdateUrl); } /// <summary>Get an update URL for an update key (if valid).</summary> /// <param name="updateKey">The update key.</param> - internal string GetUpdateUrl(string updateKey) + public string GetUpdateUrl(string updateKey) { string[] parts = updateKey.Split(new[] { ':' }, 2); if (parts.Length != 2) |