Refactor ExprBeaconValues into multiple expressions, fix bugs.

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

@@ -0,0 +1,101 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.expressions.base.PropertyExpression;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent;
+import org.bukkit.block.Beacon;
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.BiConsumer;
+
+@Name("Beacon Effects")
+@Description({
+	"The active effects of a beacon.",
+	"The secondary effect can be set to anything, but the icon in the GUI will not display correctly.",
+	"The secondary effect can only be set when the beacon is at max tier.",
+	"The primary and secondary effect can not be the same, primary will always retain the potion type and secondary will be cleared."
+})
+@Example("""
+	set primary beacon effect of {_block} to haste
+	set secondary effect of {_block} to resistance
+	"""
+)
+@Events({"Beacon Effect", "Beacon Toggle", "Beacon Change Effect"})
+@Since("2.10")
+public class ExprBeaconEffects extends PropertyExpression<Block, PotionEffectType> {
+
+	private static final boolean SUPPORTS_CHANGE_EVENT = Skript.classExists("io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent");
+
+	static {
+		registerDefault(ExprBeaconEffects.class, PotionEffectType.class, "(:primary|secondary) [beacon] effect", "blocks");
+	}
+
+	private boolean primary;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		setExpr((Expression<? extends Block>) expressions[0]);
+		primary = parseResult.hasTag("primary");
+		return true;
+	}
+
+	@Override
+	protected PotionEffectType[] get(Event event, Block[] blocks) {
+		return get(blocks, block -> {
+			if (!(block.getState() instanceof Beacon beacon))
+				return null;
+
+			if (SUPPORTS_CHANGE_EVENT
+					&& event instanceof PlayerChangeBeaconEffectEvent changeEvent
+					&& block.equals(changeEvent.getBeacon()))
+				return primary ? changeEvent.getPrimary() : changeEvent.getSecondary();
+
+			PotionEffect effect = primary ? beacon.getPrimaryEffect() : beacon.getSecondaryEffect();
+			if (effect == null)
+				return null;
+			return effect.getType();
+		});
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, RESET, DELETE -> CollectionUtils.array(PotionEffectType.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		PotionEffectType type = delta == null ? null : (PotionEffectType) delta[0];
+		BiConsumer<Beacon, PotionEffectType> changer = primary ? Beacon::setPrimaryEffect : Beacon::setSecondaryEffect;
+		for (Block block : getExpr().getArray(event)) {
+			if (!(block.getState() instanceof Beacon beacon))
+				continue;
+			changer.accept(beacon, type);
+			beacon.update(true);
+		}
+	}
+
+	@Override
+	public Class<PotionEffectType> getReturnType() {
+		return PotionEffectType.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return (primary ? "primary" : "secondary") + " beacon effect of " + getExpr().toString(event, debug);
+	}
+
+}

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

@@ -0,0 +1,84 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.classes.Changer.ChangeMode;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.expressions.base.SimplePropertyExpression;
+import ch.njol.util.Math2;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.block.Beacon;
+import org.bukkit.block.Block;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Beacon Range")
+@Description({
+	"The range of a beacon's effects, in blocks."
+})
+@Example("""
+	if the beacon tier of the clicked block is 4:
+		set the beacon effect range of the clicked block to 100
+	"""
+)
+@RequiredPlugins("Paper")
+@Since("2.10")
+public class ExprBeaconRange extends SimplePropertyExpression<Block, Double> {
+
+	static {
+		if (Skript.methodExists(Beacon.class, "getEffectRange"))
+			register(ExprBeaconRange.class, Double.class, "beacon [effect] range", "blocks");
+	}
+
+	@Override
+	public @Nullable Double convert(Block block) {
+		if (block.getState() instanceof Beacon beacon)
+			return beacon.getEffectRange();
+		return null;
+	}
+
+	@Override
+	public Class<?> @Nullable [] acceptChange(ChangeMode mode) {
+		return switch (mode) {
+			case SET, ADD, REMOVE, RESET -> CollectionUtils.array(Double.class);
+			default -> null;
+		};
+	}
+
+	@Override
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
+		if (mode == ChangeMode.RESET) {
+			for (Block block : getExpr().getArray(event)) {
+				if (block.getState() instanceof Beacon beacon) {
+					beacon.resetEffectRange();
+					beacon.update(true);
+				}
+			}
+			return;
+		}
+
+		assert delta != null;
+		double range = ((Number) delta[0]).doubleValue();
+		for (Block block : getExpr().getArray(event)) {
+			if (block.getState() instanceof Beacon beacon) {
+				switch (mode) {
+					case SET -> beacon.setEffectRange(Math2.fit(0, range, Double.MAX_VALUE));
+					case ADD -> beacon.setEffectRange(Math2.fit(0, beacon.getEffectRange() + range, Double.MAX_VALUE));
+					case REMOVE -> beacon.setEffectRange(Math2.fit(0, beacon.getEffectRange() - range, Double.MAX_VALUE));
+					default -> throw new IllegalStateException();
+				}
+				beacon.update(true);
+			}
+		}
+	}
+
+	@Override
+	public Class<? extends Double> getReturnType() {
+		return Double.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "beacon range";
+	}
+
+}

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

@@ -0,0 +1,45 @@
+package ch.njol.skript.expressions;
+
+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 ch.njol.skript.expressions.base.SimplePropertyExpression;
+import org.bukkit.block.Beacon;
+import org.bukkit.block.Block;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Beacon Tier")
+@Description({
+	"The tier of a beacon. Ranges from 0 to 4."
+})
+@Example("""
+	if the beacon tier of the clicked block is 4:
+		send "This is a max tier beacon!"
+	"""
+)
+@Since("2.10")
+public class ExprBeaconTier extends SimplePropertyExpression<Block, Integer> {
+
+	static {
+		register(ExprBeaconTier.class, Integer.class, "beacon tier", "blocks");
+	}
+
+	@Override
+	public @Nullable Integer convert(Block block) {
+		if (block.getState() instanceof Beacon beacon)
+			return beacon.getTier();
+		return null;
+	}
+
+	@Override
+	public Class<Integer> getReturnType() {
+		return Integer.class;
+	}
+
+	@Override
+	protected String getPropertyName() {
+		return "beacon tier";
+	}
+
+}