From 8af5bc5b30a18b1841f5590dc18ce07a2130d165 Mon Sep 17 00:00:00 2001 From: Drex Date: Tue, 23 Apr 2024 22:09:09 +0200 Subject: Update spark-fabric to MC 1.20.5 (#391) --- .../src/main/java/me/lucko/spark/fabric/FabricCommandSender.java | 3 ++- .../main/java/me/lucko/spark/fabric/FabricExtraMetadataProvider.java | 2 +- .../me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'spark-fabric/src/main/java') diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java index ca7b893..7da8996 100644 --- a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java +++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java @@ -26,6 +26,7 @@ import me.lucko.spark.fabric.plugin.FabricSparkPlugin; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.CommandOutput; import net.minecraft.server.rcon.RconCommandOutput; @@ -64,7 +65,7 @@ public class FabricCommandSender extends AbstractCommandSender { @Override public void sendMessage(Component message) { - Text component = Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(message)); + Text component = Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(message), DynamicRegistryManager.EMPTY); super.delegate.sendMessage(component); } 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 index 22794c2..91797bb 100644 --- a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricExtraMetadataProvider.java +++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricExtraMetadataProvider.java @@ -54,7 +54,7 @@ public class FabricExtraMetadataProvider implements MetadataProvider { obj.addProperty("name", profile.getDisplayName().getString()); obj.addProperty("description", profile.getDescription().getString()); obj.addProperty("source", resourcePackSource(profile.getSource())); - datapacks.add(profile.getName(), obj); + datapacks.add(profile.getId(), obj); } return datapacks; } diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java index dc95bf4..dc4321d 100644 --- a/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java +++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java @@ -30,6 +30,7 @@ import me.lucko.spark.common.util.SparkPlaceholder; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; +import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -60,7 +61,7 @@ public enum SparkFabricPlaceholderApi { } private static Text toText(Component component) { - return Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(component)); + return Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(component), DynamicRegistryManager.EMPTY); } } -- cgit