From a54d58d064df5654e845f9b2b4fc9db5b0189db0 Mon Sep 17 00:00:00 2001
From: Shockah <me@shockah.pl>
Date: Thu, 10 Feb 2022 16:26:43 +0100
Subject: add TryProxy for any objects

---
 .../Framework/ModHelpers/ModRegistryHelper.cs      | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'src/SMAPI/Framework/ModHelpers')

diff --git a/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
index ef1ad30c..92c52b00 100644
--- a/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
@@ -98,5 +98,31 @@ namespace StardewModdingAPI.Framework.ModHelpers
                 return castApi;
             return this.ProxyFactory.CreateProxy<TInterface>(api, this.ModID, uniqueID);
         }
+
+        /// <inheritdoc />
+        public bool TryProxy<TInterface>(string uniqueID, object toProxy, out TInterface proxy) where TInterface : class
+        {
+            try
+            {
+                foreach (var toProxyInterface in toProxy.GetType().GetInterfaces())
+                {
+                    var unproxyBuilder = this.ProxyFactory.ObtainBuilder(typeof(TInterface), toProxyInterface, this.ModID, uniqueID);
+                    if (unproxyBuilder.TryUnproxy(toProxy, out object targetInstance))
+                    {
+                        proxy = (TInterface)targetInstance;
+                        return true;
+                    }
+                }
+
+                var proxyBuilder = this.ProxyFactory.ObtainBuilder(toProxy.GetType(), typeof(TInterface), this.ModID, uniqueID);
+                proxy = (TInterface)proxyBuilder.ObtainInstance(toProxy, this.ProxyFactory);
+                return true;
+            }
+            catch
+            {
+                proxy = null;
+                return false;
+            }
+        }
     }
 }
-- 
cgit 


From ba42bb97d1f1df07e87b02ee0e03eef0227ea5a7 Mon Sep 17 00:00:00 2001
From: Shockah <me@shockah.pl>
Date: Wed, 16 Feb 2022 19:08:40 +0100
Subject: move proxying to a separate NuGet library

---
 .../Framework/ModHelpers/ModRegistryHelper.cs      | 37 ++++------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

(limited to 'src/SMAPI/Framework/ModHelpers')

diff --git a/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
index 92c52b00..93ea6028 100644
--- a/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Nanoray.Pintail;
 using StardewModdingAPI.Framework.Reflection;
 
 namespace StardewModdingAPI.Framework.ModHelpers
@@ -19,7 +20,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         private readonly HashSet<string> AccessedModApis = new HashSet<string>();
 
         /// <summary>Generates proxy classes to access mod APIs through an arbitrary interface.</summary>
-        private readonly InterfaceProxyFactory ProxyFactory;
+        private readonly IProxyManager<string> ProxyManager;
 
 
         /*********
@@ -28,13 +29,13 @@ namespace StardewModdingAPI.Framework.ModHelpers
         /// <summary>Construct an instance.</summary>
         /// <param name="modID">The unique ID of the relevant mod.</param>
         /// <param name="registry">The underlying mod registry.</param>
-        /// <param name="proxyFactory">Generates proxy classes to access mod APIs through an arbitrary interface.</param>
+        /// <param name="proxyManager">Generates proxy classes to access mod APIs through an arbitrary interface.</param>
         /// <param name="monitor">Encapsulates monitoring and logging for the mod.</param>
-        public ModRegistryHelper(string modID, ModRegistry registry, InterfaceProxyFactory proxyFactory, IMonitor monitor)
+        public ModRegistryHelper(string modID, ModRegistry registry, IProxyManager<string> proxyManager, IMonitor monitor)
             : base(modID)
         {
             this.Registry = registry;
-            this.ProxyFactory = proxyFactory;
+            this.ProxyManager = proxyManager;
             this.Monitor = monitor;
         }
 
@@ -96,33 +97,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
             // get API of type
             if (api is TInterface castApi)
                 return castApi;
-            return this.ProxyFactory.CreateProxy<TInterface>(api, this.ModID, uniqueID);
-        }
-
-        /// <inheritdoc />
-        public bool TryProxy<TInterface>(string uniqueID, object toProxy, out TInterface proxy) where TInterface : class
-        {
-            try
-            {
-                foreach (var toProxyInterface in toProxy.GetType().GetInterfaces())
-                {
-                    var unproxyBuilder = this.ProxyFactory.ObtainBuilder(typeof(TInterface), toProxyInterface, this.ModID, uniqueID);
-                    if (unproxyBuilder.TryUnproxy(toProxy, out object targetInstance))
-                    {
-                        proxy = (TInterface)targetInstance;
-                        return true;
-                    }
-                }
-
-                var proxyBuilder = this.ProxyFactory.ObtainBuilder(toProxy.GetType(), typeof(TInterface), this.ModID, uniqueID);
-                proxy = (TInterface)proxyBuilder.ObtainInstance(toProxy, this.ProxyFactory);
-                return true;
-            }
-            catch
-            {
-                proxy = null;
-                return false;
-            }
+            return this.ProxyManager.ObtainProxy<string, TInterface>(api, this.ModID, uniqueID);
         }
     }
 }
-- 
cgit