Merge remote-tracking branch 'lucko/master' into forge-1.7.10

2 files changed, 28 insertions, 1 deletions

diff --git a/spark-common/src/main/proto/spark/spark.proto b/spark-common/src/main/proto/spark/spark.proto
index ec0aa88..2ea341f 100644
--- a/spark-common/src/main/proto/spark/spark.proto
+++ b/spark-common/src/main/proto/spark/spark.proto
@@ -94,7 +94,8 @@ message PlatformStatistics {
   Tps tps = 4; // optional
   Mspt mspt = 5; // optional
   Ping ping = 6; // optional
-  int64 player_count = 7;
+  int64 player_count = 7; // optional
+  WorldStatistics world = 8; // optional
 
   message Memory {
     MemoryPool heap = 1;
@@ -127,6 +128,30 @@ message PlatformStatistics {
   }
 }
 
+message WorldStatistics {
+  int32 total_entities = 1;
+  map<string, int32> entity_counts = 2;
+  repeated World worlds = 3;
+
+  message World {
+    string name = 1;
+    int32 total_entities = 2;
+    repeated Region regions = 3;
+  }
+
+  message Region {
+    int32 total_entities = 1;
+    repeated Chunk chunks = 2;
+  }
+
+  message Chunk {
+    int32 x = 1;
+    int32 z = 2;
+    int32 total_entities = 3;
+    map<string, int32> entity_counts = 4;
+  }
+}
+
 message RollingAverageValues {
   double mean = 1;
   double max = 2;
diff --git a/spark-common/src/main/proto/spark/spark_sampler.proto b/spark-common/src/main/proto/spark/spark_sampler.proto
index 51bdd64..8d9512a 100644
--- a/spark-common/src/main/proto/spark/spark_sampler.proto
+++ b/spark-common/src/main/proto/spark/spark_sampler.proto
@@ -25,6 +25,7 @@ message SamplerMetadata {
   SystemStatistics system_statistics = 9;
   map<string, string> server_configurations = 10;
   int64 end_time = 11;
+  int32 number_of_ticks = 12;
 
   message ThreadDumper {
     Type type = 1;
@@ -42,6 +43,7 @@ message SamplerMetadata {
     Type type = 1;
     ThreadGrouper thread_grouper = 2;
     int64 tick_length_threshold = 3; // optional
+    int32 number_of_included_ticks = 4; // optional
 
     enum Type {
       SIMPLE = 0;