From 0a4f1d6d7320fa4af991fa062fc20df2985f3dbd Mon Sep 17 00:00:00 2001
From: aldelaro5 <aldelaro5@gmail.com>
Date: Sun, 1 Sep 2024 17:14:59 -0400
Subject: [PATCH] Accomodate breaking changes in preparation for api refactors

---
 BepInEx.Core/Contract/Attributes.cs                  | 4 ++--
 BepInEx.Core/Contract/IPlugin.cs                     | 2 +-
 Runtimes/NET/BepInEx.NET.Common/BasePlugin.cs        | 6 +++---
 Runtimes/Unity/BepInEx.Unity.IL2CPP/BasePlugin.cs    | 6 +++---
 Runtimes/Unity/BepInEx.Unity.Mono/BaseUnityPlugin.cs | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/BepInEx.Core/Contract/Attributes.cs b/BepInEx.Core/Contract/Attributes.cs
index f9d495c..793f456 100644
--- a/BepInEx.Core/Contract/Attributes.cs
+++ b/BepInEx.Core/Contract/Attributes.cs
@@ -290,7 +290,7 @@ public static class MetadataHelper
     /// </summary>
     /// <param name="pluginType">The plugin type.</param>
     /// <returns>The BepInPlugin metadata of the plugin type.</returns>
-    public static BepInPlugin GetPluginMetadata(Type pluginType)
+    public static BepInPlugin GetMetadata(Type pluginType)
     {
         var attributes = pluginType.GetCustomAttributes(typeof(BepInPlugin), false);
 
@@ -305,7 +305,7 @@ public static class MetadataHelper
     /// </summary>
     /// <param name="plugin">The plugin instance.</param>
     /// <returns>The BepInPlugin metadata of the plugin instance.</returns>
-    public static BepInPlugin GetPluginMetadata(object plugin) => GetPluginMetadata(plugin.GetType());
+    public static BepInPlugin GetMetadata(object plugin) => GetMetadata(plugin.GetType());
 
     /// <summary>
     ///     Retrieves the BepInPluginProvider metadata from a plugin type.
diff --git a/BepInEx.Core/Contract/IPlugin.cs b/BepInEx.Core/Contract/IPlugin.cs
index 84cc6b5..6963150 100644
--- a/BepInEx.Core/Contract/IPlugin.cs
+++ b/BepInEx.Core/Contract/IPlugin.cs
@@ -13,7 +13,7 @@ internal interface IPlugin
     /// <summary>
     /// Logger instance tied to this plugin.
     /// </summary>
-    ManualLogSource Logger { get; }
+    ManualLogSource Log { get; }
 
     /// <summary>
     /// Default config file tied to this plugin. The config file will not be created until 
diff --git a/Runtimes/NET/BepInEx.NET.Common/BasePlugin.cs b/Runtimes/NET/BepInEx.NET.Common/BasePlugin.cs
index bbd52eb..4356862 100644
--- a/Runtimes/NET/BepInEx.NET.Common/BasePlugin.cs
+++ b/Runtimes/NET/BepInEx.NET.Common/BasePlugin.cs
@@ -11,7 +11,7 @@ namespace BepInEx.NET.Common
     {
         protected BasePlugin()
         {
-            var metadata = MetadataHelper.GetPluginMetadata(this);
+            var metadata = MetadataHelper.GetMetadata(this);
 
             HarmonyInstance = new Harmony("BepInEx.Plugin." + metadata.GUID);
 
@@ -25,7 +25,7 @@ namespace BepInEx.NET.Common
                 throw new InvalidOperationException($"The plugin information for {metadata.GUID} couldn't be found on the chainloader");
             }
             
-            Logger = BepInEx.Logging.Logger.CreateLogSource(metadata.Name);
+            Log = BepInEx.Logging.Logger.CreateLogSource(metadata.Name);
 
             Config = new ConfigFile(Utility.CombinePaths(Paths.ConfigPath, metadata.GUID + ".cfg"), false, metadata);
         }
@@ -34,7 +34,7 @@ namespace BepInEx.NET.Common
         public PluginInfo Info { get; }
         
         /// <inheritdoc />
-        public ManualLogSource Logger { get; }
+        public ManualLogSource Log { get; }
 
         /// <inheritdoc />
         public ConfigFile Config { get; }
diff --git a/Runtimes/Unity/BepInEx.Unity.IL2CPP/BasePlugin.cs b/Runtimes/Unity/BepInEx.Unity.IL2CPP/BasePlugin.cs
index e6889da..b9d90c0 100644
--- a/Runtimes/Unity/BepInEx.Unity.IL2CPP/BasePlugin.cs
+++ b/Runtimes/Unity/BepInEx.Unity.IL2CPP/BasePlugin.cs
@@ -11,7 +11,7 @@ public abstract class BasePlugin : IPlugin
 {
     protected BasePlugin()
     {
-        var metadata = MetadataHelper.GetPluginMetadata(this);
+        var metadata = MetadataHelper.GetMetadata(this);
 
         if (BaseChainloader<BasePlugin>.Instance.Plugins.TryGetValue(metadata.GUID, out var pluginInfo))
         {
@@ -23,14 +23,14 @@ public abstract class BasePlugin : IPlugin
             throw new InvalidOperationException($"The plugin information for {metadata.GUID} couldn't be found on the chainloader");
         }
         
-        Logger = BepInEx.Logging.Logger.CreateLogSource(metadata.Name);
+        Log = BepInEx.Logging.Logger.CreateLogSource(metadata.Name);
 
         Config = new ConfigFile(Utility.CombinePaths(Paths.ConfigPath, metadata.GUID + ".cfg"), false, metadata);
     }
 
     public PluginInfo Info { get; }
     
-    public ManualLogSource Logger { get; }
+    public ManualLogSource Log { get; }
 
     public ConfigFile Config { get; }
 
diff --git a/Runtimes/Unity/BepInEx.Unity.Mono/BaseUnityPlugin.cs b/Runtimes/Unity/BepInEx.Unity.Mono/BaseUnityPlugin.cs
index f7ea012..3076c2a 100644
--- a/Runtimes/Unity/BepInEx.Unity.Mono/BaseUnityPlugin.cs
+++ b/Runtimes/Unity/BepInEx.Unity.Mono/BaseUnityPlugin.cs
@@ -10,7 +10,7 @@ namespace BepInEx.Unity.Mono;
 /// <summary>
 ///     The base plugin type that is used by the BepInEx plugin loader.
 /// </summary>
-public abstract class BaseUnityPlugin : MonoBehaviour, IPlugin
+public abstract class BaseUnityPlugin : MonoBehaviour
 {
     /// <summary>
     ///     Create a new instance of a plugin and all of its tied in objects.
@@ -18,7 +18,7 @@ public abstract class BaseUnityPlugin : MonoBehaviour, IPlugin
     /// <exception cref="InvalidOperationException">BepInPlugin attribute is missing.</exception>
     protected BaseUnityPlugin()
     {
-        var metadata = MetadataHelper.GetPluginMetadata(this);
+        var metadata = MetadataHelper.GetMetadata(this);
         if (metadata == null)
             throw new InvalidOperationException("Can't create an instance of " + GetType().FullName +
                                                 " because it inherits from BaseUnityPlugin and the BepInPlugin attribute is missing.");