Improve logging and projector behavior

Remove bad lines

Author: Jimmacle

Concealment/ConcealGroup.cs

@@ -9,6 +9,7 @@
 using Sandbox.Game.Entities.Blocks;
 using Sandbox.Game.World;
 using SpaceEngineers.Game.Entities.Blocks;
+using VRage.Audio;
 using VRage.Game.Entity;
 using VRage.Game.Entity.EntityComponents.Interfaces;
 using VRage.Groups;
@@ -19,6 +20,7 @@ namespace Concealment
 {
     public class ConcealGroup
     {
+        private static readonly Logger _log = LogManager.GetCurrentClassLogger();
         /// <summary>
         /// Entity ID of the first grid in the group.
         /// </summary>
@@ -70,9 +72,10 @@ private void UnhookOnClosing()
                 grid.OnMarkForClose -= Grid_OnMarkForClose;
         }
 
-        private void Grid_OnMarkForClose(VRage.Game.Entity.MyEntity obj)
+        private void Grid_OnMarkForClose(MyEntity obj)
         {
-            LogManager.GetLogger(nameof(ConcealGroup)).Info($"Grid group '{GridNames}' was marked for close.");
+            _log.Debug($"Grid group '{GridNames}' was marked for close.");
+            EnableProjectors();
             UnhookOnClosing();
             Closing?.Invoke(this);
         }
@@ -127,36 +130,54 @@ public bool IsCryoOccupied(ulong steamId)
             return false;
         }
 
+        private readonly HashSet<long> _projectors = new HashSet<long>();
+        private void DisableProjectors(MyCubeGrid grid)
+        {
+            foreach (var projector in grid.GetFatBlocks<MyProjectorBase>())
+            {
+                if (projector.ProjectedGrid == null)
+                    continue;
+
+                projector.Enabled = false;
+                _projectors.Add(projector.EntityId);
+            }
+        }
+
+        public void EnableProjectors()
+        {
+            foreach (var projector in _projectors.Select(x => (MyProjectorBase)MyEntities.GetEntityById(x)))
+            {
+                projector.Enabled = true;
+            }
+            _projectors.Clear();
+        }
+
         /// <summary>
         /// Conceals this group from game and physics logic.
         /// </summary>
         public void Conceal()
         {
-            //TODO: find good way to disable grid movement/physics
-            //_unstatic.Clear();
             foreach (var grid in Grids)
             {
-                //_unstatic[grid.EntityId] = !grid.IsStatic;
-                //grid.ConvertToStatic();
+                DisableProjectors(grid);
 
                 if (grid.Parent == null)
                     UnregisterRecursive(grid);   
             }
 
-            //foreach (var entity in Grids)
-            //    if (entity.Parent == null)
-            //        MyGamePruningStructure.Remove(entity);
-
-            void UnregisterRecursive(IMyEntity e)
+            void UnregisterRecursive(MyEntity e)
             {
-                MyEntities.UnregisterForUpdate((MyEntity)e);
+                if (e.IsPreview)
+                    return;
+                
+                MyEntities.UnregisterForUpdate(e);
                 (e.GameLogic as IMyGameLogicComponent)?.UnregisterForUpdate();
                 e.Flags |= (EntityFlags)4;
                 if (e.Hierarchy == null)
                     return;
 
                 foreach (var child in e.Hierarchy.Children)
-                    UnregisterRecursive(child.Container.Entity);
+                    UnregisterRecursive((MyEntity)child.Container.Entity);
             }
         }
 
@@ -165,32 +186,29 @@ void UnregisterRecursive(IMyEntity e)
         /// </summary>
         public void Reveal()
         {
-        //    foreach (var entity in Grids)
-        //        if (entity.Parent == null)
-        //            MyGamePruningStructure.Add(entity);
-
             foreach (var grid in Grids)
             {
-                //if (_unstatic[grid.EntityId])
-                //    grid.OnConvertToDynamic();
-                
                 if (grid.Parent == null)
                     RegisterRecursive(grid);   
             }
+            
+            EnableProjectors();
 
-            void RegisterRecursive(IMyEntity e)
+            void RegisterRecursive(MyEntity e)
             {
-                MyEntities.RegisterForUpdate((MyEntity)e);
+                if (e.IsPreview)
+                    return;
+                
+                MyEntities.RegisterForUpdate(e);
                 (e.GameLogic as IMyGameLogicComponent)?.RegisterForUpdate();
                 e.Flags &= ~(EntityFlags)4;
                 if (e.Hierarchy == null)
                     return;
 
                 foreach (var child in e.Hierarchy.Children)
-                    RegisterRecursive(child.Container.Entity);
+                    RegisterRecursive((MyEntity)child.Container.Entity);
             }
         }
-
     }
 
 }

Concealment/ConcealmentPlugin.cs

@@ -73,7 +73,6 @@ public override void Init(ITorchBase torch)
                 Settings = new Persistent<Settings>(Path.Combine(StoragePath, "Concealment.cfg"), new Settings());
             Settings.Data.PropertyChanged += Data_PropertyChanged;
             _concealedAabbTree = new MyDynamicAABBTreeD(MyConstants.GAME_PRUNING_STRUCTURE_AABB_EXTENSION);
-            RegisterEntityStorage("Concealment", Id);
             torch.Managers.GetManager<ITorchSessionManager>()?.AddFactory(CreateManager);
         }
 
@@ -87,18 +86,6 @@ private void Data_PropertyChanged(object sender, System.ComponentModel.PropertyC
             _settingsChanged = true;
         }
 
-        //TODO: make this stop spamming the log with warnings
-        private void RegisterEntityStorage(string name, Guid id)
-        {
-            return;
-            var comp = new MyModStorageComponentDefinition
-            {
-                Id = new MyDefinitionId(typeof(MyObjectBuilder_ModStorageComponent), name),
-                RegisteredStorageGuids = new[] { id }
-            };
-            MyDefinitionManager.Static.Definitions.AddDefinition(comp);
-        }
-
         //TODO: divide conceal/reveal runs over several ticks to avoid stuttering.
         public override void Update()
         {
@@ -345,9 +332,9 @@ public int ConcealGrids(double distanceFromPlayers = 0)
             Log.Debug($"Concealed grids in {sw.ElapsedMilliseconds}ms.");
             sw.Stop();
 
-
-            if (concealed != 0)
-                Log.Info($"Concealed {concealed} grids distant from players.");
+            var concealedCount = ConcealedGroups.SelectMany(x => x.Grids).Count();
+            var totalCount = MyEntities.GetEntities().Count(x => x is MyCubeGrid);
+            Log.Info($"Status: {concealedCount}/{totalCount} grids concealed ({concealedCount/(float)totalCount:P}).");
 
             return concealed;
         }
@@ -359,13 +346,13 @@ public bool IsExcluded(ConcealGroup group)
             {
                 if (_keepAliveTimers.ContainsKey(grid.EntityId))
                 {
-                    Log.Trace($"{group.GridNames} is kept alive by PB action");
+                    Log.Debug($"{group.GridNames} is kept alive by PB action");
                     return true;
                 }
 
                 if (!Settings.Data.ConcealPirates && grid.BigOwners.Contains(pirateId))
                 {
-                    Log.Trace($"{group.GridNames} is kept alive by pirate ownership");
+                    Log.Debug($"{group.GridNames} is kept alive by pirate ownership");
                     return true;
                 }
             }
@@ -380,14 +367,14 @@ public bool IsExcluded(ConcealGroup group)
 
                     if (block is IMyProductionBlock p && !Settings.Data.ConcealProduction && p.IsProducing)
                     {
-                        Log.Trace($"{group.GridNames} exempted production ({p.CustomName} active)");
+                        Log.Debug($"{group.GridNames} exempted production ({p.CustomName} active)");
                         exclude = true;
                         break;
                     }
 
                     if (Settings.Data.ExcludedSubtypes.Contains(block.BlockDefinition.Id.SubtypeName))
                     {
-                        Log.Trace($"{group.GridNames} exempted subtype {block.BlockDefinition.Id.SubtypeName}");
+                        Log.Debug($"{group.GridNames} exempted subtype {block.BlockDefinition.Id.SubtypeName}");
                         exclude = true;
                         break;
                     }