Include datapacks info in sampler proto

2 files changed, 17 insertions, 2 deletions

diff --git a/spark-paper/src/main/java/me/lucko/spark/paper/PaperSparkPlugin.java b/spark-paper/src/main/java/me/lucko/spark/paper/PaperSparkPlugin.java
index d70d5db..73694d2 100644
--- a/spark-paper/src/main/java/me/lucko/spark/paper/PaperSparkPlugin.java
+++ b/spark-paper/src/main/java/me/lucko/spark/paper/PaperSparkPlugin.java
@@ -185,7 +185,8 @@ public class PaperSparkPlugin implements PaperSparkModule, SparkPlugin {
                 Arrays.asList(this.server.getPluginManager().getPlugins()),
                 Plugin::getName,
                 plugin -> plugin.getPluginMeta().getVersion(),
-                plugin -> String.join(", ", plugin.getPluginMeta().getAuthors())
+                plugin -> String.join(", ", plugin.getPluginMeta().getAuthors()),
+                plugin -> plugin.getPluginMeta().getDescription()
         );
     }
 
@@ -209,7 +210,6 @@ public class PaperSparkPlugin implements PaperSparkModule, SparkPlugin {
         return PaperPlatformInfo.INSTANCE;
     }
 
-    // @SuppressWarnings("DataFlowIssue") // null plugin
     @Override
     public void registerApi(Spark api) {
         // this.server.getServicesManager().register(Spark.class, api, null, ServicePriority.Normal);
diff --git a/spark-paper/src/main/java/me/lucko/spark/paper/PaperWorldInfoProvider.java b/spark-paper/src/main/java/me/lucko/spark/paper/PaperWorldInfoProvider.java
index feda9a0..1729a95 100644
--- a/spark-paper/src/main/java/me/lucko/spark/paper/PaperWorldInfoProvider.java
+++ b/spark-paper/src/main/java/me/lucko/spark/paper/PaperWorldInfoProvider.java
@@ -31,8 +31,11 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 public class PaperWorldInfoProvider implements WorldInfoProvider {
     private final Server server;
@@ -104,6 +107,18 @@ public class PaperWorldInfoProvider implements WorldInfoProvider {
         return data;
     }
 
+    @SuppressWarnings("removal")
+    @Override
+    public Collection<DataPackInfo> pollDataPacks() {
+        return this.server.getDataPackManager().getDataPacks().stream()
+                .map(pack -> new DataPackInfo(
+                        pack.getTitle(),
+                        pack.getDescription(),
+                        pack.getSource().name().toLowerCase(Locale.ROOT).replace("_", "")
+                ))
+                .collect(Collectors.toList());
+    }
+
     static final class PaperChunkInfo extends AbstractChunkInfo<EntityType> {
         private final CountMap<EntityType> entityCounts;