Commit: c46988f0b9e821ef654f7334608b0abc4966e57f - automap (git)

Automap (client) [VS plugin mod]

Commit MetaInfo

• Revisão: c46988f0b9e821ef654f7334608b0abc4966e57f (tree)
• Hora: 2020-03-11 22:22:18
• Autor: The Grand Dog <alex.h@me.c...>
• Commiter: The Grand Dog

Mensagem de Log

change the way the metadata is exported, typos

instead of having a map of objects, a map of arrays with a seperate array of names is used, this makes a smaller file

Mudança Sumário

• modified: Automap/Data/BlockDesignator.cs
• modified: Automap/Data/EntitiesOfInterest.cs
• modified: Automap/Data/EntityDesignator.cs
• modified: Automap/Designators/DefaultDesignators.cs
• delete: Automap/Renderers/{StandardRenerer.cs => StandardRenderer.cs}
• modified: Automap/Subsystems/AutomapSystem.cs

Diff

--- a/Automap/Data/BlockDesignator.cs
+++ b/Automap/Data/BlockDesignator.cs
@@ -9,7 +9,7 @@ using Vintagestory.API.MathTools;
 
 namespace Automap
 {
-	public delegate void BlockDesignatonAction(ICoreClientAPI clientAPI, PointsOfInterest poi, BlockPos posn, Block block);
+	public delegate void BlockDesignatorAction(ICoreClientAPI clientAPI, PointsOfInterest poi, BlockPos posn, Block block);
 
 	/// <summary>
 	/// Point of Interest Rule Designator
@@ -17,7 +17,7 @@ namespace Automap
 	public class BlockDesignator
 	{
 		public Color OverwriteColor;
-		public BlockDesignatonAction SpecialAction;
+		public BlockDesignatorAction SpecialAction;
 		public AssetLocation Pattern;
 		public EnumBlockMaterial? Material;
 		public bool Enabled { get; set; }
@@ -35,7 +35,7 @@ namespace Automap
 			this.Enabled = true;
 		}
 
-		public BlockDesignator(AssetLocation pattern, Color overwriteColor, EnumBlockMaterial? material, BlockDesignatonAction specialAct)
+		public BlockDesignator(AssetLocation pattern, Color overwriteColor, EnumBlockMaterial? material, BlockDesignatorAction specialAct)
 		{
 			this.Pattern = pattern;
 			this.OverwriteColor = overwriteColor;

--- a/Automap/Data/EntitiesOfInterest.cs
+++ b/Automap/Data/EntitiesOfInterest.cs
@@ -10,7 +10,7 @@ using Vintagestory.API.MathTools;
 namespace Automap
 {
 	/// <summary>
-	/// Actual Physical Point in space - that is interesting.
+	/// Basically the same as a POI but for an entity
 	/// </summary>
 	public struct EntityOfInterest
 	{
@@ -26,6 +26,8 @@ namespace Automap
 	/// <remarks>Tracked by ID - these never leave.</remarks>
 	public class EntitiesOfInterest : KeyedCollection<long, EntityOfInterest>
 	{
+		protected override long GetKeyForItem(EntityOfInterest item)
+			=> item.EntityId;
 
 		internal void AddReplace(EntityOfInterest entity)
 		{
@@ -35,8 +37,6 @@ namespace Automap
 			Add(entity);
 		}
 
-		protected override long GetKeyForItem(EntityOfInterest item)
-			=> item.EntityId;
 	}
 }
 

--- a/Automap/Data/EntityDesignator.cs
+++ b/Automap/Data/EntityDesignator.cs
@@ -10,7 +10,7 @@ using Vintagestory.API.MathTools;
 
 namespace Automap
 {
-	public delegate void EntityDesignatonAction(ICoreClientAPI clientAPI, EntitiesOfInterest poi, BlockPos posn, Entity entity);
+	public delegate void EntityDesignatorAction(ICoreClientAPI clientAPI, EntitiesOfInterest poi, BlockPos posn, Entity entity);
 
 	/// <summary>
 	/// Point of Interest Rule Designator
@@ -18,7 +18,7 @@ namespace Automap
 	public class EntityDesignator
 	{
 		public Color Color;
-		public EntityDesignatonAction SpecialAction;
+		public EntityDesignatorAction SpecialAction;
 		public AssetLocation Pattern;
 		public EnumEntityState? StateCheck;//Needed?
 		public bool Enabled { get; set; }
@@ -36,7 +36,7 @@ namespace Automap
 			Enabled = true;
 		}
 
-		public EntityDesignator(AssetLocation pattern, Color color, EnumEntityState? state, EntityDesignatonAction specialAct)
+		public EntityDesignator(AssetLocation pattern, Color color, EnumEntityState? state, EntityDesignatorAction specialAct)
 		{
 			Pattern = pattern;
 			Color = color;

--- a/Automap/Designators/DefaultDesignators.cs
+++ b/Automap/Designators/DefaultDesignators.cs
@@ -131,7 +131,7 @@ namespace Automap
 
 		internal static void KeepTrackOfMerchant(ICoreClientAPI clientAPI, EntitiesOfInterest poi, BlockPos posn, Entity entity)
 		{
-			clientAPI.Logger.VerboseDebug("Trader: {0} @ {1}", entity.GetName(), posn);
+			//clientAPI.Logger.VerboseDebug("Trader: {0} @ {1}", entity.GetName(), posn);
 
 			var traderJoe = entity as EntityTrader;
 			var message = $"{entity.GetName()} Alive: {traderJoe.Alive}";

--- a/Automap/Subsystems/AutomapSystem.cs
+++ b/Automap/Subsystems/AutomapSystem.cs
@@ -169,11 +169,13 @@ namespace Automap
 						}
 
 						ColumnMeta chunkMeta;
-						if (chunkTopMetadata.Contains(mostActiveCol.Key)) {
-						chunkMeta = chunkTopMetadata[mostActiveCol.Key];
+						if (chunkTopMetadata.Contains(mostActiveCol.Key))
+						{
+							chunkMeta = chunkTopMetadata[mostActiveCol.Key];
 						}
-						else {
-						chunkMeta = CreateColumnMetadata(mostActiveCol, mapChunk);
+						else
+						{
+							chunkMeta = CreateColumnMetadata(mostActiveCol, mapChunk);
 						}
 
 						UpdateEntityMetadata();
@@ -309,33 +311,40 @@ namespace Automap
 				jsonWriter.Write("ViewFrame.chunks.southMostChunk={0};", chunkTopMetadata.South_mostChunk);
 				jsonWriter.Write("ViewFrame.chunks.eastMostChunk={0};", chunkTopMetadata.East_mostChunk);
 				jsonWriter.Write("ViewFrame.chunks.westMostChunk={0};", chunkTopMetadata.West_mostChunk);
+				// this is so that the tool tip doesnt need to be hard coded in the map 
+				jsonWriter.Write("ViewFrame.chunks.chunkMetaNames=[");
+				// there are 10 (TEN) (ten) things
+				jsonWriter.Write("'Loc.','Age','Temp.','Y Max','Fert.','Forest','Rain','Shrub','Air','Non-Air'");
+				jsonWriter.Write("];");
 				//MAP object format - [key, value]: key is "x_y"
 				jsonWriter.Write("ViewFrame.chunks.chunkMetadata=new Map([");
 				foreach (var shard in chunkTopMetadata)
 				{
 					jsonWriter.Write("['{0}_{1}',", shard.Location.X, shard.Location.Y);
-					jsonWriter.Write("{");
-					jsonWriter.Write("prettyCoord:'{0}',", shard.Location.PrettyCoords(ClientAPI));
-					jsonWriter.Write("chunkAge:'{0}',", shard.ChunkAge.ToString("g"));//World age - relative? or last edit ??
-					jsonWriter.Write("temp:'{0}',", shard.Temperature.ToString("F1"));
-					jsonWriter.Write("YMax:'{0}',", shard.YMax);
-					jsonWriter.Write("fert:'{0}',", shard.Fertility.ToString("F1"));
-					jsonWriter.Write("forestDens:'{0}',", shard.ForestDensity.ToString("F1"));
-					jsonWriter.Write("rain:'{0}',", shard.Rainfall.ToString("F1"));
-					jsonWriter.Write("shrubDens:'{0}',", shard.ShrubDensity.ToString("F1"));
-					jsonWriter.Write("airBlocks:'{0}',", shard.AirBlocks);
-					jsonWriter.Write("nonAirBlocks:'{0}',", shard.NonAirBlocks);
-					//TODO: Heightmap
+					jsonWriter.Write("[");
+					// 10 things but 0 indexed so NINE (9)
+					jsonWriter.Write("'{0}','{1}','{2}','{3}','{4}','{5}','{6}','{7}','{8}','{9}'",
+						shard.Location.PrettyCoords(ClientAPI),
+						shard.ChunkAge.ToString("g"),//World age - relative? or last edit ??
+						shard.Temperature.ToString("F1"),
+						shard.YMax,
+						shard.Fertility.ToString("F1"),
+						shard.ForestDensity.ToString("F1"),
+						shard.Rainfall.ToString("F1"),
+						shard.ShrubDensity.ToString("F1"),
+						shard.AirBlocks,
+						shard.NonAirBlocks
+					);
 					//TODO: Rock-ratio, also requires a BlockID => Name lookup table....elsewhere
-					jsonWriter.Write("}],");
+					jsonWriter.Write("]],");
 				}
 				jsonWriter.Write("]);");
 
 
-				jsonWriter.Write("ViewFrame.chunks.pointsOfInterest = new Map([");
+				jsonWriter.Write("ViewFrame.chunks.pointsOfInterest=new Map([");
 				foreach (var poi in POIs)
 				{
-					jsonWriter.Write("['{0}_{1}',", poi.Location.X, poi.Location.Z);
+					jsonWriter.Write("['{0}_{1}',", (float) poi.Location.X / chunkSize, (float) poi.Location.Z / chunkSize);
 					jsonWriter.Write("{");
 					jsonWriter.Write("prettyCoord:'{0}',", poi.Location.PrettyCoords(ClientAPI));
 					jsonWriter.Write("notes:{0},", JsonConvert.ToString(poi.Notes, '\'', StringEscapeHandling.EscapeHtml));
@@ -343,15 +352,18 @@ namespace Automap
 					jsonWriter.Write("chunkPos:'{0}_{1}',", (poi.Location.X / chunkSize), (poi.Location.Z / chunkSize));
 					jsonWriter.Write("}],");
 				}
+				jsonWriter.Write("]);");
 
-				foreach (var poi in EOIs)
+				jsonWriter.Write("ViewFrame.chunks.entitiesOfInterest=new Map([");
+				foreach (var eoi in EOIs)
 				{
-					jsonWriter.Write("['{0}_{1}',", poi.Location.X, poi.Location.Z);
+					jsonWriter.Write("['{0}_{1}',", (float) eoi.Location.X / chunkSize, (float) eoi.Location.Z / chunkSize);
 					jsonWriter.Write("{");
-					jsonWriter.Write("prettyCoord:'{0}',", poi.Location.PrettyCoords(ClientAPI));
-					jsonWriter.Write("notes:{0},", JsonConvert.ToString(poi.Notes, '\'', StringEscapeHandling.EscapeHtml));
-					jsonWriter.Write("time:new Date('{0}'),", poi.Timestamp.ToString("O"));
-					jsonWriter.Write("chunkPos:'{0}_{1}',", (poi.Location.X / chunkSize), (poi.Location.Z / chunkSize));
+					jsonWriter.Write("prettyCoord:'{0}',", eoi.Location.PrettyCoords(ClientAPI));
+					jsonWriter.Write("notes:{0},", JsonConvert.ToString(eoi.Notes, '\'', StringEscapeHandling.EscapeHtml));
+					jsonWriter.Write("time:new Date('{0}'),", eoi.Timestamp.ToString("O"));
+					jsonWriter.Write("chunkPos:'{0}_{1}',", (eoi.Location.X / chunkSize), (eoi.Location.Z / chunkSize));
+					jsonWriter.Write("entityId:'{0}'", eoi.EntityId);
 					jsonWriter.Write("}],");
 				}
 				jsonWriter.Write("]);");
@@ -364,7 +376,7 @@ namespace Automap
 
 		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(), (byte) chunkSize);
 			BlockPos equivBP = new BlockPos(mostActiveCol.Key.X * chunkSize,
 											mapChunk.YMax,
 											mostActiveCol.Key.Y * chunkSize);
@@ -390,38 +402,41 @@ namespace Automap
 
 				if (files.Length > 0)
 				{
-					#if DEBUG
+#if DEBUG
 					Logger.VerboseDebug("{0} Existing world chunk shards", files.Length);
-					#endif
-					 
-					foreach (var shardFile in files) {
+#endif
 
-					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);
+					foreach (var shardFile in files)
+					{
 
-					try 
+						if (shardFile.Length < 1024) continue;
+						var result = chunkShardRegex.Match(shardFile.Name);
+						if (result.Success)
 						{
-						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;
+							try
+							{
+								using (var fileStream = shardFile.OpenRead())
+								{
 
-						chunkTopMetadata.Add(metadataFromPng.ChunkMetadata);
-						}
+									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);
+								}
+
+							}
+							catch (PngjException someEx)
+							{
+								Logger.Error("PNG Corruption file '{0}' - Reason: {1}", shardFile.Name, someEx);
+								continue;
+							}
 						}
-						catch (PngjException someEx) 
-						{
-							Logger.Error("PNG Corruption file '{0}' - Reason: {1}", shardFile.Name, someEx);
-							continue;
-						}
-					}
 
 					}
 				}
@@ -475,21 +490,21 @@ namespace Automap
 			int targetChunkY = mapChunk.YMax / chunkSize;//Surface ... 
 			for (; targetChunkY > 0; targetChunkY--)
 			{
-			WorldChunk chunkData = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
-
-			if (chunkData == null || chunkData.BlockEntities == null) {
-			#if DEBUG
-			Logger.VerboseDebug("Chunk null or empty X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
-			#endif
-			continue;
-			}
+				WorldChunk chunkData = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
+				if (chunkData == null || chunkData.BlockEntities == null)
+				{
+#if DEBUG
+					Logger.VerboseDebug("Chunk null or empty X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
+#endif
+					continue;
+				}
 
 				/*************** Chunk Entities Scanning *********************/
 				if (chunkData.BlockEntities != null && chunkData.BlockEntities.Length > 0)
 				{
-				#if DEBUG
+#if DEBUG
 					Logger.VerboseDebug("Surface@ {0} = BlockEntities: {1}", key, chunkData.BlockEntities.Length);
-				#endif
+#endif
 
 					foreach (var blockEnt in chunkData.BlockEntities)
 					{
@@ -534,10 +549,12 @@ namespace Automap
 
 							chunkMeta.NonAirBlocks++;
 
-							//Heightmap 
-							if (chunkMeta.HeightMap[X_index, Z_index] == 0)
-							{ chunkMeta.HeightMap[X_index, Z_index] = (ushort) (Y_index + (targetChunkY * chunkSize)); }
-
+							////Heightmap
+							//if (chunkMeta.HeightMap[X_index, Z_index] == 0)
+							//{
+							//	chunkMeta.HeightMap[X_index, Z_index]
+							//		= (ushort) (Y_index + (targetChunkY * chunkSize));
+							//}
 						}
 						while (X_index++ < (chunkSize - 1));
 						X_index = 0;
@@ -564,6 +581,7 @@ namespace Automap
 				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);
 				}