move commands out of configuration

patches/server/Add-Early-Warning-Feature-to-WatchDog.patch

@@ -29,9 +29,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          paperConfigurations.initializeGlobalConfiguration();
          paperConfigurations.initializeWorldDefaultsConfiguration();
 +        org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
-         io.papermc.paper.configuration.PaperConfigurations.registerCommands(this);
+         io.papermc.paper.command.PaperCommands.registerCommands(this);
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-         // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java

patches/server/Add-debug-for-sync-chunk-loads.patch

@@ -23,14 +23,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import com.google.common.base.Functions;
  import com.google.common.base.Joiner;
  import com.google.common.collect.ImmutableSet;
- import com.google.common.collect.Iterables;
+@@ -0,0 +0,0 @@ import com.google.common.collect.Lists;
- import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
+ import net.minecraft.core.Registry;
+ import net.minecraft.resources.ResourceLocation;
 +import com.google.gson.JsonObject;
 +import com.google.gson.internal.Streams;
 +import com.google.gson.stream.JsonWriter;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.server.MCUtil;
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.server.level.ChunkHolder;
  import net.minecraft.server.level.ServerChunkCache;

patches/server/Add-paper-mobcaps-and-paper-playermobcaps.patch

@@ -21,7 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import com.google.common.collect.ImmutableSet;
  import com.google.common.collect.Iterables;
  import com.google.common.collect.Lists;
-@@ -0,0 +0,0 @@ import com.google.common.collect.Maps;
+@@ -0,0 +0,0 @@ import net.minecraft.resources.ResourceLocation;
  import com.google.gson.JsonObject;
  import com.google.gson.internal.Streams;
  import com.google.gson.stream.JsonWriter;
@@ -31,18 +31,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.kyori.adventure.text.TextComponent;
 +import net.kyori.adventure.text.format.NamedTextColor;
 +import net.kyori.adventure.text.format.TextColor;
-+import net.minecraft.core.Registry;
- import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.MCUtil;
  import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.level.ChunkHolder;
+ import net.minecraft.server.level.ServerChunkCache;
 @@ -0,0 +0,0 @@ import net.minecraft.server.level.ServerLevel;
  import net.minecraft.server.level.ServerPlayer;
  import net.minecraft.server.level.ThreadedLevelLightEngine;
  import net.minecraft.world.entity.EntityType;
 +import net.minecraft.world.entity.MobCategory;
  import net.minecraft.world.level.ChunkPos;
- import net.minecraft.network.protocol.game.ClientboundLightUpdatePacket;
- import net.minecraft.resources.ResourceLocation;
  import net.minecraft.server.MCUtil;
 +import net.minecraft.world.level.NaturalSpawner;
  import org.apache.commons.lang3.tuple.MutablePair;

patches/server/Add-tick-times-API-and-mspt-command.patch

@@ -109,19 +109,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return text(DF.format(avg), avg >= 50 ? RED : avg >= 40 ? YELLOW : GREEN);
 +    }
 +}
-diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
+diff --git a/src/main/java/io/papermc/paper/command/PaperCommands.java b/src/main/java/io/papermc/paper/command/PaperCommands.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
+--- a/src/main/java/io/papermc/paper/command/PaperCommands.java
-+++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
++++ b/src/main/java/io/papermc/paper/command/PaperCommands.java
 @@ -0,0 +0,0 @@
- package io.papermc.paper.configuration;
+ package io.papermc.paper.command;
  
 +import com.destroystokyo.paper.MSPTCommand;
- import com.destroystokyo.paper.Metrics;
  import com.destroystokyo.paper.PaperCommand;
- import com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray;
+ import net.minecraft.server.MinecraftServer;
-@@ -0,0 +0,0 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+ import org.bukkit.command.Command;
-     private static boolean metricsStarted = false;
+@@ -0,0 +0,0 @@ public final class PaperCommands {
+     private static final Map<String, Command> COMMANDS = new HashMap<>();
      static {
          COMMANDS.put("paper", new PaperCommand("paper"));
 +        COMMANDS.put("mspt", new MSPTCommand("mspt"));

patches/server/Add-version-history-to-version-command.patch

@@ -205,9 +205,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         paperConfigurations.initializeGlobalConfiguration();
          paperConfigurations.initializeWorldDefaultsConfiguration();
-         io.papermc.paper.configuration.PaperConfigurations.registerCommands(this);
+         io.papermc.paper.command.PaperCommands.registerCommands(this);
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
 +        com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
          // Paper end
  

patches/server/Anti-Xray.patch

@@ -1020,10 +1020,9 @@ diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.ja
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -0,0 +0,0 @@ package io.papermc.paper.configuration;
+@@ -0,0 +0,0 @@
+ package io.papermc.paper.configuration;
  
- import com.destroystokyo.paper.Metrics;
- import com.destroystokyo.paper.PaperCommand;
 +import com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray;
  import com.google.common.base.Suppliers;
  import com.google.common.collect.Table;

patches/server/Chunk-debug-command.patch

@@ -35,11 +35,9 @@ diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -0,0 +0,0 @@ import com.google.common.collect.ImmutableSet;
+@@ -0,0 +0,0 @@ import com.google.common.collect.Maps;
- import com.google.common.collect.Iterables;
+ import net.minecraft.core.Registry;
- import com.google.common.collect.Lists;
+ import net.minecraft.resources.ResourceLocation;
- import com.google.common.collect.Maps;
--import net.minecraft.resources.ResourceLocation;
  import net.minecraft.server.MinecraftServer;
 +import net.minecraft.server.level.ChunkHolder;
  import net.minecraft.server.level.ServerChunkCache;
@@ -47,7 +45,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import net.minecraft.world.entity.Entity;
  import net.minecraft.world.entity.EntityType;
  import net.minecraft.world.level.ChunkPos;
-+import net.minecraft.resources.ResourceLocation;
 +import net.minecraft.server.MCUtil;
  import org.apache.commons.lang3.tuple.MutablePair;
  import org.apache.commons.lang3.tuple.Pair;

patches/server/Enhance-console-tab-completions-for-brigadier-comman.patch

@@ -215,9 +215,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          paperConfigurations.initializeWorldDefaultsConfiguration();
          org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
 +        thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized
-         io.papermc.paper.configuration.PaperConfigurations.registerCommands(this);
+         io.papermc.paper.command.PaperCommands.registerCommands(this);
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
-         // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java

patches/server/Fix-Light-Command.patch

@@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.minecraft.server.level.ThreadedLevelLightEngine;
  import net.minecraft.world.entity.EntityType;
  import net.minecraft.world.level.ChunkPos;
- import net.minecraft.resources.ResourceLocation;
+ import net.minecraft.server.MCUtil;
 @@ -0,0 +0,0 @@ import org.bukkit.command.Command;
  import org.bukkit.command.CommandSender;
  import org.bukkit.craftbukkit.CraftServer;

patches/server/Implement-methods-to-convert-between-Component-and-B.patch

@@ -46,8 +46,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-         thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized
+         io.papermc.paper.command.PaperCommands.registerCommands(this);
-         io.papermc.paper.configuration.PaperConfigurations.registerCommands(this);
+         com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
 +        io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
          // Paper end

patches/server/Paper-Metrics.patch

@@ -689,37 +689,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +}
-diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -0,0 +0,0 @@
+@@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
- package io.papermc.paper.configuration;
+         paperConfigurations.initializeGlobalConfiguration();
+         paperConfigurations.initializeWorldDefaultsConfiguration();
+         io.papermc.paper.command.PaperCommands.registerCommands(this);
++        com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
+         // Paper end
  
-+import com.destroystokyo.paper.Metrics;
+         this.setPvpAllowed(dedicatedserverproperties.pvp);
- import com.destroystokyo.paper.PaperCommand;
- import com.google.common.base.Suppliers;
- import com.google.common.collect.Table;
-@@ -0,0 +0,0 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
-     }
- 
-     private static final Map<String, Command> COMMANDS = new HashMap<>();
-+    private static boolean metricsStarted = false;
-     static {
-         COMMANDS.put("paper", new PaperCommand("paper"));
-     }
-@@ -0,0 +0,0 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
-         COMMANDS.forEach((s, command) -> {
-             server.server.getCommandMap().register(s, "Paper", command);
-         });
-+
-+        if (!metricsStarted) {
-+            Metrics.PaperMetrics.startMetrics();
-+            metricsStarted = true;
-+        }
-     }
- 
-     @Deprecated
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java

patches/server/Paper-command.patch

@@ -18,6 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import com.google.common.collect.Iterables;
 +import com.google.common.collect.Lists;
 +import com.google.common.collect.Maps;
++import net.minecraft.core.Registry;
 +import net.minecraft.resources.ResourceLocation;
 +import net.minecraft.server.MinecraftServer;
 +import net.minecraft.server.level.ServerChunkCache;
@@ -296,25 +297,49 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        Command.broadcastCommandMessage(sender, text("Paper config reload complete.", GREEN));
 +    }
 +}
-diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
+diff --git a/src/main/java/io/papermc/paper/command/PaperCommands.java b/src/main/java/io/papermc/paper/command/PaperCommands.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+new file mode 100644
---- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
-+++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/command/PaperCommands.java
 @@ -0,0 +0,0 @@
- package io.papermc.paper.configuration;
++package io.papermc.paper.command;
- 
++
 +import com.destroystokyo.paper.PaperCommand;
- import com.google.common.base.Suppliers;
++import net.minecraft.server.MinecraftServer;
- import com.google.common.collect.Table;
++import org.bukkit.command.Command;
- import com.mojang.logging.LogUtils;
++
-@@ -0,0 +0,0 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
++import java.util.HashMap;
- 
++import java.util.Map;
-     private static final Map<String, Command> COMMANDS = new HashMap<>();
++
-     static {
++public final class PaperCommands {
++
++    private PaperCommands() {
++    }
++
++    private static final Map<String, Command> COMMANDS = new HashMap<>();
++    static {
 +        COMMANDS.put("paper", new PaperCommand("paper"));
-     }
++    }
++
++    public static void registerCommands(final MinecraftServer server) {
++        COMMANDS.forEach((s, command) -> {
++            server.server.getCommandMap().register(s, "Paper", command);
++        });
++    }
++}
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+         // Paper start
+         paperConfigurations.initializeGlobalConfiguration();
+         paperConfigurations.initializeWorldDefaultsConfiguration();
++        io.papermc.paper.command.PaperCommands.registerCommands(this);
+         // Paper end
  
-     public static void registerCommands(final MinecraftServer server) {
+         this.setPvpAllowed(dedicatedserverproperties.pvp);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java

patches/server/Paper-config-files.patch

@@ -1192,16 +1192,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return Files.exists(legacyConfig) && Files.isRegularFile(legacyConfig);
 +    }
 +
-+    private static final Map<String, Command> COMMANDS = new HashMap<>();
-+    static {
-+    }
-+
-+    public static void registerCommands(final MinecraftServer server) {
-+        COMMANDS.forEach((s, command) -> {
-+            server.server.getCommandMap().register(s, "Paper", command);
-+        });
-+    }
-+
 +    @Deprecated
 +    public YamlConfiguration createLegacyObject(final MinecraftServer server) {
 +        YamlConfiguration global = YamlConfiguration.loadConfiguration(this.globalFolder.resolve(this.globalConfigFileName).toFile());
@@ -4016,7 +4006,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper start
 +        paperConfigurations.initializeGlobalConfiguration();
 +        paperConfigurations.initializeWorldDefaultsConfiguration();
-+        io.papermc.paper.configuration.PaperConfigurations.registerCommands(this);
 +        // Paper end
  
          this.setPvpAllowed(dedicatedserverproperties.pvp);

patches/server/Paper-dumpitem-command.patch

@@ -9,14 +9,6 @@ diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -0,0 +0,0 @@ import net.minecraft.server.level.ServerPlayer;
- import net.minecraft.server.level.ThreadedLevelLightEngine;
- import net.minecraft.world.entity.EntityType;
- import net.minecraft.world.level.ChunkPos;
-+import net.minecraft.network.protocol.game.ClientboundLightUpdatePacket;
- import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.MCUtil;
- import org.apache.commons.lang3.tuple.MutablePair;
 @@ -0,0 +0,0 @@ import org.bukkit.command.CommandSender;
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.CraftWorld;