Release v1.4.6

IAmBatby · Feb 3, 2025 · 0d1b614 · 0d1b614
1 parent 78dbace
commit 0d1b614
Show file tree

Hide file tree

Showing 32 changed files with 272 additions and 436 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,38 @@
 **Changelog**
 --
 
+**<details><summary>Version 1.4.5</summary>**
+
+**<details><summary>Fixes</summary>**
+
+* Fixed issue where SpawnSyncedObjects in Tile Injection TileSets were not being network registered
+
+</details>
+
+</details>
+
+**<details><summary>Version 1.4.4</summary>**
+
+**<details><summary>Fixes</summary>**
+
+* Fixed additional networking issues related to AssetBundle Hotloading
+
+</details>
+
+</details>
+
+**<details><summary>Version 1.4.3</summary>**
+
+**<details><summary>Fixes</summary>**
+
+* Fixed issue with onBundlesFinishedLoading callback not being invoked
+* Re-wrote AssetBundle Hotloading networking to hopefully improve issues in multiplayer and pre-existing saves
+* Fixed issue with custom content that is manually registered not being processed correctly
+
+</details>
+
+</details>
+
 **<details><summary>Version 1.4.2</summary>**
 
 **<details><summary>Features</summary>**

diff --git a/LethalLevelLoader/AssetBundles/AssetBundleLoader.cs b/LethalLevelLoader/AssetBundles/AssetBundleLoader.cs
@@ -44,7 +44,11 @@ public static AssetBundleLoader Instance
         private static int processedBundleCount;
         private static int requestedBundleCount;
 
-        private void OnEnable() => instance = this;
+        private void OnEnable()
+        {
+             instance = this;
+            OnBundlesFinishedProcessing.AddListener(LethalLevelLoader.AssetBundleLoader.InvokeBundlesFinishedLoading);
+        }
 
         internal static bool AllowLoading { get; set; } = true;
 

diff --git a/LethalLevelLoader/AssetBundles/LethalBundleManager.cs b/LethalLevelLoader/AssetBundles/LethalBundleManager.cs
@@ -20,6 +20,8 @@ public enum ModProcessingStatus { Inactive, Loading, Complete };
 
         public static ExtendedEvent OnFinishedProcessing { get; private set; } = new ExtendedEvent();
 
+        public static bool HasFinalisedFoundContent { get; internal set; }
+
         //Semi legacy
         internal static Dictionary<string, List<Action<ExtendedMod>>> onExtendedModLoadedRequestDict = new Dictionary<string, List<Action<ExtendedMod>>>();
 
@@ -29,8 +31,7 @@ internal static void Start()
 
             PatchedContent.VanillaMod = ExtendedMod.Create("LethalCompany", "Zeekerss");
 
-            if (TryLoadLethalBundles() == false)
-                FinialiseFoundContent();
+            TryLoadLethalBundles();
         }
 
         private static bool TryLoadLethalBundles()
@@ -235,7 +236,7 @@ internal static ExtendedMod GetOrCreateExtendedMod(AssetBundleGroup source, stri
             }
         }
 
-        private static void FinialiseFoundContent()
+        internal static void FinialiseFoundContent()
         {
             foreach (ExtendedMod obtainedExtendedMod in obtainedExtendedModsList)
             {
@@ -265,6 +266,8 @@ private static void FinialiseFoundContent()
 
             DebugHelper.Log("Custom Content Processed. Unlocking Main Menu.", DebugType.User);
 
+            HasFinalisedFoundContent = true;
+
             CurrentStatus = ModProcessingStatus.Complete;
 
             OnFinishedProcessing.Invoke();

diff --git a/LethalLevelLoader/Components/ExtendedContent/ExtendedEnemyType.cs b/LethalLevelLoader/Components/ExtendedContent/ExtendedEnemyType.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using UnityEditor;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.Video;
 
 namespace LethalLevelLoader

diff --git a/LethalLevelLoader/Components/ExtendedContent/ExtendedItem.cs b/LethalLevelLoader/Components/ExtendedContent/ExtendedItem.cs
@@ -78,8 +78,8 @@ public void Initialize()
             DebugHelper.Log("Initializing Custom Item: " + Item.itemName + ". Is Buyable: " + IsBuyableItem + ". Is Scrap: " + Item.isScrap, DebugType.Developer);
 
             TryCreateMatchingProperties();
-
-            Patches.StartOfRound.allItemsList.itemsList.Add(Item);
+            if (!Patches.StartOfRound.allItemsList.itemsList.Contains(Item))
+                Patches.StartOfRound.allItemsList.itemsList.Add(Item);
             if (IsBuyableItem)
                 TerminalManager.CreateItemTerminalData(this);
         }

diff --git a/LethalLevelLoader/Components/ExtendedContent/ExtendedLevel.cs b/LethalLevelLoader/Components/ExtendedContent/ExtendedLevel.cs
@@ -28,6 +28,7 @@ public class ExtendedLevel : ExtendedContent
 
         [field: SerializeField] public bool IsRouteHidden { get; set; } = false;
         [field: SerializeField] public bool IsRouteLocked { get; set; } = false;
+        public bool IsRouteRemoved { get; set; } = false;
         [field: SerializeField] public string LockedRouteNodeText { get; set; } = string.Empty;
 
         [field: Space(5)]

diff --git a/LethalLevelLoader/Components/LLLSaveFile.cs b/LethalLevelLoader/Components/LLLSaveFile.cs
@@ -1,7 +1,5 @@
 using LethalModDataLib.Base;
-using System;
 using System.Collections.Generic;
-using System.Text;
 using Unity.Netcode;
 
 namespace LethalLevelLoader

diff --git a/LethalLevelLoader/Components/MoonsCataloguePage.cs b/LethalLevelLoader/Components/MoonsCataloguePage.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using UnityEngine;
 
 namespace LethalLevelLoader
 {

diff --git a/LethalLevelLoader/Components/Networking/NetworkSceneInfo.cs b/LethalLevelLoader/Components/Networking/NetworkSceneInfo.cs
@@ -1,8 +1,4 @@
-using Steamworks.Data;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Unity.Netcode;
+using Unity.Netcode;
 using UnityEngine.SceneManagement;
 using static LethalLevelLoader.LethalLevelLoaderNetworkManager;
 

diff --git a/LethalLevelLoader/General/Content.cs b/LethalLevelLoader/General/Content.cs
@@ -1,9 +1,7 @@
 using DunGen.Graph;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using UnityEngine;
 using UnityEngine.Audio;
 

diff --git a/LethalLevelLoader/General/EventPatches.cs b/LethalLevelLoader/General/EventPatches.cs
@@ -4,9 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using UnityEngine;
-using UnityEngine.InputSystem.HID;
 using UnityEngine.SceneManagement;
 
 namespace LethalLevelLoader
@@ -36,7 +34,7 @@ internal static void OnSceneLoaded(Scene scene, LoadSceneMode loadSceneMode)
             }
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(StoryLog), "CollectLog")]
         [HarmonyPrefix]
         internal static void StoryLogCollectLog_Prefix(StoryLog __instance)
@@ -79,7 +77,7 @@ internal static void RoundManagerSpawnRandomOutsideEnemy_Postfix(RoundManager __
 
         ////////// Dungeon Patches //////////
 
-        [HarmonyPriority(Patches.harmonyPriority + 1)] // +1 Because this needs to run after the Patch in Patches, second patch here for consistency.
+        [HarmonyPriority(Patches.priority + 1)] // +1 Because this needs to run after the Patch in Patches, second patch here for consistency.
         [HarmonyPatch(typeof(DungeonGenerator), "Generate")]
         [HarmonyPrefix]
         internal static void DungeonGeneratorGenerate_Prefix()
@@ -91,7 +89,7 @@ internal static void DungeonGeneratorGenerate_Prefix()
             }
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(RoundManager), "SwitchPower")]
         [HarmonyPrefix]
         internal static void RoundManagerSwitchPower_Prefix(bool on)
@@ -108,7 +106,7 @@ internal static void RoundManagerSwitchPower_Prefix(bool on)
             }
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(RoundManager), "SpawnScrapInLevel")]
         [HarmonyPostfix]
         internal static void RoundManagerSpawnScrapInLevel_Postfix()
@@ -121,7 +119,7 @@ internal static void RoundManagerSpawnScrapInLevel_Postfix()
             }
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(RoundManager), "SpawnSyncedProps")]
         [HarmonyPostfix]
         internal static void RoundManagerSpawnSyncedProps_Postfix()
@@ -134,7 +132,7 @@ internal static void RoundManagerSpawnSyncedProps_Postfix()
         }
 
         private static EnemyVent cachedSelectedVent;
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(RoundManager), "SpawnEnemyFromVent")]
         [HarmonyPrefix]
         internal static void RoundManagerSpawnEventFromVent_Prefix(EnemyVent vent)
@@ -143,7 +141,7 @@ internal static void RoundManagerSpawnEventFromVent_Prefix(EnemyVent vent)
                 cachedSelectedVent = vent;
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(RoundManager), "SpawnEnemyGameObject")]
         [HarmonyPostfix]
         internal static void RoundManagerSpawnEventFromVent_Postfix()
@@ -156,7 +154,7 @@ internal static void RoundManagerSpawnEventFromVent_Postfix()
             }
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(RoundManager), "SpawnMapObjects")]
         [HarmonyPostfix]
         internal static void RoundManagerSpawnMapObjects_Postfix()
@@ -173,7 +171,7 @@ internal static void RoundManagerSpawnMapObjects_Postfix()
             }
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(StartOfRound), "OnShipLandedMiscEvents")]
         [HarmonyPrefix]
         internal static void StartOfRoundOnShipLandedMiscEvents_Prefix()
@@ -190,7 +188,7 @@ internal static void StartOfRoundOnShipLandedMiscEvents_Prefix()
             }
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(StartOfRound), "ShipLeave")]
         [HarmonyPrefix]
         internal static void StartOfRoundShipLeave_Prefix()
@@ -207,7 +205,7 @@ internal static void StartOfRoundShipLeave_Prefix()
             }
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(EntranceTeleport), "TeleportPlayerServerRpc")]
         [HarmonyPrefix]
         internal static void EntranceTeleportTeleportPlayerServerRpc_Prefix(EntranceTeleport __instance, int playerObj)
@@ -246,7 +244,7 @@ internal static void EntranceTeleportTeleportPlayerServerRpc_Prefix(EntranceTele
             }
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(LungProp), "EquipItem")]
         [HarmonyPrefix]
         internal static void LungPropEquipItem_Prefix(LungProp __instance)
@@ -266,7 +264,7 @@ internal static void LungPropEquipItem_Prefix(LungProp __instance)
             }
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
+        [HarmonyPriority(Patches.priority)]
         [HarmonyPatch(typeof(TimeOfDay), "GetDayPhase")]
         [HarmonyPostfix]
         internal static void TimeOfDayGetDayPhase_Postfix(DayMode __result)

diff --git a/LethalLevelLoader/General/Extensions.cs b/LethalLevelLoader/General/Extensions.cs
@@ -1,13 +1,9 @@
 using DunGen;
 using DunGen.Graph;
 using HarmonyLib;
-using Mono.Cecil;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using UnityEngine;
 
 namespace LethalLevelLoader
 {
@@ -19,7 +15,11 @@ public static List<Tile> GetTiles(this DungeonFlow dungeonFlow)
 
             foreach (GraphNode dungeonNode in dungeonFlow.Nodes)
                 foreach (TileSet dungeonTileSet in dungeonNode.TileSets)
-                    tilesList.AddRange(GetTilesInTileSet(dungeonTileSet));
+                    if (dungeonTileSet != null)
+                        tilesList.AddRange(GetTilesInTileSet(dungeonTileSet));
+
+            foreach (TileInjectionRule tileInjectionRule in dungeonFlow.TileInjectionRules)
+                tilesList.AddRange(GetTilesInTileSet(tileInjectionRule.TileSet));
 
             foreach (GraphLine dungeonLine in dungeonFlow.Lines)
                 foreach (DungeonArchetype dungeonArchetype in dungeonLine.DungeonArchetypes)
@@ -148,4 +148,4 @@ public static List<DungeonFlow> GetDungeonFlows(this RoundManager roundManager)
             return roundManager.dungeonFlowTypes.Select(i => i.dungeonFlow).ToList();
         }
     }
-}
+}
diff --git a/LethalLevelLoader/General/OptionalPatches/LethalLibPatches.cs b/LethalLevelLoader/General/OptionalPatches/LethalLibPatches.cs
@@ -1,14 +1,12 @@
 using HarmonyLib;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace LethalLevelLoader
 {
     internal class LethalLibPatches
     {
-        [HarmonyPriority(Patches.harmonyPriority)]
-        [HarmonyPatch(typeof(LethalLib.Modules.Dungeon), "RoundManager_Start")]
+        [HarmonyPriority(Patches.priority)]
+        [HarmonyPatch("LethalLib.Modules.Dungeon", "RoundManager_Start")]
         [HarmonyPrefix]
         internal static bool Dungeon_Start_Prefix(Action<RoundManager> orig, RoundManager self)
         {
@@ -17,8 +15,8 @@ internal static bool Dungeon_Start_Prefix(Action<RoundManager> orig, RoundManage
             return (false);
         }
 
-        [HarmonyPriority(Patches.harmonyPriority)]
-        [HarmonyPatch(typeof(LethalLib.Modules.Dungeon), "RoundManager_GenerateNewFloor")]
+        [HarmonyPriority(Patches.priority)]
+        [HarmonyPatch("LethalLib.Modules.Dungeon", "RoundManager_GenerateNewFloor")]
         [HarmonyPrefix]
         internal static bool Dungeon_GenerateNewFloor_Prefix(Action<RoundManager> orig, RoundManager self)
         {
@@ -27,4 +25,4 @@ internal static bool Dungeon_GenerateNewFloor_Prefix(Action<RoundManager> orig,
             return (false);
         }
     }
-}
+}