diff --git a/BSIPA.sln b/BSIPA.sln index d0fc87fe..ec487b96 100644 --- a/BSIPA.sln +++ b/BSIPA.sln @@ -262,7 +262,6 @@ Global {23AB2621-A05C-4377-8418-85E6012C0BBE}.Debug|x86-Net4.ActiveCfg = Debug|Any CPU {23AB2621-A05C-4377-8418-85E6012C0BBE}.Release|x64-Net3.ActiveCfg = Release|Any CPU {23AB2621-A05C-4377-8418-85E6012C0BBE}.Release|x64-Net4.ActiveCfg = Release|Any CPU - {23AB2621-A05C-4377-8418-85E6012C0BBE}.Release|x64-Net4.Build.0 = Release|Any CPU {23AB2621-A05C-4377-8418-85E6012C0BBE}.Release|x86-Net3.ActiveCfg = Release|Any CPU {23AB2621-A05C-4377-8418-85E6012C0BBE}.Release|x86-Net4.ActiveCfg = Release|Any CPU {23AB2621-A05C-4377-8418-85E6012C0BBE}.Verbose_Release|x64-Net3.ActiveCfg = Release|Any CPU diff --git a/IPA.Injector/Injector.cs b/IPA.Injector/Injector.cs index fc53db10..84aa0183 100644 --- a/IPA.Injector/Injector.cs +++ b/IPA.Injector/Injector.cs @@ -240,15 +240,23 @@ namespace IPA.Injector { var ascPath = Path.Combine(managedPath, - "Assembly-CSharp.dll"); + "MainAssembly.dll"); // TODO: change to config option for other games #region Virtualize Assembly-CSharp.dll { CriticalSection.EnterExecuteSection(); - var ascModule = VirtualizedModule.Load(ascPath); - ascModule.Virtualize(cAsmName, () => bkp?.Add(ascPath)); + try + { + var ascModule = VirtualizedModule.Load(ascPath); + ascModule.Virtualize(cAsmName, () => bkp?.Add(ascPath)); + } + catch (Exception e) + { + loader.Error($"Could not virtualize {ascPath}"); + loader.Error(e); + } CriticalSection.ExitExecuteSection(); } diff --git a/IPA.Loader/Loader/manifest.json b/IPA.Loader/Loader/manifest.json index fb09ff5d..f1ce104a 100644 --- a/IPA.Loader/Loader/manifest.json +++ b/IPA.Loader/Loader/manifest.json @@ -5,7 +5,7 @@ "#![IPA.Loader.description.md]", "A mod loader specifically for Beat Saber." ], - "gameVersion": "1.5.0", + "gameVersion": "1.6.0", "id": "BSIPA", "name": "Beat Saber IPA", "version": "4.0.0-beta.1", diff --git a/Refs/Assembly-CSharp.dll b/Refs/Assembly-CSharp.dll deleted file mode 100644 index cfa9b242..00000000 Binary files a/Refs/Assembly-CSharp.dll and /dev/null differ diff --git a/Refs/MainAssembly.dll b/Refs/MainAssembly.dll new file mode 100644 index 00000000..b6b975ef Binary files /dev/null and b/Refs/MainAssembly.dll differ diff --git a/Refs/Unity.TextMeshPro.dll b/Refs/Unity.TextMeshPro.dll index 60c90e50..8214d4da 100644 Binary files a/Refs/Unity.TextMeshPro.dll and b/Refs/Unity.TextMeshPro.dll differ diff --git a/Refs/UnityEngine.CoreModule.Net4.dll b/Refs/UnityEngine.CoreModule.Net4.dll index 158ef534..6362cdf1 100644 Binary files a/Refs/UnityEngine.CoreModule.Net4.dll and b/Refs/UnityEngine.CoreModule.Net4.dll differ diff --git a/Refs/refs.txt b/Refs/refs.txt index 964eca70..29e8eb42 100644 --- a/Refs/refs.txt +++ b/Refs/refs.txt @@ -1,7 +1,6 @@ ::from ./bsinstalldir.txt "Beat Saber_Data/ ""Managed/ -"""Assembly-CSharp.dll?virt """Unity.TextMeshPro.dll """UnityEngine. """"dll?alias=UnityEngine.Net4.dll @@ -27,6 +26,14 @@ ""BeatSaberCustomUI. """dll +::startopt +::from ./bsinstalldir.txt +"Beat Saber_Data/ +""Managed/ +"""Assembly-CSharp.dll?virt +"""MainAssembly.dll?virt +::endopt + ::startopt ::from ./mdinstalldir.txt "MuseDash_Data/