Adds some command block syntax

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

@@ -0,0 +1,49 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.type.CommandBlock;
+
+@Name("Is Conditional")
+@Description(
+	"Checks whether a command block is conditional or not."
+)
+@Examples({
+	"if {_block} is conditional:",
+		"\tmake {_block} unconditional"
+})
+@Since("INSERT VERSION")
+public class CondIsConditional extends PropertyCondition<Block> {
+
+	static {
+		register(CondIsConditional.class, "[:un]conditional", "blocks");
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		setExpr((Expression<Block>) exprs[0]);
+		setNegated(parseResult.hasTag("un") ^ matchedPattern == 1);
+		return true;
+	}
+
+	@Override
+	public boolean check(Block block) {
+		if (block.getBlockData() instanceof CommandBlock)
+			return ((CommandBlock) block.getBlockData()).isConditional();
+		return false;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "conditional";
+	}
+
+}

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

@@ -0,0 +1,59 @@
+package ch.njol.skript.effects;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.type.CommandBlock;
+import org.bukkit.event.Event;
+import org.eclipse.jdt.annotation.Nullable;
+
+@Name("Conditional / Unconditional")
+@Description(
+	"Sets whether the provided command blocks are conditional or not."
+)
+@Examples({
+	"make {_block} conditional",
+	"make {_block} unconditional if {_block} is conditional"
+})
+@Since("INSERT VERSION")
+public class EffCommandBlockConditional extends Effect {
+
+	static {
+		Skript.registerEffect(EffCommandBlockConditional.class, "make %blocks% [not:(un|not )]conditional");
+	}
+
+	private Expression<Block> blocks;
+	private boolean conditional;
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		blocks = (Expression<Block>) exprs[0];
+		conditional = !parseResult.hasTag("not");
+		return true;
+	}
+
+	@Override
+	protected void execute(Event event) {
+		for (Block block : blocks.getArray(event)) {
+			if (block.getBlockData() instanceof CommandBlock) {
+				CommandBlock data = (CommandBlock) block.getBlockData();
+				data.setConditional(conditional);
+				block.setBlockData(data);
+			}
+		}
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "make " + blocks.toString(event, debug) + (conditional ? " " : " un") + "conditional";
+	}
+
+}

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

@@ -0,0 +1,83 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.block.Block;
+import org.bukkit.block.CommandBlock;
+import org.bukkit.entity.minecart.CommandMinecart;
+import org.bukkit.event.Event;
+import org.eclipse.jdt.annotation.Nullable;
+
+@Name("Command Block Command")
+@Description(
+	"Gets or sets the command associated with a command block or minecart with command block."
+)
+@Examples({
+	"send command of {_block}",
+	"set command of {_cmdMinecart} to \"say asdf\""
+})
+@Since("INSERT VERSION")
+public class ExprCommandBlockCommand extends SimplePropertyExpression<Object, String> {
+
+	static {
+		register(ExprCommandBlockCommand.class, String.class, "[command[ ]block] command", "blocks/entities");
+	}
+
+	@Override
+	public @Nullable String convert(Object holder) {
+		String command = "";
+		if (holder instanceof Block && ((Block) holder).getState() instanceof CommandBlock) {
+			command = ((CommandBlock) ((Block) holder).getState()).getCommand();
+		} else if (holder instanceof CommandMinecart) {
+			command = ((CommandMinecart) holder).getCommand();
+		}
+		return (command.isEmpty()) ? null : command;
+	}
+
+	@Override
+	@SuppressWarnings("ConstantConditions")
+	public @Nullable Class<?>[] acceptChange(ChangeMode mode) {
+		if (mode == ChangeMode.SET || mode == ChangeMode.DELETE || mode == ChangeMode.RESET)
+			return CollectionUtils.array(String.class);
+		return null;
+	}
+
+	@Override
+	@SuppressWarnings("ConstantConditions")
+	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
+		String newCommand = delta == null ? null : ((String) delta[0]);
+		for (Object holder : getExpr().getArray(event)) {
+			switch (mode) {
+				case RESET:
+				case DELETE:
+				case SET:
+					if (holder instanceof Block && ((Block) holder).getState() instanceof CommandBlock) {
+						CommandBlock state = ((CommandBlock) ((Block) holder).getState());
+						state.setCommand(newCommand);
+						state.update();
+					} else if (holder instanceof CommandMinecart) {
+						((CommandMinecart) holder).setCommand(newCommand);
+					}
+					break;
+				default:
+					assert false;
+			}
+		}
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "command block command";
+	}
+
+	@Override
+	public Class<? extends String> getReturnType() {
+		return String.class;
+	}
+
+}

src/test/skript/tests/syntaxes/conditions/CondIsConditional.sk

@@ -0,0 +1,17 @@
+test "is conditional":
+	set block at location(0,0,0,world) to command block
+	set {_b} to block at location(0,0,0,world)
+
+	assert {_b} is not conditional with "a new command block shouldn't be conditional"
+
+	make {_b} conditional
+	assert {_b} is conditional with "making a command block conditional should do exactly that"
+
+	make {_b} unconditional
+	assert {_b} is unconditional with "making a command block unconditional should do exactly that"
+
+	set block at {_b} to stone
+	assert {_b} is not conditional with "a non-command block should not be conditional"
+
+	make {_b} conditional
+	assert {_b} is not conditional with "making a non-command block conditional shouldn't do anything"

src/test/skript/tests/syntaxes/expressions/ExprCommandBlockCommand.sk

@@ -0,0 +1,35 @@
+test "command block command":
+	set block at location(0,1,0,world) to command block
+	spawn a minecart with command block at (spawn of world "world"):
+		set {_e} to entity
+	spawn a zombie at (spawn of world "world"):
+		set {_z} to entity
+	set {_b} to block at location(0,1,0,world)
+
+	assert command block command of {_b} is not set with "a new command block shouldn't have an associated command"
+	assert command block command of {_e} is not set with "a new minecart with command block shouldn't have an associated command"
+
+	set command block command of {_b} to "say asdf"
+	set command block command of {_e} to "say asdf"
+	assert command block command of {_b} is "say asdf" with "setting the command of a command block should do exactly that"
+	assert command block command of {_e} is "say asdf" with "setting the command of a minecart with command block should do exactly that"
+
+	clear command block command of {_b}
+	clear command block command of {_e}
+	assert command block command of {_b} is not set with "clearing/deleting/resetting the command of a command block should return null"
+	assert command block command of {_e} is not set with "clearing/deleting/resetting the command of a minecart with command block should return null"
+
+	assert command of {_b} is not set with "testing for possible future conflicts (block)"
+	assert command of {_e} is not set with "testing for possible future conflicts (entity)"
+
+	set block at {_b} to stone
+	assert command block command of {_b} is not set with "the command of a non-command block should return null"
+	assert command block command of {_z} is not set with "the command of a non-minecart with command block should return null"
+
+	set command block command of {_b} to "say asdf"
+	set command block command of {_z} to "say asdf"
+	assert command block command of {_b} is not set with "setting the command of a non-command block shouldn't do anything"
+	assert command block command of {_z} is not set with "setting the command of a non-minecart with command block shouldn't do anything"
+
+	delete entity within {_e}
+	delete entity within {_z}