Continue porting syntax

Author: APickledWalrus

src/main/java/ch/njol/skript/Skript.java

@@ -44,15 +44,14 @@
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.event.server.ServerCommandEvent;
 import org.bukkit.event.server.ServerLoadEvent;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnknownNullability;
 import org.jetbrains.annotations.Unmodifiable;
@@ -63,6 +62,7 @@
 import org.skriptlang.skript.addon.AddonModule;
 import org.skriptlang.skript.bukkit.BukkitModule;
 import org.skriptlang.skript.bukkit.SkriptMetrics;
+import org.skriptlang.skript.bukkit.command.elements.effects.EffCommand;
 import org.skriptlang.skript.bukkit.lang.eventvalue.EventValueRegistry;
 import org.skriptlang.skript.bukkit.log.runtime.BukkitRuntimeErrorConsumer;
 import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos;
@@ -80,7 +80,9 @@
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.structure.Structure;
 import org.skriptlang.skript.lang.structure.StructureInfo;
+import org.skriptlang.skript.log.runtime.ErrorSource;
 import org.skriptlang.skript.log.runtime.RuntimeErrorManager;
+import org.skriptlang.skript.log.runtime.RuntimeErrorProducer;
 import org.skriptlang.skript.registration.DefaultSyntaxInfos;
 import org.skriptlang.skript.registration.SyntaxInfo;
 import org.skriptlang.skript.registration.SyntaxRegistry;
@@ -1811,26 +1813,24 @@ public static <E extends Structure> void registerStructure(
 	 * @param sender
 	 * @param command
 	 * @return Whether the command was run
+	 * @deprecated There is no replacement for this method.
 	 */
-	public static boolean dispatchCommand(final CommandSender sender, final String command) {
-		try {
-			if (sender instanceof Player) {
-				final PlayerCommandPreprocessEvent e = new PlayerCommandPreprocessEvent((Player) sender, "/" + command);
-				Bukkit.getPluginManager().callEvent(e);
-				if (e.isCancelled() || !e.getMessage().startsWith("/"))
-					return false;
-				return Bukkit.dispatchCommand(e.getPlayer(), e.getMessage().substring(1));
-			} else {
-				final ServerCommandEvent e = new ServerCommandEvent(sender, command);
-				Bukkit.getPluginManager().callEvent(e);
-				if (e.getCommand().isEmpty() || e.isCancelled())
-					return false;
-				return Bukkit.dispatchCommand(e.getSender(), e.getCommand());
+	@Deprecated(since = "INSERT VERSION", forRemoval = true)
+	public static boolean dispatchCommand(CommandSender sender, String command) {
+		return EffCommand.dispatchCommand(sender, command, new RuntimeErrorProducer() {
+			@Override
+			public @NotNull ErrorSource getErrorSource() {
+				throw new UnsupportedOperationException();
 			}
-		} catch (final Exception ex) {
-			ex.printStackTrace(); // just like Bukkit
-			return false;
-		}
+			@Override
+			public void error(String message) { }
+			@Override
+			public void error(String message, String highlight) { }
+			@Override
+			public void warning(String message) { }
+			@Override
+			public void warning(String message, String highlight) { }
+		});
 	}
 
 	// ================ LOGGING ================

src/main/java/ch/njol/skript/conditions/CondIsSkriptCommand.java

@@ -5,9 +5,12 @@
 import org.skriptlang.skript.addon.HierarchicalAddonModule;
 import org.skriptlang.skript.addon.SkriptAddon;
 import org.skriptlang.skript.bukkit.command.custom.ScriptCommandRegistrar;
+import org.skriptlang.skript.bukkit.command.elements.conditions.CondIsScriptCommand;
 import org.skriptlang.skript.bukkit.command.elements.effects.EffCancelCooldown;
+import org.skriptlang.skript.bukkit.command.elements.effects.EffCommand;
 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.ExprCommand;
 import org.skriptlang.skript.bukkit.command.elements.expressions.ExprCommandInfo;
 import org.skriptlang.skript.bukkit.command.elements.structures.StructCommand;
 
@@ -22,9 +25,12 @@ protected void loadSelf(SkriptAddon addon) {
 		ScriptCommandRegistrar.init(Skript.getInstance());
 
 		register(addon,
+			CondIsScriptCommand::register,
 			EffCancelCooldown::register,
+			EffCommand::register,
 			ExprArgument::register,
 			ExprCmdCooldownInfo::register,
+			ExprCommand::register,
 			ExprCommandInfo::register,
 			syntaxRegistry -> StructCommand.register(addon, syntaxRegistry)
 		);

src/main/java/ch/njol/skript/effects/EffCommand.java

@@ -14,13 +14,15 @@
 public class ScriptCommandEvent extends Event {
 
 	private final String label;
+	private final String rawInput;
 	private final CommandSender sender;
 	private final ScriptCommandExecutor executor;
 
 	final Map<String, Object> arguments = new HashMap<>();
 
-	public ScriptCommandEvent(String label, CommandSender sender, ScriptCommandExecutor executor) {
+	public ScriptCommandEvent(String label, String rawInput, CommandSender sender, ScriptCommandExecutor executor) {
 		this.label = label;
+		this.rawInput = rawInput;
 		this.sender = sender;
 		this.executor = executor;
 	}
@@ -29,6 +31,10 @@ public String getLabel() {
 		return label;
 	}
 
+	public String getRawInput() {
+		return rawInput;
+	}
+
 	public CommandSender getSender() {
 		return sender;
 	}

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

@@ -6,8 +6,6 @@
 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;
@@ -56,7 +54,7 @@ public ScriptCommandExecutor(Trigger trigger, List<ArgumentData<?>> arguments, @
 	public int execute(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
 		CommandSender sender = context.getSource().getSender();
 		ScriptCommandEvent commandEvent =
-			new ScriptCommandEvent(context.getNodes().getFirst().getNode().getName(), sender, this);
+			new ScriptCommandEvent(context.getNodes().getFirst().getNode().getName(), context.getInput(), sender, this);
 
 		// final validations
 		if (cooldownManager != null && !cooldownManager.checkExecution(commandEvent, sender)) {

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

@@ -0,0 +1,38 @@
+package org.skriptlang.skript.bukkit.command.elements.conditions;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Example;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import org.skriptlang.skript.bukkit.command.custom.ScriptCommandRegistrar;
+import org.skriptlang.skript.registration.SyntaxRegistry;
+
+@Name("Is a Script Command")
+@Description("Checks whether a command (string label) is a script command (one registered in a script).")
+@Example("""
+	on command:
+		command is not a script command
+		# do something only for non-custom commands
+	""")
+@Since("2.6")
+public class CondIsScriptCommand extends PropertyCondition<String> {
+
+	public static void register(SyntaxRegistry syntaxRegistry) {
+		syntaxRegistry.register(SyntaxRegistry.CONDITION,
+			infoBuilder(CondIsScriptCommand.class, PropertyType.BE, "[a] s(c|k)ript (command|cmd)", "string")
+				.supplier(CondIsScriptCommand::new)
+				.build());
+	}
+
+	@Override
+	public boolean check(String command) {
+		return ScriptCommandRegistrar.getCommand(command) != null;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "script command";
+	}
+
+}