Permit mods registering commands with a namespace

Author: aromaa

forge/src/mixins/java/org/spongepowered/forge/mixin/core/commands/CommandsMixin_Forge.java

@@ -40,8 +40,11 @@
 import org.spongepowered.api.service.permission.Subject;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.common.bridge.commands.CommandSourceStackBridge;
+import org.spongepowered.common.bridge.commands.CommandsBridge;
 import org.spongepowered.common.command.manager.SpongeCommandManager;
 import org.spongepowered.common.event.tracking.PhaseTracker;
 
@@ -52,7 +55,7 @@
 import java.util.function.Function;
 
 @Mixin(Commands.class)
-public abstract class CommandsMixin_Forge {
+public abstract class CommandsMixin_Forge implements CommandsBridge {
 
     private WeakHashMap<ServerPlayer, Map<CommandNode<CommandSourceStack>, List<CommandNode<SharedSuggestionProvider>>>> impl$playerNodeCache;
     private SpongeCommandManager impl$commandManager;
@@ -98,4 +101,8 @@ public abstract class CommandsMixin_Forge {
         }
     }
 
+    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/event/ForgeEventFactory;onCommandRegister(Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/commands/Commands$CommandSelection;Lnet/minecraft/commands/CommandBuildContext;)V", unsafe = true))
+    private void forge$tellDispatcherCommandsAreRegistered(final CallbackInfo ci) {
+        this.bridge$endVanillaRegistration();
+    }
 }

neoforge/src/mixins/java/org/spongepowered/neoforge/mixin/core/commands/CommandsMixin_Neo.java

@@ -40,8 +40,11 @@
 import org.spongepowered.api.service.permission.Subject;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.common.bridge.commands.CommandSourceStackBridge;
+import org.spongepowered.common.bridge.commands.CommandsBridge;
 import org.spongepowered.common.command.manager.SpongeCommandManager;
 import org.spongepowered.common.event.tracking.PhaseTracker;
 
@@ -52,7 +55,7 @@
 import java.util.function.Function;
 
 @Mixin(Commands.class)
-public abstract class CommandsMixin_Neo {
+public abstract class CommandsMixin_Neo implements CommandsBridge {
 
     private WeakHashMap<ServerPlayer, Map<CommandNode<CommandSourceStack>, List<CommandNode<SharedSuggestionProvider>>>> impl$playerNodeCache;
     private SpongeCommandManager impl$commandManager;
@@ -97,4 +100,8 @@ public abstract class CommandsMixin_Neo {
         }
     }
 
+    @Inject(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/event/EventHooks;onCommandRegister(Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/commands/Commands$CommandSelection;Lnet/minecraft/commands/CommandBuildContext;)V"))
+    private void neo$tellDispatcherCommandsAreRegistered(final CallbackInfo ci) {
+        this.bridge$endVanillaRegistration();
+    }
 }

src/main/java/org/spongepowered/common/bridge/commands/CommandsBridge.java

@@ -29,4 +29,6 @@
 public interface CommandsBridge {
 
     SpongeCommandManager bridge$commandManager();
+
+    void bridge$endVanillaRegistration();
 }

src/main/java/org/spongepowered/common/command/registrar/BrigadierCommandRegistrar.java

@@ -242,7 +242,12 @@ private String createCommandString(final String command, final String argument)
 
     private LiteralCommandNode<CommandSourceStack> applyNamespace(final PluginContainer pluginContainer,
             final LiteralArgumentBuilder<CommandSourceStack> builder, final boolean isSpongeAware) {
-        if (builder.getLiteral().contains(":") || builder.getLiteral().contains(" ")) {
+        if (!isSpongeAware && builder.getLiteral().contains(":")) {
+            if (builder.getLiteral().contains(" ")) {
+                throw new IllegalArgumentException("The literal must not contain a space.");
+            }
+            return new SpongePermissionWrappedLiteralCommandNode(builder);
+        } else if (isSpongeAware && (builder.getLiteral().contains(":") || builder.getLiteral().contains(" "))) {
             // nope
             throw new IllegalArgumentException("The literal must not contain a colon or a space.");
         }

src/mixins/java/org/spongepowered/common/mixin/core/commands/CommandsMixin.java

@@ -42,10 +42,8 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.Slice;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.common.bridge.commands.CommandsBridge;
 import org.spongepowered.common.bridge.commands.arguments.CompletionsArgumentTypeBridge;
 import org.spongepowered.common.command.brigadier.dispatcher.DelegatingCommandDispatcher;
@@ -108,8 +106,7 @@ public abstract class CommandsMixin implements CommandsBridge {
         AdvancementCommands.register(dispatcher);
     }
 
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void impl$tellDispatcherCommandsAreRegistered(final CallbackInfo ci) {
+    public void bridge$endVanillaRegistration() {
         if (this.impl$initFrame != null) {
             this.impl$initFrame.popCause();
             PhaseTracker.getInstance().popCauseFrame(this.impl$initFrame);

vanilla/src/mixins/java/org/spongepowered/vanilla/mixin/core/commands/CommandsMixin_Vanilla.java

@@ -36,8 +36,11 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.common.bridge.commands.CommandSourceStackBridge;
+import org.spongepowered.common.bridge.commands.CommandsBridge;
 import org.spongepowered.common.command.manager.SpongeCommandManager;
 import org.spongepowered.common.event.tracking.PhaseTracker;
 
@@ -47,7 +50,7 @@
 import java.util.WeakHashMap;
 
 @Mixin(Commands.class)
-public abstract class CommandsMixin_Vanilla {
+public abstract class CommandsMixin_Vanilla implements CommandsBridge {
 
     // @formatter:off
     @Shadow private void shadow$fillUsableCommands(final CommandNode<CommandSourceStack> rootCommandSource,
@@ -87,4 +90,9 @@ public abstract class CommandsMixin_Vanilla {
             }
         }
     }
+
+    @Inject(method = "<init>", at = @At("RETURN"))
+    private void vanilla$tellDispatcherCommandsAreRegistered(final CallbackInfo ci) {
+        this.bridge$endVanillaRegistration();
+    }
 }