From 34633cfed9efb8a53b148584c1b3909bac69372f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 29 Mar 2019 23:58:06 -0400
Subject: bundle assets folder into mods by default

---
 .../Framework/ModFileManager.cs                    | 28 ++++++++++++++++++----
 src/SMAPI.ModBuildConfig/package.nuspec            |  1 +
 2 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
index 4af3100f..6c11b0fe 100644
--- a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
+++ b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using StardewModdingAPI.Toolkit.Serialisation;
 using StardewModdingAPI.Toolkit.Serialisation.Models;
+using StardewModdingAPI.Toolkit.Utilities;
 
 namespace StardewModdingAPI.ModBuildConfig.Framework
 {
@@ -61,18 +62,33 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
                 hasProjectTranslations = true;
             }
 
+            // project assets folder
+            bool hasAssetsFolder = false;
+            DirectoryInfo assetsFolder = new DirectoryInfo(Path.Combine(projectDir, "assets"));
+            if (assetsFolder.Exists)
+            {
+                foreach (FileInfo file in assetsFolder.EnumerateFiles("*", SearchOption.AllDirectories))
+                {
+                    string relativePath = PathUtilities.GetRelativePath(projectDir, file.FullName);
+                    this.Files[relativePath] = file;
+                }
+                hasAssetsFolder = true;
+            }
+
             // build output
             DirectoryInfo buildFolder = new DirectoryInfo(targetDir);
             foreach (FileInfo file in buildFolder.EnumerateFiles("*", SearchOption.AllDirectories))
             {
-                // get relative paths
-                string relativePath = file.FullName.Replace(buildFolder.FullName, "");
-                string relativeDirPath = file.Directory.FullName.Replace(buildFolder.FullName, "");
+                // get path info
+                string relativePath = PathUtilities.GetRelativePath(buildFolder.FullName, file.FullName);
+                string[] segments = PathUtilities.GetSegments(relativePath);
 
-                // prefer project manifest/i18n files
+                // prefer project manifest/i18n/assets files
                 if (hasProjectManifest && this.EqualsInvariant(relativePath, this.ManifestFileName))
                     continue;
-                if (hasProjectTranslations && this.EqualsInvariant(relativeDirPath, "i18n"))
+                if (hasProjectTranslations && this.EqualsInvariant(segments[0], "i18n"))
+                    continue;
+                if (hasAssetsFolder && this.EqualsInvariant(segments[0], "assets"))
                     continue;
 
                 // handle ignored files
@@ -149,6 +165,8 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
         /// <param name="other">The string to compare with.</param>
         private bool EqualsInvariant(string str, string other)
         {
+            if (str == null)
+                return other == null;
             return str.Equals(other, StringComparison.InvariantCultureIgnoreCase);
         }
     }
diff --git a/src/SMAPI.ModBuildConfig/package.nuspec b/src/SMAPI.ModBuildConfig/package.nuspec
index d054fd1a..b308413f 100644
--- a/src/SMAPI.ModBuildConfig/package.nuspec
+++ b/src/SMAPI.ModBuildConfig/package.nuspec
@@ -13,6 +13,7 @@
     <description>Automates the build configuration for crossplatform Stardew Valley SMAPI mods. For Stardew Valley 1.3 or later.</description>
     <releaseNotes>
       2.2.1:
+      - If the project contains an `assets` folder, its contents are now included in the mod automatically.
       - Dropped support for very old versions of SMAPI and Visual Studio.
       - Fixed `Newtonsoft.Json.pdb` included in release zips when Json.NET is referenced directly.
     </releaseNotes>
-- 
cgit