diff options
5 files changed, 9 insertions, 9 deletions
diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle index 56e314b..baf4ea9 100644 --- a/spark-fabric/build.gradle +++ b/spark-fabric/build.gradle @@ -28,9 +28,9 @@ configurations { dependencies { // https://modmuss50.me/fabric.html - minecraft 'com.mojang:minecraft:1.20.3' - mappings 'net.fabricmc:yarn:1.20.3+build.1:v2' - modImplementation 'net.fabricmc:fabric-loader:0.15.0' + minecraft 'com.mojang:minecraft:1.20.4' + mappings 'net.fabricmc:yarn:1.20.4+build.1:v2' + modImplementation 'net.fabricmc:fabric-loader:0.15.1' Set<String> apiModules = [ "fabric-api-base", @@ -40,7 +40,7 @@ dependencies { // Add each module as a dependency apiModules.forEach { - modImplementation(fabricApi.module(it, '0.91.1+1.20.3')) + modImplementation(fabricApi.module(it, '0.91.2+1.20.4')) } include(modImplementation('me.lucko:fabric-permissions-api:0.2-SNAPSHOT')) 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 c79b9e9..ca7b893 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 @@ -64,7 +64,7 @@ public class FabricCommandSender extends AbstractCommandSender<CommandOutput> { @Override public void sendMessage(Component message) { - Text component = Text.Serialization.fromJson(GsonComponentSerializer.gson().serialize(message)); + Text component = Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(message)); super.delegate.sendMessage(component); } 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 23683c3..dc95bf4 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 @@ -60,7 +60,7 @@ public enum SparkFabricPlaceholderApi { } private static Text toText(Component component) { - return Text.Serialization.fromJson(GsonComponentSerializer.gson().serialize(component)); + return Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(component)); } } diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle index 120def3..5f35322 100644 --- a/spark-forge/build.gradle +++ b/spark-forge/build.gradle @@ -9,7 +9,7 @@ tasks.withType(JavaCompile) { } minecraft { - mappings channel: 'official', version: '1.20.2' + mappings channel: 'official', version: '1.20.4' accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') } @@ -19,7 +19,7 @@ configurations { } dependencies { - minecraft 'net.minecraftforge:forge:1.20.2-48.0.1' + minecraft 'net.minecraftforge:forge:1.20.4-49.0.3' shade project(':spark-common') } diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandSender.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandSender.java index f3b746d..9353668 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandSender.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeCommandSender.java @@ -66,7 +66,7 @@ public class ForgeCommandSender extends AbstractCommandSender<CommandSource> { @Override public void sendMessage(Component message) { - MutableComponent component = Serializer.fromJson(GsonComponentSerializer.gson().serialize(message)); + MutableComponent component = Serializer.fromJson(GsonComponentSerializer.gson().serializeToTree(message)); Objects.requireNonNull(component, "component"); super.delegate.sendSystemMessage(component); } |