StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rewrite migration to avoid repeating game checks

This commit is contained in:
Jesse Plamondon-Willard 2020-12-26 10:41:39 -05:00
parent 49c192fc47
commit 8895021696
No known key found for this signature in database
GPG Key ID: CF8B1456B3E29F49
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/SMAPI/Framework/SCore.cs
View File

@ -1061,33 +1061,29 @@ namespace StardewModdingAPI.Framework
private void ApplySaveFixes() private void ApplySaveFixes()
{ {
// get last SMAPI version used with this save // get last SMAPI version used with this save
const string migrationKey = "Pathoschild.SMAPI/last-version"; const string migrationKey = "Pathoschild.SMAPI/api-version";
if (!Game1.CustomData.TryGetValue(migrationKey, out string rawVersion) || !SemanticVersion.TryParse(rawVersion, out ISemanticVersion lastVersionRun)) if (!Game1.CustomData.TryGetValue(migrationKey, out string rawVersion) || !SemanticVersion.TryParse(rawVersion, out ISemanticVersion lastVersion))
lastVersionRun = new SemanticVersion(3, 8, 0); lastVersion = new SemanticVersion(3, 8, 0);
// fix bundle corruption in SMAPI 3.8.0 // fix bundle corruption in SMAPI 3.8.0
// For non-English players who created a new save in SMAPI 3.8.0, bundle data was // For non-English players who created a new save in SMAPI 3.8.0, bundle data was
// incorrectly translated which caused the code to crash whenever the game tried to // incorrectly translated which caused the code to crash whenever the game tried to
// read it. // read it.
if (lastVersionRun.IsOlderThan(new SemanticVersion(3, 8, 1))) if (lastVersion.IsOlderThan(new SemanticVersion(3, 8, 1)) && Game1.netWorldState?.Value?.BundleData != null)
{ {
bool? hasInvalidBundleData = Game1.netWorldState?.Value var oldData = new Dictionary<string, string>(Game1.netWorldState.Value.BundleData);
?.BundleData
?.Values
?.Any(raw => raw != null && raw.Split('/').Length > 5);
if (hasInvalidBundleData == true) try
{ {
try Game1.applySaveFix(SaveGame.SaveFixes.FixBotchedBundleData);
{ bool changed = Game1.netWorldState.Value.BundleData.Any(p => oldData.TryGetValue(p.Key, out string oldValue) && oldValue != p.Value);
Game1.applySaveFix(SaveGame.SaveFixes.FixBotchedBundleData); if (changed)
this.Monitor.Log("Found corrupted community center data due to a previous version of SMAPI, and fixed it automatically.", LogLevel.Info); this.Monitor.Log("Found broken community center bundles and fixed them automatically.", LogLevel.Info);
} }
catch (Exception ex) catch (Exception ex)
{ {
this.Monitor.Log("Found corrupted community center data due to a previous version of SMAPI, but was unable to fix it automatically.", LogLevel.Error); this.Monitor.Log("Failed to verify community center data.", LogLevel.Error); // should never happen
this.Monitor.Log($"Technical details: {ex}"); this.Monitor.Log($"Technical details: {ex}");
}
} }
} }