exmods/GamecraftScripting
1
0
Fork 0
Code Issues 1 Pull requests Releases 5 Activity

Update to Harmony v2

Browse source
This commit is contained in:
NGnius (Graham) 2020-05-25 16:36:11 -04:00
parent 2bae14c46b
commit 96e7a01087
6 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
GamecraftScripting/GamecraftScripting.csproj
View file

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net472</TargetFramework> <TargetFramework>net472</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Version>0.1.0.0</Version> <Version>0.2.1</Version>
<Authors>Exmods</Authors> <Authors>Exmods</Authors>
<PackageLicenseExpression>GNU General Public Licence 3+</PackageLicenseExpression> <PackageLicenseExpression>GNU General Public Licence 3+</PackageLicenseExpression>
<PackageProjectUrl>https://git.exmods.org/SnakesOnAGame/GamecraftScripting</PackageProjectUrl> <PackageProjectUrl>https://git.exmods.org/SnakesOnAGame/GamecraftScripting</PackageProjectUrl>
@ -11,9 +11,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="IronPython" Version="2.7.9" /> <PackageReference Include="IronPython" Version="2.7.10" />
<PackageReference Include="IronPython.StdLib" Version="2.7.9" /> <PackageReference Include="IronPython.StdLib" Version="2.7.10" />
<PackageReference Include="Lib.Harmony" Version="1.2.0.1" /> <PackageReference Include="Lib.Harmony" Version="2.0.0.10" />
</ItemGroup> </ItemGroup>
<!--Start Dependencies--> <!--Start Dependencies-->
@ -795,6 +795,12 @@
<HintPath>..\..\ref\Gamecraft_Data\Managed\VisualProfiler.dll</HintPath> <HintPath>..\..\ref\Gamecraft_Data\Managed\VisualProfiler.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <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> </ItemGroup>
<!--End Dependencies--> <!--End Dependencies-->

8
GamecraftScripting/Plugin.cs
View file

@ -9,7 +9,7 @@ using IllusionPlugin;
using UnityEngine; using UnityEngine;
using GamecraftModdingAPI; using GamecraftModdingAPI;
using GamecraftModdingAPI.Commands; using GamecraftModdingAPI.Commands;
using Harmony; using HarmonyLib;
namespace GamecraftScripting namespace GamecraftScripting
{ {
@ -18,10 +18,10 @@ namespace GamecraftScripting
public string[] Filter { get; } = new string[] { "Gamecraft" }; public string[] Filter { get; } = new string[] { "Gamecraft" };
public string Name { get; } = Assembly.GetExecutingAssembly().GetName().Name; public string Name { get; } = Assembly.GetExecutingAssembly().GetName().Name;
public string Version { get; } = Assembly.GetExecutingAssembly().GetName().Version.ToString(); public string Version { get; } = Assembly.GetExecutingAssembly().GetName().Version.ToString();
private HarmonyInstance harmony = null; private Harmony harmony = null;
public void OnApplicationQuit() public void OnApplicationQuit()
{ {
@ -35,7 +35,7 @@ namespace GamecraftScripting
{ {
Main.Init(); Main.Init();
var currentAssembly = Assembly.GetExecutingAssembly(); var currentAssembly = Assembly.GetExecutingAssembly();
harmony = HarmonyInstance.Create(currentAssembly.GetName().Name); harmony = new Harmony(currentAssembly.GetName().Name);
harmony.PatchAll(currentAssembly); harmony.PatchAll(currentAssembly);
// register development commands // register development commands
#if DEBUG #if DEBUG

2
GamecraftScripting/Serialization/DeserializeFromDiskEntitiesEnginePatch.cs
View file

@ -1,7 +1,7 @@
using System; using System;
using System.Text; using System.Text;
using System.Reflection; using System.Reflection;
using Harmony; using HarmonyLib;
using RobocraftX.Common; using RobocraftX.Common;
using Svelto.DataStructures; using Svelto.DataStructures;
using Svelto.ECS; using Svelto.ECS;

2
GamecraftScripting/Serialization/SaveAndLoadCompositionRootPatch.cs
View file

@ -1,5 +1,5 @@
using System; using System;
using Harmony; using HarmonyLib;
using RobocraftX.SaveAndLoad; using RobocraftX.SaveAndLoad;
using Svelto.ECS; using Svelto.ECS;
namespace GamecraftScripting.Serialization namespace GamecraftScripting.Serialization

2
GamecraftScripting/Serialization/SaveGameEnginePatch.cs
View file

@ -1,7 +1,7 @@
using System; using System;
using System.Text; using System.Text;
using System.Reflection; using System.Reflection;
using Harmony; using HarmonyLib;
using RobocraftX.Common; using RobocraftX.Common;
using RobocraftX.SaveAndLoad; using RobocraftX.SaveAndLoad;
using Svelto.DataStructures; using Svelto.DataStructures;

2
GamecraftScripting/Serialization/SerializationDescriptorMapPatch.cs
View file

@ -1,6 +1,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using Harmony; using HarmonyLib;
using Svelto.ECS; using Svelto.ECS;
using Svelto.ECS.Serialization; using Svelto.ECS.Serialization;
using GamecraftModdingAPI.Utility; using GamecraftModdingAPI.Utility;