OSDN Git Service

2nd Entity processing fix attempt
[automap/automap.git] / Automap / Subsystems / AutomapSystem.cs
index ece2be3..32cda38 100644 (file)
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-using System.Web.UI;
 
 using Hjg.Pngcs;
-using Hjg.Pngcs.Chunks;
+using Mono.Collections.Generic;
+using ProtoBuf;
 
 using Vintagestory.API.Client;
 using Vintagestory.API.Common;
+using Vintagestory.API.Common.Entities;
+using Vintagestory.API.Config;
+using Vintagestory.API.Datastructures;
 using Vintagestory.API.MathTools;
-
-
+using Vintagestory.Common;
 
 namespace Automap
 {
        public class AutomapSystem
        {
                private Thread cartographer_thread;
+
+               private Snapshotter snapshot;
                private ICoreClientAPI ClientAPI { get; set; }
                private ILogger Logger { get; set; }
+               private AChunkRenderer ChunkRenderer { get; set; }
+               private JsonGenerator JsonGenerator { get; set; }
 
-               private const string _mapPath = @"Maps";
-               private const string _chunkPath = @"Chunks";
+               internal const string _mapPath = @"Maps";
+               internal const string _chunkPath = @"Chunks";
+               internal const uint editThreshold = 9;
                private const string _domain = @"automap";
                private const string chunkFile_filter = @"*_*.png";
-               private static Regex chunkShardRegex = new Regex(@"(?<X>[\d]+)_(?<Z>[\d]+).png", RegexOptions.Singleline);
+               private const string poiFileName = @"poi_binary";
+               private const string eoiFileName = @"eoi_binary";
+               private const string pointsTsvFileName = @"points_of_interest.tsv";
+               private const string plainMetadataFileName = @"map_metadata.txt";
+               private static Regex chunkShardRegex = new Regex(@"(?<X>[\d]+)_(?<Z>[\d]+)\.png", RegexOptions.Singleline);
 
-               private ConcurrentDictionary<Vec2i, uint> columnCounter = new ConcurrentDictionary<Vec2i, uint>(3, 150 );
+               private ConcurrentDictionary<Vec2i, ColumnCounter> columnCounters = new ConcurrentDictionary<Vec2i, ColumnCounter>(3, 150);
                private ColumnsMetadata chunkTopMetadata;
-               private PointsOfInterest POIs;
+               internal PointsOfInterest POIs = new PointsOfInterest();
+               internal EntitiesOfInterest EOIs = new EntitiesOfInterest();
 
-               internal Dictionary<int, Designator> BlockID_Designators { get; private set;}
-               internal bool Enabled { get; set; }
-               //Run status, Chunks processed, stats, center of map....
-               internal uint nullChunkCount;
-               internal uint updatedChunksTotal;
-               internal Vec2i startChunkColumn;
+               internal Dictionary<int, BlockDesignator> BlockID_Designators { get; private set; }
+               internal Dictionary<AssetLocation, EntityDesignator> Entity_Designators { get; private set; }
+               internal Dictionary<int, string> RockIdCodes { get; private set; }
+               internal Dictionary<int, string> AiryIdCodes { get; private set; }
 
+               internal CommandType CurrentState { get; set; }
+               //Run status, Chunks processed, stats, center of map....
+               private uint nullChunkCount, nullMapCount, updatedChunksTotal;
+               private Vec2i startChunkColumn;
 
+               private readonly int chunkSize;
                private string path;
-               private IAsset stylesFile;
+               private IAsset staticMap;
+               private PersistedConfiguration configuration;
 
 
-               public AutomapSystem(ICoreClientAPI clientAPI, ILogger logger)
-               {
-               this.ClientAPI = clientAPI;
-               this.Logger = logger;
-               ClientAPI.Event.LevelFinalize += EngageAutomap;
-               }
+               public static string AutomapStatusEventKey = @"AutomapStatus";
+               public static string AutomapCommandEventKey = @"AutomapCommand";
 
-
-               #region Internals
-               private void EngageAutomap( )
+               public AutomapSystem(ICoreClientAPI clientAPI, ILogger logger, PersistedConfiguration config)
                {
-               path = ClientAPI.GetOrCreateDataPath(_mapPath);
-               path = ClientAPI.GetOrCreateDataPath(Path.Combine(path, "World_" + ClientAPI.World.Seed));//Add name of World too...'ServerApi.WorldManager.CurrentWorldName'
+                       this.ClientAPI = clientAPI;
+                       this.Logger = logger;
+                       chunkSize = ClientAPI.World.BlockAccessor.ChunkSize;
 
-               stylesFile = ClientAPI.World.AssetManager.Get(new AssetLocation(_domain, "config/automap_format.css"));
-               Logger.VerboseDebug("CSS loaded: {0} size: {1}",stylesFile.IsLoaded() ,stylesFile.ToText( ).Length);
+                       configuration = config;
+                       ClientAPI.Event.LevelFinalize += EngageAutomap;
 
-               Prefill_POI_Designators( );
-               startChunkColumn = new Vec2i((ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.X / ClientAPI.World.BlockAccessor.ChunkSize), (ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Z / ClientAPI.World.BlockAccessor.ChunkSize));
-               chunkTopMetadata = new ColumnsMetadata(startChunkColumn);
+                       this.ChunkRenderer = InstantiateChosenRenderer(config.RendererName);
 
-               Logger.Notification("AUTOMAP Start {0}", startChunkColumn);
-               Reload_Metadata( );
+                       //Listen on bus for commands
+                       ClientAPI.Event.RegisterEventBusListener(CommandListener, 1.0, AutomapSystem.AutomapCommandEventKey);
 
-               ClientAPI.Event.ChunkDirty += ChunkAChanging;
 
-               cartographer_thread = new Thread(Cartographer);
-               cartographer_thread.Name = "Cartographer";
-               cartographer_thread.Priority = ThreadPriority.Lowest;
-               cartographer_thread.IsBackground = true;
+                       if (configuration.Autostart)
+                       {
+                               CurrentState = CommandType.Run;
+                               Logger.Notification("Autostart is Enabled.");
+                       }
 
-               ClientAPI.Event.RegisterGameTickListener(AwakenCartographer, 6000);
                }
 
-               private void ChunkAChanging(Vec3i chunkCoord, IWorldChunk chunk, EnumChunkDirtyReason reason)
-               {                       
-               Vec2i topPosition = new Vec2i(chunkCoord.X, chunkCoord.Z);
 
-                       columnCounter.AddOrUpdate(topPosition, 1, (key, colAct) => colAct + 1);
-               }
-
-               private void AwakenCartographer(float delayed)
+               #region Internals
+               private void EngageAutomap()
                {
+                       path = ClientAPI.GetOrCreateDataPath(_mapPath);
+                       path = ClientAPI.GetOrCreateDataPath(Path.Combine(path, "World_" + ClientAPI.World.Seed));//Add name of World too...'ServerApi.WorldManager.CurrentWorldName'
+                       ClientAPI.GetOrCreateDataPath(Path.Combine(path, _chunkPath));
+                                                 
+                       JsonGenerator = new JsonGenerator(ClientAPI, Logger, path);
 
-               if (Enabled && (ClientAPI.IsGamePaused != false || ClientAPI.IsShuttingDown != true)) {
-               #if DEBUG
-               Logger.VerboseDebug("Cartographer re-trigger from [{0}]", cartographer_thread.ThreadState);
-               #endif
+                       string mapFilename = Path.Combine(path, "automap.html");
+                       StreamWriter outputText = new StreamWriter(File.Open(mapFilename, FileMode.Create, FileAccess.Write, FileShare.ReadWrite));
 
-               if (cartographer_thread.ThreadState.HasFlag(ThreadState.Unstarted)) {
-               cartographer_thread.Start( );
-               }
-               else if (cartographer_thread.ThreadState.HasFlag(ThreadState.WaitSleepJoin)) {
-               //Time to (re)write chunk shards
-               cartographer_thread.Interrupt( );
-               }
-               ClientAPI.TriggerChatMessage($"Automap {updatedChunksTotal} Updates - MAX (N:{chunkTopMetadata.North_mostChunk},S:{chunkTopMetadata.South_mostChunk},E:{chunkTopMetadata.East_mostChunk}, W:{chunkTopMetadata.West_mostChunk} - TOTAL: {chunkTopMetadata.Count})");
-               }
-
-               }
+                       staticMap = ClientAPI.World.AssetManager.Get(new AssetLocation(_domain, "config/automap.html"));
+                       outputText.Write(staticMap.ToText());
+                       outputText.Flush();
 
+                       Prefill_POI_Designators();
+                       startChunkColumn = new Vec2i((ClientAPI.World.Player.Entity.Pos.AsBlockPos.X / chunkSize), (ClientAPI.World.Player.Entity.Pos.AsBlockPos.Z / chunkSize));
+                       chunkTopMetadata = new ColumnsMetadata(startChunkColumn);
+                       Logger.Notification("AUTOMAP Start {0}", startChunkColumn);
+                       Reload_Metadata();
 
-               private void Cartographer( )
-               {
-       wake:
-               Logger.VerboseDebug("Cartographer thread awoken");
-
-               try {
-               uint ejectedItem = 0;
-               uint updatedChunks = 0;
+                       ClientAPI.Event.ChunkDirty += ChunkAChanging;
 
-               //-- Should dodge enumerator changing underfoot....at a cost.
-               if (!columnCounter.IsEmpty) {
-               var tempSet = columnCounter.ToArray( ).OrderByDescending(kvp => kvp.Value);
-               foreach (var mostActiveCol in tempSet) {
+                       cartographer_thread = new Thread(Cartographer)
+                       {
+                               Name = "Cartographer",
+                               Priority = ThreadPriority.Lowest,
+                               IsBackground = true
+                       };
 
-               var mapChunk = ClientAPI.World.BlockAccessor.GetMapChunk(mostActiveCol.Key);
-
-               if (mapChunk == null) {
-               Logger.Warning("SKIP CHUNK: ({0}) - Map Chunk NULL!", mostActiveCol.Key);
-               nullChunkCount++;
-               columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem );
-               continue;
+                       ClientAPI.Event.RegisterGameTickListener(ThreadDecider, 6000);
                }
-               
-               ColumnMeta chunkMeta = UpdateColumnMetadata(mostActiveCol,mapChunk);
-               PngWriter pngWriter = SetupPngImage(mostActiveCol.Key, chunkMeta);
 
-               uint updatedPixels = 0;
-               GenerateChunkImage(mostActiveCol.Key, mapChunk, pngWriter , out updatedPixels);
+               private void ChunkAChanging(Vec3i chunkCoord, IWorldChunk chunk, EnumChunkDirtyReason reason)
+               {
+               Vec2i topPosition = new Vec2i(chunkCoord.X, chunkCoord.Z);              
+               bool newOrEdit = (reason == EnumChunkDirtyReason.NewlyCreated || reason == EnumChunkDirtyReason.NewlyLoaded);
                
-               if (updatedPixels > 0) {                
+               columnCounters.AddOrUpdate(topPosition, 
+                                             new ColumnCounter(chunkSize, newOrEdit, chunkCoord), 
+                                             (chkPos, chkChng) => chkChng.Update(chunkCoord, chunkSize, newOrEdit)
+                                            );
                
-               #if DEBUG
-               Logger.VerboseDebug("Wrote chunk shard: ({0}) - Edits#:{1}, Pixels#:{2}", mostActiveCol.Key, mostActiveCol.Value, updatedPixels);
-               #endif
-               updatedChunks++;
-               chunkTopMetadata.Update(chunkMeta);
-               columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem);
-               }
-               else {
-               columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem);
-               Logger.VerboseDebug("Un-painted chunk: ({0}) ", mostActiveCol.Key);
-               }
-
                }
-               }
-
-               if (updatedChunks > 0) {
-               //TODO: ONLY update if chunk bounds have changed!
-               updatedChunksTotal += updatedChunks;
-               GenerateMapHTML( );
-               updatedChunks = 0;
-               }
-
-               //Then sleep until interupted again, and repeat
 
-               Logger.VerboseDebug("Thread '{0}' about to sleep indefinitely.", Thread.CurrentThread.Name);
-
-               Thread.Sleep(Timeout.Infinite);
-
-               } catch (ThreadInterruptedException) {
-
-               Logger.VerboseDebug("Thread '{0}' interupted [awoken]", Thread.CurrentThread.Name);
-               goto wake;
-
-               } catch (ThreadAbortException) {
-               Logger.VerboseDebug("Thread '{0}' aborted.", Thread.CurrentThread.Name);
+               /// <summary>
+               /// Cartographer Thread 'decider'
+               /// </summary>
+               /// <param name="delayed">called delay offset</param>
+               private void ThreadDecider(float delayed)
+               {
 
-               } finally {
-               Logger.VerboseDebug("Thread '{0}' executing finally block.", Thread.CurrentThread.Name);
-               }
+                       if (CurrentState == CommandType.Run && (ClientAPI.IsGamePaused != false || ClientAPI.IsShuttingDown != true))
+                       {
+                               #if DEBUG
+                               Logger.VerboseDebug("ThreadDecider re-trigger from [{0}]", cartographer_thread.ThreadState);
+                               #endif
+
+                               if (cartographer_thread.ThreadState.HasFlag(ThreadState.Unstarted))
+                               {
+                                       cartographer_thread.Start();
+                               }
+                               else if (cartographer_thread.ThreadState.HasFlag(ThreadState.WaitSleepJoin))
+                               {
+                                       //Time to (re)write chunk shards
+                                       cartographer_thread.Interrupt();
+                               }
+                               //#if DEBUG
+                               //ClientAPI.TriggerChatMessage($"Automap {updatedChunksTotal} Updates - MAX (N:{chunkTopMetadata.North_mostChunk},S:{chunkTopMetadata.South_mostChunk},E:{chunkTopMetadata.East_mostChunk}, W:{chunkTopMetadata.West_mostChunk} - TOTAL: {chunkTopMetadata.Count})");
+                               //#endif
+                       }
+                       else if (CurrentState == CommandType.Snapshot)
+                       {
+                       //Prepare for taking a snopshot
+                       if (snapshot == null) {         
+                               snapshot = new Snapshotter(path, chunkTopMetadata, chunkSize, ClientAPI.World.Seed);
+                               #if DEBUG
+                               Logger.VerboseDebug("Starting new Snapshot: {0} Wx{1} Hx{2}", snapshot.fileName, snapshot.Width, snapshot.Height);
+                               #endif
+                               snapshot.Take( );
+                               }
+                       else if (snapshot != null && snapshot.Finished) {
+                               #if DEBUG
+                                       Logger.VerboseDebug("COMPLETED Snapshot: {0} Wx{1} Hx{2}, taking {3}", snapshot.fileName, snapshot.Width, snapshot.Height, snapshot.Timer.Elapsed);
+                               #endif
+                               snapshot = null;
+                               CurrentState = CommandType.Run;
+                               }
+                       }
                }
 
 
-
-
-               private void Prefill_POI_Designators( )
+               private void Cartographer()
                {
-               this.POIs = new PointsOfInterest( );
-               this.BlockID_Designators = new Dictionary<int, Designator>( );
+                       wake:
+                       Logger.VerboseDebug("Cartographer thread awoken");
+
+                       try
+                       {
+                               ColumnCounter ejectedItem ;
+                               uint updatedChunks = 0;
+                               uint updatedPixels = 0;
+
+                               //-- Should dodge enumerator changing underfoot....at a cost.
+                               if (!columnCounters.IsEmpty)
+                               {
+                                       var tempSet = columnCounters.ToArray().Where(cks => cks.Value.WeightedSum > editThreshold) .OrderByDescending(kvp => kvp.Value.WeightedSum);
+                                       UpdateEntityMetadata();
+
+                                       foreach (var mostActiveCol in tempSet)
+                                       {
+                                               var mapChunk = ClientAPI.World.BlockAccessor.GetMapChunk(mostActiveCol.Key);
+
+                                               if (mapChunk == null)
+                                               {
+                                                       //TODO: REVISIT THIS CHUNK!
+                                                       #if DEBUG
+                                                       Logger.Warning("SKIP CHUNK: ({0}) - Map Chunk NULL!", mostActiveCol.Key);
+                                                       #endif
+                                                       nullMapCount++;
+                                                       columnCounters.TryRemove(mostActiveCol.Key, out ejectedItem);
+                                                       continue;
+                                               }
+
+                                               ColumnMeta chunkMeta;
+                                               if (chunkTopMetadata.Contains(mostActiveCol.Key))
+                                               {
+                                                       chunkMeta = chunkTopMetadata[mostActiveCol.Key];
+                                                       #if DEBUG
+                                                       Logger.VerboseDebug("Loaded meta-chunk {0}", mostActiveCol.Key);
+                                                       #endif
+                                               }
+                                               else
+                                               {
+                                                       chunkMeta = CreateColumnMetadata(mostActiveCol, mapChunk);
+                                                       #if DEBUG
+                                                       Logger.VerboseDebug("Created meta-chunk {0}", mostActiveCol.Key);
+                                                       #endif
+                                               }
+                                               ProcessChunkBlocks(mostActiveCol.Key, mapChunk, ref chunkMeta);
+                                               mostActiveCol.Value.SetCutoff(chunkMeta.YMax / chunkSize);
+
+                                               ChunkRenderer.SetupPngImage(mostActiveCol.Key, path, _chunkPath, ref chunkMeta);
+                                               ChunkRenderer.GenerateChunkPngShard(mostActiveCol.Key, mapChunk, chunkMeta, ref chunkTopMetadata, out updatedPixels);
+
+                                               if (updatedPixels > 0)
+                                               {
+                                                       #if DEBUG
+                                                       Logger.VerboseDebug("Wrote top-chunk shard: ({0}) - Weight:{1}, Pixels#:{2}", mostActiveCol.Key, mostActiveCol.Value, updatedPixels);
+                                                       #endif
+                                                       updatedChunks++;
+                                                       chunkTopMetadata.Update(chunkMeta);
+                                                       columnCounters.TryRemove(mostActiveCol.Key, out ejectedItem);
+                                               }
+                                               else
+                                               {
+                                                       columnCounters.TryRemove(mostActiveCol.Key, out ejectedItem);
+                                                       #if DEBUG
+                                                       Logger.VerboseDebug("Un-painted chunk shard: ({0}) ", mostActiveCol.Key);
+                                                       #endif
+                                               }
+                                       }
+                               }
+
+                               UpdateStatus(this.updatedChunksTotal, this.nullChunkCount, updatedChunks);
+
+                               if (updatedChunks > 0)
+                               {
+                                       //What about chunk updates themselves; a update bitmap isn't kept...
+                                       updatedChunksTotal += updatedChunks;
+                                       JsonGenerator.GenerateJSONMetadata(chunkTopMetadata, startChunkColumn, POIs, EOIs, RockIdCodes);
+                                       updatedChunks = 0;
+
+                                       //Cleanup in-memory Metadata...
+                                       chunkTopMetadata.ClearMetadata( );
+                               }
+
+                               #if DEBUG
+                               Logger.VerboseDebug("Clearing Column Counters of: {0} non-written shards", columnCounters.Count);
+                               #endif
+
+                               columnCounters.Clear( );
+
+                               //Then sleep until interupted again, and repeat
+#if DEBUG
+                               Logger.VerboseDebug("Thread '{0}' about to sleep indefinitely.", Thread.CurrentThread.Name);
+#endif
+                               Thread.Sleep(Timeout.Infinite);
 
-               //Add special marker types for BlockID's of "Interest", overwrite colour, and method
+                       }
+                       catch (ThreadInterruptedException)
+                       {
 
-               var theDesignators = new List<Designator>{
-                               DefaultDesignators.Roads,
-                DefaultDesignators.GroundSigns,
-                DefaultDesignators.WallSigns,
-                DefaultDesignators.PostSigns,
-                               };
+#if DEBUG
+                               Logger.VerboseDebug("Thread '{0}' interupted [awoken]", Thread.CurrentThread.Name);
+#endif
+                               goto wake;
 
-               Install_POI_Designators(theDesignators);
+                       }
+                       catch (ThreadAbortException)
+                       {
+#if DEBUG
+                               Logger.VerboseDebug("Thread '{0}' aborted.", Thread.CurrentThread.Name);
+#endif
+                       }
+                       finally
+                       {
+#if DEBUG
+                               Logger.VerboseDebug("Thread '{0}' executing finally block.", Thread.CurrentThread.Name);
+#endif
+                               PersistPointsData();
+                               Write_PlainMetadata( );
+                       }
                }
 
-               private void Install_POI_Designators(ICollection<Designator> designators)
+               private void Snap()
                {
-               Logger.VerboseDebug("Connecting {0} configured Designators", designators.Count);
-               foreach (var designator in designators) {                               
-                       var blockIDs = Helpers.ArbitrarytBlockIdHunter(ClientAPI, designator.Pattern, designator.Material);
-                               if (blockIDs.Count > 0) { Logger.VerboseDebug("Designator {0} has {1} associated blockIDs", designator.ToString( ), blockIDs.Count); }
-                       foreach (var entry in blockIDs) {
-                       BlockID_Designators.Add(entry.Key, designator);
+                       snapshotTake:
+#if DEBUG
+                       Logger.VerboseDebug("Snapshot started");
+#endif
+                       try
+                       {
+                               snapshot.Take();
+#if DEBUG
+                               Logger.VerboseDebug("Snapshot sleeping");
+#endif
+                               CurrentState = CommandType.Run;
+                               Thread.Sleep(Timeout.Infinite);
+                       }
+                       catch (ThreadInterruptedException)
+                       {
+#if DEBUG
+                               Logger.VerboseDebug("Snapshot intertupted");
+#endif
+                               goto snapshotTake;
                        }
                }
 
-               }
-
-
-               private void GenerateMapHTML( )
+               private void UpdateStatus(uint totalUpdates, uint voidChunks, uint delta)
                {
-               string mapFilename = Path.Combine(path, "Automap.html");
-
-               int TopNorth = chunkTopMetadata.North_mostChunk;
-               int TopSouth = chunkTopMetadata.South_mostChunk;
-               int TopEast = chunkTopMetadata.East_mostChunk;
-               int TopWest = chunkTopMetadata.West_mostChunk;
-
-               using (StreamWriter outputText = new StreamWriter(File.Open(mapFilename, FileMode.Create, FileAccess.Write, FileShare.ReadWrite))) {
-               using (HtmlTextWriter tableWriter = new HtmlTextWriter(outputText)) {
-               tableWriter.BeginRender( );
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Html);
-
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Head);
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Title);
-               tableWriter.WriteEncodedText("Generated Automap");
-               tableWriter.RenderEndTag( );
-               //CSS  style  here
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Style);
-               tableWriter.Write(stylesFile.ToText( ));
-               tableWriter.RenderEndTag( );//</style>
-
-               //## JSON map-state data ######################
-               tableWriter.AddAttribute(HtmlTextWriterAttribute.Type, "text/javascript");
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Script);
-
-               tableWriter.Write("var available_images = [");
-
-               foreach (var shard in this.chunkTopMetadata) {
-               tableWriter.Write("{{X:{0},Y:{1} }}, ", shard.Location.X, shard.Location.Y);
-               }
+                       StatusData updateData = new StatusData(totalUpdates, voidChunks, delta, CommandType.Run);
 
-               tableWriter.Write(" ];\n");
-
-               tableWriter.RenderEndTag( );
-
-               tableWriter.RenderEndTag( );
-
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Body);
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.P);
-               tableWriter.WriteEncodedText($"Created {DateTimeOffset.UtcNow.ToString("u")}");
-               tableWriter.RenderEndTag( );
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.P);
-               tableWriter.WriteEncodedText($"W:{TopWest}, E: {TopEast}, N:{TopNorth}, S:{TopSouth} ");
-               tableWriter.RenderEndTag( );
-               tableWriter.WriteLine( );
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Table);
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Caption);
-               tableWriter.WriteEncodedText($"Start: {startChunkColumn}, Seed: {ClientAPI.World.Seed}\n");             
-               tableWriter.RenderEndTag( );
-
-               //################ X-Axis <thead> #######################
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Thead);
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Tr);
-
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Th);
-               tableWriter.Write("N, W");
-               tableWriter.RenderEndTag( );
-
-               for (int xAxisT = TopWest; xAxisT <= TopEast; xAxisT++) {
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Th);
-               tableWriter.Write(xAxisT);
-               tableWriter.RenderEndTag( );
+                       this.ClientAPI.Event.PushEvent(AutomapStatusEventKey, updateData);
                }
 
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Th);
-               tableWriter.Write("N, E");
-               tableWriter.RenderEndTag( );
-               
-               tableWriter.RenderEndTag( );
-               tableWriter.RenderEndTag( );
-               //###### </thead> ################################
-
-               //###### <tbody> - Chunk rows & Y-axis cols
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Tbody);
-
-               //######## <tr> for every vertical row
-               for (int yAxis = TopNorth; yAxis <= TopSouth; yAxis++) {
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Tr);
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
-               tableWriter.Write(yAxis);//legend: Y-axis
-               tableWriter.RenderEndTag( );
-
-               for (int xAxis = TopWest; xAxis <= TopEast; xAxis++) {
-               //###### <td>  #### for chunk shard 
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
-               var colLoc = new Vec2i(xAxis, yAxis);
-               if (chunkTopMetadata.Contains( colLoc)){
-               ColumnMeta meta = chunkTopMetadata[colLoc];
-               //Tooltip first                                 
-               tableWriter.AddAttribute(HtmlTextWriterAttribute.Class, "tooltip");
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Div);
-
-               tableWriter.AddAttribute(HtmlTextWriterAttribute.Src, $"{xAxis}_{yAxis}.png");          
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Img);
-               tableWriter.RenderEndTag( );
-               // <span class="tooltiptext">Tooltip text
-               tableWriter.AddAttribute(HtmlTextWriterAttribute.Class, "tooltiptext");
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Span);
-
-               StringBuilder tooltipText = new StringBuilder( );
-               tooltipText.Append($"{meta.Location.PrettyCoords(ClientAPI)} ");
-               tooltipText.Append($" Max-Height: {meta.YMax}, Temp: {meta.Temperature.ToString("F1")} " );
-               tooltipText.Append($" Rainfall: {meta.Rainfall.ToString("F1")}, ");
-               tooltipText.Append($" Shrubs: {meta.ShrubDensity.ToString("F1")}, ");
-               tooltipText.Append($" Forest: {meta.ForestDensity.ToString("F1")}, ");
-               tooltipText.Append($" Fertility: {meta.Fertility.ToString("F1")}, ");
-
-               if (meta.RockRatio != null) {
-               foreach (KeyValuePair<int, uint> blockID in meta.RockRatio) {
-               var block = ClientAPI.World.GetBlock(blockID.Key);
-               tooltipText.AppendFormat(" {0} × {1},\t", block.Code.GetName( ), meta.RockRatio[blockID.Key]);
-               }
-               }
+               private void Prefill_POI_Designators()
+               {
 
-               tableWriter.WriteEncodedText(tooltipText.ToString() );
-               
-               tableWriter.RenderEndTag( );//</span>
-                                                                               
+                       this.BlockID_Designators = new Dictionary<int, BlockDesignator>();
+                       this.Entity_Designators = new Dictionary<AssetLocation, EntityDesignator>();
+                       this.RockIdCodes = Helpers.ArbitrarytBlockIdHunter(ClientAPI, new AssetLocation(GlobalConstants.DefaultDomain, "rock-"), EnumBlockMaterial.Stone);
+
+                       var airBlocksQuery = from airyBlock in ClientAPI.World.Blocks
+                                                        where airyBlock.MatterState == EnumMatterState.Solid
+                                                        where airyBlock.BlockMaterial == EnumBlockMaterial.Plant || airyBlock.BlockMaterial == EnumBlockMaterial.Leaves 
+                                                        where airyBlock.CollisionBoxes == null || airyBlock.CollisionBoxes.Length == 0 || airyBlock.RainPermeable == true                                       
+                                                               select airyBlock;                       
+                       //^^ 'Solid' phase - 'Plant' Blocks without any bounding-box; OR 'Invisible' shapes...
+                       var invisibleBlocksQuery = from novisBlock in ClientAPI.World.Blocks                                                                       
+                                                                          where novisBlock.Shape == null || novisBlock.Shape.Base.EndsWith(GlobalConstants.DefaultDomain, @"invisible")   //Whaat! [ base: "block/basic/invisible" ]
+                                                                               select novisBlock;                      
+                       this.AiryIdCodes = airBlocksQuery.Union(invisibleBlocksQuery).ToDictionary(aBlk => aBlk.BlockId, aBlk => aBlk.Code.Path);
+
+                       #if DEBUG
+                       foreach (var fluffBlock in AiryIdCodes) {
+                       Logger.VerboseDebug("ID#\t{0}:\t{1} IGNORED", fluffBlock.Key, fluffBlock.Value);
+                       }
+                       Logger.VerboseDebug("Ignoring {0} blocks", AiryIdCodes.Count);
+                       #endif
 
-               tableWriter.RenderEndTag( );//</div> --tooltip enclosure
+               //Add special marker types for BlockID's of "Interest", overwrite colour, and method
+               Reload_POI_Designators();
                }
-               else {
-               tableWriter.Write("?");
-               }       
-
-               tableWriter.RenderEndTag( );
-               }//############ </td> ###########
 
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
-               tableWriter.Write(yAxis);//legend: Y-axis
-               tableWriter.RenderEndTag( );
+               private void Reload_POI_Designators()
+               {
+               uint poisSetup =0, eoiSetup = 0;
+                       foreach (var designator in configuration.BlockDesignators)
+                       {
+                               if (designator.Enabled == false) continue;
+                               var blockIDs = Helpers.ArbitrarytBlockIdHunter(ClientAPI, designator.Pattern, designator.Material);
+                               if (blockIDs.Count > 0) { Logger.VerboseDebug("Designator {0} has {1} associated blockIDs", designator.ToString(), blockIDs.Count); }
+                               foreach (var entry in blockIDs)
+                               {
+                                       BlockID_Designators.Add(entry.Key, designator);
+                                       poisSetup++;
+                               }
+                       }
+                       this.ChunkRenderer.BlockID_Designators = BlockID_Designators;
+                       Logger.VerboseDebug("Connected {0} IDs from {1} Block-Designators", poisSetup, configuration.BlockDesignators.Count );
+
+
+                       foreach (var designator in configuration.EntityDesignators)
+                       {
+                               if (designator.Enabled == false) continue;
+                               //Get Variants first, from EntityTypes...better be populated!
+                               var matched = ClientAPI.World.EntityTypes.FindAll(entp => entp.Code.BeginsWith(designator.Pattern.Domain, designator.Pattern.Path));
+
+                               foreach (var match in matched)
+                               {                                       
+                                       Logger.VerboseDebug("Linked Entity: {0} Designator: {1}", match.Code, designator);
+                                       this.Entity_Designators.Add(match.Code, designator);
+                                       eoiSetup++;
+                               }
+                       }
+                       Logger.VerboseDebug("Connected {0} IDs from {1} Entity-Designators", eoiSetup, configuration.EntityDesignators.Count);
 
-               tableWriter.RenderEndTag( );
-               
                }
-               tableWriter.RenderEndTag( );
-
-               //################ X-Axis <tfoot> #######################
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Tfoot);
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Tr);
 
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
-               tableWriter.Write("S, W");
-               tableWriter.RenderEndTag( );
 
-               for (int xAxisB = TopWest; xAxisB <= TopEast; xAxisB++) {
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
-               tableWriter.Write(xAxisB);
-               tableWriter.RenderEndTag( );
-               }
 
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Td);
-               tableWriter.Write("S, E");
-               tableWriter.RenderEndTag( );
+               /// <summary>
+               /// Store Points/Entity of Interest
+               /// </summary>
+               private void PersistPointsData()
+               {
+                       //POI and EOI raw dump files ~ WRITE em!
+                       //var poiRawFile = File.
+                       string poiPath = Path.Combine(path, poiFileName);
+                       string eoiPath = Path.Combine(path, eoiFileName);
+
+                       if (this.POIs.Count > 0)
+                       {
+                               using (var poiFile = File.Open(poiPath, FileMode.Create, FileAccess.Write, FileShare.None))
+                               {
+                                       Serializer.Serialize<PointsOfInterest>(poiFile, this.POIs);
+                                       poiFile.Flush(true);
+                               }
+                       }
 
-               tableWriter.RenderEndTag( );
-               tableWriter.RenderEndTag( );
-               //###### </tfoot> ################################
+                       if (this.EOIs.Count > 0)
+                       {
+                               using (var eoiFile = File.Open(eoiPath, FileMode.Create, FileAccess.Write, FileShare.None))
+                               {
+                                       Serializer.Serialize<EntitiesOfInterest>(eoiFile, this.EOIs);
+                                       eoiFile.Flush(true);
+                               }
+                       }
 
+                       //Create Easy to Parse TSV file for tool/human use....
+                       string pointsTsvPath = Path.Combine(path, pointsTsvFileName);
+
+                       using (var tsvWriter = new StreamWriter(pointsTsvPath, false, Encoding.UTF8))
+                       {
+                               tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\tDestination\tEntity_UID");
+                               foreach (var point in this.POIs)
+                               {
+                                       tsvWriter.Write(point.Name + "\t");
+                                       var notes = point.Notes
+                                               .Replace('\n', '\x001f')
+                                               .Replace("\t", "\\t")
+                                               .Replace("\\", "\\\\");
+                                       tsvWriter.Write(notes + "\t");
+                                       tsvWriter.Write(point.Location.PrettyCoords(ClientAPI) + "\t");
+                                       tsvWriter.Write(point.Timestamp.ToString("u") + "\t");
+                                       tsvWriter.Write((point.Destination != null ? point.Destination.PrettyCoords(ClientAPI) : "---") +"\t");
+                                       tsvWriter.Write("null\t");
+                                       tsvWriter.WriteLine();
+                               }
+                               foreach (var entity in this.EOIs)
+                               {
+                                       tsvWriter.Write(entity.Name + "\t");
+                                       var notes = entity.Notes
+                                               .Replace('\n', '\x001f')
+                                               .Replace("\t", "\\t")
+                                               .Replace("\\", "\\\\");
+                                       tsvWriter.Write(notes + "\t");
+                                       tsvWriter.Write(entity.Location.PrettyCoords(ClientAPI) + "\t");
+                                       tsvWriter.Write(entity.Timestamp.ToString("u") + "\t");
+                                       tsvWriter.Write("---\t");
+                                       tsvWriter.Write(entity.EntityId.ToString("D"));
+                                       tsvWriter.WriteLine();
+                               }
+                               tsvWriter.WriteLine();
+                               tsvWriter.Flush();
+                       }
 
-               tableWriter.RenderEndTag( );//</table>
-               
-               //############## POI list #####################
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Ul);
-               foreach (var poi in this.POIs) {
-               tableWriter.RenderBeginTag(HtmlTextWriterTag.Li);
-               tableWriter.WriteEncodedText(poi.Timestamp.ToString("u"));
-               tableWriter.WriteEncodedText(poi.Notes);
-               tableWriter.WriteEncodedText(poi.Location.PrettyCoords(this.ClientAPI));
-               tableWriter.RenderEndTag( );
                }
 
-               tableWriter.RenderEndTag( );
-
-               
-
-
-               tableWriter.RenderEndTag( );//### </BODY> ###
-                                                       
-               tableWriter.EndRender( );
-               tableWriter.Flush( );
-               }
-               outputText.Flush( );            
+               private void Write_PlainMetadata( )
+               { 
+               string metaPath = Path.Combine(path, plainMetadataFileName);
+
+               using (var metaDataFile = File.Open(metaPath,FileMode.Create)) {
+               using (var mdWriter = new StreamWriter(metaDataFile, Encoding.ASCII)) 
+                       {
+                               mdWriter.WriteLine("WorldSeed {0}", ClientAPI.World.Seed);
+                               mdWriter.WriteLine("PlayerChunkCoords {0:D} {1:D}", startChunkColumn.X, startChunkColumn.Y);
+                               mdWriter.WriteLine("DefaultSpawnPos {0:D} {1:D} {2:D}", ClientAPI.World.DefaultSpawnPosition.AsBlockPos.X,ClientAPI.World.DefaultSpawnPosition.AsBlockPos.Y,ClientAPI.World.DefaultSpawnPosition.AsBlockPos.Z);
+                               //mdWriter.WriteLine("CurrentPlayerSpawn", ClientAPI.World.Player.WorldData.EntityPlayer.);
+                               mdWriter.WriteLine("ChunkSize {0}", chunkSize);
+                               mdWriter.WriteLine("SeaLevel {0:D}", ClientAPI.World.SeaLevel);
+                               mdWriter.WriteLine("WorldSize {0:D} {1:D} {2:D}", ClientAPI.World.BulkBlockAccessor.MapSizeX, ClientAPI.World.BulkBlockAccessor.MapSizeY,ClientAPI.World.BulkBlockAccessor.MapSizeZ);
+                               mdWriter.WriteLine("RegionSize {0:D}", ClientAPI.World.BulkBlockAccessor.RegionSize);
+                               mdWriter.WriteLine("AMVersion '{0}'", ClientAPI.Self().Info.Version);
+                               mdWriter.WriteLine("PlayTime {0:F1}", ClientAPI.InWorldEllapsedMilliseconds / 1000);
+                               mdWriter.WriteLine("GameDate {0}", ClientAPI.World.Calendar.PrettyDate());
+                               mdWriter.WriteLine("Chunks {0:D}", chunkTopMetadata.Count);
+                               mdWriter.WriteLine("Chunks Updated {0:D}", updatedChunksTotal);
+                               mdWriter.WriteLine("Null Chunks {0:D}", nullChunkCount);        
+                               mdWriter.Flush( );
+                       }
                }
-
-               Logger.VerboseDebug("Generated HTML map");
                }
+                       
 
-
-
-               private ColumnMeta UpdateColumnMetadata(KeyValuePair<Vec2i, uint> mostActiveCol, IMapChunk mapChunk)
+               private ColumnMeta CreateColumnMetadata(KeyValuePair<Vec2i, ColumnCounter> mostActiveCol, IMapChunk mapChunk)
                {
-               ColumnMeta data = new ColumnMeta(mostActiveCol.Key.Copy());
-               BlockPos equivBP = new BlockPos(mostActiveCol.Key.X * ClientAPI.World.BlockAccessor.ChunkSize,
-                                                                               mapChunk.YMax,
-                                                                               mostActiveCol.Key.Y * ClientAPI.World.BlockAccessor.ChunkSize);
+                       ColumnMeta data = new ColumnMeta(mostActiveCol.Key.Copy(), ClientAPI, (byte) chunkSize, (ClientAPI.World.BlockAccessor.MapSizeY / chunkSize));
+                       BlockPos equivBP = new BlockPos(mostActiveCol.Key.X * chunkSize,
+                                                                                       mapChunk.YMax,
+                                                                                       mostActiveCol.Key.Y * chunkSize);
 
-               var climate = ClientAPI.World.BlockAccessor.GetClimateAt(equivBP);
-               data.ChunkAge = TimeSpan.FromHours(ClientAPI.World.Calendar.TotalHours);
-               data.Temperature = climate.Temperature;
-               data.Fertility = climate.Fertility;
-               data.ForestDensity = climate.ForestDensity;
-               data.Rainfall = climate.Rainfall;
-               data.ShrubDensity = climate.ShrubDensity;
+                       var climate = ClientAPI.World.BlockAccessor.GetClimateAt(equivBP);
+                       data.UpdateFieldsFrom(climate, mapChunk, TimeSpan.FromHours(ClientAPI.World.Calendar.TotalHours));
 
-               data.YMax = mapChunk.YMax;
-
-               
-               /* Only present on server....
-               if (mapChunk.TopRockIdMap != null) {
-               foreach (var topRockId in mapChunk.TopRockIdMap) {
-
-               if (data.RockRatio.ContainsKey(topRockId)) { data.RockRatio[topRockId]++; }
-               else { data.RockRatio.Add(topRockId, 1); }
-               }
-               }*/
-
-
-               return data;
+                       return data;
                }
 
                /// <summary>
                /// Reload chunk bounds from chunk shards
                /// </summary>
                /// <returns>The metadata.</returns>
-               private void Reload_Metadata( )
-               {       
-               var worldmapDir = new DirectoryInfo(path);
-
-               if (worldmapDir.Exists) {
+               private void Reload_Metadata()
+               {
+                       var shardsDir = new DirectoryInfo( Path.Combine(path, _chunkPath) );
+
+                       if (!shardsDir.Exists)
+                       {
+                               #if DEBUG
+                               Logger.VerboseDebug("Could not open world map (shards) directory");
+                               #endif
+                               return;
+                       }
+                       var shardFiles = shardsDir.GetFiles(chunkFile_filter);
+
+                       if (shardFiles.Length > 0)
+                       {
+                               #if DEBUG
+                               Logger.VerboseDebug("Metadata reloading from {0} shards", shardFiles.Length);
+                               #endif
+
+                               foreach (var shardFile in shardFiles)
+                               {
+
+                                       if (shardFile.Length < 1024) continue;
+                                       var result = chunkShardRegex.Match(shardFile.Name);
+                                       if (!result.Success) continue;
+
+                                       int X_chunk_pos = int.Parse(result.Groups["X"].Value);
+                                       int Z_chunk_pos = int.Parse(result.Groups["Z"].Value);
+
+                                       try
+                                       {
+                                               using (var fileStream = shardFile.OpenRead())
+                                               {
+
+                                                       PngReader pngRead = new PngReader(fileStream);
+                                                       pngRead.ReadSkippingAllRows();
+                                                       pngRead.End();
+                                                       //Parse PNG chunks for METADATA in shard
+                                                       PngMetadataChunk metadataFromPng = pngRead.GetChunksList().GetById1(PngMetadataChunk.ID) as PngMetadataChunk;
+                                                       var column = metadataFromPng.ChunkMetadata;
+                                                       if (column.PrettyLocation == null)
+                                                               column = column.Reload(ClientAPI);
+                                                       chunkTopMetadata.Add(column);
+                                               }
+
+                                       }
+                                       catch (PngjException someEx)
+                                       {
+                                               Logger.Error("PNG Corruption file '{0}' - Reason: {1}", shardFile.Name, someEx);
+                                               continue;
+                                       }
+                                       catch (ProtoException protoEx) 
+                                       {
+                                               Logger.Error("ProtoBuf invalid! file:'{0}' - Reason: {1}", shardFile.Name, protoEx);
+                                               continue;
+                                       }
+                               }
+                       }
 
-               var files = worldmapDir.GetFiles(chunkFile_filter);
+                       //POI and EOI raw dump files ~ reload em!
+                       //var poiRawFile = File.
+                       string poiPath = Path.Combine(path, poiFileName);
+                       string eoiPath = Path.Combine(path, eoiFileName);
+
+                       if (File.Exists(poiPath))
+                       {
+                               using (var poiFile = File.OpenRead(poiPath))
+                               {
+                                       this.POIs = Serializer.Deserialize<PointsOfInterest>(poiFile);
+                                       Logger.VerboseDebug("Reloaded {0} POIs from file.", this.POIs.Count);
+                               }
+                       }
 
-               if (files.Length > 0) {
-               #if DEBUG
-               Logger.VerboseDebug("{0} Existing world chunk shards", files.Length);
-               #endif
+                       if (File.Exists(eoiPath))
+                       {
+                               using (var eoiFile = File.OpenRead(eoiPath))
+                               {
+                                       this.EOIs = Serializer.Deserialize<EntitiesOfInterest>(eoiFile);
+                                       Logger.VerboseDebug("Reloaded {0} EOIs from file.", this.EOIs.Count);
+                               }
+                       }
 
-               
+               }
 
-               foreach (var shardFile in files) {
-               var result = chunkShardRegex.Match(shardFile.Name);
-               if (result.Success) {
-               int X_chunk_pos = int.Parse(result.Groups["X"].Value );
-               int Z_chunk_pos = int.Parse(result.Groups["Z"].Value );
-               
-               //Parse PNG chunks for METADATA in shard
-               using (var fileStream = shardFile.OpenRead( ))
-               {
-               PngReader pngRead = new PngReader(fileStream );
-               pngRead.ReadSkippingAllRows( );
-               pngRead.End( );
 
-               PngMetadataChunk metadataFromPng = pngRead.GetChunksList( ).GetById1(PngMetadataChunk.ID) as PngMetadataChunk;
 
-               chunkTopMetadata.Add(metadataFromPng.ChunkMetadata);
-               }
-               
-               }
-               }
+               /// <summary>
+               /// Does the heavy lifting of Scanning columns of chunks - scans for BlockEntity, creates Heightmap and stats...
+               /// </summary>
+               /// <param name="key">Chunk Coordinate</param>
+               /// <param name="mapChunk">Map chunk.</param>
+               /// <param name="chunkMeta">Chunk metadata</param>
+               private void ProcessChunkBlocks(Vec2i key, IMapChunk mapChunk, ref ColumnMeta chunkMeta)
+               {
+                       int targetChunkY = mapChunk.YMax / chunkSize;//Surface ish... 
+                       byte chunkTally = 0;
 
-               }
-               }
-               else {
                #if DEBUG
-               Logger.VerboseDebug("Could not open world map directory");
+               Logger.VerboseDebug("Start col @ X{0} Y{1} Z{2} !", key.X, targetChunkY, key.Y);
                #endif
-               }
-
-
 
+               chunkMeta.ResetMetadata(ClientAPI.World.BlockAccessor.MapSizeY);
+
+               for (; targetChunkY > 0; targetChunkY--)
+                       {
+                               WorldChunk worldChunk = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
+
+                               if (worldChunk == null || worldChunk.BlockEntities == null)
+                               {
+                                       #if DEBUG
+                                       Logger.VerboseDebug("WORLD chunk: null or empty X{0} Y{1} Z{2} !", key.X, targetChunkY, key.Y);
+                                       #endif
+                                       nullChunkCount++;
+                                       continue;
+                               }
+
+                               if (worldChunk.IsPacked()) 
+                               {
+                               #if DEBUG
+                               Logger.VerboseDebug("WORLD chunk: Compressed: X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
+                               #endif
+                               worldChunk.Unpack( );//RESEARCH: Thread Unsafe? 
+                               }
+
+                               /*************** Chunk Entities Scanning *********************/
+                               if (worldChunk.BlockEntities != null && worldChunk.BlockEntities.Count > 0)
+                               {
+                                       #if DEBUG
+                                       Logger.VerboseDebug("Scan pos.({0}) for BlockEntities# {1}", key, worldChunk.BlockEntities.Count);
+                                       #endif
+
+                                       foreach (var blockEnt in worldChunk.BlockEntities)
+                                       {
+                                               if (blockEnt.Key != null && blockEnt.Value != null && blockEnt.Value.Block != null && BlockID_Designators.ContainsKey(blockEnt.Value.Block.BlockId))
+                                               {
+                                                       var designator = BlockID_Designators[blockEnt.Value.Block.BlockId];
+                                                       designator?.SpecialAction(ClientAPI, POIs, blockEnt.Value.Pos.Copy(), blockEnt.Value.Block);
+                                               }
+                                       }
+                               }
+
+                               /********************* Chunk/Column BLOCKs scanning ****************/
+                               //Heightmap, Stats, block tally
+
+                               int X_index, Y_index, Z_index;
+
+                               //First Chance fail-safe;
+                               if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) {
+                               #if DEBUG
+                               Logger.VerboseDebug("WORLD chunk; Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", key.X, targetChunkY, key.Y);
+                               #endif
+                               nullChunkCount++;
+                               continue;
+                               }               
+
+                               chunkMeta.ColumnPresense[targetChunkY] = true;
+                               chunkTally++;
+                               for (Y_index = 0; Y_index < chunkSize; Y_index++)
+                               {
+                                       for (Z_index = 0; Z_index < chunkSize; Z_index++)
+                                       {
+                                               for (X_index = 0; X_index < chunkSize; X_index++) 
+                                               {
+                                               var indicie = MapUtil.Index3d(X_index, Y_index, Z_index, chunkSize, chunkSize);
+
+                                               //'Last' Chance fail-safe;
+                                               if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) {
+                                               #if DEBUG
+                                               Logger.VerboseDebug("Processing Block: Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", X_index, Y_index, Z_index);
+                                               #endif
+                                               nullChunkCount++;
+                                               goto loop_bustout; 
+                                               }
+
+                                               int aBlockId = worldChunk.Blocks[indicie];
+
+                                               if (aBlockId == 0 || AiryIdCodes.ContainsKey(aBlockId)) {//Airy blocks,,,
+                                               chunkMeta.AirBlocks++;
+                                               continue;
+                                               }
+
+                                               if (RockIdCodes.ContainsKey(aBlockId)) {
+                                               if (chunkMeta.RockRatio.ContainsKey(aBlockId))
+                                                       chunkMeta.RockRatio[aBlockId]++;
+                                               else
+                                                       chunkMeta.RockRatio.Add(aBlockId, 1);
+                                               }
+
+                                               chunkMeta.NonAirBlocks++;
+
+                                               ushort localHeight = ( ushort )(Y_index + (targetChunkY * chunkSize));
+                                               //Heightmap - Need to ignore Grass & Snow
+                                               if (localHeight > chunkMeta.HeightMap[X_index, Z_index]) 
+                                                       {
+                                                       chunkMeta.HeightMap[X_index, Z_index] = localHeight;
+                                                       if (localHeight > chunkMeta.YMax) chunkMeta.YMax = localHeight;
+                                                       }
+                                               }
+                                       }
+                               }
+                               loop_bustout:;
+                       }
+                       #if DEBUG
+                       Logger.VerboseDebug("COLUMN X{0} Z{1}: {2}, processed.", key.X , key.Y, chunkTally + 1);
+                       #endif
                }
 
-               private PngWriter SetupPngImage(Vec2i coord, ColumnMeta metadata)
+               private void UpdateEntityMetadata()
                {
-               ImageInfo imageInf = new ImageInfo(ClientAPI.World.BlockAccessor.ChunkSize, ClientAPI.World.BlockAccessor.ChunkSize, 8, false);
-               
-               string filename = $"{coord.X}_{coord.Y}.png";
-               filename = Path.Combine(path, filename);
-
-               PngWriter pngWriter = FileHelper.CreatePngWriter(filename, imageInf, true);
-               PngMetadata meta = pngWriter.GetMetadata( );
-               meta.SetTimeNow( );
-               meta.SetText("Chunk_X", coord.X.ToString("D"));
-               meta.SetText("Chunk_Y", coord.Y.ToString("D"));
-               //Setup specialized meta-data PNG chunks here...
-               PngMetadataChunk pngChunkMeta = new PngMetadataChunk(pngWriter.ImgInfo);
-               pngChunkMeta.ChunkMetadata = metadata;          
-               pngWriter.GetChunksList( ).Queue(pngChunkMeta);
-
-               return pngWriter;
-               }
-
-               #endregion
-
+               #if DEBUG
+               Logger.Debug("Presently {0} Entities", ClientAPI.World.LoadedEntities.Count);
+               #endif
 
-               #region COPYPASTA
-               //TODO: rewrite - with vertical ray caster, down to bottom-most chunk (for object detection...)
-               //A partly re-written; ChunkMapLayer :: public int[] GenerateChunkImage(Vec2i chunkPos, IMapChunk mc)
-               private void GenerateChunkImage(Vec2i chunkPos, IMapChunk mc, PngWriter pngWriter, out uint pixelCount)
-               {
-               pixelCount = 0;
-               BlockPos tmpPos = new BlockPos( );
-               Vec2i localpos = new Vec2i( );
-               int chunkSize = ClientAPI.World.BlockAccessor.ChunkSize;
-               var chunksColumn = new IWorldChunk[ClientAPI.World.BlockAccessor.MapSizeY / chunkSize];
-
-               int topChunkY = mc.YMax / chunkSize;//Heywaitaminute -- this isn't a highest FEATURE, if Rainmap isn't accurate!
-                                                                                       //Metadata of DateTime chunk was edited, chunk coords.,world-seed? Y-Max feature height
-                                                                                       //Grab a chunk COLUMN... Topmost Y down...
-               for (int chunkY = 0; chunkY <= topChunkY; chunkY++) {
-               chunksColumn[chunkY] = ClientAPI.World.BlockAccessor.GetChunk(chunkPos.X, chunkY, chunkPos.Y);
-               //What to do if chunk is a void? invalid?
+               var keyList = new long[ClientAPI.World.LoadedEntities.Keys.Count];
+               ClientAPI.World.LoadedEntities.Keys.CopyTo(keyList, 0);
+
+            //'ElementAt'; worse! instead; walk fixed list...
+               Entity loadedEntity;
+               foreach (var key in keyList)
+                       {
+                       if (ClientAPI.World.LoadedEntities.TryGetValue(key, out loadedEntity))
+                               {               
+                               #if DEBUG
+                               //Logger.VerboseDebug($"ENTITY: ({loadedEntity.Value.Code}) = #{loadedEntity.Value.EntityId} {loadedEntity.Value.State} {loadedEntity.Value.LocalPos}    <<<<<<<<<<<<");
+                               #endif
+
+                               var dMatch = Entity_Designators.SingleOrDefault(se => se.Key.Equals(loadedEntity.Code));
+                               if (dMatch.Value != null) 
+                                       {
+                                       dMatch.Value.SpecialAction(ClientAPI, this.EOIs, loadedEntity.Pos.AsBlockPos.Copy( ), loadedEntity);
+                                       }
+                               }                               
+                       }
                }
 
-               // Prefetch map chunks, in pattern
-               IMapChunk[ ] mapChunks = new IMapChunk[ ]
+               private void AddNote(string notation)
                {
-                       ClientAPI.World.BlockAccessor.GetMapChunk(chunkPos.X - 1, chunkPos.Y - 1),
-                       ClientAPI.World.BlockAccessor.GetMapChunk(chunkPos.X - 1, chunkPos.Y),
-                       ClientAPI.World.BlockAccessor.GetMapChunk(chunkPos.X, chunkPos.Y - 1)
-               };
-
-               //pre-create PNG line slices...
-               ImageLine[ ] lines = Enumerable.Repeat(new object( ), chunkSize).Select(l => new ImageLine(pngWriter.ImgInfo)).ToArray( );
-
-               for (int posIndex = 0; posIndex < (chunkSize * chunkSize); posIndex++) {
-               int mapY = mc.RainHeightMap[posIndex];
-               int localChunkY = mapY / chunkSize;
-               if (localChunkY >= (chunksColumn.Length)) continue;//Out of range!
-
-               MapUtil.PosInt2d(posIndex, chunkSize, localpos);
-               int localX = localpos.X;
-               int localZ = localpos.Y;
-
-               float b = 1;
-               int leftTop, rightTop, leftBot;
-
-               IMapChunk leftTopMapChunk = mc;
-               IMapChunk rightTopMapChunk = mc;
-               IMapChunk leftBotMapChunk = mc;
-
-               int topX = localX - 1;
-               int botX = localX;
-               int leftZ = localZ - 1;
-               int rightZ = localZ;
-
-               if (topX < 0 && leftZ < 0) {
-               leftTopMapChunk = mapChunks[0];
-               rightTopMapChunk = mapChunks[1];
-               leftBotMapChunk = mapChunks[2];
-               }
-               else {
-               if (topX < 0) {
-               leftTopMapChunk = mapChunks[1];
-               rightTopMapChunk = mapChunks[1];
-               }
-               if (leftZ < 0) {
-               leftTopMapChunk = mapChunks[2];
-               leftBotMapChunk = mapChunks[2];
-               }
-               }
-
-               topX = GameMath.Mod(topX, chunkSize);
-               leftZ = GameMath.Mod(leftZ, chunkSize);
-
-               leftTop = leftTopMapChunk == null ? 0 : Math.Sign(mapY - leftTopMapChunk.RainHeightMap[leftZ * chunkSize + topX]);
-               rightTop = rightTopMapChunk == null ? 0 : Math.Sign(mapY - rightTopMapChunk.RainHeightMap[rightZ * chunkSize + topX]);
-               leftBot = leftBotMapChunk == null ? 0 : Math.Sign(mapY - leftBotMapChunk.RainHeightMap[leftZ * chunkSize + botX]);
-
-               float slopeness = (leftTop + rightTop + leftBot);
+                       var playerNodePoi = new PointOfInterest()
+                       {
+                               Name = "Note",
+                               Location = ClientAPI.World.Player.Entity.Pos.AsBlockPos.Copy(),
+                               Notes = notation,
+                               Timestamp = DateTime.UtcNow,
+                       };
 
-               if (slopeness > 0) b = 1.2f;
-               if (slopeness < 0) b = 0.8f;
-
-               b -= 0.15f; //Slope boost value 
-
-               if (chunksColumn[localChunkY] == null) {
-
-               continue;
+                       this.POIs.AddReplace(playerNodePoi);
                }
 
-               chunksColumn[localChunkY].Unpack( );
-               int blockId = chunksColumn[localChunkY].Blocks[MapUtil.Index3d(localpos.X, mapY % chunkSize, localpos.Y, chunkSize, chunkSize)];
-
-               Block block = ClientAPI.World.Blocks[blockId];
 
-               tmpPos.Set(chunkSize * chunkPos.X + localpos.X, mapY, chunkSize * chunkPos.Y + localpos.Y);
-
-               int avgCol = block.GetColor(ClientAPI, tmpPos);
-               int rndCol = block.GetRandomColor(ClientAPI, tmpPos, BlockFacing.UP);
-               int col = ColorUtil.ColorOverlay(avgCol, rndCol, 0.125f);
-               var packedFormat = ColorUtil.ColorMultiply3Clamped(col, b);
-
-               int red = ColorUtil.ColorB(packedFormat);
-               int green = ColorUtil.ColorG(packedFormat);
-               int blue = ColorUtil.ColorR(packedFormat);
 
+               private void CommandListener(string eventName, ref EnumHandling handling, IAttribute data)
+               {
+                       //Logger.VerboseDebug("MsgBus RX: AutomapCommandMsg: {0}", data.ToJsonToken());
+
+                       CommandData cmdData = data as CommandData;
+
+                       switch (cmdData.State)
+                       {
+                               case CommandType.Run:
+                               case CommandType.Stop:
+                               case CommandType.Snapshot:
+                                       if (CurrentState != cmdData.State)
+                                       {
+                                               CurrentState = cmdData.State;
+                                               ThreadDecider(0.0f);
+                                       }
+                                       break;
+
+                               case CommandType.Notation:
+                                       //Add to POI list where player location
+                                       AddNote(cmdData.Notation);
+                                       break;
+                       }
 
-               //============ POI Population =================
-               if (BlockID_Designators.ContainsKey(blockId)) {
-               var desig = BlockID_Designators[blockId];
-               red = desig.OverwriteColor.R;
-               green = desig.OverwriteColor.G;
-               blue = desig.OverwriteColor.B;
+                       ClientAPI.TriggerChatMessage($"Automap commanded to: {cmdData.State} ");
 
-               if (desig.SpecialAction != null) {
-               desig.SpecialAction(ClientAPI, this.POIs, tmpPos, block);
-               }
                }
+#endregion
 
-               ImageLineHelper.SetPixel(lines[localZ], localX, red, green, blue);
-
-               //chunkImage.SetPixel(localX, localZ, pixelColor);
-               pixelCount++;
-               }
+               private AChunkRenderer InstantiateChosenRenderer(string rendererName )
+               {
+               Logger.VerboseDebug("Using '{0}' style Shard Renderer", rendererName);
+               switch (rendererName) 
+               {                               
+               case StandardRenderer.Name:
+                       return new StandardRenderer(ClientAPI, Logger, this.configuration.SeasonalColors);
+               
+               case AlternateRenderer.Name:
+                       return new AlternateRenderer(ClientAPI, Logger, this.configuration.SeasonalColors);
+       
+               case FlatRenderer.Name:
+                       return new FlatRenderer(ClientAPI, Logger, this.configuration.SeasonalColors);  
 
-               for (int row = 0; row < pngWriter.ImgInfo.Rows; row++) {
-               pngWriter.WriteRow(lines[row], row);
+               default:
+                       throw new ArgumentOutOfRangeException("rendererName",rendererName,"That value isn't supported or known...");
                }
 
-               pngWriter.End( );
+               return null;
                }
-               #endregion
        }
 
-}
\ No newline at end of file
+}