Works for Deli 0.3.1

WurstModders · Apr 5, 2021 · e237286 · e237286
1 parent 4b47c57
commit e237286
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 77 deletions.
diff --git a/WurstMod/Runtime/Entrypoint.cs b/WurstMod/Runtime/Entrypoint.cs
@@ -20,6 +20,9 @@ public class Entrypoint : DeliBehaviour
 
         public Entrypoint()
         {
+            // Patches
+            Patches.Patch();
+
             // Add a number of callbacks
             Stages.Setup += StagesOnSetup;
             SceneManager.sceneLoaded += SceneManager_sceneLoaded;

diff --git a/WurstMod/Runtime/Loader.cs b/WurstMod/Runtime/Loader.cs
@@ -42,17 +42,8 @@ public static IEnumerator OnSceneLoad(Scene scene)
 
             if (IsLoadInProgress && LevelToLoad.HasValue)
             {
-                // We're loading the modded scene after the base scene
-                ScenePatcher.RunPatches(scene);
-
                 IsLoadInProgress = false;
             }
-
-            if (!IsLoadInProgress && !LevelToLoad.HasValue)
-            {
-                // We're loading a base scene
-                ScenePatcher.RunPatches(scene);
-            }
         }
 
         /// <summary>
@@ -135,7 +126,7 @@ private static IEnumerator MergeCustomScene(LevelInfo level)
             yield return null;
 
             // Then merge the scene into the original
-            SceneManager.MergeScenes(SceneManager.GetSceneAt(SceneManager.sceneCount - 1), SceneManager.GetActiveScene());
+            SceneManager.MergeScenes(SceneManager.GetSceneByName(sceneName), SceneManager.GetActiveScene());
 
             // Find the level component
             ObjectReferences.CustomScene = _loadedScene.GetRootGameObjects()

diff --git a/WurstMod/Runtime/ScenePatchers/MainMenuScenePatcher.cs b/WurstMod/Runtime/ScenePatchers/MainMenuScenePatcher.cs
diff --git a/WurstMod/Runtime/ScenePatchers/ScenePatcher.cs b/WurstMod/Runtime/ScenePatchers/ScenePatcher.cs
diff --git a/WurstMod/Shared/Constants.cs b/WurstMod/Shared/Constants.cs
@@ -2,7 +2,7 @@
 {
     internal static class Constants
     {
-        public const string LegacyLevelsDirectory = "mods/legacy/CustomLevels";
+        public const string LegacyLevelsDirectory = "Deli/mods/legacy/CustomLevels";
         public const string FilenameLevelData = "leveldata";
         public const string FilenameLevelInfo = "info.json";
         public const string FilenameLevelThumbnail = "thumb.png";

diff --git a/WurstMod/Shared/LevelInfo.cs b/WurstMod/Shared/LevelInfo.cs
@@ -3,6 +3,7 @@
 using FistVR;
 using UnityEngine;
 using Valve.Newtonsoft.Json;
+using Valve.VR.InteractionSystem.Sample;
 
 namespace WurstMod.Shared
 {
@@ -32,7 +33,7 @@ public Texture2D Thumbnail
         {
             get
             {
-                var stream = AssetBundlePath.OpenRead();
+                var stream = ThumbnailPath.OpenRead();
                 var buffer = new byte[stream.Length];
                 stream.Read(buffer, 0, buffer.Length);
                 var tex = new Texture2D(0, 0);

diff --git a/WurstMod/WurstMod.csproj b/WurstMod/WurstMod.csproj
@@ -146,8 +146,6 @@
     <Compile Include="Runtime\SceneLoaders\SandboxSceneLoader.cs" />
     <Compile Include="Runtime\SceneLoaders\TakeAndHoldSceneLoader.cs" />
     <Compile Include="Runtime\ScenePatchers\Generic_LevelPopulator.cs" />
-    <Compile Include="Runtime\ScenePatchers\MainMenuScenePatcher.cs" />
-    <Compile Include="Runtime\ScenePatchers\ScenePatcher.cs" />
     <Compile Include="Runtime\ScenePatchers\TNH_LevelSelector.cs" />
     <Compile Include="Runtime\SosigSpawnerHelper.cs" />
     <Compile Include="Runtime\SpriteLoader.cs" />