Added removing commands with usign commands what written on java.

MairwunNx · MairwunNx · commit 3d02f0fcf3e9 · 2020-01-18T19:42:44.000+03:00
Signed-off-by: Pavel Erokhin (MairwunNx) &lt;MairwunNx@gmail.com&gt;
diff --git a/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/ExecuteCommand.java b/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/ExecuteCommand.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.Lists;
 import com.mairwunnx.projectessentials.core.JavaCompatibility;
 import com.mairwunnx.projectessentials.core.helpers.ModErrorsHelperKt;
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.ResultConsumer;
@@ -69,6 +70,7 @@ public class ExecuteCommand {
 
     public static void register(CommandDispatcher<CommandSource> dispatcher) {
         logger.info("Replacing `/execute` vanilla command");
+        NativeCommandUtils.removeCommand("execute");
 
         LiteralCommandNode<CommandSource> literalcommandnode = dispatcher.register(Commands.literal("execute"));
         dispatcher.register(Commands.literal("execute").then(Commands.literal("run").redirect(dispatcher.getRoot())).then(makeIfCommand(literalcommandnode, Commands.literal("if"), true)).then(makeIfCommand(literalcommandnode, Commands.literal("unless"), false)).then(Commands.literal("as").then(Commands.argument("targets", EntityArgument.entities()).fork(literalcommandnode, (p_198385_0_) -> {
diff --git a/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/ForceLoadCommand.java b/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/ForceLoadCommand.java
@@ -3,6 +3,7 @@
 import com.google.common.base.Joiner;
 import com.mairwunnx.projectessentials.core.JavaCompatibility;
 import com.mairwunnx.projectessentials.core.helpers.ModErrorsHelperKt;
+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;
@@ -35,6 +36,7 @@ public class ForceLoadCommand {
 
     public static void register(CommandDispatcher<CommandSource> dispatcher) {
         logger.info("Replacing `/forceload` vanilla command");
+        NativeCommandUtils.removeCommand("forceload");
 
         dispatcher.register(Commands.literal("forceload").then(Commands.literal("add").then(Commands.argument("from", ColumnPosArgument.columnPos()).executes((p_212711_0_) -> {
             return func_212719_a(p_212711_0_.getSource(), ColumnPosArgument.func_218101_a(p_212711_0_, "from"), ColumnPosArgument.func_218101_a(p_212711_0_, "from"), true);
diff --git a/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/LootCommand.java b/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/LootCommand.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.Lists;
 import com.mairwunnx.projectessentials.core.JavaCompatibility;
 import com.mairwunnx.projectessentials.core.helpers.ModErrorsHelperKt;
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
@@ -56,6 +57,7 @@ public class LootCommand {
 
     public static void register(CommandDispatcher<CommandSource> p_218886_0_) {
         logger.info("Replacing `/loot` vanilla command");
+        NativeCommandUtils.removeCommand("loot");
 
         p_218886_0_.register(func_218868_a(Commands.literal("loot"), (p_218880_0_, p_218880_1_) -> {
             return p_218880_0_.then(Commands.literal("fish").then(Commands.argument("loot_table", ResourceLocationArgument.resourceLocation()).suggests(field_218904_a).then(Commands.argument("pos", BlockPosArgument.blockPos()).executes((p_218899_1_) -> {
diff --git a/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/ScoreboardCommand.java b/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/ScoreboardCommand.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.Lists;
 import com.mairwunnx.projectessentials.core.JavaCompatibility;
 import com.mairwunnx.projectessentials.core.helpers.ModErrorsHelperKt;
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
@@ -48,6 +49,7 @@ public class ScoreboardCommand {
 
     public static void register(CommandDispatcher<CommandSource> dispatcher) {
         logger.info("Replacing `/scoreboard` vanilla command");
+        NativeCommandUtils.removeCommand("scoreboard");
 
         dispatcher.register(Commands.literal("scoreboard").then(Commands.literal("objectives").then(Commands.literal("list").executes((p_198640_0_) -> {
             return listObjectives(p_198640_0_.getSource());
diff --git a/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/SpreadPlayersCommand.java b/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/SpreadPlayersCommand.java
@@ -4,6 +4,7 @@
 import com.google.common.collect.Sets;
 import com.mairwunnx.projectessentials.core.JavaCompatibility;
 import com.mairwunnx.projectessentials.core.helpers.ModErrorsHelperKt;
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.FloatArgumentType;
@@ -42,6 +43,8 @@ public class SpreadPlayersCommand {
 
     public static void register(CommandDispatcher<CommandSource> dispatcher) {
         logger.info("Replacing `/spreadplayers` vanilla command");
+        NativeCommandUtils.removeCommand("spreadplayers");
+
         dispatcher.register(Commands.literal("spreadplayers").then(Commands.argument("center", Vec2Argument.vec2()).then(Commands.argument("spreadDistance", FloatArgumentType.floatArg(0.0F)).then(Commands.argument("maxRange", FloatArgumentType.floatArg(1.0F)).then(Commands.argument("respectTeams", BoolArgumentType.bool()).then(Commands.argument("targets", EntityArgument.entities()).executes((p_198718_0_) -> {
             return spreadPlayers(p_198718_0_.getSource(), Vec2Argument.getVec2f(p_198718_0_, "center"), FloatArgumentType.getFloat(p_198718_0_, "spreadDistance"), FloatArgumentType.getFloat(p_198718_0_, "maxRange"), BoolArgumentType.getBool(p_198718_0_, "respectTeams"), EntityArgument.getEntities(p_198718_0_, "targets"));
         })))))));
diff --git a/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/TeamCommand.java b/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/TeamCommand.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.Lists;
 import com.mairwunnx.projectessentials.core.JavaCompatibility;
 import com.mairwunnx.projectessentials.core.helpers.ModErrorsHelperKt;
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
@@ -46,6 +47,7 @@ public class TeamCommand {
 
     public static void register(CommandDispatcher<CommandSource> dispatcher) {
         logger.info("Replacing `/team` vanilla command");
+        NativeCommandUtils.removeCommand("team");
 
         dispatcher.register(Commands.literal("team").then(Commands.literal("list").executes((p_198760_0_) -> {
             return listTeams(p_198760_0_.getSource());
diff --git a/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/TeleportCommand.java b/src/main/java/com/mairwunnx/projectessentials/core/vanilla/commands/TeleportCommand.java
@@ -2,6 +2,7 @@
 
 import com.mairwunnx.projectessentials.core.JavaCompatibility;
 import com.mairwunnx.projectessentials.core.helpers.ModErrorsHelperKt;
+import com.mairwunnx.projectessentials.core.vanilla.utils.NativeCommandUtils;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.tree.LiteralCommandNode;
@@ -32,6 +33,7 @@ public class TeleportCommand {
 
     public static void register(CommandDispatcher<CommandSource> dispatcher) {
         logger.info("Replacing `/teleport` vanilla command");
+        NativeCommandUtils.removeCommand("teleport");
 
         LiteralCommandNode<CommandSource> literalcommandnode = dispatcher.register(Commands.literal("teleport").then(Commands.argument("targets", EntityArgument.entities()).then(Commands.argument("location", Vec3Argument.vec3()).executes((p_198807_0_) -> {
             return teleportToPos(p_198807_0_.getSource(), EntityArgument.getEntities(p_198807_0_, "targets"), p_198807_0_.getSource().getWorld(), Vec3Argument.getLocation(p_198807_0_, "location"), null, null);
diff --git a/src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/utils/NativeCommandUtils.kt b/src/main/kotlin/com/mairwunnx/projectessentials/core/vanilla/utils/NativeCommandUtils.kt
@@ -21,7 +21,8 @@ internal object NativeCommandUtils {
         registeredCommands = root.get(dispatcher) as RootCommandNode<CommandSource>
     }
 
-    internal fun removeCommand(commandName: String) {
+    @JvmStatic
+    fun removeCommand(commandName: String) {
         logger.info("Removing native vanilla command /$commandName")
         registeredCommands.children.removeIf {
             it.name == commandName

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ internal object NativeCommandUtils {`
`21`	`21`	`registeredCommands = root.get(dispatcher) as RootCommandNode<CommandSource>`
`22`	`22`	`}`
`23`	`23`
`24`		`- internal fun removeCommand(commandName: String) {`
	`24`	`+ @JvmStatic`
	`25`	`+ fun removeCommand(commandName: String) {`
`25`	`26`	`logger.info("Removing native vanilla command /$commandName")`
`26`	`27`	`registeredCommands.children.removeIf {`
`27`	`28`	`it.name == commandName`