Merge branch 'develop' into stable

2 files changed, 25 insertions, 21 deletions

diff --git a/src/SMAPI/Framework/Reflection/PrivateProperty.cs b/src/SMAPI/Framework/Reflection/PrivateProperty.cs
index 08204b7e..be346d71 100644
--- a/src/SMAPI/Framework/Reflection/PrivateProperty.cs
+++ b/src/SMAPI/Framework/Reflection/PrivateProperty.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 
 namespace StardewModdingAPI.Framework.Reflection
@@ -10,14 +10,14 @@ namespace StardewModdingAPI.Framework.Reflection
         /*********
         ** Properties
         *********/
-        /// <summary>The type that has the field.</summary>
-        private readonly Type ParentType;
+        /// <summary>The display name shown in error messages.</summary>
+        private readonly string DisplayName;
 
-        /// <summary>The object that has the instance field (if applicable).</summary>
-        private readonly object Parent;
+        /// <summary>The underlying property getter.</summary>
+        private readonly Func<TValue> GetterDelegate;
 
-        /// <summary>The display name shown in error messages.</summary>
-        private string DisplayName => $"{this.ParentType.FullName}::{this.PropertyInfo.Name}";
+        /// <summary>The underlying property setter.</summary>
+        private readonly Action<TValue> SetterDelegate;
 
 
         /*********
@@ -39,20 +39,24 @@ namespace StardewModdingAPI.Framework.Reflection
         /// <exception cref="ArgumentException">The <paramref name="obj"/> is null for a non-static field, or not null for a static field.</exception>
         public PrivateProperty(Type parentType, object obj, PropertyInfo property, bool isStatic)
         {
-            // validate
+            // validate input
             if (parentType == null)
                 throw new ArgumentNullException(nameof(parentType));
             if (property == null)
                 throw new ArgumentNullException(nameof(property));
+
+            // validate static
             if (isStatic && obj != null)
                 throw new ArgumentException("A static property cannot have an object instance.");
             if (!isStatic && obj == null)
                 throw new ArgumentException("A non-static property must have an object instance.");
 
-            // save
-            this.ParentType = parentType;
-            this.Parent = obj;
+
+            this.DisplayName = $"{parentType.FullName}::{property.Name}";
             this.PropertyInfo = property;
+
+            this.GetterDelegate = (Func<TValue>)Delegate.CreateDelegate(typeof(Func<TValue>), obj, this.PropertyInfo.GetMethod);
+            this.SetterDelegate = (Action<TValue>)Delegate.CreateDelegate(typeof(Action<TValue>), obj, this.PropertyInfo.SetMethod);
         }
 
         /// <summary>Get the property value.</summary>
@@ -60,7 +64,7 @@ namespace StardewModdingAPI.Framework.Reflection
         {
             try
             {
-                return (TValue)this.PropertyInfo.GetValue(this.Parent);
+                return this.GetterDelegate();
             }
             catch (InvalidCastException)
             {
@@ -78,7 +82,7 @@ namespace StardewModdingAPI.Framework.Reflection
         {
             try
             {
-                this.PropertyInfo.SetValue(this.Parent, value);
+                this.SetterDelegate(value);
             }
             catch (InvalidCastException)
             {
diff --git a/src/SMAPI/Framework/Reflection/Reflector.cs b/src/SMAPI/Framework/Reflection/Reflector.cs
index 5c2d90fa..23a48505 100644
--- a/src/SMAPI/Framework/Reflection/Reflector.cs
+++ b/src/SMAPI/Framework/Reflection/Reflector.cs
@@ -38,7 +38,7 @@ namespace StardewModdingAPI.Framework.Reflection
                 throw new ArgumentNullException(nameof(obj), "Can't get a private instance field from a null object.");
 
             // get field from hierarchy
-            IPrivateField<TValue> field = this.GetFieldFromHierarchy<TValue>(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic);
+            IPrivateField<TValue> field = this.GetFieldFromHierarchy<TValue>(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
             if (required && field == null)
                 throw new InvalidOperationException($"The {obj.GetType().FullName} object doesn't have a private '{name}' instance field.");
             return field;
@@ -52,7 +52,7 @@ namespace StardewModdingAPI.Framework.Reflection
         public IPrivateField<TValue> GetPrivateField<TValue>(Type type, string name, bool required = true)
         {
             // get field from hierarchy
-            IPrivateField<TValue> field = this.GetFieldFromHierarchy<TValue>(type, null, name, BindingFlags.NonPublic | BindingFlags.Static);
+            IPrivateField<TValue> field = this.GetFieldFromHierarchy<TValue>(type, null, name, BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Public);
             if (required && field == null)
                 throw new InvalidOperationException($"The {type.FullName} object doesn't have a private '{name}' static field.");
             return field;
@@ -73,7 +73,7 @@ namespace StardewModdingAPI.Framework.Reflection
                 throw new ArgumentNullException(nameof(obj), "Can't get a private instance property from a null object.");
 
             // get property from hierarchy
-            IPrivateProperty<TValue> property = this.GetPropertyFromHierarchy<TValue>(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic);
+            IPrivateProperty<TValue> property = this.GetPropertyFromHierarchy<TValue>(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
             if (required && property == null)
                 throw new InvalidOperationException($"The {obj.GetType().FullName} object doesn't have a private '{name}' instance property.");
             return property;
@@ -87,7 +87,7 @@ namespace StardewModdingAPI.Framework.Reflection
         public IPrivateProperty<TValue> GetPrivateProperty<TValue>(Type type, string name, bool required = true)
         {
             // get field from hierarchy
-            IPrivateProperty<TValue> property = this.GetPropertyFromHierarchy<TValue>(type, null, name, BindingFlags.NonPublic | BindingFlags.Static);
+            IPrivateProperty<TValue> property = this.GetPropertyFromHierarchy<TValue>(type, null, name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
             if (required && property == null)
                 throw new InvalidOperationException($"The {type.FullName} object doesn't have a private '{name}' static property.");
             return property;
@@ -107,7 +107,7 @@ namespace StardewModdingAPI.Framework.Reflection
                 throw new ArgumentNullException(nameof(obj), "Can't get a private instance method from a null object.");
 
             // get method from hierarchy
-            IPrivateMethod method = this.GetMethodFromHierarchy(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic);
+            IPrivateMethod method = this.GetMethodFromHierarchy(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
             if (required && method == null)
                 throw new InvalidOperationException($"The {obj.GetType().FullName} object doesn't have a private '{name}' instance method.");
             return method;
@@ -120,7 +120,7 @@ namespace StardewModdingAPI.Framework.Reflection
         public IPrivateMethod GetPrivateMethod(Type type, string name, bool required = true)
         {
             // get method from hierarchy
-            IPrivateMethod method = this.GetMethodFromHierarchy(type, null, name, BindingFlags.NonPublic | BindingFlags.Static);
+            IPrivateMethod method = this.GetMethodFromHierarchy(type, null, name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static);
             if (required && method == null)
                 throw new InvalidOperationException($"The {type.FullName} object doesn't have a private '{name}' static method.");
             return method;
@@ -141,7 +141,7 @@ namespace StardewModdingAPI.Framework.Reflection
                 throw new ArgumentNullException(nameof(obj), "Can't get a private instance method from a null object.");
 
             // get method from hierarchy
-            PrivateMethod method = this.GetMethodFromHierarchy(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic, argumentTypes);
+            PrivateMethod method = this.GetMethodFromHierarchy(obj.GetType(), obj, name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public, argumentTypes);
             if (required && method == null)
                 throw new InvalidOperationException($"The {obj.GetType().FullName} object doesn't have a private '{name}' instance method with that signature.");
             return method;
@@ -155,7 +155,7 @@ namespace StardewModdingAPI.Framework.Reflection
         public IPrivateMethod GetPrivateMethod(Type type, string name, Type[] argumentTypes, bool required = true)
         {
             // get field from hierarchy
-            PrivateMethod method = this.GetMethodFromHierarchy(type, null, name, BindingFlags.NonPublic | BindingFlags.Static, argumentTypes);
+            PrivateMethod method = this.GetMethodFromHierarchy(type, null, name, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static, argumentTypes);
             if (required && method == null)
                 throw new InvalidOperationException($"The {type.FullName} object doesn't have a private '{name}' static method with that signature.");
             return method;