From 9ee4728e2a2dc89e4228bb748c0ddc107e59a505 Mon Sep 17 00:00:00 2001
From: Evil Factory <36804725+evilfactory@users.noreply.github.com>
Date: Sun, 1 Mar 2026 13:09:05 -0300
Subject: [PATCH] Better logging

---
 .../SharedSource/LuaCs/LuaCsSetup.cs             | 16 +++++++++++++++-
 .../_Services/LuaScriptManagementService.cs      |  4 ++--
 .../LuaCs/_Services/PluginManagementService.cs   |  7 ++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
index e10f9867b..042015714 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
@@ -325,6 +325,8 @@ namespace Barotrauma
             // ReSharper disable InconsistentNaming
             void RunStateUnloaded_OnEnter(State<RunState> currentState)
             {
+                Logger.LogMessage("LuaCs unloaded state entered");
+
                 if (PackageManagementService.IsAnyPackageRunning())
                 {
                     Logger.LogResults(PackageManagementService.StopRunningPackages());
@@ -342,6 +344,8 @@ namespace Barotrauma
                 PackageManagementService.Reset();
                 NetworkingService.Reset();
 
+                Logger.LogMessage("Services have been reset");
+
                 SubscribeToLuaCsEvents();
 
                 CurrentRunState = RunState.Unloaded;
@@ -349,6 +353,8 @@ namespace Barotrauma
 
             void RunStateLoadedNoExec_OnEnter(State<RunState> currentState)
             {
+                Logger.LogMessage("LuaCs no execution state entered");
+
                 if (PackageManagementService.IsAnyPackageRunning())
                 {
                     Logger.LogResults(PackageManagementService.StopRunningPackages());
@@ -371,6 +377,9 @@ namespace Barotrauma
                 
             void RunStateRunning_OnEnter(State<RunState> currentState)
             {
+                string csEnabled = IsCsEnabled ? "enabled" : "disabled";
+                Logger.LogMessage($"LuaCs running state entered. Running under commit {AssemblyInfo.GitRevision}, CSharp is {csEnabled}");
+
                 if (!PackageManagementService.IsAnyPackageLoaded())
                 {
                     foreach (var registrationProvider in _servicesProvider.GetAllServices<ISettingsRegistrationProvider>())
@@ -396,10 +405,15 @@ namespace Barotrauma
 #endif
                 CurrentRunState = RunState.Running;
             }
-                
+
+
             void RunStateRunning_OnExit(State<RunState> currentState)
             {
+                EventService.Call("stop");
+
                 Logger.LogResults(PackageManagementService.StopRunningPackages());
+
+                Logger.LogMessage("LuaCs running state exited");
             }
             // ReSharper restore InconsistentNaming
         }
diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs
index 5a8b76be9..4ae22dad6 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs
@@ -348,7 +348,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
             return FluentResults.Result.Fail("Tried to execute Lua scripts without unloading first."); 
         }
 
-        _loggerService.LogMessage("Executing Lua scripts");
+        _loggerService.LogMessage("[Lua] Executing scripts");
 
         SetupEnvironment(enableSandbox);
 
@@ -373,7 +373,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
             {
                 try
                 {
-                    _loggerService.LogMessage($"Run {filePath.Value}");
+                    _loggerService.LogMessage($"[Lua] - Run {filePath.Value}");
                     _script.Call(_script.LoadFile(filePath.FullPath), resource.OwnerPackage.Dir);
                 }
                 catch(Exception e)
diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/PluginManagementService.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/PluginManagementService.cs
index 3af050db4..6eb0be740 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/PluginManagementService.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/PluginManagementService.cs
@@ -356,6 +356,8 @@ public class PluginManagementService : IAssemblyManagementService
         {
             return FluentResults.Result.Ok();
         }
+
+        _logger.LogMessage($"Activating {nameof(IAssemblyPlugin)} instances");
         
         var loadedPackagePlugins =
             ImmutableArray.CreateBuilder<(ContentPackage Package, ImmutableArray<IAssemblyPlugin> Plugins)>();
@@ -368,6 +370,7 @@ public class PluginManagementService : IAssemblyManagementService
             {
                 try
                 {
+                    _logger.LogMessage($"- Instantiating {pluginType.Name}");
                     var plugin = (IAssemblyPlugin)Activator.CreateInstance(pluginType);
                     _pluginInjectorContainer.InjectProperties(plugin);
                     _pluginInjectorContainer.Register(pluginType, fac => plugin);
@@ -579,9 +582,7 @@ public class PluginManagementService : IAssemblyManagementService
                     continue;
                 }
                 
-#if DEBUG
-                _logger.Log($"[DEBUG] Compiling assembly for {scripts.Key}, in ContentPackage {contentPackRes.Key.Name}");
-#endif
+                _logger.LogMessage($"Compiling assembly for {scripts.Key}, in ContentPackage {contentPackRes.Key.Name}");
                 
                 result.WithReasons(assemblyLoader.CompileScriptAssembly(
                     assemblyName: scripts.Key,