From 23306329af4d8abdad7a1f486fedcd19709639b1 Mon Sep 17 00:00:00 2001
From: Pierre Kisters <pierrekisters@gmail.com>
Date: Mon, 24 Aug 2020 02:08:46 +0200
Subject: [PATCH] use CommandRegistrationCallback

---
 .../main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java   | 7 +++----
 .../main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java   | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java b/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java
index e7ce36ed..5d8d89fa 100644
--- a/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java
+++ b/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/DynmapPlugin.java
@@ -4,6 +4,7 @@ import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
@@ -103,6 +104,7 @@ public class DynmapPlugin {
         plugin = this;
         // Fabric events persist between server instances
         ServerLifecycleEvents.SERVER_STARTING.register(this::serverStart);
+        CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> registerCommands(dispatcher));
         CustomServerLifecycleEvents.SERVER_STARTED_PRE_WORLD_LOAD.register(this::serverStarted);
         ServerLifecycleEvents.SERVER_STOPPING.register(this::serverStop);
     }
@@ -297,7 +299,6 @@ public class DynmapPlugin {
         this.server = server;
         this.fserver = new FabricServer(this, server);
         this.onEnable();
-        plugin.onStarting(server.getCommandManager().getDispatcher());
     }
 
     private void serverStarted(MinecraftServer server) {
@@ -481,9 +482,7 @@ public class DynmapPlugin {
     private DmarkerCommand dmarkerCmd;
     private DynmapExpCommand dynmapexpCmd;
 
-    public void onStarting(CommandDispatcher<ServerCommandSource> cd) {
-        /* Register command hander */
-        // TODO: Use CommandRegistrationCallback
+    public void registerCommands(CommandDispatcher<ServerCommandSource> cd) {
         dynmapCmd = new DynmapCommand(this);
         dmapCmd = new DmapCommand(this);
         dmarkerCmd = new DmarkerCommand(this);
diff --git a/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java b/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java
index e49fdee1..39edce5b 100644
--- a/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java
+++ b/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/DynmapPlugin.java
@@ -4,6 +4,7 @@ import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
@@ -103,6 +104,7 @@ public class DynmapPlugin {
         plugin = this;
         // Fabric events persist between server instances
         ServerLifecycleEvents.SERVER_STARTING.register(this::serverStart);
+        CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> registerCommands(dispatcher));
         CustomServerLifecycleEvents.SERVER_STARTED_PRE_WORLD_LOAD.register(this::serverStarted);
         ServerLifecycleEvents.SERVER_STOPPING.register(this::serverStop);
     }
@@ -283,7 +285,6 @@ public class DynmapPlugin {
         this.server = server;
         this.fserver = new FabricServer(this, server);
         this.onEnable();
-        plugin.onStarting(server.getCommandManager().getDispatcher());
     }
 
     private void serverStarted(MinecraftServer server) {
@@ -469,9 +470,7 @@ public class DynmapPlugin {
     private DmarkerCommand dmarkerCmd;
     private DynmapExpCommand dynmapexpCmd;
 
-    public void onStarting(CommandDispatcher<ServerCommandSource> cd) {
-        /* Register command hander */
-        // TODO: Use CommandRegistrationCallback
+    public void registerCommands(CommandDispatcher<ServerCommandSource> cd) {
         dynmapCmd = new DynmapCommand(this);
         dmapCmd = new DmapCommand(this);
         dmarkerCmd = new DmarkerCommand(this);