Port ExprCommandInfo

Author: APickledWalrus

src/main/java/ch/njol/skript/expressions/ExprCommandInfo.java

@@ -40,6 +40,23 @@ public Patterns(Object[][] info) {
 		}
 	}
 
+	/**
+	 * Creates a new {@link Patterns} with the provided paired inputs.
+	 * @param info Pattern-Value pairs, for example:
+	 * <code>
+	 * new Patterns("pattern1", value1, "pattern2", value2);
+	 * </code>
+	 */
+	public Patterns(Object... info) {
+		patterns = new String[info.length / 2];
+		types = new Object[info.length / 2];
+		for (int i = 0; i < info.length; i += 2) {
+			patterns[i / 2] = (String) info[i];
+			types[i / 2] = info[i + 1];
+			matchedPatterns.computeIfAbsent(info[i + 1], list -> new ArrayList<>()).add(i / 2);
+		}
+	}
+
 	/**
 	 * Returns an array of the registered patterns.
 	 * @return An {@link java.lang.reflect.Array} of {@link String}s.

src/main/java/ch/njol/skript/util/Patterns.java

@@ -8,6 +8,7 @@
 import org.skriptlang.skript.bukkit.command.elements.effects.EffCancelCooldown;
 import org.skriptlang.skript.bukkit.command.elements.expressions.ExprArgument;
 import org.skriptlang.skript.bukkit.command.elements.expressions.ExprCmdCooldownInfo;
+import org.skriptlang.skript.bukkit.command.elements.expressions.ExprCommandInfo;
 import org.skriptlang.skript.bukkit.command.elements.structures.StructCommand;
 
 public class CommandModule extends HierarchicalAddonModule {
@@ -24,6 +25,7 @@ protected void loadSelf(SkriptAddon addon) {
 			EffCancelCooldown::register,
 			ExprArgument::register,
 			ExprCmdCooldownInfo::register,
+			ExprCommandInfo::register,
 			syntaxRegistry -> StructCommand.register(addon, syntaxRegistry)
 		);
 	}

src/main/java/org/skriptlang/skript/bukkit/command/CommandModule.java

@@ -21,5 +21,6 @@ public record ScriptBrigadierCommand(
 	Collection<String> aliases,
 	@Nullable String description,
 	@Nullable String usage,
-	@Nullable String namespace
+	@Nullable String namespace,
+	@Nullable String permission
 ) { }

src/main/java/org/skriptlang/skript/bukkit/command/custom/ScriptBrigadierCommand.java

@@ -13,16 +13,22 @@
  */
 public class ScriptCommandEvent extends Event {
 
+	private final String label;
 	private final CommandSender sender;
 	private final ScriptCommandExecutor executor;
 
 	final Map<String, Object> arguments = new HashMap<>();
 
-	public ScriptCommandEvent(CommandSender sender, ScriptCommandExecutor executor) {
+	public ScriptCommandEvent(String label, CommandSender sender, ScriptCommandExecutor executor) {
+		this.label = label;
 		this.sender = sender;
 		this.executor = executor;
 	}
 
+	public String getLabel() {
+		return label;
+	}
+
 	public CommandSender getSender() {
 		return sender;
 	}

src/main/java/org/skriptlang/skript/bukkit/command/custom/ScriptCommandEvent.java

@@ -6,6 +6,8 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.tree.ArgumentCommandNode;
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import com.mojang.brigadier.tree.RootCommandNode;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.command.brigadier.argument.resolvers.ArgumentResolver;
 import org.bukkit.command.CommandSender;
@@ -53,7 +55,8 @@ public ScriptCommandExecutor(Trigger trigger, List<ArgumentData<?>> arguments, @
 
 	public int execute(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
 		CommandSender sender = context.getSource().getSender();
-		ScriptCommandEvent commandEvent = new ScriptCommandEvent(sender, this);
+		ScriptCommandEvent commandEvent =
+			new ScriptCommandEvent(context.getNodes().getFirst().getNode().getName(), sender, this);
 
 		// final validations
 		if (cooldownManager != null && !cooldownManager.checkExecution(commandEvent, sender)) {