Revert "Replace the manual isCurrentEvent checks in favor of ERS (#8529)"

This reverts commit 06b54ed.

Author: Efnilite

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

@@ -3,11 +3,9 @@
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.*;
 import ch.njol.skript.lang.Condition;
-import ch.njol.skript.lang.EventRestrictedSyntax;
 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 com.destroystokyo.paper.event.player.PlayerElytraBoostEvent;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
@@ -20,7 +18,7 @@
 			prevent the used firework from being consumed
 	""")
 @Since("2.10")
-public class CondElytraBoostConsume extends Condition implements EventRestrictedSyntax {
+public class CondElytraBoostConsume extends Condition {
 
 	static {
 		if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerElytraBoostEvent")) {
@@ -34,15 +32,14 @@ public class CondElytraBoostConsume extends Condition implements EventRestricted
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerElytraBoostEvent.class)) {
+			Skript.error("This condition can only be used in an 'elytra boost' event.");
+			return false;
+		}
 		checkConsume = matchedPattern == 0;
 		return true;
 	}
 
-	@Override
-	public Class<? extends Event>[] supportedEvents() {
-		return CollectionUtils.array(PlayerElytraBoostEvent.class);
-	}
-
 	@Override
 	public boolean check(Event event) {
 		if (!(event instanceof PlayerElytraBoostEvent boostEvent))

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

@@ -1,7 +1,5 @@
 package ch.njol.skript.conditions;
 
-import ch.njol.skript.lang.EventRestrictedSyntax;
-import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
 import org.bukkit.event.entity.EntityUnleashEvent;
 import org.jetbrains.annotations.Nullable;
@@ -25,7 +23,7 @@
 @Keywords("lead")
 @Events("Leash / Unleash")
 @Since("2.10")
-public class CondLeashWillDrop extends Condition implements EventRestrictedSyntax {
+public class CondLeashWillDrop extends Condition {
 
 	static {
 		// TODO - remove this when Spigot support is dropped
@@ -35,15 +33,14 @@ public class CondLeashWillDrop extends Condition implements EventRestrictedSynta
 
 	@Override
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(EntityUnleashEvent.class)) {
+			Skript.error("The 'leash will drop' condition can only be used in an 'unleash' event");
+			return false;
+		}
 		setNegated(parseResult.hasTag("not"));
 		return true;
 	}
 
-	@Override
-	public Class<? extends Event>[] supportedEvents() {
-		return CollectionUtils.array(EntityUnleashEvent.class);
-	}
-
 	@Override
 	public boolean check(Event event) {
 		if (!(event instanceof EntityUnleashEvent unleashEvent))

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

@@ -1,7 +1,5 @@
 package ch.njol.skript.conditions;
 
-import ch.njol.skript.lang.EventRestrictedSyntax;
-import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
 import org.bukkit.event.player.PlayerResourcePackStatusEvent;
 import org.bukkit.event.player.PlayerResourcePackStatusEvent.Status;
@@ -27,7 +25,7 @@
 	""")
 @Since("2.4")
 @Events("resource pack request response")
-public class CondResourcePack extends Condition implements EventRestrictedSyntax {
+public class CondResourcePack extends Condition {
 
 	static {
 		Skript.registerCondition(CondResourcePack.class,
@@ -41,15 +39,14 @@ public class CondResourcePack extends Condition implements EventRestrictedSyntax
 	@SuppressWarnings({"unchecked", "null"})
 	@Override
 	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerResourcePackStatusEvent.class)) {
+			Skript.error("The resource pack condition can't be used outside of a resource pack response event");
+			return false;
+		}
 		states = (Expression<Status>) exprs[0];
 		setNegated(matchedPattern == 1);
 		return true;
 	}
-
-	@Override
-	public Class<? extends Event>[] supportedEvents() {
-		return CollectionUtils.array(PlayerResourcePackStatusEvent.class);
-	}
 
 	@Override
 	public boolean check(Event e) {

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

@@ -8,11 +8,9 @@
 import ch.njol.skript.doc.RequiredPlugins;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Condition;
-import ch.njol.skript.lang.EventRestrictedSyntax;
 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 org.bukkit.event.Event;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.jetbrains.annotations.Nullable;
@@ -27,7 +25,7 @@
 @RequiredPlugins("Minecraft 1.16+")
 @Since("2.7")
 @Events("respawn")
-public class CondRespawnLocation extends Condition implements EventRestrictedSyntax {
+public class CondRespawnLocation extends Condition {
 
 	static {
 		Skript.registerCondition(CondRespawnLocation.class, "[the] respawn location (was|is)[1:(n'| no)t] [a] (:bed|respawn anchor)");
@@ -37,16 +35,15 @@ public class CondRespawnLocation extends Condition implements EventRestrictedSyn
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerRespawnEvent.class)) {
+			Skript.error("The 'respawn location' condition may only be used in a respawn event");
+			return false;
+		}
 		setNegated(parseResult.mark == 1);
 		bedSpawn = parseResult.hasTag("bed");
 		return true;
 	}
 
-	@Override
-	public Class<? extends Event>[] supportedEvents() {
-		return CollectionUtils.array(PlayerRespawnEvent.class);
-	}
-
 	@Override
 	public boolean check(Event event) {
 		if (event instanceof PlayerRespawnEvent) {

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

@@ -7,11 +7,9 @@
 import ch.njol.skript.doc.Name;
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Condition;
-import ch.njol.skript.lang.EventRestrictedSyntax;
 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 org.bukkit.event.Event;
 import org.bukkit.event.player.PlayerEggThrowEvent;
 import org.jetbrains.annotations.Nullable;
@@ -25,7 +23,7 @@
 	""")
 @Events("Egg Throw")
 @Since("2.7")
-public class CondWillHatch extends Condition implements EventRestrictedSyntax {
+public class CondWillHatch extends Condition {
 
 	static {
 		Skript.registerCondition(CondWillHatch.class,
@@ -35,15 +33,14 @@ public class CondWillHatch extends Condition implements EventRestrictedSyntax {
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerEggThrowEvent.class)) {
+			Skript.error("You can't use the 'egg will hatch' condition outside of a Player Egg Throw event.");
+			return false;
+		}
 		setNegated(!parseResult.hasTag("will"));
 		return true;
 	}
 
-	@Override
-	public Class<? extends Event>[] supportedEvents() {
-		return CollectionUtils.array(PlayerEggThrowEvent.class);
-	}
-
 	@Override
 	public boolean check(Event event) {
 		if (!(event instanceof PlayerEggThrowEvent))

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

@@ -1,7 +1,5 @@
 package ch.njol.skript.effects;
 
-import ch.njol.skript.lang.EventRestrictedSyntax;
-import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
@@ -32,7 +30,7 @@
 			set the player's display name to arg-1
 	""")
 @Since("2.2-dev34")
-public class EffCancelCooldown extends Effect implements EventRestrictedSyntax {
+public class EffCancelCooldown extends Effect {
 
 	static {
 		Skript.registerEffect(EffCancelCooldown.class,
@@ -44,15 +42,14 @@ public class EffCancelCooldown extends Effect implements EventRestrictedSyntax {
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(ScriptCommandEvent.class)) {
+			Skript.error("The cancel cooldown effect may only be used in a command", ErrorQuality.SEMANTIC_ERROR);
+			return false;
+		}
 		cancel = matchedPattern == 0;
 		return true;
 	}
 
-	@Override
-	public Class<? extends Event>[] supportedEvents() {
-		return CollectionUtils.array(ScriptCommandEvent.class);
-	}
-
 	@Override
 	protected void execute(Event e) {
 		if (!(e instanceof ScriptCommandEvent))

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

@@ -1,7 +1,5 @@
 package ch.njol.skript.effects;
 
-import ch.njol.skript.lang.EventRestrictedSyntax;
-import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.event.Event;
 import org.bukkit.event.entity.EntityUnleashEvent;
 import org.jetbrains.annotations.Nullable;
@@ -25,7 +23,7 @@
 @Keywords("lead")
 @Events("Leash / Unleash")
 @Since("2.10")
-public class EffDropLeash extends Effect implements EventRestrictedSyntax {
+public class EffDropLeash extends Effect {
 
 	static {
 			Skript.registerEffect(EffDropLeash.class,
@@ -38,15 +36,14 @@ public class EffDropLeash extends Effect implements EventRestrictedSyntax {
 
 	@Override
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(EntityUnleashEvent.class)) {
+			Skript.error("The 'drop leash' effect can only be used in an 'unleash' event");
+			return false;
+		}
 		allowLeashDrop = matchedPattern == 0;
 		return true;
 	}
 
-	@Override
-	public Class<? extends Event>[] supportedEvents() {
-		return CollectionUtils.array(EntityUnleashEvent.class);
-	}
-
 	@Override
 	protected void execute(Event event) {
 		if (!(event instanceof EntityUnleashEvent unleashEvent))

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

@@ -3,11 +3,9 @@
 import ch.njol.skript.Skript;
 import ch.njol.skript.doc.*;
 import ch.njol.skript.lang.Effect;
-import ch.njol.skript.lang.EventRestrictedSyntax;
 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 com.destroystokyo.paper.event.player.PlayerElytraBoostEvent;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
@@ -20,7 +18,7 @@
 			prevent the used firework from being consume
 	""")
 @Since("2.10")
-public class EffElytraBoostConsume extends Effect implements EventRestrictedSyntax {
+public class EffElytraBoostConsume extends Effect {
 
 	static {
 		if (Skript.classExists("com.destroystokyo.paper.event.player.PlayerElytraBoostEvent")) {
@@ -34,15 +32,14 @@ public class EffElytraBoostConsume extends Effect implements EventRestrictedSynt
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		if (!getParser().isCurrentEvent(PlayerElytraBoostEvent.class)) {
+			Skript.error("This effect can only be used in an 'elytra boost' event.");
+			return false;
+		}
 		consume = matchedPattern == 1;
 		return true;
 	}
 
-	@Override
-	public Class<? extends Event>[] supportedEvents() {
-		return CollectionUtils.array(PlayerElytraBoostEvent.class);
-	}
-
 	@Override
 	protected void execute(Event event) {
 		if (!(event instanceof PlayerElytraBoostEvent boostEvent))

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

@@ -3,8 +3,6 @@
 import java.util.Arrays;
 import java.util.Iterator;
 
-import ch.njol.skript.lang.EventRestrictedSyntax;
-import ch.njol.util.coll.CollectionUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.server.ServerListPingEvent;
@@ -30,33 +28,35 @@
 		hide {vanished::*} from the server list
 	""")
 @Since("2.3")
-public class EffHidePlayerFromServerList extends Effect implements EventRestrictedSyntax {
+public class EffHidePlayerFromServerList extends Effect {
 
 	static {
 		Skript.registerEffect(EffHidePlayerFromServerList.class,
 				"hide %players% (in|on|from) [the] server list",
 				"hide %players%'[s] info[rmation] (in|on|from) [the] server list");
 	}
 
+	private static final boolean PAPER_EVENT_EXISTS = Skript.classExists("com.destroystokyo.paper.event.server.PaperServerListPingEvent");
+
 	@SuppressWarnings("null")
 	private Expression<Player> players;
 
 	@SuppressWarnings({"unchecked", "null"})
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		if (isDelayed == Kleenean.TRUE) {
+		boolean isServerPingEvent = getParser().isCurrentEvent(ServerListPingEvent.class) ||
+				(PAPER_EVENT_EXISTS && getParser().isCurrentEvent(PaperServerListPingEvent.class));
+		if (!isServerPingEvent) {
+			Skript.error("The hide player from server list effect can't be used outside of a server list ping event");
+			return false;
+		} else if (isDelayed == Kleenean.TRUE) {
 			Skript.error("Can't hide players from the server list anymore after the server list ping event has already passed");
 			return false;
 		}
 		players = (Expression<Player>) exprs[0];
 		return true;
 	}
 
-	@Override
-	public Class<? extends Event>[] supportedEvents() {
-		return CollectionUtils.array(ServerListPingEvent.class, PaperServerListPingEvent.class);
-	}
-
 	@Override
 	@SuppressWarnings("removal")
 	protected void execute(Event e) {