From 8776d1afa6dce054f3bc7cb421c86f3e2fe06ab3 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 10 Dec 2017 18:05:18 -0500
Subject: adjust reflection API to correctly reflect what it does (#410)

---
 src/SMAPI/Framework/SContentManager.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/SMAPI/Framework/SContentManager.cs')

diff --git a/src/SMAPI/Framework/SContentManager.cs b/src/SMAPI/Framework/SContentManager.cs
index 524b2d17..1803098d 100644
--- a/src/SMAPI/Framework/SContentManager.cs
+++ b/src/SMAPI/Framework/SContentManager.cs
@@ -45,7 +45,7 @@ namespace StardewModdingAPI.Framework
         private readonly ContentCache Cache;
 
         /// <summary>The private <see cref="LocalizedContentManager"/> method which generates the locale portion of an asset name.</summary>
-        private readonly IPrivateMethod GetKeyLocale;
+        private readonly IReflectedMethod GetKeyLocale;
 
         /// <summary>The language codes used in asset keys.</summary>
         private readonly IDictionary<string, LanguageCode> KeyLocales;
@@ -101,7 +101,7 @@ namespace StardewModdingAPI.Framework
             // init
             this.Monitor = monitor ?? throw new ArgumentNullException(nameof(monitor));
             this.Cache = new ContentCache(this, reflection, SContentManager.PossiblePathSeparators, SContentManager.PreferredPathSeparator);
-            this.GetKeyLocale = reflection.GetPrivateMethod(this, "languageCode");
+            this.GetKeyLocale = reflection.GetMethod(this, "languageCode");
             this.ModContentPrefix = this.GetAssetNameFromFilePath(Constants.ModPath);
 
             // get asset data
@@ -413,7 +413,7 @@ namespace StardewModdingAPI.Framework
         private IDictionary<string, LanguageCode> GetKeyLocales(Reflector reflection)
         {
             // get the private code field directly to avoid changed-code logic
-            IPrivateField<LanguageCode> codeField = reflection.GetPrivateField<LanguageCode>(typeof(LocalizedContentManager), "_currentLangCode");
+            IReflectedField<LanguageCode> codeField = reflection.GetField<LanguageCode>(typeof(LocalizedContentManager), "_currentLangCode");
 
             // remember previous settings
             LanguageCode previousCode = codeField.GetValue();
-- 
cgit 


From 6bdd49af13ed6bdfef8220c85ca32bca904d3a1e Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 10 Dec 2017 23:27:10 -0500
Subject: detect libgdiplus-missing exception and show a friendly error instead
 (#408)

---
 docs/release-notes.md                     | 1 +
 src/SMAPI/Framework/InternalExtensions.cs | 9 +++++++++
 src/SMAPI/Framework/SContentManager.cs    | 4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework/SContentManager.cs')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index fa04c055..a76b5e19 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,6 +5,7 @@
   * Fixed `GraphicsEvents.OnPostRenderEvent` not being raised in some specialised cases.
   * Fixed error when using the reflection API accesses with a property with either `get` and `set` missing.
   * Fixed issue where a mod could change the cursor position reported to other mods.
+  * Improved cryptic libgdiplus errors on Mac when Mono isn't installed.
 
 ## 2.2
 * For players:
diff --git a/src/SMAPI/Framework/InternalExtensions.cs b/src/SMAPI/Framework/InternalExtensions.cs
index f81e05a9..bec6c183 100644
--- a/src/SMAPI/Framework/InternalExtensions.cs
+++ b/src/SMAPI/Framework/InternalExtensions.cs
@@ -108,6 +108,15 @@ namespace StardewModdingAPI.Framework
             }
         }
 
+        /// <summary>Get the lowest exception in an exception stack.</summary>
+        /// <param name="exception">The exception from which to search.</param>
+        public static Exception GetInnermostException(this Exception exception)
+        {
+            while (exception.InnerException != null)
+                exception = exception.InnerException;
+            return exception;
+        }
+
         /****
         ** Sprite batch
         ****/
diff --git a/src/SMAPI/Framework/SContentManager.cs b/src/SMAPI/Framework/SContentManager.cs
index 1803098d..ebea6c84 100644
--- a/src/SMAPI/Framework/SContentManager.cs
+++ b/src/SMAPI/Framework/SContentManager.cs
@@ -205,7 +205,7 @@ namespace StardewModdingAPI.Framework
                 return this.LoadImpl<T>(assetName, instance);
 
             // load mod content
-            SContentLoadException GetContentError(string reasonPhrase) => new SContentLoadException($"Failed loading content asset '{assetName}': {reasonPhrase}.");
+            SContentLoadException GetContentError(string reasonPhrase) => new SContentLoadException($"Failed loading content asset '{assetName}': {reasonPhrase}");
             try
             {
                 return this.WithWriteLock(() =>
@@ -252,6 +252,8 @@ namespace StardewModdingAPI.Framework
             }
             catch (Exception ex) when (!(ex is SContentLoadException))
             {
+                if (ex.GetInnermostException() is DllNotFoundException dllEx && dllEx.Message == "libgdiplus.dylib")
+                    throw GetContentError("couldn't find libgdiplus, which is needed to load mod images. Make sure Mono is installed and you're running the game through the normal launcher.");
                 throw new SContentLoadException($"The content manager failed loading content asset '{assetName}'.", ex);
             }
         }
-- 
cgit