The nuclear Additive option

Author: DaXcess

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.4.5
+
+**Fixes**:
+- First it's Mirage, now it's LLL, this time we go nuclear (additive scene load on init scene)
+
 # 1.4.4
 
 **Fixes**:

Docs/Thunderstore/README.md

@@ -65,7 +65,8 @@ Here is a list of LCVR versions and which version(s) of Lethal Company it suppor
 
 | LCVR              | Lethal Company    |
 |-------------------|-------------------|
-| v1.4.4 *(LATEST)* | V73               |
+| v1.4.5 *(LATEST)* | V73               |
+| v1.4.4            | V73               |
 | v1.4.3            | V73               |
 | v1.4.2            | V73               |
 | v1.4.1            | V73               |

LCVR.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>LCVR</AssemblyName>
     <Description>Collecting Scrap in VR</Description>
-    <Version>1.4.4</Version>
+    <Version>1.4.5</Version>
     <Authors>DaXcess</Authors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>12.0</LangVersion>

Preloader/LCVR.Preload.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <Description>LCVR Preloader</Description>
         <Authors>DaXcess</Authors>
-        <Version>1.4.4</Version>
+        <Version>1.4.5</Version>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <LangVersion>12.0</LangVersion>
         <Title>LCVR.Preload</Title>

README.md

@@ -40,7 +40,8 @@ Here is a list of LCVR versions and which version(s) of Lethal Company it suppor
 
 | LCVR              | Lethal Company    | [Configuration version](Docs/Configuration/README.md) |
 |-------------------|-------------------|-------------------------------------------------------|
-| v1.4.4 *(LATEST)* | V73               | 1                                                     |
+| v1.4.5 *(LATEST)* | V73               | 1                                                     |
+| v1.4.4            | V73               | 1                                                     |
 | v1.4.3            | V73               | 1                                                     |
 | v1.4.2            | V73               | 1                                                     |
 | v1.4.1            | V73               | 1                                                     |

Source/Managers/VRSession.cs

@@ -1,13 +1,11 @@
-using System;
-using System.Collections;
+using System.Collections;
 using HarmonyLib;
 using LCVR.Assets;
 using LCVR.Physics.Interactions;
 using LCVR.UI;
 using Microsoft.MixedReality.Toolkit.Experimental.UI;
 using System.Collections.Generic;
 using System.Linq;
-using GameNetcodeStuff;
 using LCVR.Physics.Interactions.Car;
 using LCVR.Player;
 using LCVR.Rendering;

Source/Patches/UI/UIPatches.cs

@@ -1,9 +1,9 @@
-using System.Collections;
-using HarmonyLib;
+using HarmonyLib;
 using LCVR.Assets;
 using LCVR.Managers;
 using TMPro;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using UnityEngine.XR.Interaction.Toolkit.UI;
@@ -21,15 +21,9 @@ internal static class UIPatches
     [HarmonyPostfix]
     private static void OnPreInitMenuShown(PreInitSceneScript __instance)
     {
-        __instance.StartCoroutine(LoadSceneDelayed());
-        return;
-
-        // Delay loading of init scene to allow mods that use PreInitSceneScript.Start as an entrypoint to load
-        static IEnumerator LoadSceneDelayed()
-        {
-            yield return null;
-            SceneManager.LoadSceneAsync("LCVR Init Scene");
-        }
+        Object.FindObjectOfType<EventSystem>().gameObject.SetActive(false);
+        
+        SceneManager.LoadSceneAsync("LCVR Init Scene", LoadSceneMode.Additive);
     }
 
     /// <summary>

Source/Plugin.cs

@@ -27,7 +27,7 @@ public class Plugin : BaseUnityPlugin
 {
     public const string PLUGIN_GUID = "io.daxcess.lcvr";
     public const string PLUGIN_NAME = "LCVR";
-    public const string PLUGIN_VERSION = "1.4.4";
+    public const string PLUGIN_VERSION = "1.4.5";
 
 #if DEBUG
     private const string SKIP_CHECKSUM_VAR = $"--lcvr-skip-checksum={PLUGIN_VERSION}-dev";

Source/UI/Spectating/SpectatingMenu.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using LCVR.Managers;
 using TMPro;
 using UnityEngine;