Merge branch 'master' into 4.0.0-beta

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

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();
                 }

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",

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/