EffSendBlockChange as Original

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

@@ -1,100 +1,95 @@
 package ch.njol.skript.effects;
 
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Example;
 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;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
 import ch.njol.util.Kleenean;
+import org.bukkit.Location;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
 
 @Name("Send Block Change")
-@Description("Makes a player see a block as something it really isn't. BlockData support is only for MC 1.13+")
-@Examples({"make player see block at player as dirt",
-		"make player see target block as campfire[facing=south]"})
-@Since("2.2-dev37c, 2.5.1 (block data support)")
+@Description("Makes a player see a block as something else or as the original.")
+@Example("make player see block at player as dirt")
+@Example("make player see player's target block as campfire[facing=south]")
+@Example("""
+	make all players see (blocks in radius 5 of location(0, 0, 0)) as bedrock
+	make all players see (blocks in radius 5 of location(0, 0, 0)) as original
+	""")
+@Since("2.2-dev37c, 2.5.1 (block data support), INSERT VERSION (as original)")
 public class EffSendBlockChange extends Effect {
 
-	private static final boolean BLOCK_DATA_SUPPORT = Skript.classExists("org.bukkit.block.data.BlockData");
-	private static final boolean SUPPORTED =
-			Skript.methodExists(
-					Player.class,
-					"sendBlockChange",
-					Location.class,
-					Material.class,
-					byte.class
-			);
-
 	static {
 		Skript.registerEffect(EffSendBlockChange.class,
-				BLOCK_DATA_SUPPORT ? "make %players% see %blocks% as %itemtype/blockdata%" : "make %players% see %blocks% as %itemtype%"
+			"make %players% see %locations% as %itemtype/blockdata%",
+			"make %players% see %locations% as [the|its] (original|normal|actual) [block]"
 		);
 	}
 
-	@SuppressWarnings("null")
 	private Expression<Player> players;
-
-	@SuppressWarnings("null")
-	private Expression<Block> blocks;
-
-	@SuppressWarnings("null")
-	private Expression<Object> as;
+	private Expression<Location> locations;
+	private @Nullable Expression<Object> type;
+	private boolean asOriginal;
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-		if (!SUPPORTED) {
-			Skript.error("The send block change effect is not supported on this version. " +
-				"If Spigot has added a replacement method without magic values " +
-				"please open an issue at https://github.com/SkriptLang/Skript/issues " +
-				"and support will be added for it.");
-			return false;
-		}
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		players = (Expression<Player>) exprs[0];
-		blocks = (Expression<Block>) exprs[1];
-		as = (Expression<Object>) exprs[2];
+		locations = (Expression<Location>) exprs[1];
+		asOriginal = matchedPattern == 1;
+		if (!asOriginal)
+			type = (Expression<Object>) exprs[2];
 		return true;
 	}
 
 	@Override
-	protected void execute(Event e) {
-		Object object = this.as.getSingle(e);
-		if (object instanceof ItemType) {
-			ItemType itemType = (ItemType) object;
-			for (Player player : players.getArray(e)) {
-				for (Block block : blocks.getArray(e)) {
-					itemType.sendBlockChange(player, block.getLocation());
-				}
+	protected void execute(Event event) {
+		if (asOriginal) {
+			Player[] players = this.players.getArray(event);
+			for (Location location : locations.getArray(event)) {
+				for (Player player : players)
+					player.sendBlockChange(location, location.getBlock().getBlockData());
 			}
-		} else if (BLOCK_DATA_SUPPORT && object instanceof BlockData) {
-			BlockData blockData = (BlockData) object;
-			for (Player player : players.getArray(e)) {
-				for (Block block : blocks.getArray(e)) {
-					player.sendBlockChange(block.getLocation(), blockData);
-				}
+			return;
+		}
+		assert type != null;
+		Object type = this.type.getSingle(event);
+		if (type == null)
+			return;
+		Player[] players = this.players.getArray(event);
+		if (type instanceof ItemType itemType) {
+			for (Location location : locations.getArray(event))  {
+				for (Player player : players)
+					itemType.sendBlockChange(player, location);
+			}
+		} else if (type instanceof BlockData blockData) {
+			for (Location location : locations.getArray(event)) {
+				for (Player player : players)
+					player.sendBlockChange(location, blockData);
 			}
 		}
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return String.format(
-				"make %s see %s as %s",
-				players.toString(e, debug),
-				blocks.toString(e, debug),
-				as.toString(e, debug)
-		);
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+		builder.append("make", players, "see", locations, "as");
+		if (asOriginal) {
+			builder.append("original");
+		} else {
+			assert type != null;
+			builder.append(type);
+		}
+		return builder.toString();
 	}
 
 }