From 32f1168f1571fdff72fa4c3add29d3673c651ae5 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Wed, 6 Oct 2021 09:25:57 -0400
Subject: [PATCH 1/2] Implement assemblyLocation and assemblyDirectory in DPI

---
 Dalamud/Plugin/DalamudPluginInterface.cs | 15 ++++++++++++++-
 Dalamud/Plugin/Internal/LocalPlugin.cs   |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Dalamud/Plugin/DalamudPluginInterface.cs b/Dalamud/Plugin/DalamudPluginInterface.cs
index d3f416404..fb1741f87 100644
--- a/Dalamud/Plugin/DalamudPluginInterface.cs
+++ b/Dalamud/Plugin/DalamudPluginInterface.cs
@@ -35,9 +35,10 @@ namespace Dalamud.Plugin
         /// Set up the interface and populate all fields needed.
         /// </summary>
         /// <param name="pluginName">The internal name of the plugin.</param>
+        /// <param name="assemblyLocation">Location of the assembly.</param>
         /// <param name="reason">The reason the plugin was loaded.</param>
         /// <param name="isDev">A value indicating whether this is a dev plugin.</param>
-        internal DalamudPluginInterface(string pluginName, PluginLoadReason reason, bool isDev)
+        internal DalamudPluginInterface(string pluginName, FileInfo assemblyLocation, PluginLoadReason reason, bool isDev)
         {
             var configuration = Service<DalamudConfiguration>.Get();
             var dataManager = Service<DataManager>.Get();
@@ -46,6 +47,8 @@ namespace Dalamud.Plugin
             this.UiBuilder = new UiBuilder(pluginName);
 
             this.pluginName = pluginName;
+            this.AssemblyLocation = assemblyLocation;
+            this.AssemblyDirectory = new DirectoryInfo(assemblyLocation.DirectoryName!);
             this.configs = Service<PluginManager>.Get().PluginConfigs;
             this.Reason = reason;
             this.IsDev = isDev;
@@ -113,6 +116,16 @@ namespace Dalamud.Plugin
         /// </summary>
         public DirectoryInfo DalamudAssetDirectory => Service<Dalamud>.Get().AssetDirectory;
 
+        /// <summary>
+        /// Gets the location of your plugin assembly.
+        /// </summary>
+        public FileInfo AssemblyLocation { get; }
+
+        /// <summary>
+        /// Gets the directory your plugin assembly and bundled files are stored in.
+        /// </summary>
+        public DirectoryInfo AssemblyDirectory { get; }
+
         /// <summary>
         /// Gets the directory your plugin configurations are stored in.
         /// </summary>
diff --git a/Dalamud/Plugin/Internal/LocalPlugin.cs b/Dalamud/Plugin/Internal/LocalPlugin.cs
index a0d49e434..8207b08e6 100644
--- a/Dalamud/Plugin/Internal/LocalPlugin.cs
+++ b/Dalamud/Plugin/Internal/LocalPlugin.cs
@@ -309,7 +309,7 @@ namespace Dalamud.Plugin.Internal
                 // Update the location for the Location and CodeBase patches
                 PluginManager.PluginLocations[this.pluginType.Assembly.FullName] = new(this.DllFile);
 
-                this.DalamudInterface = new DalamudPluginInterface(this.pluginAssembly.GetName().Name!, reason, this.IsDev);
+                this.DalamudInterface = new DalamudPluginInterface(this.pluginAssembly.GetName().Name!, this.DllFile, reason, this.IsDev);
 
                 var ioc = Service<ServiceContainer>.Get();
                 this.instance = ioc.Create(this.pluginType, this.DalamudInterface) as IDalamudPlugin;

From 6f2dcbff190cfcd1609d3e01ab7e168dfe334013 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Wed, 6 Oct 2021 16:28:42 -0400
Subject: [PATCH 2/2] Remove AssemblyDirectory

---
 Dalamud/Plugin/DalamudPluginInterface.cs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Dalamud/Plugin/DalamudPluginInterface.cs b/Dalamud/Plugin/DalamudPluginInterface.cs
index fb1741f87..8eaf1a74c 100644
--- a/Dalamud/Plugin/DalamudPluginInterface.cs
+++ b/Dalamud/Plugin/DalamudPluginInterface.cs
@@ -48,7 +48,6 @@ namespace Dalamud.Plugin
 
             this.pluginName = pluginName;
             this.AssemblyLocation = assemblyLocation;
-            this.AssemblyDirectory = new DirectoryInfo(assemblyLocation.DirectoryName!);
             this.configs = Service<PluginManager>.Get().PluginConfigs;
             this.Reason = reason;
             this.IsDev = isDev;
@@ -121,11 +120,6 @@ namespace Dalamud.Plugin
         /// </summary>
         public FileInfo AssemblyLocation { get; }
 
-        /// <summary>
-        /// Gets the directory your plugin assembly and bundled files are stored in.
-        /// </summary>
-        public DirectoryInfo AssemblyDirectory { get; }
-
         /// <summary>
         /// Gets the directory your plugin configurations are stored in.
         /// </summary>