allow greater than and lesser than or equal to

Author: sovdeeth

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

@@ -42,6 +42,7 @@
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.BiPredicate;
 import java.util.stream.Collectors;
 
 @ContainerType(ItemStack.class)
@@ -1342,34 +1343,61 @@ public boolean hasAnyEnchantments(Enchantment... enchantments) {
 	 * Checks whether this item type contains all the given enchantments.
 	 * Also checks the enchantment level, where any level equal or lesser than the item's level is accepted.
 	 * @param enchantments The enchantments to be checked.
+	 * @deprecated Use {@link #hasEnchantmentsOrBetter(EnchantmentType...)}
 	 */
+	@Deprecated(since="INSERT VERSION")
 	public boolean hasEnchantments(EnchantmentType... enchantments) {
-		return hasEnchantments(true, enchantments);
+		return hasEnchantmentsOrBetter(true, enchantments);
 	}
 
 	/**
 	 * Checks whether this item type contains the given enchantments.
 	 * Also checks the enchantment level, where any level equal or lesser than the item's level is accepted.
 	 * @param all Whether to check all enchantments or any enchantment.
 	 * @param enchantments The enchantments to be checked.
+	 * @deprecated Use {@link #hasEnchantmentsOrBetter(boolean, EnchantmentType...)}
 	 */
+	@Deprecated(since="INSERT VERSION")
 	public boolean hasEnchantments(boolean all, EnchantmentType... enchantments) {
-		if (!hasEnchantments())
-			return false;
-		ItemMeta meta = getItemMeta();
-		for (EnchantmentType enchantment : enchantments) {
-			Enchantment type = enchantment.getType();
-			assert type != null; // Bukkit working different than we expect
-			if (!meta.hasEnchant(type) && all)
-				return false;
-			if (enchantment.getInternalLevel() == -1 || meta.getEnchantLevel(type) >= enchantment.getLevel()) {
-				if (!all)
-					return true;
-			} else if (all) {
-				return false;
-			}
-		}
-		return all;
+		return hasEnchantmentsOrBetter(all, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains all the given enchantments.
+	 * Also checks the enchantment level, where any level equal or lesser than the item's level is accepted.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasEnchantmentsOrBetter(EnchantmentType... enchantments) {
+		return hasEnchantmentsOrBetter(true, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains the given enchantments.
+	 * Also checks the enchantment level, where any level equal or lesser than the item's level is accepted.
+	 * @param all Whether to check all enchantments or any enchantment.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasEnchantmentsOrBetter(boolean all, EnchantmentType... enchantments) {
+		return hasEnchantments((itemLevel, typeLevel) -> itemLevel >= typeLevel, all, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains all the given enchantments.
+	 * Also checks the enchantment level, where any level equal or greater than the item's level is accepted.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasEnchantmentsOrWorse(EnchantmentType... enchantments) {
+		return hasEnchantmentsOrWorse(true, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains the given enchantments.
+	 * Also checks the enchantment level, where any level equal or greater than the item's level is accepted.
+	 * @param all Whether to check all enchantments or any enchantment.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasEnchantmentsOrWorse(boolean all, EnchantmentType... enchantments) {
+		return hasEnchantments((itemLevel, typeLevel) -> itemLevel <= typeLevel, all, enchantments);
 	}
 
 	/**
@@ -1388,6 +1416,18 @@ public boolean hasExactEnchantments(EnchantmentType... enchantments) {
 	 * @param enchantments The enchantments to be checked.
 	 */
 	public boolean hasExactEnchantments(boolean all, EnchantmentType... enchantments) {
+		return hasEnchantments(Integer::equals, all, enchantments);
+	}
+
+	/**
+	 * Checks whether this item type contains the given enchantments.
+	 * Also checks the enchantment level, with behavior depending on the {@code exact} parameter.
+	 * @param levelMatchingCondition A predicate used to tell whether the item's level (first param) matches a type's level (second param).
+	 *                               Types with no specified level will always match, regardless of this predicate.
+	 * @param all Whether to check all enchantments or any enchantment.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	private boolean hasEnchantments(BiPredicate<@NotNull Integer, @NotNull Integer> levelMatchingCondition, boolean all, EnchantmentType... enchantments) {
 		if (!hasEnchantments())
 			return false;
 		ItemMeta meta = getItemMeta();
@@ -1396,14 +1436,15 @@ public boolean hasExactEnchantments(boolean all, EnchantmentType... enchantments
 			assert type != null; // Bukkit working different than we expect
 			if (!meta.hasEnchant(type) && all)
 				return false;
-			if (enchantment.getInternalLevel() == -1 || meta.getEnchantLevel(type) == enchantment.getLevel()) {
+			if (enchantment.getInternalLevel() == -1 || levelMatchingCondition.test(meta.getEnchantLevel(type), enchantment.getLevel())) {
 				if (!all)
 					return true;
 			} else if (all) {
 				return false;
 			}
 		}
 		return all;
+
 	}
 
 	/**

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

@@ -16,26 +16,43 @@
 import org.jetbrains.annotations.Nullable;
 
 @Name("Is Enchanted")
-@Description("Checks whether an item is enchanted. Enchants must match the exact level by default, unless 'or better' is used.")
+@Description("Checks whether an item is enchanted. Enchants must match the exact level by default, unless 'or better' or 'or worse' are used.")
 @Example("tool of the player is enchanted with efficiency 2")
 @Example("if player's helmet or player's boots are enchanted with protection 3 or better:")
+@Example("if player's chestplate is enchanted with protection")
 @Since("1.4.6, INSERT VERSION ('or better')")
 public class CondIsEnchanted extends Condition {
-	
+
+	private enum Comparison {
+		EXACT(""),
+		AT_LEAST(" or better"),
+		AT_MOST(" or worse");
+
+		private final String toString;
+
+		Comparison(String toString) {
+			this.toString = toString;
+		}
+
+		public String toSkriptString() {
+			return toString;
+		}
+	}
+
 	static {
-		PropertyCondition.register(CondIsEnchanted.class, "enchanted [with %-enchantmenttypes% [atleast:or (better|greater)]]", "itemtypes");
+		PropertyCondition.register(CondIsEnchanted.class, "enchanted [with %-enchantmenttypes% [or (1:(better|greater|higher|above)|2:(worse|lesser|lower|below))]]", "itemtypes");
 	}
 
 	private Expression<ItemType> items;
 	private @Nullable Expression<EnchantmentType> enchs;
-	private boolean exact;
+	private Comparison comparison;
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		items = (Expression<ItemType>) exprs[0];
 		enchs = (Expression<EnchantmentType>) exprs[1];
-		exact = !parseResult.hasTag("atleast");
+		comparison = Comparison.values()[parseResult.mark];
 		setNegated(matchedPattern == 1);
 		return true;
 	}
@@ -45,10 +62,11 @@ public boolean check(Event event) {
 		if (enchs != null) {
 			EnchantmentType[] enchantments = enchs.getAll(event);
 			boolean and = enchs.getAnd();
-			return items.check(event, item ->
-				exact ? item.hasExactEnchantments(and, enchantments)
-					: item.hasEnchantments(and, enchantments),
-				isNegated());
+			return items.check(event, item -> switch (comparison) {
+				case EXACT -> item.hasExactEnchantments(and, enchantments);
+				case AT_MOST -> item.hasEnchantmentsOrWorse(and, enchantments);
+				case AT_LEAST -> item.hasEnchantmentsOrBetter(and, enchantments);
+			}, isNegated());
 		} else {
 			return items.check(event, ItemType::hasEnchantments, isNegated());
 		}
@@ -58,7 +76,7 @@ public boolean check(Event event) {
 	public String toString(@Nullable Event event, boolean debug) {
 		return PropertyCondition.toString(this, PropertyType.BE, event, debug, items,
 				"enchanted" + (enchs == null ? "" : " with " + enchs.toString(event, debug)) +
-					(exact ? "" : " or better"));
+				comparison.toSkriptString());
 	}
 
 }