Merge pull request #284 from embeddedt/forge-1.7.10

Align 1.7.10 with master

2 files changed, 15 insertions, 3 deletions

diff --git a/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4ClassSourceLookup.java b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4ClassSourceLookup.java
index c5c22c3..84840d2 100644
--- a/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4ClassSourceLookup.java
+++ b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4ClassSourceLookup.java
@@ -23,7 +23,7 @@ package me.lucko.spark.velocity;
 import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.plugin.PluginManager;
 
-import me.lucko.spark.common.util.ClassSourceLookup;
+import me.lucko.spark.common.sampler.source.ClassSourceLookup;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -48,7 +48,7 @@ public class Velocity4ClassSourceLookup extends ClassSourceLookup.ByClassLoader
         for (PluginContainer plugin : pluginManager.plugins()) {
             Object instance = plugin.instance();
             if (instance != null) {
-                this.classLoadersToPlugin.put(instance.getClass().getClassLoader(), plugin.description().name());
+                this.classLoadersToPlugin.put(instance.getClass().getClassLoader(), plugin.description().id());
             }
         }
     }
diff --git a/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4SparkPlugin.java b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4SparkPlugin.java
index 0c57689..b638246 100644
--- a/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4SparkPlugin.java
+++ b/spark-velocity4/src/main/java/me/lucko/spark/velocity/Velocity4SparkPlugin.java
@@ -34,11 +34,13 @@ import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.SparkPlugin;
 import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
 import me.lucko.spark.common.platform.PlatformInfo;
-import me.lucko.spark.common.util.ClassSourceLookup;
+import me.lucko.spark.common.sampler.source.ClassSourceLookup;
+import me.lucko.spark.common.sampler.source.SourceMetadata;
 
 import org.slf4j.Logger;
 
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.stream.Stream;
@@ -134,6 +136,16 @@ public class Velocity4SparkPlugin implements SparkPlugin, SimpleCommand {
     }
 
     @Override
+    public Collection<SourceMetadata> getKnownSources() {
+        return SourceMetadata.gather(
+                this.proxy.pluginManager().plugins(),
+                plugin -> plugin.description().id(),
+                plugin -> plugin.description().version(),
+                plugin -> String.join(", ", plugin.description().authors())
+        );
+    }
+
+    @Override
     public PlayerPingProvider createPlayerPingProvider() {
         return new Velocity4PlayerPingProvider(this.proxy);
     }