Merge pull request #284 from embeddedt/forge-1.7.10

Align 1.7.10 with master

3 files changed, 15 insertions, 12 deletions

diff --git a/spark-bungeecord/build.gradle b/spark-bungeecord/build.gradle
index ccea89d..885de55 100644
--- a/spark-bungeecord/build.gradle
+++ b/spark-bungeecord/build.gradle
@@ -4,13 +4,7 @@ plugins {
 
 dependencies {
     implementation project(':spark-common')
-    implementation('me.lucko:adventure-platform-bungeecord:4.9.4') {
-        exclude(module: 'adventure-api')
-        exclude(module: 'checker-qual')
-        exclude(module: 'annotations')
-        exclude(module: 'adventure-text-serializer-gson')
-        exclude(module: 'adventure-text-serializer-legacy')
-    }
+    implementation 'net.kyori:adventure-platform-bungeecord:4.2.0'
     compileOnly 'net.md-5:bungeecord-api:1.16-R0.4'
 }
 
@@ -27,12 +21,9 @@ processResources {
 shadowJar {
     archiveName = "spark-${project.pluginVersion}-bungeecord.jar"
 
-    relocate 'okio', 'me.lucko.spark.lib.okio'
-    relocate 'okhttp3', 'me.lucko.spark.lib.okhttp3'
     relocate 'net.kyori.adventure', 'me.lucko.spark.lib.adventure'
     relocate 'net.kyori.examination', 'me.lucko.spark.lib.adventure.examination'
     relocate 'net.bytebuddy', 'me.lucko.spark.lib.bytebuddy'
-    relocate 'org.tukaani.xz', 'me.lucko.spark.lib.xz'
     relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf'
     relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm'
     relocate 'one.profiler', 'me.lucko.spark.lib.asyncprofiler'
diff --git a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/BungeeCordClassSourceLookup.java b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/BungeeCordClassSourceLookup.java
index e601f87..2024d54 100644
--- a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/BungeeCordClassSourceLookup.java
+++ b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/BungeeCordClassSourceLookup.java
@@ -20,7 +20,7 @@
 
 package me.lucko.spark.bungeecord;
 
-import me.lucko.spark.common.util.ClassSourceLookup;
+import me.lucko.spark.common.sampler.source.ClassSourceLookup;
 
 import net.md_5.bungee.api.plugin.PluginDescription;
 
diff --git a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/BungeeCordSparkPlugin.java b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/BungeeCordSparkPlugin.java
index e259adc..71beddb 100644
--- a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/BungeeCordSparkPlugin.java
+++ b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/BungeeCordSparkPlugin.java
@@ -24,7 +24,8 @@ 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 net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.CommandSender;
@@ -33,6 +34,7 @@ import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.TabExecutor;
 
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.logging.Level;
 import java.util.stream.Stream;
 
@@ -92,6 +94,16 @@ public class BungeeCordSparkPlugin extends Plugin implements SparkPlugin {
     }
 
     @Override
+    public Collection<SourceMetadata> getKnownSources() {
+        return SourceMetadata.gather(
+                getProxy().getPluginManager().getPlugins(),
+                plugin -> plugin.getDescription().getName(),
+                plugin -> plugin.getDescription().getVersion(),
+                plugin -> plugin.getDescription().getAuthor()
+        );
+    }
+
+    @Override
     public PlayerPingProvider createPlayerPingProvider() {
         return new BungeeCordPlayerPingProvider(getProxy());
     }