🚀 Enchantment Improvements

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

@@ -44,6 +44,7 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
+import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -1200,7 +1201,7 @@ public boolean hasEnchantments(EnchantmentType... enchantments) {
 			assert type != null; // Bukkit working different than we expect
 			if (!meta.hasEnchant(type))
 				return false;
-			if (enchantment.getInternalLevel() != -1 && meta.getEnchantLevel(type) < enchantment.getLevel())
+			if (enchantment.getInternalLevel() != -1 && meta.getEnchantLevel(type) != enchantment.getLevel())
 				return false;
 		}
 		return true;
@@ -1250,6 +1251,109 @@ public void clearEnchantments() {
 		}
 		setItemMeta(meta);
 	}
+
+	/**
+	 * Gets all stored enchantments of this item.
+	 * @return the stored enchantments of this item type.
+	 */
+	@Nullable
+	public EnchantmentType[] getStoredEnchantmentTypes() {
+		EnchantmentStorageMeta meta = getEnchantmentStorageMeta();
+		if (meta == null)
+			return new EnchantmentType[0];
+
+		Set<Entry<Enchantment, Integer>> enchants = meta.getStoredEnchants().entrySet();
+
+		return enchants.stream()
+			.map(enchant -> new EnchantmentType(enchant.getKey(), enchant.getValue()))
+			.toArray(EnchantmentType[]::new);
+	}
+
+	/**
+	 * Checks whether this item type has stored enchantments.
+	 * Used for materials such as {@link Material#ENCHANTED_BOOK}
+	 */
+	public boolean hasStoredEnchantments() {
+		ItemType type = getBaseType();
+		ItemMeta meta = type.getItemMeta();
+		if (meta instanceof EnchantmentStorageMeta)
+			return ((EnchantmentStorageMeta) meta).hasStoredEnchants();
+		else
+			return false;
+	}
+
+	/**
+	 * Checks whether this item type contains the given stored enchantments.
+	 * Also checks the enchantment level.
+	 * @param enchantments The enchantments to be checked.
+	 */
+	public boolean hasStoredEnchantments(EnchantmentType... enchantments) {
+		EnchantmentStorageMeta meta = getEnchantmentStorageMeta();
+		if (meta == null)
+			return false;
+		if (!hasStoredEnchantments())
+			return false;
+
+		for (EnchantmentType enchantment : enchantments) {
+			Enchantment type = enchantment.getType();
+			assert type != null; // Bukkit working different than we expect
+			if (!meta.hasStoredEnchant(type))
+				return false;
+			if (enchantment.getInternalLevel() != -1 && meta.getStoredEnchantLevel(type) != enchantment.getLevel())
+				return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Adds the given enchantments to the stored enchantments of this item type.
+	 * @param enchantments The enchantments to be added.
+	 */
+	public void addStoredEnchantments(EnchantmentType... enchantments) {
+		EnchantmentStorageMeta meta = getEnchantmentStorageMeta();
+		if (meta == null)
+			return;
+
+		for (EnchantmentType enchantment : enchantments) {
+			Enchantment type = enchantment.getType();
+			assert type != null; // Bukkit working different than we expect
+			meta.addStoredEnchant(type, enchantment.getLevel(), true);
+		}
+		setItemMeta(meta);
+	}
+
+	/**
+	 * Removes the given enchantments from the stored enchantments of this item type.
+	 * @param enchantments The enchantments to be removed.
+	 */
+	public void removeStoredEnchantments(EnchantmentType... enchantments) {
+		EnchantmentStorageMeta meta = getEnchantmentStorageMeta();
+		if (meta == null)
+			return;
+
+		for (EnchantmentType enchantment : enchantments) {
+			Enchantment type = enchantment.getType();
+			assert type != null; // Bukkit working different than we expect
+			meta.removeStoredEnchant(type);
+		}
+		setItemMeta(meta);
+	}
+
+	/**
+	 * Clears all stored enchantments from this item type
+	 */
+	public void clearStoredEnchantments() {
+		EnchantmentStorageMeta meta = getEnchantmentStorageMeta();
+		if (meta == null)
+			return;
+
+		Set<Enchantment> enchants = meta.getStoredEnchants().keySet();
+		for (Enchantment ench : enchants) {
+			assert ench != null;
+			meta.removeStoredEnchant(ench);
+		}
+		setItemMeta(meta);
+	}
 
 	/**
 	 * Gets item meta that applies to all items represented by this type.
@@ -1259,6 +1363,20 @@ public ItemMeta getItemMeta() {
 		return globalMeta != null ? globalMeta : types.get(0).getItemMeta();
 	}
 
+	/**
+	 * Gets {@link EnchantmentStorageMeta} that applies to all items represented by this type if possible.
+	 * @return Item meta.
+	 */
+	@Nullable
+	public EnchantmentStorageMeta getEnchantmentStorageMeta() {
+		if (globalMeta != null && globalMeta instanceof EnchantmentStorageMeta)
+			return (EnchantmentStorageMeta) globalMeta;
+		else if (types.get(0).getItemMeta() instanceof EnchantmentStorageMeta)
+			return (EnchantmentStorageMeta) types.get(0).getItemMeta();
+		else
+			return null;
+	}
+
 	/**
 	 * Sets item meta that is applied for everything this type represents.
 	 * Note that previous item meta is overridden if it exists.

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

@@ -0,0 +1,89 @@
+/**
+ *   This file is part of Skript.
+ *
+ *  Skript is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Skript is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright Peter Güttinger, SkriptLang team and contributors
+ */
+package ch.njol.skript.conditions;
+
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.conditions.base.PropertyCondition;
+import ch.njol.skript.conditions.base.PropertyCondition.PropertyType;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+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 org.bukkit.enchantments.Enchantment;
+import org.bukkit.event.Event;
+import org.bukkit.inventory.meta.EnchantmentStorageMeta;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.eclipse.jdt.annotation.Nullable;
+
+@Name("Has Conflicting Enchantments")
+@Description("Checks whether an item has conflicting enchantments with the given enchantment.")
+@Examples({"player's tool has conflicting enchantments with efficiency",
+		"event-item has conflicting stored enchantments with power"})
+@Since("INSERT VERSION")
+public class CondHasConflictingEnchantments extends Condition {
+
+	static {
+		PropertyCondition.register(CondHasConflictingEnchantments.class, PropertyType.HAVE,
+			"conflicting [(1¦stored)] enchant[ment]s with %enchantment%", "itemtypes");
+	}
+
+	@SuppressWarnings("NotNullFieldNotInitialized")
+	private Expression<ItemType> items;
+	@SuppressWarnings("NotNullFieldNotInitialized")
+	private Expression<Enchantment> ench;
+	private boolean isStored;
+
+	@Override
+	@SuppressWarnings({"unchecked", "null"})
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
+		items = (Expression<ItemType>) exprs[0];
+		ench = (Expression<Enchantment>) exprs[1];
+		isStored = parseResult.mark > 0;
+		setNegated(matchedPattern == 1);
+		return true;
+	}
+
+	@Override
+	public boolean check(Event e) {
+		Enchantment ench = this.ench.getSingle(e);
+		if (ench == null)
+			return false;
+
+		return items.check(e, item ->
+		{
+			ItemMeta meta = item.getItemMeta();
+			if ((isStored && meta instanceof EnchantmentStorageMeta)) {
+				return ((EnchantmentStorageMeta) meta).hasConflictingStoredEnchant(ench);
+			} else {
+				return meta.hasConflictingEnchant(ench);
+			}
+		}, isNegated());
+	}
+
+	@Override
+	public String toString(@Nullable Event e, boolean debug) {
+		return PropertyCondition.toString(this, PropertyType.HAVE, e, debug, items,
+			"conflicting " + (isStored ? "stored " : "") + "enchantments with " + ench.toString(e, debug));
+	}
+
+}

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

@@ -19,6 +19,7 @@
 package ch.njol.skript.conditions;
 
 import org.bukkit.event.Event;
+import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.eclipse.jdt.annotation.Nullable;
 
 import ch.njol.skript.aliases.ItemType;
@@ -34,49 +35,53 @@
 import ch.njol.skript.util.EnchantmentType;
 import ch.njol.util.Kleenean;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Is Enchanted")
 @Description("Checks whether an item is enchanted.")
 @Examples({"tool of the player is enchanted with efficiency 2",
-		"helm, chestplate, leggings or boots are enchanted"})
-@Since("1.4.6")
+		"helm, chestplate, leggings or boots are enchanted",
+		"",
+		"# For enchanted books",
+		"player's tool is stored enchanted",
+		"event-item is enchanted with stored power 2"})
+@Since("1.4.6, INSERT VERSION (stored enchantments)")
 public class CondIsEnchanted extends Condition {
 
 	static {
-		PropertyCondition.register(CondIsEnchanted.class, "enchanted [with %-enchantmenttype%]", "itemtypes");
+		PropertyCondition.register(CondIsEnchanted.class,
+			"[(1¦stored[ly])] enchanted [with %-enchantmenttype%]", "itemtypes");
 	}
 
 	@SuppressWarnings("NotNullFieldNotInitialized")
 	private Expression<ItemType> items;
 	@Nullable
 	private Expression<EnchantmentType> enchs;
+	private boolean isStored;
 
-	@SuppressWarnings({"unchecked", "null"})
 	@Override
-	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
+	@SuppressWarnings({"unchecked", "null"})
+	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		items = (Expression<ItemType>) exprs[0];
 		enchs = (Expression<EnchantmentType>) exprs[1];
+		isStored = parseResult.mark > 0;
 		setNegated(matchedPattern == 1);
 		return true;
 	}
 
 	@Override
-	public boolean check(final Event e) {
+	public boolean check(Event e) {
 		if (enchs != null)
-			return items.check(e, item -> enchs.check(e, item::hasEnchantments), isNegated());
+			return items.check(e, item ->
+					(isStored && item.getItemMeta() instanceof EnchantmentStorageMeta) ? enchs.check(e, item::hasStoredEnchantments) : enchs.check(e, item::hasEnchantments), isNegated());
 		else
-			return items.check(e, ItemType::hasEnchantments, isNegated());
-
+			return items.check(e, item ->
+					(isStored && item.getItemMeta() instanceof EnchantmentStorageMeta) ? item.hasStoredEnchantments() : item.hasEnchantments(), isNegated());
+
 	}
 
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		final Expression<EnchantmentType> es = enchs;
-
+	public String toString(@Nullable Event e, boolean debug) {
 		return PropertyCondition.toString(this, PropertyType.BE, e, debug, items,
-				"enchanted" + (es == null ? "" : " with " + es.toString(e, debug)));
+			(isStored ? "stored " : "") + "enchanted" + (enchs == null ? "" : " with " + enchs.toString(e, debug)));
 	}
 
 }