Allow platforms to pass extra misc metadata to the viewer

4 files changed, 91 insertions, 2 deletions

diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricExtraMetadataProvider.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricExtraMetadataProvider.java
new file mode 100644
index 0000000..9eb2694
--- /dev/null
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricExtraMetadataProvider.java
@@ -0,0 +1,75 @@
+/*
+ * This file is part of spark.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.lucko.spark.fabric;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+import me.lucko.spark.common.platform.MetadataProvider;
+
+import net.minecraft.resource.ResourcePackManager;
+import net.minecraft.resource.ResourcePackProfile;
+import net.minecraft.resource.ResourcePackSource;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class FabricExtraMetadataProvider implements MetadataProvider {
+
+    private final ResourcePackManager resourcePackManager;
+
+    public FabricExtraMetadataProvider(ResourcePackManager resourcePackManager) {
+        this.resourcePackManager = resourcePackManager;
+    }
+
+    @Override
+    public Map<String, JsonElement> get() {
+        Map<String, JsonElement> metadata = new LinkedHashMap<>();
+        metadata.put("datapacks", datapackMetadata());
+        return metadata;
+    }
+
+    private JsonElement datapackMetadata() {
+        JsonObject datapacks = new JsonObject();
+        for (ResourcePackProfile profile : this.resourcePackManager.getEnabledProfiles()) {
+            JsonObject obj = new JsonObject();
+            obj.addProperty("name", profile.getDisplayName().getString());
+            obj.addProperty("description", profile.getDescription().getString());
+            obj.addProperty("source", resourcePackSource(profile.getSource()));
+            datapacks.add(profile.getName(), obj);
+        }
+        return datapacks;
+    }
+
+    private static String resourcePackSource(ResourcePackSource source) {
+        if (source == ResourcePackSource.PACK_SOURCE_NONE) {
+            return "none";
+        } else if (source == ResourcePackSource.PACK_SOURCE_BUILTIN) {
+            return "builtin";
+        } else if (source == ResourcePackSource.PACK_SOURCE_WORLD) {
+            return "world";
+        } else if (source == ResourcePackSource.PACK_SOURCE_SERVER) {
+            return "server";
+        } else {
+            return "unknown";
+        }
+    }
+}
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerConfigProvider.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerConfigProvider.java
index 18079d3..325a324 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerConfigProvider.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerConfigProvider.java
@@ -23,14 +23,14 @@ package me.lucko.spark.fabric;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
-import me.lucko.spark.common.platform.serverconfig.AbstractServerConfigProvider;
 import me.lucko.spark.common.platform.serverconfig.ConfigParser;
 import me.lucko.spark.common.platform.serverconfig.PropertiesConfigParser;
+import me.lucko.spark.common.platform.serverconfig.ServerConfigProvider;
 
 import java.util.Collection;
 import java.util.Map;
 
-public class FabricServerConfigProvider extends AbstractServerConfigProvider {
+public class FabricServerConfigProvider extends ServerConfigProvider {
 
     /** A map of provided files and their type */
     private static final Map<String, ConfigParser> FILES;
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java
index 0ef6620..faf4eef 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java
@@ -28,12 +28,14 @@ import com.mojang.brigadier.suggestion.SuggestionProvider;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 
+import me.lucko.spark.common.platform.MetadataProvider;
 import me.lucko.spark.common.platform.PlatformInfo;
 import me.lucko.spark.common.platform.world.WorldInfoProvider;
 import me.lucko.spark.common.sampler.ThreadDumper;
 import me.lucko.spark.common.tick.TickHook;
 import me.lucko.spark.common.tick.TickReporter;
 import me.lucko.spark.fabric.FabricCommandSender;
+import me.lucko.spark.fabric.FabricExtraMetadataProvider;
 import me.lucko.spark.fabric.FabricPlatformInfo;
 import me.lucko.spark.fabric.FabricSparkMod;
 import me.lucko.spark.fabric.FabricTickHook;
@@ -138,6 +140,11 @@ public class FabricClientSparkPlugin extends FabricSparkPlugin implements Comman
     }
 
     @Override
+    public MetadataProvider createExtraMetadataProvider() {
+        return new FabricExtraMetadataProvider(this.minecraft.getResourcePackManager());
+    }
+
+    @Override
     public WorldInfoProvider createWorldInfoProvider() {
         return new FabricWorldInfoProvider.Client(this.minecraft);
     }
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java
index f840f5e..c528e5b 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java
@@ -30,6 +30,7 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
+import me.lucko.spark.common.platform.MetadataProvider;
 import me.lucko.spark.common.platform.PlatformInfo;
 import me.lucko.spark.common.platform.serverconfig.ServerConfigProvider;
 import me.lucko.spark.common.platform.world.WorldInfoProvider;
@@ -37,6 +38,7 @@ import me.lucko.spark.common.sampler.ThreadDumper;
 import me.lucko.spark.common.tick.TickHook;
 import me.lucko.spark.common.tick.TickReporter;
 import me.lucko.spark.fabric.FabricCommandSender;
+import me.lucko.spark.fabric.FabricExtraMetadataProvider;
 import me.lucko.spark.fabric.FabricPlatformInfo;
 import me.lucko.spark.fabric.FabricPlayerPingProvider;
 import me.lucko.spark.fabric.FabricServerConfigProvider;
@@ -163,6 +165,11 @@ public class FabricServerSparkPlugin extends FabricSparkPlugin implements Comman
     }
 
     @Override
+    public MetadataProvider createExtraMetadataProvider() {
+        return new FabricExtraMetadataProvider(this.server.getDataPackManager());
+    }
+
+    @Override
     public WorldInfoProvider createWorldInfoProvider() {
         return new FabricWorldInfoProvider.Server(this.server);
     }