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

replace manual relative path logic with new path utilities

This commit is contained in:
Jesse Plamondon-Willard 2018-02-19 20:29:52 -05:00
parent b6cc17112d
commit 9369232118
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/SMAPI/Framework/ModLoading/ModResolver.cs
View File

@ -6,6 +6,7 @@ using StardewModdingAPI.Framework.Exceptions;
using StardewModdingAPI.Framework.ModData; using StardewModdingAPI.Framework.ModData;
using StardewModdingAPI.Framework.Models; using StardewModdingAPI.Framework.Models;
using StardewModdingAPI.Framework.Serialisation; using StardewModdingAPI.Framework.Serialisation;
using StardewModdingAPI.Framework.Utilities;
namespace StardewModdingAPI.Framework.ModLoading namespace StardewModdingAPI.Framework.ModLoading
{ {
@ -55,7 +56,7 @@ namespace StardewModdingAPI.Framework.ModLoading
if (string.IsNullOrWhiteSpace(displayName)) if (string.IsNullOrWhiteSpace(displayName))
displayName = dataRecord?.DisplayName; displayName = dataRecord?.DisplayName;
if (string.IsNullOrWhiteSpace(displayName)) if (string.IsNullOrWhiteSpace(displayName))
displayName = modDir.FullName.Replace(rootPath, "").Trim('/', '\\'); displayName = PathUtilities.GetRelativePath(rootPath, modDir.FullName);
// apply defaults // apply defaults
if (manifest != null && dataRecord != null) if (manifest != null && dataRecord != null)

5
src/SMAPI/Program.cs
View File

@ -25,6 +25,7 @@ using StardewModdingAPI.Framework.ModHelpers;
using StardewModdingAPI.Framework.ModLoading; using StardewModdingAPI.Framework.ModLoading;
using StardewModdingAPI.Framework.Reflection; using StardewModdingAPI.Framework.Reflection;
using StardewModdingAPI.Framework.Serialisation; using StardewModdingAPI.Framework.Serialisation;
using StardewModdingAPI.Framework.Utilities;
using StardewValley; using StardewValley;
using Monitor = StardewModdingAPI.Framework.Monitor; using Monitor = StardewModdingAPI.Framework.Monitor;
using SObject = StardewValley.Object; using SObject = StardewValley.Object;
@ -660,7 +661,7 @@ namespace StardewModdingAPI
{ {
// get basic info // get basic info
IManifest manifest = metadata.Manifest; IManifest manifest = metadata.Manifest;
this.Monitor.Log($"Loading {metadata.DisplayName} from {metadata.DirectoryPath.Replace(Constants.ModPath, "").TrimStart(Path.DirectorySeparatorChar)} (content pack)...", LogLevel.Trace); this.Monitor.Log($"Loading {metadata.DisplayName} from {PathUtilities.GetRelativePath(Constants.ModPath, metadata.DirectoryPath)} (content pack)...", LogLevel.Trace);
// validate status // validate status
if (metadata.Status == ModMetadataStatus.Failed) if (metadata.Status == ModMetadataStatus.Failed)
@ -702,7 +703,7 @@ namespace StardewModdingAPI
// get basic info // get basic info
IManifest manifest = metadata.Manifest; IManifest manifest = metadata.Manifest;
this.Monitor.Log(metadata.Manifest?.EntryDll != null this.Monitor.Log(metadata.Manifest?.EntryDll != null
? $"Loading {metadata.DisplayName} from {metadata.DirectoryPath.Replace(Constants.ModPath, "").TrimStart(Path.DirectorySeparatorChar)}{Path.DirectorySeparatorChar}{metadata.Manifest.EntryDll}..." // don't use Path.Combine here, since EntryDLL might not be valid ? $"Loading {metadata.DisplayName} from {PathUtilities.GetRelativePath(Constants.ModPath, metadata.DirectoryPath)}{Path.DirectorySeparatorChar}{metadata.Manifest.EntryDll}..." // don't use Path.Combine here, since EntryDLL might not be valid
: $"Loading {metadata.DisplayName}...", LogLevel.Trace); : $"Loading {metadata.DisplayName}...", LogLevel.Trace);
// validate status // validate status