OSDN Git Service

Merge branch 'Split_renderers' into vgd
authorThe Grand Dog <alex.h@me.com>
Mon, 27 Apr 2020 14:36:53 +0000 (10:36 -0400)
committerThe Grand Dog <alex.h@me.com>
Mon, 27 Apr 2020 14:36:53 +0000 (10:36 -0400)
1  2 
Automap/Data/ColumnMeta.cs
Automap/Data/EntitiesOfInterest.cs
Automap/Data/PointOfInterest.cs
Automap/Subsystems/AutomapSystem.cs

Simple merge
@@@ -28,9 -29,7 +29,9 @@@ namespace Automa
                [ProtoMember(2)]
                public string Notes;
  
-               [DisplayName(0, "Loc.")]
+               [DisplayName(1, "Loc.")]
 +              public string PrettyLocation;
 +
                [ProtoMember(3)]
                public BlockPos Location;
  
@@@ -25,9 -26,7 +26,9 @@@ namespace Automa
                [ProtoMember(2)]
                public string Notes;
  
-               [DisplayName(0, "Loc.")]
+               [DisplayName(1, "Loc.")]
 +              public string PrettyLocation;
 +
                [ProtoMember(3)]
                public BlockPos Location;
  
@@@ -502,15 -495,15 +503,15 @@@ namespace Automa
                        int targetChunkY = mapChunk.YMax / chunkSize;//Surface ... 
                        for (; targetChunkY > 0; targetChunkY--)
                        {
 -                      WorldChunk chunkData = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
 +                              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;
-                               }
+                       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
+                       nullChunkCount++;
+                       continue;
+                       }
  
                                /*************** Chunk Entities Scanning *********************/
                                if (chunkData.BlockEntities != null && chunkData.BlockEntities.Length > 0)