From eca00f3f37f32b6df600b450b5ea8ce9e2f7a804 Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Wed, 1 Sep 2021 21:48:41 +0200
Subject: [PATCH] fixup! Merge branch 'master' into api4-b

---
 Penumbra/Interop/GameResourceManagement.cs | 3 ---
 Penumbra/Penumbra.csproj                   | 7 -------
 Penumbra/UI/MenuTabs/TabResourceManager.cs | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Penumbra/Interop/GameResourceManagement.cs b/Penumbra/Interop/GameResourceManagement.cs
index 930f7cd1..1b88e0c1 100644
--- a/Penumbra/Interop/GameResourceManagement.cs
+++ b/Penumbra/Interop/GameResourceManagement.cs
@@ -1,10 +1,7 @@
 using System;
-using System.Reflection;
 using System.Runtime.InteropServices;
 using Dalamud.Logging;
-using Dalamud.Plugin;
 using Penumbra.Structs;
-using Reloaded.Hooks.Definitions.X64;
 using ResourceHandle = FFXIVClientStructs.FFXIV.Client.System.Resource.Handle.ResourceHandle;
 
 namespace Penumbra.Interop
diff --git a/Penumbra/Penumbra.csproj b/Penumbra/Penumbra.csproj
index 12a0b033..f3699adc 100644
--- a/Penumbra/Penumbra.csproj
+++ b/Penumbra/Penumbra.csproj
@@ -56,13 +56,6 @@
         </Reference>
     </ItemGroup>
 
-    <ItemGroup>
-        <Reference Include="System.Windows.Forms" />
-        <Reference Include="System.Data.DataSetExtensions" />
-        <Reference Include="Microsoft.CSharp" />
-        <Reference Include="System.Net.Http" />
-    </ItemGroup>
-
     <Target Name="ILRepack" AfterTargets="Build">
         <ItemGroup>
             <InputAssemblies Include="$(TargetPath)"/>
diff --git a/Penumbra/UI/MenuTabs/TabResourceManager.cs b/Penumbra/UI/MenuTabs/TabResourceManager.cs
index 47ea0c8c..3443516b 100644
--- a/Penumbra/UI/MenuTabs/TabResourceManager.cs
+++ b/Penumbra/UI/MenuTabs/TabResourceManager.cs
@@ -91,7 +91,7 @@ namespace Penumbra.UI
                 return;
             }
 
-            var resourceHandler = *( ResourceManager** )( _plugin.PluginInterface.TargetModuleScanner.Module.BaseAddress + 0x1D93AC0 );
+            var resourceHandler = *( ResourceManager** )( Dalamud.SigScanner.Module.BaseAddress + 0x1D93AC0 );
 
             if( resourceHandler == null )
             {