From 4c0272c0aaec58fbd457e87650f66a067efc2fee Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sat, 23 Jan 2021 12:01:46 -0500 Subject: remove unused AlternativeUrl field in metadata model --- src/SMAPI.Tests/Core/ModResolverTests.cs | 3 +-- src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs | 1 - src/SMAPI.Toolkit/Framework/ModData/ModDataFieldKey.cs | 3 --- src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs | 5 ----- src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs | 3 --- src/SMAPI.Web/wwwroot/SMAPI.metadata.json | 3 --- src/SMAPI/Framework/ModLoading/ModResolver.cs | 2 -- 7 files changed, 1 insertion(+), 19 deletions(-) (limited to 'src') diff --git a/src/SMAPI.Tests/Core/ModResolverTests.cs b/src/SMAPI.Tests/Core/ModResolverTests.cs index 78056ef7..28262111 100644 --- a/src/SMAPI.Tests/Core/ModResolverTests.cs +++ b/src/SMAPI.Tests/Core/ModResolverTests.cs @@ -146,8 +146,7 @@ namespace SMAPI.Tests.Core Mock mock = this.GetMetadata("Mod A", new string[0], allowStatusChange: true); this.SetupMetadataForValidation(mock, new ModDataRecordVersionedFields { - Status = ModStatus.AssumeBroken, - AlternativeUrl = "https://example.org" + Status = ModStatus.AssumeBroken }); // act diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs index 44422f01..6658d219 100644 --- a/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs +++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataField.cs @@ -69,7 +69,6 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData return manifest.UpdateKeys != null && manifest.UpdateKeys.Any(p => !string.IsNullOrWhiteSpace(p)); // non-manifest fields - case ModDataFieldKey.AlternativeUrl: case ModDataFieldKey.StatusReasonPhrase: case ModDataFieldKey.StatusReasonDetails: case ModDataFieldKey.Status: diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataFieldKey.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataFieldKey.cs index 068291aa..2b59096d 100644 --- a/src/SMAPI.Toolkit/Framework/ModData/ModDataFieldKey.cs +++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataFieldKey.cs @@ -6,9 +6,6 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData /// A manifest update key. UpdateKey, - /// An alternative URL the player can check for an updated version. - AlternativeUrl, - /// The mod's predefined compatibility status. Status, diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs index f28f6afe..5dd32acf 100644 --- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs +++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecord.cs @@ -92,11 +92,6 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData parsed.UpdateKey = field.Value; break; - // alternative URL - case ModDataFieldKey.AlternativeUrl: - parsed.AlternativeUrl = field.Value; - break; - // status case ModDataFieldKey.Status: parsed.Status = (ModStatus)Enum.Parse(typeof(ModStatus), field.Value, ignoreCase: true); diff --git a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs index f0282eb4..5aaabd51 100644 --- a/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs +++ b/src/SMAPI.Toolkit/Framework/ModData/ModDataRecordVersionedFields.cs @@ -15,9 +15,6 @@ namespace StardewModdingAPI.Toolkit.Framework.ModData /// The update key to apply. public string UpdateKey { get; set; } - /// The alternative URL the player can check for an updated version. - public string AlternativeUrl { get; set; } - /// The predefined compatibility status. public ModStatus Status { get; set; } = ModStatus.None; diff --git a/src/SMAPI.Web/wwwroot/SMAPI.metadata.json b/src/SMAPI.Web/wwwroot/SMAPI.metadata.json index 150aec65..8cc60a73 100644 --- a/src/SMAPI.Web/wwwroot/SMAPI.metadata.json +++ b/src/SMAPI.Web/wwwroot/SMAPI.metadata.json @@ -49,9 +49,6 @@ * * - StatusReasonDetails: a technical reason shown in TRACE logs, indicating why the status * was overridden. If not provided, it defaults to the StatusReasonPhrase or 'no reason given'. - * - * - AlternativeUrl: a URL where the player can find an unofficial update or alternative if the - * mod is no longer compatible. */ "ModData": { /********* diff --git a/src/SMAPI/Framework/ModLoading/ModResolver.cs b/src/SMAPI/Framework/ModLoading/ModResolver.cs index af7d90f6..c70820e4 100644 --- a/src/SMAPI/Framework/ModLoading/ModResolver.cs +++ b/src/SMAPI/Framework/ModLoading/ModResolver.cs @@ -88,8 +88,6 @@ namespace StardewModdingAPI.Framework.ModLoading if (url != null) updateUrls.Add(url); } - if (mod.DataRecord.AlternativeUrl != null) - updateUrls.Add(mod.DataRecord.AlternativeUrl); // default update URL updateUrls.Add("https://smapi.io/mods"); -- cgit