Update for 1.181

Author: Jimmacle

Concealment/Commands.cs

@@ -14,7 +14,7 @@ public void Conceal(double distance = 0)
         {
             if (distance == 0)
             {
-                distance = Plugin.Settings.ConcealDistance;
+                distance = Plugin.Settings.Data.ConcealDistance;
             }
             var num = Plugin.ConcealDistantGrids(distance);
             Context.Respond($"{num} grids concealed.");
@@ -35,7 +35,7 @@ public void Reveal(double distance = 1000)
             Context.Respond($"{num} grids revealed.");
         }
 
-        [Command("all", "Reveal all grids", null, "reveal"), Permission(MyPromoteLevel.SpaceMaster)]
+        [Command("reveal all", "Reveal all grids"), Permission(MyPromoteLevel.SpaceMaster)]
         public void RevealAll()
         {
             int num = Plugin.RevealAll();

Concealment/ConcealGroup.cs

@@ -22,6 +22,7 @@ public class ConcealGroup
         public List<MyCubeGrid> Grids { get; }
         public List<MyMedicalRoom> MedicalRooms { get; } = new List<MyMedicalRoom>();
         public List<MyCryoChamber> CryoChambers { get; } = new List<MyCryoChamber>();
+        public event Action<ConcealGroup> Closing;
         internal volatile int ProxyId = -1;
 
         public ConcealGroup(MyGroups<MyCubeGrid, MyGridPhysicalGroupData>.Group group)
@@ -39,6 +40,20 @@ public void UpdatePostConceal()
         {
             UpdateAABB();
             CacheSpawns();
+            HookOnClosing();
+        }
+
+        private void HookOnClosing()
+        {
+            foreach (var grid in Grids)
+                grid.OnClosing += Grid_OnClosing;
+        }
+
+        private void Grid_OnClosing(VRage.Game.Entity.MyEntity obj)
+        {
+            Closing?.Invoke(this);
+            foreach (var grid in Grids)
+                grid.OnClosing -= Grid_OnClosing;
         }
 
         private void UpdateAABB()

Concealment/ConcealmentControl.xaml

@@ -8,8 +8,10 @@
              d:DesignHeight="300" d:DesignWidth="300">
     <DockPanel>
         <StackPanel DockPanel.Dock="Top">
-            <StackPanel DataContext="{Binding Settings}">
+            <StackPanel DataContext="{Binding Settings.Data}">
                 <CheckBox Content="Enable Concealment" Margin="3" IsChecked="{Binding Enabled}" />
+                <CheckBox Content="Manage Physics" Margin="3" IsChecked="{Binding ManagePhysics}" />
+                <CheckBox Content="Manage Gamelogic" Margin="3" IsChecked="{Binding ManageGamelogic}" />
                 <StackPanel Orientation="Horizontal">
                     <TextBox Margin="3" Width="150" Text="{Binding ConcealDistance}" />
                     <Label Content="Conceal Distance (meters)" Margin="3" />
@@ -31,8 +33,9 @@
                 <Button Content="Manual Conceal" Margin="3" Click="Conceal_OnClick" />
                 <Button Content="Manual Reveal" Margin="3" Click="Reveal_OnClick" />
             </StackPanel>
+            <Button Content="Edit Excluded Subtypes" Margin="3" Click="RevealSelected_OnClick"/>
         </StackPanel>
-        <Button Content="Reveal Selected" Margin="3" DockPanel.Dock="Bottom" Click="ButtonBase_OnClick" />
+        <Button Content="Reveal Selected" Margin="3" DockPanel.Dock="Bottom" Click="EditExclusion_OnClick" />
         <ListView Name="Concealed" Margin="3" DockPanel.Dock="Bottom" ItemsSource="{Binding ConcealGroups}">
             <ItemsControl.ItemTemplate>
                 <DataTemplate>

Concealment/ConcealmentControl.xaml.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using Torch.Views;
 
 #endregion
 
@@ -20,7 +21,7 @@ public ConcealmentControl()
 
         public ConcealmentPlugin Plugin => (ConcealmentPlugin)DataContext;
 
-        private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+        private void RevealSelected_OnClick(object sender, RoutedEventArgs e)
         {
             var groups = Concealed.SelectedItems.Cast<ConcealGroup>().ToList();
             Concealed.SelectedItems.Clear();
@@ -38,13 +39,19 @@ private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
         private void Reveal_OnClick(object sender, RoutedEventArgs e)
         {
             var p = Plugin;
-            Plugin.Torch.Invoke(delegate { p.RevealNearbyGrids(p.Settings.RevealDistance); });
+            Plugin.Torch.Invoke(delegate { p.RevealNearbyGrids(p.Settings.Data.RevealDistance); });
         }
 
         private void Conceal_OnClick(object sender, RoutedEventArgs e)
         {
             var p = Plugin;
-            Plugin.Torch.Invoke(delegate { p.ConcealDistantGrids(p.Settings.ConcealDistance); });
+            Plugin.Torch.Invoke(delegate { p.ConcealDistantGrids(p.Settings.Data.ConcealDistance); });
+        }
+
+        private void EditExclusion_OnClick(object sender, RoutedEventArgs e)
+        {
+            var editor = new CollectionEditor() {Owner = Window.GetWindow(this)};
+            editor.Edit(Plugin.Settings.Data.ExcludedSubtypes, "Excluded Subtypes");
         }
     }
 }

Concealment/ConcealmentPlugin.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -24,7 +25,7 @@ namespace Concealment
     [Plugin("Concealment", "1.0", "17f44521-b77a-4e85-810f-ee73311cf75d")]
     public class ConcealmentPlugin : TorchPluginBase, IWpfPlugin
     {
-        public Settings Settings { get; }
+        public Persistent<Settings> Settings { get; }
         public MTObservableCollection<ConcealGroup> ConcealGroups { get; } = new MTObservableCollection<ConcealGroup>();
 
         private static readonly Logger Log = LogManager.GetLogger("Concealment");
@@ -35,11 +36,11 @@ public class ConcealmentPlugin : TorchPluginBase, IWpfPlugin
         private readonly List<ConcealGroup> _intersectGroups;
         private MyDynamicAABBTreeD _concealedAabbTree;
 
-
         public ConcealmentPlugin()
         {
             _intersectGroups = new List<ConcealGroup>();
-            Settings = Settings.LoadOrCreate("Concealment.cfg");
+            Settings = Persistent<Settings>.Load("Concealment.cfg");
+            Settings.Data.RevealNeeded += () => RevealNearbyGrids(Settings.Data.RevealDistance);
         }
 
         public UserControl GetControl()
@@ -51,17 +52,23 @@ public override void Init(ITorchBase torch)
         {
             base.Init(torch);
             _concealedAabbTree = new MyDynamicAABBTreeD(MyConstants.GAME_PRUNING_STRUCTURE_AABB_EXTENSION);
+            torch.SessionUnloading += Torch_SessionUnloading;
+        }
+
+        private void Torch_SessionUnloading()
+        {
+            RevealAll();
         }
 
         public override void Update()
         {
             if (MyAPIGateway.Session == null)
                 return;
 
-            if (_counter % Settings.ConcealInterval == 0)
-                ConcealDistantGrids(Settings.ConcealDistance);
-            if (_counter % Settings.RevealInterval == 0)
-                RevealNearbyGrids(Settings.RevealDistance);
+            if (_counter % Settings.Data.ConcealInterval == 0)
+                ConcealDistantGrids(Settings.Data.ConcealDistance);
+            if (_counter % Settings.Data.RevealInterval == 0)
+                RevealNearbyGrids(Settings.Data.RevealDistance);
             _counter += 1;
 
             if (_init)
@@ -75,6 +82,7 @@ public override void Update()
 
         public override void Dispose()
         {
+            RevealAll();
             Settings.Save("Concealment.cfg");
         }
 
@@ -123,11 +131,16 @@ private void RevealSpawns(PlayerRequestArgs args)
         private void ConcealEntity(IMyEntity entity)
         {
             if (entity != entity.GetTopMostParent())
-                throw new InvalidOperationException("Can only conceal top-level entities.");
+                return;
+
+            if (Settings.Data.ManagePhysics)
+            {
+                MyGamePruningStructure.Remove((MyEntity)entity);
+                entity.Physics?.Deactivate();
+            }
 
-            MyGamePruningStructure.Remove((MyEntity)entity);
-            entity.Physics?.Deactivate();
-            UnregisterRecursive(entity);
+            if (Settings.Data.ManageGamelogic)
+                UnregisterRecursive(entity);
 
             void UnregisterRecursive(IMyEntity e)
             {
@@ -143,11 +156,16 @@ void UnregisterRecursive(IMyEntity e)
         private void RevealEntity(IMyEntity entity)
         {
             if (entity != entity.GetTopMostParent())
-                throw new InvalidOperationException("Can only conceal top-level entities.");
+                return;
 
-            MyGamePruningStructure.Add((MyEntity)entity);
-            entity.Physics?.Activate();
-            RegisterRecursive(entity);
+            if (Settings.Data.ManagePhysics)
+            {
+                MyGamePruningStructure.Add((MyEntity)entity);
+                entity.Physics?.Activate();
+            }
+
+            if (Settings.Data.ManageGamelogic)
+                RegisterRecursive(entity);
 
             void RegisterRecursive(IMyEntity e)
             {
@@ -176,9 +194,15 @@ private int ConcealGroup(ConcealGroup group)
                 Log.Debug($"Group {group.Id} cached");
                 Torch.Invoke(() => _concealGroups.Add(group));
             });
+            group.Closing += Group_Closing;
             return group.Grids.Count;
         }
 
+        private void Group_Closing(ConcealGroup group)
+        {
+            RevealGroup(group);
+        }
+
         public int RevealGroup(ConcealGroup group)
         {
             Log.Info($"Revealing grids: {string.Join(", ", group.Grids.Select(g => g.DisplayName))}");
@@ -201,7 +225,8 @@ public int RevealGridsInSphere(BoundingSphereD sphere)
 
         public int RevealNearbyGrids(double distanceFromPlayers)
         {
-            Log.Debug("Revealing nearby grids");
+            //annoying log spam
+            //Log.Debug("Revealing nearby grids");
             var revealed = 0;
             var playerSpheres = GetPlayerBoundingSpheres(distanceFromPlayers);
             foreach (var sphere in playerSpheres)
@@ -213,21 +238,44 @@ public int RevealNearbyGrids(double distanceFromPlayers)
         public int ConcealDistantGrids(double distanceFromPlayers)
         {
             Log.Debug("Concealing distant grids");
-            var concealed = 0;
+            int concealed = 0;
             var playerSpheres = GetPlayerBoundingSpheres(distanceFromPlayers);
 
-            foreach (var group in MyCubeGridGroups.Static.Physical.Groups)
+            ConcurrentBag<ConcealGroup> groups = new ConcurrentBag<ConcealGroup>();
+            Parallel.ForEach(MyCubeGridGroups.Static.Physical.Groups, group =>
             {
+                var concealGroup = new ConcealGroup(group);
+
                 var volume = group.GetWorldAABB();
                 if (playerSpheres.Any(s => s.Contains(volume) != ContainmentType.Disjoint))
-                    continue;
+                    return;
 
-                concealed += ConcealGroup(new ConcealGroup(group));
+                //if (IsExcluded(concealGroup))
+                //    return;
+
+                groups.Add(concealGroup);
+            });
+            foreach (var group in groups)
+            {
+                concealed += ConcealGroup(group);
             }
 
             return concealed;
         }
 
+        public bool IsExcluded(ConcealGroup group)
+        {
+            foreach (var block in group.Grids.SelectMany(g => g.CubeBlocks).Select(x => x.FatBlock))
+            {
+                if (block == null)
+                    continue;
+                if (Settings.Data.ExcludedSubtypes.Contains(block.BlockDefinition.Id.SubtypeName))
+                    return false;
+            }
+
+            return true;
+        }
+
         public int RevealAll()
         {
             Log.Debug("Revealing all grids");

Concealment/Settings.cs

@@ -1,4 +1,6 @@
-using System.IO;
+using System;
+using System.Collections.Generic;
+using System.IO;
 using System.Xml.Serialization;
 using Torch;
 
@@ -11,6 +13,11 @@ public class Settings : ViewModel
         private ulong _concealInterval = 3600;
         private double _revealDistance = 50000;
         private ulong _revealInterval = 60;
+        private bool _managePhysics = true;
+        private bool _manageGamelogic = true;
+
+        public MTObservableCollection<string> ExcludedSubtypes { get; } = new MTObservableCollection<string>();
+        public event Action RevealNeeded;
 
         public bool Enabled
         {
@@ -42,6 +49,18 @@ public double RevealDistance
             set { _revealDistance = value; OnPropertyChanged(); }
         }
 
+        public bool ManagePhysics
+        {
+            get => _managePhysics;
+            set { RevealNeeded?.Invoke(); _managePhysics = value; OnPropertyChanged(); }
+        }
+
+        public bool ManageGamelogic
+        {
+            get => _manageGamelogic;
+            set { RevealNeeded?.Invoke(); _manageGamelogic = value; OnPropertyChanged(); }
+        }
+
         public void Save(string path)
         {
             var xmlSerializer = new XmlSerializer(typeof(Settings));