Added NativeCommandUtils with ability to remove command.

Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>

Author: MairwunNx

src/main/kotlin/com/mairwunnx/projectessentials/core/EntryPoint.kt

@@ -2,6 +2,7 @@ package com.mairwunnx.projectessentials.core
 
 import com.mairwunnx.projectessentials.core.configuration.commands.CommandsConfigurationUtils
 import com.mairwunnx.projectessentials.core.vanilla.commands.*
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils
 import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
 import com.mojang.brigadier.CommandDispatcher
 import net.minecraft.command.CommandSource
@@ -67,6 +68,9 @@ internal class EntryPoint : EssBase() {
     @SubscribeEvent
     internal fun onServerStarting(it: FMLServerStartingEvent) {
         if (CommandsConfigurationUtils.getConfig().nativeReplace) {
+            NativeCommandUtils.assignDispatcherRoot(
+                it.server.commandManager.dispatcher
+            )
             registerNativeCommands(
                 it.server.commandManager.dispatcher,
                 it.server.isDedicatedServer

src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/AdvancementCommand.kt

@@ -12,6 +12,7 @@ import com.mairwunnx.projectessentials.core.EntryPoint
 import com.mairwunnx.projectessentials.core.EntryPoint.Companion.hasPermission
 import com.mairwunnx.projectessentials.core.configuration.commands.CommandsConfigurationUtils
 import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.StringArgumentType
 import com.mojang.brigadier.context.CommandContext
@@ -28,6 +29,7 @@ import net.minecraft.entity.player.ServerPlayerEntity
 import net.minecraft.util.text.TranslationTextComponent
 import org.apache.logging.log4j.LogManager
 
+
 internal object AdvancementCommand {
     private val logger = LogManager.getLogger()
     private var aliases =
@@ -50,6 +52,7 @@ internal object AdvancementCommand {
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
         logger.info("Replacing `/advancement` vanilla command")
+        NativeCommandUtils.removeCommand("advancement")
         tryAssignAliases()
 
         aliases.forEach { command ->

src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/BanCommand.kt

@@ -10,6 +10,7 @@ import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentials.core.EntryPoint
 import com.mairwunnx.projectessentials.core.configuration.commands.CommandsConfigurationUtils
 import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils
 import com.mojang.authlib.GameProfile
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.exceptions.CommandSyntaxException
@@ -42,6 +43,7 @@ internal object BanCommand {
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
         logger.info("Replacing `/ban` vanilla command")
+        NativeCommandUtils.removeCommand("ban")
         tryAssignAliases()
 
         aliases.forEach { command ->

src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/BanIpCommand.kt

@@ -10,6 +10,7 @@ import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentials.core.EntryPoint
 import com.mairwunnx.projectessentials.core.configuration.commands.CommandsConfigurationUtils
 import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.StringArgumentType
 import com.mojang.brigadier.exceptions.CommandSyntaxException
@@ -47,6 +48,7 @@ internal object BanIpCommand {
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
         logger.info("Replacing `/ban-ip` vanilla command")
+        NativeCommandUtils.removeCommand("ban-ip")
         tryAssignAliases()
 
         aliases.forEach { command ->

src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/BanListCommand.kt

@@ -12,6 +12,7 @@ import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentials.core.EntryPoint
 import com.mairwunnx.projectessentials.core.configuration.commands.CommandsConfigurationUtils
 import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.exceptions.CommandSyntaxException
 import net.minecraft.command.CommandException
@@ -33,6 +34,7 @@ internal object BanListCommand {
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
         logger.info("Replacing `/banlist` vanilla command")
+        NativeCommandUtils.removeCommand("banlist")
         tryAssignAliases()
 
         aliases.forEach { command ->

src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/BossBarCommand.kt

@@ -10,6 +10,7 @@ import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentials.core.EntryPoint
 import com.mairwunnx.projectessentials.core.configuration.commands.CommandsConfigurationUtils
 import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.BoolArgumentType
 import com.mojang.brigadier.arguments.IntegerArgumentType
@@ -96,6 +97,7 @@ internal object BossBarCommand {
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
         logger.info("Replacing `/bossbar` vanilla command")
+        NativeCommandUtils.removeCommand("bossbar")
         tryAssignAliases()
 
         aliases.forEach { command ->

src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/ClearCommand.kt

@@ -10,6 +10,7 @@ import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentials.core.EntryPoint
 import com.mairwunnx.projectessentials.core.configuration.commands.CommandsConfigurationUtils
 import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.IntegerArgumentType
 import com.mojang.brigadier.exceptions.CommandSyntaxException
@@ -56,6 +57,7 @@ internal object ClearCommand {
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
         logger.info("Replacing `/clear` vanilla command")
+        NativeCommandUtils.removeCommand("clear")
         tryAssignAliases()
 
         aliases.forEach { command ->

src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/CloneCommand.kt

@@ -11,6 +11,7 @@ import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentials.core.EntryPoint
 import com.mairwunnx.projectessentials.core.configuration.commands.CommandsConfigurationUtils
 import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.exceptions.CommandSyntaxException
 import com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType
@@ -66,6 +67,7 @@ internal object CloneCommand {
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
         logger.info("Replacing `/clone` vanilla command")
+        NativeCommandUtils.removeCommand("clone")
         tryAssignAliases()
 
         aliases.forEach { command ->

src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/DataPackCommand.kt

@@ -13,6 +13,7 @@ import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentials.core.EntryPoint
 import com.mairwunnx.projectessentials.core.configuration.commands.CommandsConfigurationUtils
 import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.StringArgumentType
 import com.mojang.brigadier.context.CommandContext
@@ -86,6 +87,7 @@ internal object DataPackCommand {
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
         logger.info("Replacing `/datapack` vanilla command")
+        NativeCommandUtils.removeCommand("datapack")
         tryAssignAliases()
 
         aliases.forEach { command ->

src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/commands/DeOpCommand.kt

@@ -10,6 +10,7 @@ import com.mairwunnx.projectessentials.cooldown.essentials.CommandsAliases
 import com.mairwunnx.projectessentials.core.EntryPoint
 import com.mairwunnx.projectessentials.core.configuration.commands.CommandsConfigurationUtils
 import com.mairwunnx.projectessentials.core.helpers.PERMISSION_LEVEL
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils
 import com.mairwunnx.projectessentials.permissions.permissions.PermissionsAPI
 import com.mojang.authlib.GameProfile
 import com.mojang.brigadier.CommandDispatcher
@@ -38,6 +39,7 @@ internal object DeOpCommand {
     }
 
     fun register(dispatcher: CommandDispatcher<CommandSource>) {
+        NativeCommandUtils.removeCommand("deop")
         logger.info("Replacing `/deop` vanilla command")
         tryAssignAliases()