From bb9717ccca64eef543c809cc8de654f83766a55d Mon Sep 17 00:00:00 2001
From: jixxed <jixxed@jixxed.nl>
Date: Mon, 16 Jan 2023 19:16:26 +0100
Subject: [PATCH] Use HarmonyX instead

---
 Source/ExampleMod/ExampleMod.csproj                           | 4 ++--
 Source/ExampleMod/packages.config                             | 2 +-
 Source/Stationeers.Addons/Modules/HarmonyLib/HarmonyModule.cs | 2 +-
 .../PluginCompiler/Whitelists/HarmonyWhitelist.cs             | 4 ++--
 Source/Stationeers.Addons/Stationeers.Addons.csproj           | 4 ++--
 Source/Stationeers.Addons/packages.config                     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/ExampleMod/ExampleMod.csproj b/Source/ExampleMod/ExampleMod.csproj
index 541afe5..09505e9 100644
--- a/Source/ExampleMod/ExampleMod.csproj
+++ b/Source/ExampleMod/ExampleMod.csproj
@@ -31,8 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lib.Harmony.2.0.4\lib\net45\0Harmony.dll</HintPath>
+    <Reference Include="0Harmony, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HarmonyX.2.9.0\lib\net45\0Harmony.dll</HintPath>
     </Reference>
   </ItemGroup>
   
diff --git a/Source/ExampleMod/packages.config b/Source/ExampleMod/packages.config
index 2258412..700e522 100644
--- a/Source/ExampleMod/packages.config
+++ b/Source/ExampleMod/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Lib.Harmony" version="2.0.4" targetFramework="net45" />
+  <package id="HarmonyX" version="2.9.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Source/Stationeers.Addons/Modules/HarmonyLib/HarmonyModule.cs b/Source/Stationeers.Addons/Modules/HarmonyLib/HarmonyModule.cs
index ac7f288..234523d 100644
--- a/Source/Stationeers.Addons/Modules/HarmonyLib/HarmonyModule.cs
+++ b/Source/Stationeers.Addons/Modules/HarmonyLib/HarmonyModule.cs
@@ -49,7 +49,7 @@ public IEnumerator Load()
         /// <inheritdoc />
         public void Shutdown()
         {
-            _harmony.UnpatchAll();
+            _harmony.UnpatchSelf();
             _harmony = null;
         }
         
diff --git a/Source/Stationeers.Addons/PluginCompiler/Whitelists/HarmonyWhitelist.cs b/Source/Stationeers.Addons/PluginCompiler/Whitelists/HarmonyWhitelist.cs
index 5657e16..43776cf 100644
--- a/Source/Stationeers.Addons/PluginCompiler/Whitelists/HarmonyWhitelist.cs
+++ b/Source/Stationeers.Addons/PluginCompiler/Whitelists/HarmonyWhitelist.cs
@@ -11,8 +11,8 @@ public void Register(PluginWhitelist whitelist)
                 // Do not allow for transpile for now TODO: We have to figure something out
                 typeof(HarmonyLib.HarmonyTranspiler),
                 typeof(HarmonyLib.Transpilers),
-                typeof(HarmonyLib.FileLog),
-                typeof(HarmonyLib.Memory)
+                typeof(HarmonyLib.FileLog)//,
+                //typeof(HarmonyLib.Memory)
             );
             whitelist.WhitelistTypesNamespaces(
                 typeof(HarmonyLib.Harmony) // Just allow everything
diff --git a/Source/Stationeers.Addons/Stationeers.Addons.csproj b/Source/Stationeers.Addons/Stationeers.Addons.csproj
index 01b51a5..0b1a876 100644
--- a/Source/Stationeers.Addons/Stationeers.Addons.csproj
+++ b/Source/Stationeers.Addons/Stationeers.Addons.csproj
@@ -34,8 +34,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lib.Harmony.2.0.4\lib\net45\0Harmony.dll</HintPath>
+	<Reference Include="0Harmony, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HarmonyX.2.9.0\lib\net45\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis, Version=3.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CodeAnalysis.Common.3.8.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
diff --git a/Source/Stationeers.Addons/packages.config b/Source/Stationeers.Addons/packages.config
index 010a703..65a8b6b 100644
--- a/Source/Stationeers.Addons/packages.config
+++ b/Source/Stationeers.Addons/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Lib.Harmony" version="2.0.4" targetFramework="net45" />
+  <package id="HarmonyX" version="2.9.0" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="3.0.0" targetFramework="net471" developmentDependency="true" />
   <package id="Microsoft.CodeAnalysis.CSharp" version="3.8.0" targetFramework="net471" />
   <package id="Microsoft.CodeAnalysis.Common" version="3.8.0" targetFramework="net471" />