Modernise enchantments

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

@@ -24,8 +24,6 @@
 import org.bukkit.block.banner.PatternType;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.CommandSender;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.enchantments.EnchantmentOffer;
 import org.bukkit.entity.*;
 import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
@@ -424,17 +422,6 @@ public boolean mustSyncDeserialization() {
 					}
 				}));
 
-		Classes.registerClass(new RegistryClassInfo<>(Enchantment.class, Registry.ENCHANTMENT, "enchantment", "enchantments")
-				.user("enchantments?")
-				.name("Enchantment")
-				.description("An enchantment, e.g. 'sharpness' or 'fortune'. Unlike <a href='#enchantmenttype'>enchantment type</a> " +
-						"this type has no level, but you usually don't need to use this type anyway.",
-						"NOTE: Minecraft namespaces are supported, ex: 'minecraft:basalt_deltas'.",
-						"As of Minecraft 1.21 this will also support custom enchantments using namespaces, ex: 'myenchants:explosive'.")
-				.examples("")
-				.since("1.4.6")
-				.before("enchantmenttype"));
-
 		Material[] allMaterials = Material.values();
 		Classes.registerClass(new ClassInfo<>(Material.class, "material")
 				.name(ClassInfo.NO_DOC)
@@ -615,31 +602,6 @@ public String[] getPatterns() {
 					ExpressionPropertyHandler.of(GameRule::getName, String.class)
 				));
 
-		Classes.registerClass(new ClassInfo<>(EnchantmentOffer.class, "enchantmentoffer")
-				.user("enchant[ment][ ]offers?")
-				.name("Enchantment Offer")
-				.description("The enchantmentoffer in an enchant prepare event.")
-				.examples("on enchant prepare:",
-					"\tset enchant offer 1 to sharpness 1",
-					"\tset the cost of enchant offer 1 to 10 levels")
-				.since("2.5")
-				.parser(new Parser<>() {
-					@Override
-					public boolean canParse(ParseContext context) {
-						return false;
-					}
-
-					@Override
-					public String toString(EnchantmentOffer eo, int flags) {
-						return Classes.toString(eo.getEnchantment()) + " " + eo.getEnchantmentLevel();
-					}
-
-					@Override
-					public String toVariableNameString(EnchantmentOffer eo) {
-						return "offer:" + Classes.toString(eo.getEnchantment()) + "=" + eo.getEnchantmentLevel();
-					}
-				}));
-
 		Classes.registerClass(new RegistryClassInfo<>(Attribute.class, Registry.ATTRIBUTE, "attributetype", "attribute types")
 				.user("attribute ?types?")
 				.name("Attribute Type")

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

@@ -545,35 +545,6 @@ public boolean supportsOrdering() {
 			}
 		});
 
-		// EnchantmentOffer Comparators
-		// EnchantmentOffer - EnchantmentType
-		Comparators.registerComparator(EnchantmentOffer.class, EnchantmentType.class, new Comparator<EnchantmentOffer, EnchantmentType>() {
-			@Override
-			public Relation compare(EnchantmentOffer eo, EnchantmentType et) {
-				return Relation.get(eo.getEnchantment() == et.getType() && eo.getEnchantmentLevel() == et.getLevel());
-			}
-
-			@Override
-			public boolean supportsOrdering() {
-				return false;
-			}
-		});
-		// EnchantmentOffer - Experience
-		Comparators.registerComparator(EnchantmentOffer.class, Experience.class, new Comparator<EnchantmentOffer, Experience>() {
-			@Override
-			public Relation compare(EnchantmentOffer eo, Experience exp) {
-				return Relation.get(eo.getCost() == exp.getXP());
-			}
-
-			@Override public boolean supportsOrdering() {
-				return false;
-			}
-		});
-
-		//EnchantmentType - Enchantment
-		Comparators.registerComparator(EnchantmentType.class, Enchantment.class, ((enchantmentType, enchantment) ->
-			Relation.get(enchantmentType.getType().equals(enchantment))));
-
 		Comparators.registerComparator(Inventory.class, InventoryType.class, new Comparator<Inventory, InventoryType>() {
 			@Override
 			public Relation compare(Inventory inventory, InventoryType inventoryType) {

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

@@ -21,8 +21,6 @@
 import org.bukkit.block.DoubleChest;
 import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.enchantments.EnchantmentOffer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntitySnapshot;
 import org.bukkit.entity.LivingEntity;
@@ -304,15 +302,9 @@ public void setAmount(Number amount) {
 			return null;
 		});
 
-		// Enchantment - EnchantmentType
-		Converters.registerConverter(Enchantment.class, EnchantmentType.class, e -> new EnchantmentType(e, -1));
-
 		// Vector - Direction
 		Converters.registerConverter(Vector.class, Direction.class, Direction::new);
 
-		// EnchantmentOffer - EnchantmentType
-		Converters.registerConverter(EnchantmentOffer.class, EnchantmentType.class, eo -> new EnchantmentType(eo.getEnchantment(), eo.getEnchantmentLevel()));
-
 		Converters.registerConverter(String.class, World.class, Bukkit::getWorld);
 
 		if (Skript.classExists("org.bukkit.entity.EntitySnapshot"))

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

@@ -382,33 +382,6 @@ public String toVariableNameString(Color color) {
 						"grow a huge red mushroom above the block")
 				.since("1.0"));
 
-		Classes.registerClass(new ClassInfo<>(EnchantmentType.class, "enchantmenttype")
-				.user("enchant(ing|ment) types?")
-				.name("Enchantment Type")
-				.description("An enchantment with an optional level, e.g. 'sharpness 2' or 'fortune'.")
-				.usage("<enchantment> [<level>]")
-				.examples("enchant the player's tool with sharpness 5",
-						"helmet is enchanted with waterbreathing")
-				.since("1.4.6")
-				.parser(new Parser<EnchantmentType>() {
-					@Override
-					@Nullable
-					public EnchantmentType parse(final String s, final ParseContext context) {
-						return EnchantmentType.parse(s);
-					}
-
-					@Override
-					public String toString(final EnchantmentType t, final int flags) {
-						return t.toString();
-					}
-
-					@Override
-					public String toVariableNameString(final EnchantmentType o) {
-						return o.toString();
-					}
-				})
-				.serializer(new YggdrasilSerializer<>()));
-
 		Classes.registerClass(new ClassInfo<>(Experience.class, "experience")
 				.user("experience ?(points?)?")
 				.name("Experience")

src/main/java/org/skriptlang/skript/bukkit/BukkitModule.java

@@ -9,6 +9,7 @@
 import org.skriptlang.skript.bukkit.breeding.BreedingModule;
 import org.skriptlang.skript.bukkit.brewing.BrewingModule;
 import org.skriptlang.skript.bukkit.damagesource.DamageSourceModule;
+import org.skriptlang.skript.bukkit.enchantments.EnchantmentModule;
 import org.skriptlang.skript.bukkit.entity.EntityModule;
 import org.skriptlang.skript.bukkit.fishing.FishingModule;
 import org.skriptlang.skript.bukkit.input.InputModule;
@@ -50,7 +51,8 @@ public Iterable<AddonModule> children() {
 			new PDCModule(this),
 			new PotionModule(this),
 			new TagModule(this),
-			new TextModule(this)
+			new TextModule(this),
+			new EnchantmentModule(this)
 		);
 	}