From 96e7a01087372d34289cc1bf41ffa823a79f892a Mon Sep 17 00:00:00 2001
From: "NGnius (Graham)" <ngniusness@gmail.com>
Date: Mon, 25 May 2020 16:36:11 -0400
Subject: [PATCH] Update to Harmony v2

---
 GamecraftScripting/GamecraftScripting.csproj       | 14 ++++++++++----
 GamecraftScripting/Plugin.cs                       |  8 ++++----
 .../DeserializeFromDiskEntitiesEnginePatch.cs      |  2 +-
 .../SaveAndLoadCompositionRootPatch.cs             |  2 +-
 .../Serialization/SaveGameEnginePatch.cs           |  2 +-
 .../SerializationDescriptorMapPatch.cs             |  2 +-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/GamecraftScripting/GamecraftScripting.csproj b/GamecraftScripting/GamecraftScripting.csproj
index ebe105e..4412e83 100644
--- a/GamecraftScripting/GamecraftScripting.csproj
+++ b/GamecraftScripting/GamecraftScripting.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Version>0.1.0.0</Version>
+    <Version>0.2.1</Version>
     <Authors>Exmods</Authors>
     <PackageLicenseExpression>GNU General Public Licence 3+</PackageLicenseExpression>
     <PackageProjectUrl>https://git.exmods.org/SnakesOnAGame/GamecraftScripting</PackageProjectUrl>
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IronPython" Version="2.7.9" />
-    <PackageReference Include="IronPython.StdLib" Version="2.7.9" />
-    <PackageReference Include="Lib.Harmony" Version="1.2.0.1" />
+    <PackageReference Include="IronPython" Version="2.7.10" />
+    <PackageReference Include="IronPython.StdLib" Version="2.7.10" />
+    <PackageReference Include="Lib.Harmony" Version="2.0.0.10" />
   </ItemGroup>
 
 <!--Start Dependencies-->
@@ -795,6 +795,12 @@
       <HintPath>..\..\ref\Gamecraft_Data\Managed\VisualProfiler.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="GamecraftModdingAPI">
+      <HintPath>..\ref\Plugins\GamecraftModdingAPI.dll</HintPath>
+    </Reference>
+    <Reference Include="GamecraftModdingAPI">
+      <HintPath>..\..\ref\Plugins\GamecraftModdingAPI.dll</HintPath>
+    </Reference>
   </ItemGroup>
 <!--End Dependencies-->
 
diff --git a/GamecraftScripting/Plugin.cs b/GamecraftScripting/Plugin.cs
index 44158eb..0769718 100644
--- a/GamecraftScripting/Plugin.cs
+++ b/GamecraftScripting/Plugin.cs
@@ -9,7 +9,7 @@ using IllusionPlugin;
 using UnityEngine;
 using GamecraftModdingAPI;
 using GamecraftModdingAPI.Commands;
-using Harmony;
+using HarmonyLib;
 
 namespace GamecraftScripting
 {
@@ -18,10 +18,10 @@ namespace GamecraftScripting
         public string[] Filter { get; } = new string[] { "Gamecraft" };
 
         public string Name { get; } = Assembly.GetExecutingAssembly().GetName().Name;
-
+        
         public string Version { get; } = Assembly.GetExecutingAssembly().GetName().Version.ToString();
 
-		private HarmonyInstance harmony = null;
+		private Harmony harmony = null;
 
         public void OnApplicationQuit()
         {
@@ -35,7 +35,7 @@ namespace GamecraftScripting
         {
             Main.Init();
 			var currentAssembly = Assembly.GetExecutingAssembly();
-			harmony = HarmonyInstance.Create(currentAssembly.GetName().Name);
+			harmony = new Harmony(currentAssembly.GetName().Name);
             harmony.PatchAll(currentAssembly);
             // register development commands
 #if DEBUG
diff --git a/GamecraftScripting/Serialization/DeserializeFromDiskEntitiesEnginePatch.cs b/GamecraftScripting/Serialization/DeserializeFromDiskEntitiesEnginePatch.cs
index b450842..cf87520 100644
--- a/GamecraftScripting/Serialization/DeserializeFromDiskEntitiesEnginePatch.cs
+++ b/GamecraftScripting/Serialization/DeserializeFromDiskEntitiesEnginePatch.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 using System.Reflection;
-using Harmony;
+using HarmonyLib;
 using RobocraftX.Common;
 using Svelto.DataStructures;
 using Svelto.ECS;
diff --git a/GamecraftScripting/Serialization/SaveAndLoadCompositionRootPatch.cs b/GamecraftScripting/Serialization/SaveAndLoadCompositionRootPatch.cs
index b264fdc..a301850 100644
--- a/GamecraftScripting/Serialization/SaveAndLoadCompositionRootPatch.cs
+++ b/GamecraftScripting/Serialization/SaveAndLoadCompositionRootPatch.cs
@@ -1,5 +1,5 @@
 using System;
-using Harmony;
+using HarmonyLib;
 using RobocraftX.SaveAndLoad;
 using Svelto.ECS;
 namespace GamecraftScripting.Serialization
diff --git a/GamecraftScripting/Serialization/SaveGameEnginePatch.cs b/GamecraftScripting/Serialization/SaveGameEnginePatch.cs
index d9d5d9d..853f7ca 100644
--- a/GamecraftScripting/Serialization/SaveGameEnginePatch.cs
+++ b/GamecraftScripting/Serialization/SaveGameEnginePatch.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 using System.Reflection;
-using Harmony;
+using HarmonyLib;
 using RobocraftX.Common;
 using RobocraftX.SaveAndLoad;
 using Svelto.DataStructures;
diff --git a/GamecraftScripting/Serialization/SerializationDescriptorMapPatch.cs b/GamecraftScripting/Serialization/SerializationDescriptorMapPatch.cs
index 00e789d..a1bb6a1 100644
--- a/GamecraftScripting/Serialization/SerializationDescriptorMapPatch.cs
+++ b/GamecraftScripting/Serialization/SerializationDescriptorMapPatch.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Reflection;
-using Harmony;
+using HarmonyLib;
 using Svelto.ECS;
 using Svelto.ECS.Serialization;
 using GamecraftModdingAPI.Utility;