Update to 24w10a

lucko · Mar 8, 2024 · a292dfd · a292dfd
1 parent aafc582
commit a292dfd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-    id 'fabric-loom' version '1.4-SNAPSHOT'
+    id 'fabric-loom' version '1.5-SNAPSHOT'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
@@ -28,9 +28,9 @@ configurations {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    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'
+    minecraft 'com.mojang:minecraft:24w10a'
+    mappings 'net.fabricmc:yarn:24w10a+build.4:v2'
+    modImplementation 'net.fabricmc:fabric-loader:0.15.7'
 
     Set<String> apiModules = [
             "fabric-api-base",

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
@@ -26,6 +26,7 @@
 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 UUID getUniqueId() {
 
     @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
@@ -54,7 +54,7 @@ private JsonElement datapackMetadata() {
             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
@@ -30,6 +30,7 @@
 
 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 @@ private static PlaceholderResult toResult(Component component) {
         }
 
         private static Text toText(Component component) {
-            return Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(component));
+            return Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(component), DynamicRegistryManager.EMPTY);
         }
     }