Include datapacks info in sampler proto

2 files changed, 15 insertions, 1 deletions

diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8SparkPlugin.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8SparkPlugin.java
index 8e875ec..c675a8c 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8SparkPlugin.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8SparkPlugin.java
@@ -185,7 +185,8 @@ public class Sponge8SparkPlugin implements SparkPlugin {
                 plugin -> plugin.metadata().version().toString(),
                 plugin -> plugin.metadata().contributors().stream()
                         .map(PluginContributor::name)
-                        .collect(Collectors.joining(", "))
+                        .collect(Collectors.joining(", ")),
+                plugin -> plugin.metadata().description().orElse(null)
         );
     }
 
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8WorldInfoProvider.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8WorldInfoProvider.java
index 58f9c33..1bad9d7 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8WorldInfoProvider.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8WorldInfoProvider.java
@@ -25,6 +25,7 @@ import com.google.common.collect.Lists;
 import me.lucko.spark.common.platform.world.AbstractChunkInfo;
 import me.lucko.spark.common.platform.world.CountMap;
 import me.lucko.spark.common.platform.world.WorldInfoProvider;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.spongepowered.api.Server;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.EntityType;
@@ -35,6 +36,7 @@ import org.spongepowered.api.world.gamerule.GameRules;
 import org.spongepowered.api.world.server.ServerWorld;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -95,6 +97,17 @@ public class Sponge8WorldInfoProvider implements WorldInfoProvider {
         return data;
     }
 
+    @Override
+    public Collection<DataPackInfo> pollDataPacks() {
+        return this.server.packRepository().enabled().stream()
+                .map(pack -> new DataPackInfo(
+                        pack.id(),
+                        PlainTextComponentSerializer.plainText().serialize(pack.description()),
+                        "unknown"
+                ))
+                .collect(Collectors.toList());
+    }
+
     static final class Sponge7ChunkInfo extends AbstractChunkInfo<EntityType<?>> {
         private final CountMap<EntityType<?>> entityCounts;