chore: unified more initialisation logging

Valheim-Modding · Sep 27, 2023 · b6a569d · b6a569d
1 parent 545e9d6
commit b6a569d
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Fixed some errors when a Jotunn dependent mod has no BepInEx dependency set and loads before Jotunn. A warning will be logged
 * Fixed items were not added to the main menu ObjectDB if added in the OnVanillaPrefabsAvailable event and thus not visually shown on the player
 * Fixed input block did not prevent mouse wheel character zoom
+* Improved module initialisation logging by unifying messages
 
 ## Version 2.14.0
 * Fixed the SynchronizationManager wasn't always initialised, resulting in no sync of admin configs

diff --git a/JotunnLib/Main.cs b/JotunnLib/Main.cs
@@ -132,13 +132,13 @@ private void InitializePatches()
             }
         }
 
-        internal static void LogManagerInit(string manager)
+        internal static void LogInit(string module)
         {
-            Jotunn.Logger.LogInfo($"Initializing {manager}");
+            Jotunn.Logger.LogInfo($"Initializing {module}");
 
             if (!Instance)
             {
-                string message = $"{manager} was accessed before Jotunn Awake, this can cause unexpected behaviour. " +
+                string message = $"{module} was accessed before Jotunn Awake, this can cause unexpected behaviour. " +
                                  "Please make sure to add `[BepInDependency(Jotunn.Main.ModGuid)]` next to your BaseUnityPlugin";
                 Jotunn.Logger.LogWarning(BepInExUtils.GetSourceModMetadata(), message);
             }

diff --git a/JotunnLib/Managers/CommandManager.cs b/JotunnLib/Managers/CommandManager.cs
@@ -47,7 +47,7 @@ static CommandManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("CommandManager");
+            Main.LogInit("CommandManager");
             AddConsoleCommand(new ClearCommand());
 
             Main.Harmony.PatchAll(typeof(Patches));

diff --git a/JotunnLib/Managers/CreatureManager.cs b/JotunnLib/Managers/CreatureManager.cs
@@ -69,7 +69,7 @@ static CreatureManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("CreatureManager");
+            Main.LogInit("CreatureManager");
 
             SpawnListContainer = new GameObject("Creatures");
             SpawnListContainer.transform.parent = Main.RootObject.transform;

diff --git a/JotunnLib/Managers/GUIManager.cs b/JotunnLib/Managers/GUIManager.cs
@@ -291,7 +291,7 @@ private static void TextInput_IsVisible(ref bool __result)
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("GUIManager");
+            Main.LogInit("GUIManager");
 
             // Cache headless state
             Headless = SystemInfo.graphicsDeviceType == GraphicsDeviceType.Null;

diff --git a/JotunnLib/Managers/InputManager.cs b/JotunnLib/Managers/InputManager.cs
@@ -218,7 +218,7 @@ static InputManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("InputManager");
+            Main.LogInit("InputManager");
 
             // Dont init on a dedicated server
             if (!GUIManager.IsHeadless())

diff --git a/JotunnLib/Managers/ItemManager.cs b/JotunnLib/Managers/ItemManager.cs
@@ -73,7 +73,7 @@ static ItemManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("ItemManager");
+            Main.LogInit("ItemManager");
             Main.Harmony.PatchAll(typeof(Patches));
             PrefabManager.Instance.Activate();
         }

diff --git a/JotunnLib/Managers/KeyHintManager.cs b/JotunnLib/Managers/KeyHintManager.cs
@@ -68,7 +68,7 @@ static KeyHintManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("KeyHintManager");
+            Main.LogInit("KeyHintManager");
 
             // Dont init on a headless server
             if (!GUIManager.IsHeadless())

diff --git a/JotunnLib/Managers/KitbashManager.cs b/JotunnLib/Managers/KitbashManager.cs
@@ -39,7 +39,7 @@ static KitbashManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("KitbashManager");
+            Main.LogInit("KitbashManager");
             ItemManager.OnKitbashItemsAvailable += ApplyKitbashes;
         }
 

diff --git a/JotunnLib/Managers/LocalizationManager.cs b/JotunnLib/Managers/LocalizationManager.cs
@@ -91,7 +91,7 @@ static LocalizationManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("LocalizationManager");
+            Main.LogInit("LocalizationManager");
 
             Main.Harmony.PatchAll(typeof(Patches));
 

diff --git a/JotunnLib/Managers/MinimapManager.cs b/JotunnLib/Managers/MinimapManager.cs
@@ -103,7 +103,7 @@ static MinimapManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("MinimapManager");
+            Main.LogInit("MinimapManager");
 
             // Dont init on a headless server
             if (GUIManager.IsHeadless())

diff --git a/JotunnLib/Managers/MockSystem/MockManager.cs b/JotunnLib/Managers/MockSystem/MockManager.cs
@@ -56,7 +56,7 @@ private MockManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("MockManager");
+            Main.LogInit("MockManager");
 
             MockPrefabContainer = new GameObject("MockPrefabs");
             MockPrefabContainer.transform.parent = Main.RootObject.transform;

diff --git a/JotunnLib/Managers/NetworkManager.cs b/JotunnLib/Managers/NetworkManager.cs
@@ -50,7 +50,7 @@ static NetworkManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("NetworkManager");
+            Main.LogInit("NetworkManager");
             Main.Harmony.PatchAll(typeof(Patches));
         }
 

diff --git a/JotunnLib/Managers/PieceManager.cs b/JotunnLib/Managers/PieceManager.cs
@@ -91,7 +91,7 @@ public static class PieceCategorySettings
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("PieceManager");
+            Main.LogInit("PieceManager");
             Main.Harmony.PatchAll(typeof(Patches));
             PrefabManager.Instance.Activate();
         }

diff --git a/JotunnLib/Managers/PrefabManager.cs b/JotunnLib/Managers/PrefabManager.cs
@@ -63,7 +63,7 @@ static PrefabManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("PrefabManager");
+            Main.LogInit("PrefabManager");
 
             PrefabContainer = new GameObject("Prefabs");
             PrefabContainer.transform.parent = Main.RootObject.transform;

diff --git a/JotunnLib/Managers/RenderManager.cs b/JotunnLib/Managers/RenderManager.cs
@@ -52,7 +52,7 @@ static RenderManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("RenderManager");
+            Main.LogInit("RenderManager");
 
             if (GUIManager.IsHeadless())
             {

diff --git a/JotunnLib/Managers/SkillManager.cs b/JotunnLib/Managers/SkillManager.cs
@@ -36,7 +36,7 @@ static SkillManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("SkillManager");
+            Main.LogInit("SkillManager");
             Main.Harmony.PatchAll(typeof(Patches));
         }
 

diff --git a/JotunnLib/Managers/SynchronizationManager.cs b/JotunnLib/Managers/SynchronizationManager.cs
@@ -62,7 +62,7 @@ private SynchronizationManager() { }
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("SynchronizationManager");
+            Main.LogInit("SynchronizationManager");
 
             // Register RPCs and the admin watchdog
             ConfigRPC = NetworkManager.Instance.AddRPC(

diff --git a/JotunnLib/Managers/UndoManager.cs b/JotunnLib/Managers/UndoManager.cs
@@ -72,7 +72,7 @@ static UndoManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("UndoManager");
+            Main.LogInit("UndoManager");
             Main.Harmony.PatchAll(typeof(Patches));
         }
 

diff --git a/JotunnLib/Managers/ZoneManager.cs b/JotunnLib/Managers/ZoneManager.cs
@@ -64,7 +64,7 @@ static ZoneManager()
         /// </summary>
         void IManager.Init()
         {
-            Main.LogManagerInit("ZoneManager");
+            Main.LogInit("ZoneManager");
 
             LocationContainer = new GameObject("Locations");
             LocationContainer.transform.parent = Main.RootObject.transform;

diff --git a/JotunnLib/Utils/ModCompatibility/ModCompatibility.cs b/JotunnLib/Utils/ModCompatibility/ModCompatibility.cs
@@ -26,7 +26,7 @@ public static class ModCompatibility
 
         internal static void Init()
         {
-            Logger.LogInfo("Initializing ModCompatibility");
+            Main.LogInit("ModCompatibility");
             Main.Harmony.PatchAll(typeof(ModCompatibility));
         }
 

diff --git a/JotunnLib/Utils/ModQuery.cs b/JotunnLib/Utils/ModQuery.cs
@@ -27,7 +27,7 @@ public class ModQuery
 
         internal static void Init()
         {
-            Logger.LogInfo("Initializing ModQuery");
+            Main.LogInit("ModQuery");
             Main.Harmony.PatchAll(typeof(ModQuery));
         }