Feature/target block update

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

@@ -20,6 +20,7 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptConfig;
+import ch.njol.skript.bukkitutil.ItemUtils;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
@@ -29,62 +30,75 @@
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
-import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
 import org.eclipse.jdt.annotation.Nullable;
 
 @Name("Targeted Block")
-@Description("The block at the crosshair. This regards all blocks that are not air as fully solid, e.g. torches will be like a solid stone block for this expression.")
-@Examples({"# A command to set the block a player looks at to a specific type:",
-		"command /setblock <material>:",
-		"\ttrigger:",
-		"\t\tset targeted block to argument"})
-@Since("1.0")
-public class ExprTargetedBlock extends PropertyExpression<Player, Block> {
+@Description({
+	"The block at the crosshair. This regards all blocks that are not air as fully solid, e.g. torches will be like a solid stone block for this expression.",
+	"The actual target block will regard the actual hit box of the block."
+})
+@Examples({
+	"set target block of player to stone",
+	"set target block of player to oak_stairs[waterlogged=true]",
+	"break target block of player using player's tool",
+	"give player 1 of type of target block",
+	"teleport player to location above target block",
+	"kill all entities in radius 3 around target block of player",
+	"set {_block} to actual target block of player",
+	"break actual target block of player"
+})
+@Since("1.0, INSERT VERSION (actual/exact)")
+public class ExprTargetedBlock extends PropertyExpression<LivingEntity, Block> {
 
 	static {
 		Skript.registerExpression(ExprTargetedBlock.class, Block.class, ExpressionType.COMBINED,
-				"[the] target[ed] block[s] [of %players%]", "%players%'[s] target[ed] block[s]",
-				"[the] actual[ly] target[ed] block[s] [of %players%]", "%players%'[s] actual[ly] target[ed] block[s]");
+				"[the] [actual:(actual[ly]|exact)] target[ed] block[s] [of %livingentities%]", "%livingentities%'[s] [actual:(actual[ly]|exact)] target[ed] block[s]");
 	}
 
+	private boolean actual;
+
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parser) {
-		setExpr((Expression<Player>) exprs[0]);
-		if (matchedPattern >= 2) {
-			// TODO remove 'actual' patterns in the future
-			Skript.warning("The 'actual' part of the targeted block expression is deprecated, it is now no longer required");
-		}
+		setExpr((Expression<LivingEntity>) exprs[0]);
+		actual = parser.hasTag("actual");
 		return true;
 	}
 
 	@Override
-	protected Block[] get(Event e, Player[] source) {
-		return get(source, p -> {
-			Block block = p.getTargetBlock(null, SkriptConfig.maxTargetBlockDistance.value());
-			if (block.getType() == Material.AIR)
+	protected Block[] get(Event event, LivingEntity[] source) {
+		Integer distance = SkriptConfig.maxTargetBlockDistance.value();
+		return get(source, livingEntity -> {
+			Block block;
+			if (actual) {
+				block = livingEntity.getTargetBlockExact(distance);
+			} else {
+				block = livingEntity.getTargetBlock(null, distance);
+			}
+			if (block != null && ItemUtils.isAir(block.getType()))
 				return null;
 			return block;
 		});
 	}
 
-	@Override
-	public Class<Block> getReturnType() {
-		return Block.class;
-	}
-
 	@Override
 	public boolean setTime(int time) {
 		super.setTime(time);
 		return true;
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "the targeted block" + (getExpr().isSingle() ? "" : "s") + " of " + getExpr().toString(e, debug);
+	public Class<Block> getReturnType() {
+		return Block.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		String block = getExpr().isSingle() ? "block" : "blocks";
+		return "the " + (this.actual ? "actual " : "") + "target " + block + " of " + getExpr().toString(event, debug);
 	}
 
 }