Merge pull request #34 from chilla55/main

switch from harmony to harmonyx
SpaceWarpDev · Feb 26, 2023 · 47dabc4 · 47dabc4
2 parents b16d4a5 + 654cd59
commit 47dabc4
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 3 deletions.
diff --git a/SpaceWarp/SpaceWarp.csproj b/SpaceWarp/SpaceWarp.csproj
@@ -31,13 +31,31 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="0Harmony">
-      <HintPath>..\packages\Lib.Harmony.2.2.2\lib\net472\0Harmony.dll</HintPath>
+    <Reference Include="0Harmony, Version=2.10.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\HarmonyX.2.10.1\lib\net45\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\external_dlls\Assembly-CSharp.dll</HintPath>
     </Reference>
+    <Reference Include="Mono.Cecil, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.11.4\lib\net40\Mono.Cecil.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.11.4\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.11.4\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.11.4\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
+    </Reference>
+    <Reference Include="MonoMod.RuntimeDetour, Version=22.3.23.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MonoMod.RuntimeDetour.22.3.23.4\lib\net452\MonoMod.RuntimeDetour.dll</HintPath>
+    </Reference>
+    <Reference Include="MonoMod.Utils, Version=22.3.23.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MonoMod.Utils.22.3.23.4\lib\net452\MonoMod.Utils.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\external_dlls\Newtonsoft.Json.dll</HintPath>

diff --git a/SpaceWarp/packages.config b/SpaceWarp/packages.config
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Lib.Harmony" version="2.2.2" targetFramework="net472" />
+  <package id="HarmonyX" version="2.10.1" targetFramework="net472" />
+  <package id="Mono.Cecil" version="0.11.4" targetFramework="net472" />
+  <package id="MonoMod.RuntimeDetour" version="22.3.23.4" targetFramework="net472" />
+  <package id="MonoMod.Utils" version="22.3.23.4" targetFramework="net472" />
 </packages>
diff --git a/build_debug.ps1 b/build_debug.ps1
@@ -5,6 +5,12 @@ dotnet build SpaceWarp/SpaceWarp.csproj -c Debug
 Copy-Item ./SpaceWarp/bin/Debug/SpaceWarp.dll ./build/SpaceWarp/core
 Copy-Item ./SpaceWarp/bin/Debug/SpaceWarp.pdb ./build/SpaceWarp/core
 Copy-Item ./SpaceWarp/bin/Debug/0Harmony.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/Mono.Cecil.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/Mono.Cecil.Mdb.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/Mono.Cecil.Pdb.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/Mono.Cecil.Rocks.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/MonoMod.RuntimeDetour.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/MonoMod.Utils.dll ./build/SpaceWarp/core
 mkdir ./build/SpaceWarp/assets/bundles
 mkdir ./build/SpaceWarp/Mods
 Get-ChildItem ./Bundles -Filter *.bundle | Copy-Item -Destination ./build/SpaceWarp/assets/bundles/ -Force -PassThru
diff --git a/build_release.ps1 b/build_release.ps1
@@ -4,6 +4,12 @@ Copy-Item ./Doorstop/* ./build
 dotnet build SpaceWarp/SpaceWarp.csproj -c Release
 Copy-Item ./SpaceWarp/bin/Release/SpaceWarp.dll ./build/SpaceWarp/core
 Copy-Item ./SpaceWarp/bin/Release/0Harmony.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/Mono.Cecil.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/Mono.Cecil.Mdb.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/Mono.Cecil.Pdb.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/Mono.Cecil.Rocks.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/MonoMod.RuntimeDetour.dll ./build/SpaceWarp/core
+Copy-Item ./SpaceWarp/bin/Release/MonoMod.Utils.dll ./build/SpaceWarp/core
 mkdir ./build/SpaceWarp/assets/bundles
 mkdir ./build/SpaceWarp/Mods
 Get-ChildItem ./Bundles -Filter *.bundle | Copy-Item -Destination ./build/SpaceWarp/assets/bundles/ -Force -PassThru