change initialization approach, refactoring

should resolve errors occurring on both Atlas and WurstMod maps

Assets/MeatKit/MeatKitPlugin.cs

@@ -68,7 +68,7 @@ public static AssetBundle bundle;
     public static ConfigEntry<HealthExpireIndicationType> cfgHealthCrystalIndicator;
 
     // Take and Hold modifications
-    private static InPlay instance;
+    private static InPlay playInstance;
 
     // Searching for old leaderboards player count mod to disable
     private float lpcSearchTime;
@@ -83,21 +83,40 @@ public static AssetBundle bundle;
 
     private Harmony harmony;
 
-    // Could soft-lock if we're not in TNH!
-    public static IEnumerator WaitForTNHInit()
-    {
-        while (InPlay.tnhManager == null || FindObjectOfType<TNH_Manager>() == null)
-        {
-            yield return null;
-        }
-    }
-
     private void SceneChanged(Scene from, Scene to)
     {
+		StartCoroutine("SceneChangedCoroutine");
+	}
+
+    private IEnumerator SceneChangedCoroutine()
+    {
+        Destroy(playInstance);
+        for (int i = 0; i < 11; ++i)
+        {
+			// TNH patches
+			if (GameObject.Find("_GameManager") != null || FindObjectOfType<TNH_Manager>() != null)
+			{
+				Logger.LogInfo("We are in a TNH game!");
+				playInstance = new GameObject().AddComponent<InPlay>();
+                playerCamera = GameObject.FindGameObjectWithTag("MainCamera");
+                break;
+			}
+			else
+			{
+				Logger.LogInfo(String.Format("Couldn't find a TNH game. Trying again...({0}/10)", i));
+				yield return new WaitForEndOfFrame();
+			}
+        }
+
+        if (playInstance == null)
+        {
+            Logger.LogInfo("We are NOT in a TNH game!");
+        }
+
+        // setup non-TNH specific static objects
+        // running AFTER searching for TNH_Manager ensures we have everything initialized
         playerCamera = GameObject.FindGameObjectWithTag("MainCamera");
         hpDisplay = FindObjectOfType<FVRHealthBar>();
-        GetFonts();
-
         // apply health counter tweaks globally
         if (hpDisplay != null)
         {
@@ -112,34 +131,7 @@ public static AssetBundle bundle;
         {
             WristMenuAPI.Buttons.Remove(wmbHPToggle);
         }
-
+        GetFonts();
-		StartCoroutine("TryTNH");
-	}
-
-    private IEnumerator TryTNH()
-    {
-        for (int i = 0; i < 11; ++i)
-        {
-			// TNH patches
-			if (GameObject.Find("_GameManager") != null || FindObjectOfType<TNH_Manager>() != null)
-			{
-				Logger.LogInfo("We are in a TNH game!");
-				instance = new GameObject().AddComponent<InPlay>();
-                break;
-			}
-			else
-			{
-				Logger.LogInfo(String.Format("Couldn't find a TNH game. Trying again...({0}/10)", i));
-				yield return new WaitForEndOfFrame();
-			}
-        }
-
-        // destroy self only if we are FOR SURE not in a TNH game
-        if (GameObject.Find("_GameManager") == null || FindObjectOfType<TNH_Manager>() == null)
-        {
-            Logger.LogInfo("We are NOT in a TNH game!");
-            Destroy(instance);
-        }
     }
     
     // called on scene change, find fonts from game if they're not set

Assets/_Scripts/Extensions.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a7e0925cb0a2d20488bcb5d230cf74f7
+folderAsset: yes
+timeCreated: 1690792321
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Scripts/HPHideWhenAiming.cs

@@ -1,11 +1,10 @@
-using System.Collections;
+using UnityEngine;
-using System.Collections.Generic;
-using UnityEngine;
 using UnityEngine.UI;
 using FistVR;
 
 // To be attached to FVRHealthBar object
-public class HPHideWhenAiming : MonoBehaviour {
+public class HPHideWhenAiming : MonoBehaviour
+{
     CanvasGroup canvasGroup;
 
     GameObject gObjHUD;
@@ -25,7 +24,8 @@ public class HPHideWhenAiming : MonoBehaviour {
     //LineRenderer colliderRenderer;
 
     // Use this for initialization
-    void Start() {
+    void Start()
+    {
         gObjHUD = transform.GetChild(0).gameObject;
         leftHand = MeatKitPlugin.playerCamera.transform.parent.GetChild(1).GetComponent<FVRViveHand>();
         rightHand = MeatKitPlugin.playerCamera.transform.parent.GetChild(0).GetComponent<FVRViveHand>();

Assets/_Scripts/InPlay.cs

@@ -1,6 +1,4 @@
-using HarmonyLib;
+using UnityEngine;
-using System.Reflection;
-using UnityEngine;
 using FistVR;
 
 namespace TNHQoLImprovements
@@ -32,7 +30,6 @@ namespace TNHQoLImprovements
 
 		void OnDestroy()
 		{
-			// Destroy statics
 			tnhManager = null;
 		}
 	}

Assets/_Scripts/TNHInfo.cs

@@ -95,8 +95,8 @@ namespace TNHQoLImprovements
 
         private void Update()
         {
-            // game over area; do not update anything else
+			// game over area; do not update anything else
-            if (InPlay.tnhManager.Phase == TNH_Phase.Dead || InPlay.tnhManager.Phase == TNH_Phase.Completed)
+			if (InPlay.tnhManager.Phase == TNH_Phase.Dead || InPlay.tnhManager.Phase == TNH_Phase.Completed)
             {
                 if (tokenCounter != null)
                     tokenCounter.SetActive(true);