From 014cfe32accf2f3cb2d42e49337809dbb32c2e2d Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Tue, 14 Jul 2020 18:35:53 +0100
Subject: Update spark-fabric to 1.16

---
 spark-fabric/build.gradle                                         | 8 ++++----
 .../me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spark-fabric/build.gradle b/spark-fabric/build.gradle
index 7cac2f1..2b62343 100644
--- a/spark-fabric/build.gradle
+++ b/spark-fabric/build.gradle
@@ -12,10 +12,10 @@ configurations {
 
 dependencies {
     // https://modmuss50.me/fabric.html
-    minecraft "com.mojang:minecraft:1.15.2"
-    mappings "net.fabricmc:yarn:1.15.2+build.7:v2"
-    modCompile "net.fabricmc:fabric-loader:0.7.6+build.179"
-    modCompile "net.fabricmc.fabric-api:fabric-api:0.4.29+build.290-1.15"
+    minecraft "com.mojang:minecraft:1.16"
+    mappings "net.fabricmc:yarn:1.16+build.1:v2"
+    modCompile "net.fabricmc:fabric-loader:0.8.8+build.202"
+    modCompile "net.fabricmc.fabric-api:fabric-api:0.13.1+build.370-1.16"
 
     shade project(':spark-common')
 }
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 6e8e9c1..7d7c474 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
@@ -32,7 +32,7 @@ import me.lucko.spark.fabric.FabricCommandSender;
 import me.lucko.spark.fabric.FabricPlatformInfo;
 import me.lucko.spark.fabric.FabricSparkMod;
 import me.lucko.spark.fabric.FabricTickHook;
-import net.fabricmc.fabric.api.registry.CommandRegistry;
+import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandOutput;
@@ -48,7 +48,7 @@ public class FabricServerSparkPlugin extends FabricSparkPlugin implements Comman
     public static void register(FabricSparkMod mod, MinecraftServer server) {
         FabricServerSparkPlugin plugin = new FabricServerSparkPlugin(mod, server);
         registerCommands(server.getCommandManager().getDispatcher(), plugin, plugin, "spark");
-        CommandRegistry.INSTANCE.register(false, dispatcher -> registerCommands(dispatcher, plugin, plugin, "spark"));
+        CommandRegistrationCallback.EVENT.register((dispatcher, isDedicated) -> registerCommands(dispatcher, plugin, plugin, "spark"));
     }
 
     private final MinecraftServer server;
-- 
cgit