🚀 Item cooldown expression + condition

src/main/java/ch/njol/skript/aliases/ItemType.java

@@ -345,6 +345,13 @@ public boolean hasBlock() {
 		}
 		return false;
 	}
+
+	/**
+	 * @return Whether this ItemType has at least one ItemData that represents it whether it's a block or an item
+	 */
+	public boolean hasType() {
+		return types.get(0) != null;
+	}
 
 	/**
 	 * Sets the given block to this ItemType

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

@@ -36,15 +36,19 @@
 
 @Name("Has Item Cooldown")
 @Description("Check whether a cooldown is active on the specified material for a specific player.")
-@Examples({"if player has item cooldown on player's tool:",
-	"\tsend \"You can't use this item right now. Wait %item cooldown of player's tool for player%\""})
+@Examples({
+	"if player has player's tool on cooldown:",
+		"\tsend \"You can't use this item right now. Wait %item cooldown of player's tool for player%\""
+})
 @Since("INSERT VERSION")
 public class CondHasItemCooldown extends Condition {
 
 	static {
 		Skript.registerCondition(CondHasItemCooldown.class, 
-			"%players% (has|have) ([([an] item|a)] cooldown (on|for) %itemtypes%|%itemtypes% on cooldown)",
-			"%players% (doesn't|does not|do not|don't) have ([([an] item|a)] cooldown (on|for) %itemtypes%|%itemtypes% on cooldown)");
+			"%players% (has|have) [([an] item|a)] cooldown (on|for) %itemtypes%",
+			"%players% (has|have) %itemtypes% on cooldown",
+			"%players% (doesn't|does not|do not|don't) have [([an] item|a)] cooldown (on|for) %itemtypes%",
+			"%players% (doesn't|does not|do not|don't) have %itemtypes% on cooldown");
 	}
 
 	private Expression<Player> players;
@@ -55,22 +59,23 @@ public class CondHasItemCooldown extends Condition {
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		players = (Expression<Player>) exprs[0];
 		itemtypes = (Expression<ItemType>) exprs[1];
-		setNegated(matchedPattern == 1);
+		setNegated(matchedPattern > 1);
 		return true;
 	}
 
 	@Override
-	public boolean check(Event e) {
-		return players.check(e, (p) -> 
-				itemtypes.check(e, (it) -> 
-						p.hasCooldown(it.getMaterial())
+	public boolean check(Event event) {
+		return players.check(event, (player) ->
+				itemtypes.check(event, (itemType) ->
+						itemType.hasType() && player.hasCooldown(itemType.getMaterial())
 				)
 		);
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return PropertyCondition.toString(this, PropertyType.HAVE, e, debug, players, itemtypes.toString(e, debug) + " on cooldown");
+	public String toString(@Nullable Event event, boolean debug) {
+		return PropertyCondition.toString(this, PropertyType.HAVE, event, debug, players,
+			itemtypes.toString(event, debug) + " on cooldown");
 	}
 
 }

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

@@ -37,16 +37,16 @@
 import org.bukkit.event.Event;
 import org.eclipse.jdt.annotation.Nullable;
 
-import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Name("Item Cooldown")
-@Description("Set the cooldown of a specific material for a certain amount of ticks. Setting this to <code>0 ticks</code> will remove the cooldown.")
+@Description("Change the cooldown of a specific material to a certain amount of <a href='./classes.html#timespan'>Timespan</a>.")
 @Examples({
-	"on right click using stick:" +
-	"\tset item cooldown of player's tool for player to 1 minute",
-	"\tset item cooldown of stone and grass for all players to 20 seconds",
-	"\treset item cooldown of cobblestone and dirt for all players"
+	"on right click using stick:",
+		"\tset item cooldown of player's tool for player to 1 minute",
+		"\tset item cooldown of stone and grass for all players to 20 seconds",
+		"\treset item cooldown of cobblestone and dirt for all players"
 })
 @Since("INSERT VERSION")
 public class ExprItemCooldown extends SimpleExpression<Timespan> {
@@ -73,27 +73,16 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	@Override
 	protected Timespan[] get(Event event) {
 		Player[] players = this.players.getArray(event);
-		ItemType[] itemtypesArray = this.itemtypes.getArray(event);
-		if (players == null || itemtypesArray == null)
-			return null;
 
-		List<ItemType> itemtypes = Arrays.stream(itemtypesArray)
-			.filter(it -> {
-				try {
-					it.getMaterial();
-					return true;
-				} catch (IllegalArgumentException ex) {
-					return false;
-				}
-			}).toList();
+		List<ItemType> itemTypes = this.itemtypes.stream(event)
+				.filter(ItemType::hasType).collect(Collectors.toList());
 
-		Timespan[] timespan = new Timespan[players.length * itemtypes.size()];
+		Timespan[] timespan = new Timespan[players.length * itemTypes.size()];
 
 		int i = 0;
 		for (Player player : players) {
-			for (ItemType itemtype : itemtypes) {
-				timespan[i] = Timespan.fromTicks_i(player.getCooldown(itemtype.getMaterial()));
-				i++;
+			for (ItemType itemType : itemTypes) {
+				timespan[i++] = Timespan.fromTicks_i(player.getCooldown(itemType.getMaterial()));
 			}
 		}
 		return timespan;
@@ -102,34 +91,21 @@ protected Timespan[] get(Event event) {
 	@Override
 	@Nullable
 	public Class<?>[] acceptChange(ChangeMode mode) {
-		if (mode == ChangeMode.REMOVE_ALL)
-			return null;
-		return CollectionUtils.array(Timespan.class);
+		return mode == ChangeMode.REMOVE_ALL ? null : CollectionUtils.array(Timespan.class);
 	}
 
 	@Override
-	public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
+	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		if (mode != ChangeMode.RESET && mode != ChangeMode.DELETE && delta == null)
 			return;
 
 		int ticks = delta != null ? (int) ((Timespan) delta[0]).getTicks_i() : 0; // 0 for DELETE/RESET
 		Player[] players = this.players.getArray(event);
-		ItemType[] itemtypesArray = this.itemtypes.getArray(event);
-		if (players == null || itemtypesArray == null)
-			return;
-
-		List<ItemType> itemtypes = Arrays.stream(itemtypesArray)
-			.filter(it -> {
-				try {
-					it.getMaterial();
-					return true;
-				} catch (IllegalArgumentException ex) {
-					return false;
-				}
-			}).toList();
+		List<ItemType> itemTypes = this.itemtypes.stream(event)
+				.filter(ItemType::hasType).collect(Collectors.toList());
 
 		for (Player player : players) {
-			for (ItemType itemtype : itemtypes) {
+			for (ItemType itemtype : itemTypes) {
 				Material material = itemtype.getMaterial();
 				switch (mode) {
 					case RESET: