Include server brand in viewer payloads

7 files changed, 7 insertions, 13 deletions

diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8ClassSourceLookup.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8ClassSourceLookup.java
index 7f02e75..52218e5 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8ClassSourceLookup.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8ClassSourceLookup.java
@@ -21,9 +21,7 @@
 package me.lucko.spark.sponge;
 
 import com.google.common.collect.ImmutableMap;
-
 import me.lucko.spark.common.sampler.source.ClassSourceLookup;
-
 import org.spongepowered.api.Game;
 import org.spongepowered.plugin.PluginCandidate;
 import org.spongepowered.plugin.PluginContainer;
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java
index e7878dc..8bf67bd 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java
@@ -21,11 +21,9 @@
 package me.lucko.spark.sponge;
 
 import me.lucko.spark.common.command.sender.AbstractCommandSender;
-
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.identity.Identity;
 import net.kyori.adventure.text.Component;
-
 import org.spongepowered.api.command.CommandCause;
 import org.spongepowered.api.service.permission.Subject;
 import org.spongepowered.api.util.Identifiable;
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlatformInfo.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlatformInfo.java
index 9589ddf..840a686 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlatformInfo.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlatformInfo.java
@@ -21,9 +21,9 @@
 package me.lucko.spark.sponge;
 
 import me.lucko.spark.common.platform.PlatformInfo;
-
 import org.spongepowered.api.Game;
 import org.spongepowered.api.Platform;
+import org.spongepowered.plugin.metadata.PluginMetadata;
 
 public class Sponge8PlatformInfo implements PlatformInfo {
     private final Game game;
@@ -43,6 +43,12 @@ public class Sponge8PlatformInfo implements PlatformInfo {
     }
 
     @Override
+    public String getBrand() {
+        PluginMetadata brandMetadata = this.game.platform().container(Platform.Component.IMPLEMENTATION).metadata();
+        return brandMetadata.name().orElseGet(brandMetadata::id);
+    }
+
+    @Override
     public String getVersion() {
         return this.game.platform().container(Platform.Component.IMPLEMENTATION).metadata().version().toString();
     }
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlayerPingProvider.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlayerPingProvider.java
index 2bcaf6a..e908d0d 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlayerPingProvider.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlayerPingProvider.java
@@ -21,9 +21,7 @@
 package me.lucko.spark.sponge;
 
 import com.google.common.collect.ImmutableMap;
-
 import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
-
 import org.spongepowered.api.Server;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
 
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 5faf843..8e875ec 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
@@ -22,7 +22,6 @@ package me.lucko.spark.sponge;
 
 import com.google.common.base.Suppliers;
 import com.google.inject.Inject;
-
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.SparkPlugin;
 import me.lucko.spark.common.command.sender.CommandSender;
@@ -33,9 +32,7 @@ import me.lucko.spark.common.sampler.ThreadDumper;
 import me.lucko.spark.common.sampler.source.ClassSourceLookup;
 import me.lucko.spark.common.sampler.source.SourceMetadata;
 import me.lucko.spark.common.tick.TickHook;
-
 import net.kyori.adventure.text.Component;
-
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.api.Game;
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8TickHook.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8TickHook.java
index 6db51b8..6502da2 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8TickHook.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8TickHook.java
@@ -22,7 +22,6 @@ package me.lucko.spark.sponge;
 
 import me.lucko.spark.common.tick.AbstractTickHook;
 import me.lucko.spark.common.tick.TickHook;
-
 import org.spongepowered.api.Game;
 import org.spongepowered.api.scheduler.ScheduledTask;
 import org.spongepowered.api.scheduler.Task;
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 69b4515..fadd629 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
@@ -22,11 +22,9 @@ package me.lucko.spark.sponge;
 
 import com.google.common.collect.Iterables;
 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 org.spongepowered.api.Server;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.EntityType;