using System;
+using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Threading;
using Hjg.Pngcs;
-using Hjg.Pngcs.Chunks;
-using Newtonsoft.Json;
+using ProtoBuf;
using Vintagestory.API.Client;
using Vintagestory.API.Common;
public class AutomapSystem
{
private Thread cartographer_thread;
+ private Thread snapshotThread;
+ private Snapshotter snapshot;
private ICoreClientAPI ClientAPI { get; set; }
private ILogger Logger { get; set; }
- private IChunkRenderer ChunkRenderer { 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";
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 static Regex chunkShardRegex = new Regex(@"(?<X>[\d]+)_(?<Z>[\d]+)\.png", RegexOptions.Singleline);
private ConcurrentDictionary<Vec2i, uint> columnCounter = new ConcurrentDictionary<Vec2i, uint>(3, 150);
private ColumnsMetadata chunkTopMetadata;
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, updatedChunksTotal;
+ private uint nullChunkCount, nullMapCount, updatedChunksTotal;
private Vec2i startChunkColumn;
private readonly int chunkSize;
public static string AutomapStatusEventKey = @"AutomapStatus";
public static string AutomapCommandEventKey = @"AutomapCommand";
- PersistedConfiguration cachedConfiguration;
public AutomapSystem(ICoreClientAPI clientAPI, ILogger logger, PersistedConfiguration config)
{
ClientAPI.Event.LevelFinalize += EngageAutomap;
configuration = config;
-
-
//TODO:Choose which one from GUI
- this.ChunkRenderer = new StandardRenderer(clientAPI, logger);
+ this.ChunkRenderer = new StandardRenderer(clientAPI, logger, this.configuration.SeasonalColors);
//Listen on bus for commands
ClientAPI.Event.RegisterEventBusListener(CommandListener, 1.0, AutomapSystem.AutomapCommandEventKey);
- if (configuration.Autostart)
+
+ if (configuration.Autostart)
{
CurrentState = CommandType.Run;
Logger.Debug("Autostart is Enabled.");
{
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);
string mapFilename = Path.Combine(path, "automap.html");
StreamWriter outputText = new StreamWriter(File.Open(mapFilename, FileMode.Create, FileAccess.Write, FileShare.ReadWrite));
outputText.Flush();
Prefill_POI_Designators();
- startChunkColumn = new Vec2i((ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.X / chunkSize), (ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Z / chunkSize));
+ 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();
IsBackground = true
};
+ snapshot = new Snapshotter(path, chunkTopMetadata, chunkSize,ClientAPI.World.Seed );
+ snapshotThread = new Thread(Snap)
+ {
+ Name = "Snapshot",
+ Priority = ThreadPriority.Lowest,
+ IsBackground = true
+ };
+
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);
+ Vec2i topPosition = new Vec2i(chunkCoord.X, chunkCoord.Z);
+
+ //TODO: Track Y Chunk - Column, surface chunks being more important
+ //Only NEW/LOADED chunks unless edits > N
+ //if (reason == EnumChunkDirtyReason.NewlyCreated || reason == EnumChunkDirtyReason.NewlyLoaded)
+ //{
+ columnCounter.AddOrUpdate(topPosition, 1, (key, colAct) => colAct + 1);
+ //}
}
private void AwakenCartographer(float delayed)
}
else if (CurrentState == CommandType.Snapshot)
{
- //TODO: Snapshot generator second thread...
+ if (snapshotThread.ThreadState.HasFlag(ThreadState.Unstarted))
+ {
+ snapshotThread.Start();
+ } else if (snapshotThread.ThreadState.HasFlag(ThreadState.WaitSleepJoin))
+ {
+ snapshotThread.Interrupt();
+ }
}
}
if (!columnCounter.IsEmpty)
{
var tempSet = columnCounter.ToArray().OrderByDescending(kvp => kvp.Value);
- UpdateEntityMetadata( );
+ UpdateEntityMetadata();
foreach (var mostActiveCol in tempSet)
{
if (mapChunk == null)
{
+ //TODO: REVISIT THIS CHUNK!
Logger.Warning("SKIP CHUNK: ({0}) - Map Chunk NULL!", mostActiveCol.Key);
- nullChunkCount++;
+ nullMapCount++;
columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem);
continue;
}
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);
- PngWriter pngWriter = SetupPngImage(mostActiveCol.Key, chunkMeta);
- ChunkRenderer.GenerateChunkPngShard(mostActiveCol.Key, mapChunk, chunkMeta, pngWriter, out updatedPixels);
+ 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 chunk shard: ({0}) - Edits#:{1}, Pixels#:{2}", mostActiveCol.Key, mostActiveCol.Value, updatedPixels);
+ Logger.VerboseDebug("Wrote top-chunk shard: ({0}) - Edits#:{1}, Pixels#:{2}", mostActiveCol.Key, mostActiveCol.Value, updatedPixels);
#endif
updatedChunks++;
chunkTopMetadata.Update(chunkMeta);
else
{
columnCounter.TryRemove(mostActiveCol.Key, out ejectedItem);
- Logger.VerboseDebug("Un-painted chunk: ({0}) ", mostActiveCol.Key);
+ #if DEBUG
+ Logger.VerboseDebug("Un-painted chunk shard: ({0}) ", mostActiveCol.Key);
+ #endif
}
-
}
}
{
//What about chunk updates themselves; a update bitmap isn't kept...
updatedChunksTotal += updatedChunks;
- GenerateJSONMetadata();
+ JsonGenerator.GenerateJSONMetadata(chunkTopMetadata, startChunkColumn, POIs, EOIs, RockIdCodes);
updatedChunks = 0;
+
+ //Cleanup in-memory Metadata...
+ chunkTopMetadata.ClearMetadata( );
}
//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);
}
catch (ThreadInterruptedException)
{
+#if DEBUG
Logger.VerboseDebug("Thread '{0}' interupted [awoken]", Thread.CurrentThread.Name);
+#endif
goto wake;
}
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();
+ }
+ }
+
+ private void Snap()
+ {
+ 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;
}
}
this.Entity_Designators = new Dictionary<AssetLocation, EntityDesignator>();
this.RockIdCodes = Helpers.ArbitrarytBlockIdHunter(ClientAPI, new AssetLocation(GlobalConstants.DefaultDomain, "rock-"), EnumBlockMaterial.Stone);
- //Add special marker types for BlockID's of "Interest", overwrite colour, and method
+ 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
+ select airyBlock;
+ //^^ 'Solid' phase - 'Plant' Blocks without any boundg box ? Except water...
+ this.AiryIdCodes = airBlocksQuery.ToDictionary(aBlk => aBlk.BlockId, aBlk => aBlk.Code.Path);
+ //Add special marker types for BlockID's of "Interest", overwrite colour, and method
Reload_POI_Designators();
}
private void Reload_POI_Designators()
- {
+ {
Logger.VerboseDebug("Connecting {0} Configured Block-Designators", configuration.BlockDesignators.Count);
foreach (var designator in configuration.BlockDesignators)
{
this.Entity_Designators.Add(match.Code, designator);
}
-
-
//EntityProperties props = ClientAPI.World.GetEntityType(designator.Pattern);
}
}
- //TODO: Rewrite as Newtonsoft JsonTextWriter !!!
+
+
/// <summary>
- /// Generates the JSON Metadata. (in Map object format )
+ /// Store Points/Entity of Interest
/// </summary>
- private void GenerateJSONMetadata()
+ private void PersistPointsData()
{
- string jsonFilename = Path.Combine(path, "Metadata.js");
-
- StreamWriter stream = new StreamWriter(jsonFilename, false, Encoding.UTF8);
-
- using (stream) {
- JsonTextWriter jsonWriter = new JsonTextWriter(stream);
+ //POI and EOI raw dump files ~ WRITE em!
+ //var poiRawFile = File.
+ string poiPath = Path.Combine(path, poiFileName);
+ string eoiPath = Path.Combine(path, eoiFileName);
- jsonWriter.Formatting = Formatting.None;
- jsonWriter.StringEscapeHandling = StringEscapeHandling.EscapeHtml;
- jsonWriter.Indentation = 0;
- //jsonWriter.AutoCompleteOnClose = true;
- jsonWriter.QuoteChar = '\'';
- jsonWriter.DateFormatHandling = DateFormatHandling.IsoDateFormat;
- jsonWriter.DateTimeZoneHandling = DateTimeZoneHandling.Utc;
-
- using (jsonWriter)
+ if (this.POIs.Count > 0)
{
- jsonWriter.WriteRaw("ViewFrame.chunks={};\n");
- jsonWriter.WriteRaw("ViewFrame.chunks.worldSeedNum=" );
- jsonWriter.WriteValue(ClientAPI.World.Seed);
- jsonWriter.WriteRaw(";\n");
-
- jsonWriter.WriteRaw("ViewFrame.chunks.genTime=");
- jsonWriter.WriteValue(DateTimeOffset.UtcNow);
- jsonWriter.WriteRaw(";\n");
-
- jsonWriter.WriteRaw("ViewFrame.chunks.startCoords=");
- jsonWriter.WriteStartArray( );
- jsonWriter.WriteValue(startChunkColumn.X);
- jsonWriter.WriteValue(startChunkColumn.Y);
- jsonWriter.WriteEndArray( );
- jsonWriter.WriteRaw(";\n");
-
- jsonWriter.WriteRaw("ViewFrame.chunks.chunkSize=");
- jsonWriter.WriteValue(chunkSize);
- jsonWriter.WriteRaw(";\n");
-
- jsonWriter.WriteRaw("ViewFrame.chunks.northMostChunk=");
- jsonWriter.WriteValue(chunkTopMetadata.North_mostChunk);
- jsonWriter.WriteRaw(";\n");
-
- jsonWriter.WriteRaw("ViewFrame.chunks.southMostChunk=");
- jsonWriter.WriteValue(chunkTopMetadata.South_mostChunk);
- jsonWriter.WriteRaw(";\n");
-
- jsonWriter.WriteRaw("ViewFrame.chunks.westMostChunk=");
- jsonWriter.WriteValue(chunkTopMetadata.West_mostChunk);
- jsonWriter.WriteRaw(";\n");
-
- jsonWriter.WriteRaw("ViewFrame.chunks.eastMostChunk=");
- jsonWriter.WriteValue(chunkTopMetadata.East_mostChunk);
- jsonWriter.WriteRaw(";\n");
-
-
- //MAP object format - [key, value]: key is "x_y"
- jsonWriter.WriteRaw("ViewFrame.chunks.chunkMetadata=");
- jsonWriter.WriteStartConstructor("Map");
- jsonWriter.WriteStartArray( );//An array of... 2-component arrays
-
-
- foreach (var shard in chunkTopMetadata)
+ using (var poiFile = File.OpenWrite(poiPath))
{
- jsonWriter.WriteStartArray( );//Start tuple
- jsonWriter.WriteValue($"{shard.Location.X}_{shard.Location.Y}");//Key of Tuple
-
- jsonWriter.WriteStartObject( );
- jsonWriter.WritePropertyName("prettyCoord");
- jsonWriter.WriteValue( shard.Location.PrettyCoords(ClientAPI));
-
- jsonWriter.WritePropertyName("chunkAge");
- jsonWriter.WriteValue(shard.ChunkAge);
-
- jsonWriter.WritePropertyName("temp");
- jsonWriter.WriteValue(shard.Temperature);
-
- jsonWriter.WritePropertyName("YMax");
- jsonWriter.WriteValue(shard.YMax);
-
- jsonWriter.WritePropertyName("fert");
- jsonWriter.WriteValue(shard.Fertility);
-
- jsonWriter.WritePropertyName("forestDens");
- jsonWriter.WriteValue( shard.ForestDensity);
-
- jsonWriter.WritePropertyName("rain");
- jsonWriter.WriteValue( shard.Rainfall);
-
- jsonWriter.WritePropertyName("shrubDens");
- jsonWriter.WriteValue( shard.ShrubDensity);
-
- jsonWriter.WritePropertyName("airBlocks");
- jsonWriter.WriteValue( shard.AirBlocks);
-
- jsonWriter.WritePropertyName("nonAirBlocks");
- jsonWriter.WriteValue( shard.NonAirBlocks);
-
- //TODO: Heightmap ?
- //Start rockMap ; FOR a Ratio....on tooltip GUI
- jsonWriter.WritePropertyName("rockRatio");
- jsonWriter.WriteStartConstructor("Map");
- jsonWriter.WriteStartArray( );
- foreach (var rockEntry in shard.RockRatio) {
- var rockBlock = ClientAPI.World.GetBlock(rockEntry.Key);
- jsonWriter.WriteStartArray( );
- jsonWriter.WriteValue(rockBlock.Code.Path);
- jsonWriter.WriteValue(rockEntry.Value);//Total per chunk-column
- jsonWriter.WriteEndArray( );
- }
- jsonWriter.WriteEndArray( );
- jsonWriter.WriteEndConstructor( );//end rock-map
-
- jsonWriter.WriteEndObject( );//end Map value: {Object}
- jsonWriter.WriteEndArray( );//end Tuple
+ Serializer.Serialize<PointsOfInterest>(poiFile, this.POIs);
}
+ }
- jsonWriter.WriteEndArray( );//Enclose tuples of chunkMetadata
- jsonWriter.WriteEndConstructor( );//Close constructor of Map (chunkMetadata)
- jsonWriter.WriteRaw(";\n");
-
- jsonWriter.WriteRaw("ViewFrame.chunks.pointsOfInterest=");
- jsonWriter.WriteStartConstructor("Map");
- jsonWriter.WriteStartArray( );//An array of... 2-component arrays
-
- foreach (var poi in POIs)
+ if (this.EOIs.Count > 0)
+ {
+ using (var eoiFile = File.OpenWrite(eoiPath))
{
- jsonWriter.WriteStartArray( );
- jsonWriter.WriteValue($"{poi.Location.X}_{poi.Location.Z}");
-
- jsonWriter.WriteStartObject();
- jsonWriter.WritePropertyName("prettyCoord");
- jsonWriter.WriteValue(poi.Location.PrettyCoords(ClientAPI) );
-
- jsonWriter.WritePropertyName("notes");
- jsonWriter.WriteValue(poi.Notes);//Encoded to HTML Entities
-
- jsonWriter.WritePropertyName("time");
- jsonWriter.WriteValue(poi.Timestamp);
-
- jsonWriter.WritePropertyName("chunkPos");
- jsonWriter.WriteValue($"{(poi.Location.X / chunkSize)}_{(poi.Location.Z / chunkSize)}");
-
- jsonWriter.WriteEndObject( );
- jsonWriter.WriteEndArray( );
+ Serializer.Serialize<EntitiesOfInterest>(eoiFile, this.EOIs);
}
- jsonWriter.Write("]);");
-
- jsonWriter.Write("ViewFrame.chunks.entitiesOfInterest=new Map([");
- foreach (var eoi in EOIs)
- {
- jsonWriter.WriteStartArray( );
- jsonWriter.WriteValue($"{poi.Location.X}_{poi.Location.Z}");
-
- jsonWriter.WriteStartObject( );
- jsonWriter.WritePropertyName("prettyCoord");
- jsonWriter.WriteValue(poi.Location.PrettyCoords(ClientAPI));
-
- jsonWriter.WritePropertyName("notes");
- jsonWriter.WriteValue(poi.Notes);//Encoded to HTML Entities
-
- jsonWriter.WritePropertyName("time");
- jsonWriter.WriteValue(poi.Timestamp);
+ }
- jsonWriter.WritePropertyName("chunkPos");
- jsonWriter.WriteValue($"{(poi.Location.X / chunkSize)}_{(poi.Location.Z / chunkSize)}");
+ //Create Easy to Parse TSV file for tool/human use....
+ string pointsTsvPath = Path.Combine(path, pointsTsvFileName);
- jsonWriter.WriteEndObject( );
- jsonWriter.WriteEndArray( );
+ using (var tsvWriter = new StreamWriter(pointsTsvPath, false, Encoding.UTF8))
+ {
+ tsvWriter.WriteLine("Name\tDescription\tLocation\tTime\tDestination");
+ foreach (var point in this.POIs)
+ {
+ tsvWriter.Write(point.Name + "\t");
+ var notes = point.Notes
+ .Replace("\n", "\\n")
+ .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.WriteLine();
}
-
- jsonWriter.WriteEndArray( );
- jsonWriter.WriteEndConstructor( );
- jsonWriter.WriteRaw(";\n");
-
- jsonWriter.WriteWhitespace("\n");
- jsonWriter.WriteComment("============= BlockID's for Rockmap / Rock-ratios ===============");
- jsonWriter.WriteWhitespace("\n");
-
- jsonWriter.WriteRaw("ViewFrame.chunks.rock_Lookup =");
- jsonWriter.WriteStartConstructor("Map");
- jsonWriter.WriteStartArray( );//An array of... 2-component arrays
-
- foreach (var entry in RockIdCodes) {
- var block = ClientAPI.World.GetBlock(entry.Key);
-
- jsonWriter.WriteStartArray( );
- jsonWriter.WriteValue(block.Code.Path);
-
- jsonWriter.WriteStartObject( );
- jsonWriter.WritePropertyName("assetCode");
- jsonWriter.WriteValue(entry.Value);
-
- jsonWriter.WritePropertyName("name");
- jsonWriter.WriteValue(Lang.GetUnformatted(block.Code.Path));
- //Color?
-
- jsonWriter.WriteEndObject( );
- jsonWriter.WriteEndArray( );
+ foreach (var entity in this.EOIs)
+ {
+ tsvWriter.Write(entity.Name + "\t");
+ var notes = entity.Notes
+ .Replace("\n", "\\n")
+ .Replace("\t", "\\t")
+ .Replace("\\", "\\\\");
+ tsvWriter.Write(notes + "\t");
+ tsvWriter.Write(entity.Location.PrettyCoords(ClientAPI) + "\t");
+ tsvWriter.Write(entity.Timestamp.ToString("u") + "\t");
+ tsvWriter.Write("n/a\t");
+ tsvWriter.WriteLine();
}
- jsonWriter.WriteEndArray( );
- jsonWriter.WriteEndConstructor();
-
- jsonWriter.WriteRaw(";\n");
-
- jsonWriter.Flush();
- }
+ tsvWriter.WriteLine();
+ tsvWriter.Flush();
}
}
-
private ColumnMeta CreateColumnMetadata(KeyValuePair<Vec2i, uint> mostActiveCol, IMapChunk mapChunk)
{
- ColumnMeta data = new ColumnMeta(mostActiveCol.Key.Copy(), (byte) 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);
/// <returns>The metadata.</returns>
private void Reload_Metadata()
{
- var worldmapDir = new DirectoryInfo(path);
+ var shardsDir = new DirectoryInfo( Path.Combine(path, _chunkPath) );
- if (worldmapDir.Exists)
+ if (!shardsDir.Exists)
{
+ #if DEBUG
+ Logger.VerboseDebug("Could not open world map (shards) directory");
+ #endif
+ return;
+ }
+ var shardFiles = shardsDir.GetFiles(chunkFile_filter);
- var files = worldmapDir.GetFiles(chunkFile_filter);
+ if (shardFiles.Length > 0)
+ {
+ #if DEBUG
+ Logger.VerboseDebug("Metadata reloading from {0} shards", shardFiles.Length);
+ #endif
- if (files.Length > 0)
+ foreach (var shardFile in shardFiles)
{
-#if DEBUG
- Logger.VerboseDebug("{0} Existing world chunk shards", files.Length);
-#endif
-
- foreach (var shardFile in files)
- {
- if (shardFile.Length < 1024) continue;
- 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);
+ if (shardFile.Length < 1024) continue;
+ var result = chunkShardRegex.Match(shardFile.Name);
+ if (!result.Success) continue;
- try
- {
- using (var fileStream = shardFile.OpenRead())
- {
+ int X_chunk_pos = int.Parse(result.Groups["X"].Value);
+ int Z_chunk_pos = int.Parse(result.Groups["Z"].Value);
- 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;
-
- chunkTopMetadata.Add(metadataFromPng.ChunkMetadata);
- }
+ try
+ {
+ using (var fileStream = shardFile.OpenRead())
+ {
- }
- catch (PngjException someEx)
- {
- Logger.Error("PNG Corruption file '{0}' - Reason: {1}", shardFile.Name, someEx);
- continue;
- }
+ 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;
+ }
}
+ }
+ //POI and EOI raw dump files ~ reload em!
+ //var poiRawFile = File.
+ string poiPath = Path.Combine(path, poiFileName);
+ string eoiPath = Path.Combine(path, eoiFileName);
- }
- else
+ if (File.Exists(poiPath))
{
-#if DEBUG
- Logger.VerboseDebug("Could not open world map directory");
-#endif
+ using (var poiFile = File.OpenRead(poiPath))
+ {
+ this.POIs = Serializer.Deserialize<PointsOfInterest>(poiFile);
+ Logger.VerboseDebug("Reloaded {0} POIs from file.", this.POIs.Count);
+ }
}
-
+ 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);
+ }
+ }
}
- private PngWriter SetupPngImage(Vec2i coord, ColumnMeta metadata)
- {
- ImageInfo imageInf = new ImageInfo(chunkSize, 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)
- {
- ChunkMetadata = metadata
- };
- pngWriter.GetChunksList().Queue(pngChunkMeta);
- pngWriter.CompLevel = 9;// 9 is the maximum compression
- pngWriter.CompressionStrategy = Hjg.Pngcs.Zlib.EDeflateCompressStrategy.Huffman;
- return pngWriter;
- }
/// <summary>
/// Does the heavy lifting of Scanning columns of chunks - scans for BlockEntity, creates Heightmap and stats...
/// <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;
+
+ #if DEBUG
+ Logger.VerboseDebug("Start col @ X{0} Y{1} Z{2} !", key.X, targetChunkY, key.Y);
+ #endif
- int targetChunkY = mapChunk.YMax / chunkSize;//Surface ...
- for (; targetChunkY > 0; targetChunkY--)
+ chunkMeta.ResetMetadata(ClientAPI.World.BlockAccessor.MapSizeY);
+
+ for (; targetChunkY > 0; targetChunkY--)
{
- WorldChunk chunkData = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
- if (chunkData == null || chunkData.BlockEntities == null)
+ WorldChunk worldChunk = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
+
+ if (worldChunk == null || worldChunk.BlockEntities == null)
{
-#if DEBUG
- Logger.VerboseDebug("Chunk null or empty X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
-#endif
+ #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())
+ {
+ Logger.VerboseDebug("WORLD chunk: Compressed: X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
+ worldChunk.Unpack( );//RESEARCH: Thread Unsafe?
+ }
+
/*************** Chunk Entities Scanning *********************/
- if (chunkData.BlockEntities != null && chunkData.BlockEntities.Length > 0)
+ if (worldChunk.BlockEntities != null && worldChunk.BlockEntities.Count > 0)
{
-#if DEBUG
- Logger.VerboseDebug("Surface@ {0} = BlockEntities: {1}", key, chunkData.BlockEntities.Length);
-#endif
+ #if DEBUG
+ Logger.VerboseDebug("Scan pos.({0}) for BlockEntities# {1}", key, worldChunk.BlockEntities.Count);
+ #endif
- foreach (var blockEnt in chunkData.BlockEntities)
+ foreach (var blockEnt in worldChunk.BlockEntities)
{
-
- if (blockEnt != null && blockEnt.Block != null && BlockID_Designators.ContainsKey(blockEnt.Block.BlockId))
+ if (blockEnt.Value != null && blockEnt.Value.Block != null && BlockID_Designators.ContainsKey(blockEnt.Value.Block.BlockId))
{
- var designator = BlockID_Designators[blockEnt.Block.BlockId];
- designator.SpecialAction(ClientAPI, POIs, blockEnt.Pos.Copy(), blockEnt.Block);
+ 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
- chunkData.Unpack();
int X_index, Y_index, Z_index;
- X_index = Y_index = Z_index = 0;
- do
+ //First Chance fail-safe;
+ if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) {
+ Logger.VerboseDebug("WORLD chunk; Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", key.X, targetChunkY, key.Y);
+ nullChunkCount++;
+ continue;
+ }
+
+ chunkMeta.ColumnPresense[targetChunkY] = true;
+ chunkTally++;
+ for (Y_index = 0; Y_index < chunkSize; Y_index++)
{
- do
+ for (Z_index = 0; Z_index < chunkSize; Z_index++)
{
- do
+ for (X_index = 0; X_index < chunkSize; X_index++)
{
- /* Encode packed indicie
- (y * chunksize + z) * chunksize + x
- */
- var indicie = Helpers.ChunkBlockIndicie16(X_index, Y_index, Z_index);
- int aBlockId = chunkData.Blocks[indicie];
-
- if (aBlockId == 0)
- {//Air
- chunkMeta.AirBlocks++;
- continue;
- }
+ var indicie = MapUtil.Index3d(X_index, Y_index, Z_index, chunkSize, chunkSize);
- if (RockIdCodes.ContainsKey(aBlockId))
- {
- if (chunkMeta.RockRatio.ContainsKey(aBlockId)) { chunkMeta.RockRatio[aBlockId]++; } else { chunkMeta.RockRatio.Add(aBlockId, 1); }
- }
+ //'Last' Chance fail-safe;
+ if (worldChunk.Blocks == null || worldChunk.Blocks.Length <= 0) {
+ Logger.VerboseDebug("Processing Block: Missing block DATA⁈ X{0} Y{1} Z{2} ⁈", X_index, Y_index, Z_index);
+ nullChunkCount++;
+ goto loop_bustout; ;
+ }
- chunkMeta.NonAirBlocks++;
+ int aBlockId = worldChunk.Blocks[indicie];
- ////Heightmap
- //if (chunkMeta.HeightMap[X_index, Z_index] == 0)
- //{
- // chunkMeta.HeightMap[X_index, Z_index]
- // = (ushort) (Y_index + (targetChunkY * chunkSize));
- //}
+ 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;
+ }
}
- while (X_index++ < (chunkSize - 1));
- X_index = 0;
}
- while (Z_index++ < (chunkSize - 1));
- Z_index = 0;
}
- while (Y_index++ < (chunkSize - 1));
-
+ loop_bustout:;
}
+ Logger.VerboseDebug("COLUMN X{0} Z{1}: {2}, processed.", key.X , key.Y, chunkTally + 1);
}
private void UpdateEntityMetadata()
var dMatch = Entity_Designators.SingleOrDefault(se => se.Key.Equals(loadedEntity.Value.Code));
if (dMatch.Value != null)
{
- Logger.Chat("Entity designator hit!");
- dMatch.Value.SpecialAction(ClientAPI, this.EOIs, loadedEntity.Value.LocalPos.AsBlockPos.Copy(), loadedEntity.Value);
+ dMatch.Value.SpecialAction(ClientAPI, this.EOIs, loadedEntity.Value.Pos.AsBlockPos.Copy(), loadedEntity.Value);
}
}
{
var playerNodePoi = new PointOfInterest()
{
- Location = ClientAPI.World.Player.Entity.LocalPos.AsBlockPos.Copy(),
+ Name = "Note",
+ Location = ClientAPI.World.Player.Entity.Pos.AsBlockPos.Copy(),
Notes = notation,
- Timestamp = DateTimeOffset.UtcNow,
+ Timestamp = DateTime.UtcNow,
};
this.POIs.AddReplace(playerNodePoi);
private void CommandListener(string eventName, ref EnumHandling handling, IAttribute data)
{
- Logger.VerboseDebug("MsgBus RX: AutomapCommandMsg: {0}", data.ToJsonToken());
+ //Logger.VerboseDebug("MsgBus RX: AutomapCommandMsg: {0}", data.ToJsonToken());
CommandData cmdData = data as CommandData;
-
- if (CurrentState != CommandType.Snapshot)
+ switch (cmdData.State)
{
- switch (cmdData.State)
- {
- case CommandType.Run:
+ case CommandType.Run:
+ case CommandType.Stop:
+ case CommandType.Snapshot:
+ if (CurrentState != cmdData.State)
+ {
CurrentState = cmdData.State;
AwakenCartographer(0.0f);
- break;
-
- case CommandType.Stop:
- CurrentState = cmdData.State;
- break;
-
- case CommandType.Snapshot:
- CurrentState = CommandType.Stop;
- //Snapshot starts a second thread/process...
-
- break;
-
- case CommandType.Notation:
- //Add to POI list where player location
- AddNote(cmdData.Notation);
- break;
- }
-
- }
+ }
+ break;
- if (CurrentState != cmdData.State)
- {
- CurrentState = cmdData.State;
- AwakenCartographer(0.0f);
+ case CommandType.Notation:
+ //Add to POI list where player location
+ AddNote(cmdData.Notation);
+ break;
}
-
#if DEBUG
- Logger.VerboseDebug($"Automap commanded to: {cmdData.State} ");
+ ClientAPI.TriggerChatMessage($"Automap commanded to: {cmdData.State} ");
#endif
-
}
-
-
#endregion
}
-}
\ No newline at end of file
+}