OSDN Git Service

1st attempt to fix Protocol buffer corruption issue
[automap/automap.git] / Automap / Data / ColumnMeta.cs
index 77daaf4..38e83d1 100644 (file)
@@ -1,41 +1,42 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-
+using System.Diagnostics;
+using System.IO;
+using System.Collections.ObjectModel;
+using System.Text;
 
 using Vintagestory.API.MathTools;
 using Vintagestory.API.Common;
+using Vintagestory.API.Client;
 
 using ProtoBuf;
-using System.IO;
-using System.Collections.ObjectModel;
-using System.Text;
-using Vintagestory.API.Client;
-using Newtonsoft.Json.Linq;
 
 namespace Automap
 {
-       [ProtoContract]
+       [ProtoContract(ImplicitFields = ImplicitFields.None)]
        public struct ColumnMeta
        {
                [ProtoMember(1)]
                public Vec2i Location;
 
                [DisplayName(0, "Coords.")]
+               [ProtoIgnore]
                public string PrettyLocation;
 
                [ProtoMember(2)]
                public TimeSpan ChunkAge;//OLDEST CHUNK. from chunk last edit
 
                [DisplayName(1, "Age")]
+               [ProtoIgnore]
                public string ShortChunkAge { get => ChunkAge.ToString("c"); }
 
-               [ProtoMember(3)]
                [DisplayName(2, "Temp.")]
+               [ProtoMember(3)]
                public float Temperature;// Temperature - surface
 
-               [ProtoMember(4)]
                [DisplayName(3, "Y Max.")]
+               [ProtoMember(4)]
                public ushort YMax;// Y feature height
 
                [ProtoMember(5)]
@@ -56,28 +57,28 @@ namespace Automap
                //}
 
 
-               [ProtoMember(6)]
                [DisplayName(4, "Fert.")]
+               [ProtoMember(6)]
                public float Fertility;
 
-               [ProtoMember(7)]
                //[DisplayName(5, "Forest")]
+               [ProtoMember(7)]
                public float ForestDensity; // not given to client
 
-               [ProtoMember(8)]
                [DisplayName(6, "Rain")]
+               [ProtoMember(8)]
                public float Rainfall;
 
-               [ProtoMember(9)]
                //[DisplayName(7, "Shrub")]
+               [ProtoMember(9)]
                public float ShrubDensity; // not given to client
 
-               [ProtoMember(10)]
                [DisplayName(8, "Air blocks")]
+               [ProtoMember(10)]
                public uint AirBlocks;
 
-               [ProtoMember(11)]
                [DisplayName(9, "Non-air")]
+               [ProtoMember(11)]
                public uint NonAirBlocks;
 
                [ProtoMember(12)]
@@ -176,7 +177,7 @@ namespace Automap
                internal ColumnMeta Reload(ICoreClientAPI clientAPI)
                {
                        this.PrettyLocation = Location.PrettyCoords(clientAPI);
-                       Console.Write(PrettyLocation == null ? "*" : ",");
+                       Debug.Write(PrettyLocation == null ? "*" : ",");
                        return this;
                }
        }