Merge pull request #15 from bookdude13/update-dependencies

Update to SRModCore 1.1.0 and MelonLoader v0.6.1
bookdude13 · May 28, 2023 · 962ee05 · 962ee05
2 parents 4e9ec42 + 9a64601
commit 962ee05
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/PrepareRelease.bat b/PrepareRelease.bat
@@ -1,5 +1,5 @@
 
-set BUILT_VERSION=1.2.1
+set BUILT_VERSION=1.3.0
 set MOD_NAME=SRVoting
 
 set RELEASE_BUILD_DIR=.\%MOD_NAME%\bin\Release

diff --git a/SRVoting/Properties/AssemblyInfo.cs b/SRVoting/Properties/AssemblyInfo.cs
@@ -33,9 +33,9 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.3.0")]
+[assembly: AssemblyFileVersion("1.3.0")]
 
-[assembly: MelonInfo(typeof(SRVoting.SRVoting), "SRVoting", "1.2.1", "bookdude13", "https://github.com/bookdude13/SRVoting")]
+[assembly: MelonInfo(typeof(SRVoting.SRVoting), "SRVoting", "1.3.0", "bookdude13", "https://github.com/bookdude13/SRVoting")]
 [assembly: MelonGame("Kluge Interactive", "SynthRiders")]
 
diff --git a/SRVoting/SRVoting.cs b/SRVoting/SRVoting.cs
@@ -27,9 +27,9 @@ public class SRVoting : MelonMod
         private GameObject rootGameObjectMultiplayer = null;
 
 
-        public override void OnApplicationStart()
+        public override void OnInitializeMelon()
         {
-            base.OnApplicationStart();
+            base.OnInitializeMelon();
 
             logger = new MelonLoggerWrapper(LoggerInstance);
             Instance = this;

diff --git a/SRVoting/SRVoting.csproj b/SRVoting/SRVoting.csproj
@@ -33,7 +33,7 @@
   <ItemGroup>
     <Reference Include="0Harmony, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SynthRiders\MelonLoader\0Harmony.dll</HintPath>
+      <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SynthRiders\MelonLoader\net6\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SynthRiders\SynthRiders_Data\Managed\Assembly-CSharp.dll</HintPath>
@@ -42,8 +42,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SynthRiders\SynthRiders_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
-    <Reference Include="MelonLoader">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SynthRiders\MelonLoader\MelonLoader.dll</HintPath>
+    <Reference Include="MelonLoader, Version=0.5.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\SynthRiders\MelonLoader\net6\MelonLoader.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/SRVoting/libs/SRModCore.dll b/SRVoting/libs/SRModCore.dll