BeaconEvents + Expressions

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

@@ -44,10 +44,7 @@
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.attribute.Attribute;
-import org.bukkit.block.Biome;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.DoubleChest;
+import org.bukkit.block.*;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
@@ -1526,6 +1523,7 @@ public String toVariableNameString(EnchantmentOffer eo) {
 				.name("Transform Reason")
 				.description("Represents a transform reason of an <a href='events.html#entity transform'>entity transform event</a>.")
 				.since("2.8.0"));
+
 	}
 
 }

src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java

@@ -42,14 +42,12 @@
 import ch.njol.skript.util.slot.InventorySlot;
 import ch.njol.skript.util.slot.Slot;
 import com.destroystokyo.paper.event.block.AnvilDamagedEvent;
+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
 import com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent;
 import com.destroystokyo.paper.event.entity.ProjectileCollideEvent;
 import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent;
 import io.papermc.paper.event.entity.EntityMoveEvent;
-import io.papermc.paper.event.player.PlayerStopUsingItemEvent;
-import io.papermc.paper.event.player.PlayerInventorySlotChangeEvent;
-import io.papermc.paper.event.player.PlayerStonecutterRecipeSelectEvent;
-import io.papermc.paper.event.player.PlayerTradeEvent;
+import io.papermc.paper.event.player.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.FireworkEffect;
@@ -1935,5 +1933,36 @@ public RegainReason get(EntityRegainHealthEvent event) {
 				return event.getRegainReason();
 			}
 		}, EventValues.TIME_NOW);
+
+		// BeaconEffectEvent
+		if (Skript.classExists("com.destroystokyo.paper.event.block.BeaconEffectEvent")) {
+			EventValues.registerEventValue(BeaconEffectEvent.class, PotionEffectType.class, new Getter<PotionEffectType, BeaconEffectEvent>() {
+				@Override
+				public @Nullable PotionEffectType get(BeaconEffectEvent event) {
+					return event.getEffect().getType();
+				}
+			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(BeaconEffectEvent.class, Player.class, new Getter<Player, BeaconEffectEvent>() {
+				@Override
+				public @Nullable Player get(BeaconEffectEvent event) {
+					return event.getPlayer();
+				}
+			}, EventValues.TIME_NOW);
+			EventValues.registerEventValue(BeaconEffectEvent.class, Boolean.class, new Getter<Boolean, BeaconEffectEvent>() {
+				@Override
+				public @Nullable Boolean get(BeaconEffectEvent event) {
+					return event.isPrimary();
+				}
+			}, EventValues.TIME_NOW, "Use 'applied effect is (primary|secondary)' in beacon effect events", BeaconEffectEvent.class);
+		}
+		// PlayerChangeBeaconEffectEvent
+		if (Skript.classExists("io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent")) {
+			EventValues.registerEventValue(PlayerChangeBeaconEffectEvent.class, Block.class, new Getter<Block, PlayerChangeBeaconEffectEvent>() {
+				@Override
+				public @Nullable Block get(PlayerChangeBeaconEffectEvent event) {
+					return event.getBeacon();
+				}
+			}, EventValues.TIME_NOW);
+		}
 	}
 }

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

@@ -0,0 +1,62 @@
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Applied Effect")
+@Description("Checks to see if the applied effect of a beacon effect event is primary or secondary")
+@Examples({
+	"on beacon effect:",
+		"\tif applied effect is primary:",
+			"\t\tbroadcast \"Is Primary\"",
+		"\telse if applied effect is secondary:",
+			"\t\tbroadcast \"Is Secondary\""
+})
+@RequiredPlugins("Paper")
+@Since("INSERT VERSION")
+public class CondAppliedEffect extends Condition {
+
+	static {
+		Skript.registerCondition(CondAppliedEffect.class,
+			"applied effect is primary",
+			"applied effect is secondary"
+			);
+	}
+
+	private int pattern;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(BeaconEffectEvent.class)) {
+			Skript.error("This condition can only be used in a on beacon effect event.");
+			return false;
+		}
+		pattern = matchedPattern;
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		BeaconEffectEvent beaconEffectEvent = (BeaconEffectEvent) event;
+		boolean isPrimary = beaconEffectEvent.isPrimary();
+		if (pattern == 0) {
+			return isPrimary;
+		} else if (pattern == 1) {
+			return !isPrimary;
+		}
+		return false;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "applied effect is " + (pattern == 0 ? "primary" : "secondary");
+	}
+
+}

src/main/java/ch/njol/skript/events/EvtBeacon.java

@@ -0,0 +1,77 @@
+package ch.njol.skript.events;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Literal;
+import ch.njol.skript.lang.SkriptEvent;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
+import io.papermc.paper.event.block.BeaconActivatedEvent;
+import io.papermc.paper.event.block.BeaconDeactivatedEvent;
+import io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+public class EvtBeacon extends SkriptEvent {
+
+	static {
+		if (Skript.classExists("com.destroystokyo.paper.event.block.BeaconEffectEvent")) {
+			Skript.registerEvent("Beacon Effect", EvtBeacon.class, BeaconEffectEvent.class, "beacon effect")
+				.description("Called when a player gets an effect from a beacon")
+				.examples(
+					"on beacon effect:",
+						"\tbroadcast event-potioneffecttype",
+						"\tbroadcast event-player",
+						"\tbroadcast event-block"
+				)
+				.since("INSERT VERSION")
+				.requiredPlugins("Paper");
+		}
+		if (Skript.classExists("io.papermc.paper.event.block.BeaconActivatedEvent")) {
+			Skript.registerEvent("Beacon Toggle", EvtBeacon.class, new Class[] {BeaconActivatedEvent.class, BeaconDeactivatedEvent.class}, "beacon [:de]activate")
+				.description("Called when a beacon is activated or deactivated")
+				.examples(
+					"on beacon activate:",
+						"\tbroadcast event-block"
+				)
+				.since("INSERT VERSION")
+				.requiredPlugins("Paper");
+		}
+		if (Skript.classExists("io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent")) {
+			Skript.registerEvent("Beacon Change Effect", EvtBeacon.class, PlayerChangeBeaconEffectEvent.class,
+				"beacon change effect", "beacon effect change")
+				.description("Called when a player changes the effects of a beacon")
+				.examples(
+					"on beacon effect change:",
+						"\tbroadcast event-player",
+						"\tbroadcast event-block",
+						"\tbroadcast primary beacon effect",
+						"\tbroadcast secondary beacon effect"
+				)
+				.since("INSERT VERSION")
+				.requiredPlugins("Paper");
+		}
+	}
+
+	private boolean isActivate;
+
+	@Override
+	public boolean init(Literal<?>[] exprs, int matchedPattern, ParseResult parseResult) {
+		isActivate = !parseResult.hasTag("de");
+		return true;
+	}
+
+	@Override
+	public boolean check(Event event) {
+		if (event instanceof BeaconActivatedEvent) {
+			return isActivate;
+		} else if (event instanceof BeaconDeactivatedEvent) {
+			return !isActivate;
+		}
+		return true;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return "beacon effect/activate/deactivate/change effect";
+	}
+}