From c94eba98639303d4663296349819fb6638a9ab9c Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sun, 7 Jul 2024 20:26:10 +0100
Subject: Include server brand in viewer payloads

---
 .../java/me/lucko/spark/neoforge/NeoForgePlatformInfo.java    | 11 +++++++++++
 .../main/java/me/lucko/spark/neoforge/NeoForgeSparkMod.java   |  1 -
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'spark-neoforge/src/main/java')

diff --git a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgePlatformInfo.java b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgePlatformInfo.java
index 18d88c3..6a2338f 100644
--- a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgePlatformInfo.java
+++ b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgePlatformInfo.java
@@ -21,7 +21,10 @@
 package me.lucko.spark.neoforge;
 
 import me.lucko.spark.common.platform.PlatformInfo;
+import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.ModList;
 import net.neoforged.fml.loading.FMLLoader;
+import net.neoforged.neoforgespi.language.IModInfo;
 
 public class NeoForgePlatformInfo implements PlatformInfo {
     private final Type type;
@@ -40,6 +43,14 @@ public class NeoForgePlatformInfo implements PlatformInfo {
         return "NeoForge";
     }
 
+    @Override
+    public String getBrand() {
+        return ModList.get().getModContainerById("neoforge")
+                .map(ModContainer::getModInfo)
+                .map(IModInfo::getDisplayName)
+                .orElse("NeoForge");
+    }
+
     @Override
     public String getVersion() {
         return FMLLoader.versionInfo().neoForgeVersion();
diff --git a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeSparkMod.java b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeSparkMod.java
index 1a03831..72436c9 100644
--- a/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeSparkMod.java
+++ b/spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeSparkMod.java
@@ -24,7 +24,6 @@ import me.lucko.spark.neoforge.plugin.NeoForgeClientSparkPlugin;
 import me.lucko.spark.neoforge.plugin.NeoForgeServerSparkPlugin;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.IExtensionPoint;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
-- 
cgit