CondIsBlockRedstonePowered - Adding "indirectly redstone powered" (#3297)

Author: Romitou

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

@@ -20,30 +20,60 @@
 package ch.njol.skript.conditions;
 
 import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.eclipse.jdt.annotation.Nullable;
+
+import ch.njol.skript.Skript;
 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.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
 
 @Name("Is Block Redstone Powered")
-@Description("Checks if a block is powered by redstone")
+@Description("Checks if a block is indirectly or directly powered by redstone")
 @Examples({"if clicked block is redstone powered:",
-	"\tsend \"This block is well-powered by redstone!\""})
+	"\tsend \"This block is well-powered by redstone!\"",
+	"if clicked block is indirectly redstone powered:",
+	"\tsend \"This block is indirectly redstone powered.\""})
 @Since("2.5")
-public class CondIsBlockRedstonePowered extends PropertyCondition<Block> {
+public class CondIsBlockRedstonePowered extends Condition {
 
 	static {
-		register(CondIsBlockRedstonePowered.class, "redstone powered", "blocks");
+		Skript.registerCondition(CondIsBlockRedstonePowered.class,
+			"%blocks% (is|are) redstone powered",
+			"%blocks% (is|are) indirectly redstone powered",
+			"%blocks% (is|are)(n't| not) redstone powered",
+			"%blocks% (is|are)(n't| not) indirectly redstone powered");
+	}
+	
+	@SuppressWarnings("null")
+	private Expression<Block> blocks;
+	private boolean isIndirectlyPowered;
+	
+	@SuppressWarnings({"unchecked", "null"})
+	@Override
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		blocks = (Expression<Block>) exprs[0];
+		isIndirectlyPowered = matchedPattern % 2 == 1;
+		setNegated(matchedPattern > 1);
+		return true;
 	}
 
 	@Override
-	public boolean check(Block b) {
-		return b.isBlockPowered();
+	public boolean check(Event e) {
+		return isIndirectlyPowered
+			? blocks.check(e, Block::isBlockIndirectlyPowered, isNegated())
+			: blocks.check(e, Block::isBlockPowered, isNegated());
 	}
 
 	@Override
-	protected String getPropertyName() {
-		return "redstone powered";
+	public String toString(@Nullable Event e, boolean debug) {
+		return PropertyCondition.toString(this, PropertyCondition.PropertyType.BE, e, debug, blocks, (isIndirectlyPowered ? "indirectly " : "") + "powered");
 	}
+	
 }