Merge branch 'dev/feature' into feature/better-enchanted-condition

Author: sovdeeth

.github/workflows/update-gradle-wrapper.yml

@@ -0,0 +1,47 @@
+name: Update the gradle wrapper to the latest version
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+
+jobs:
+  update-gradle-wrapper:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'adopt'
+          cache: gradle
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Get latest Gradle version
+        id: get_latest_gradle
+        run: |
+          response=$(curl -s https://services.gradle.org/versions/current)
+          latest_version=$(echo $response | jq -r '.version')
+          echo "LATEST_GRADLE_VERSION=$latest_version" >> $GITHUB_ENV
+          latest_download_url=$(echo $response | jq -r '.downloadUrl')
+          echo "LATEST_GRADLE_DOWNLOAD_URL=$latest_download_url" >> $GITHUB_ENV
+      - name: Update gradle-wrapper.properties
+        run: |
+          sed -i "s|^distributionUrl=.*$|distributionUrl=${LATEST_GRADLE_DOWNLOAD_URL}|" gradle/wrapper/gradle-wrapper.properties
+          ./gradlew wrapper --gradle-version ${LATEST_GRADLE_VERSION}
+      - name: Validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v2
+      - name: Build Skript and run test scripts
+        run: ./gradlew clean quickTest
+      - name: Commit and push changes
+        if: success()
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          git add gradle/wrapper/
+          git commit -m "Update Gradle wrapper to ${LATEST_GRADLE_VERSION}"
+          git push

src/main/java/ch/njol/skript/Skript.java

@@ -396,7 +396,8 @@ public void onEnable() {
 		File config = new File(getDataFolder(), "config.sk");
 		File features = new File(getDataFolder(), "features.sk");
 		File lang = new File(getDataFolder(), "lang");
-		if (!scriptsFolder.isDirectory() || !config.exists() || !features.exists() || !lang.exists()) {
+		File aliasesFolder = new File(getDataFolder(), "aliases");
+		if (!scriptsFolder.isDirectory() || !config.exists() || !features.exists() || !lang.exists() || !aliasesFolder.exists()) {
 			ZipFile f = null;
 			try {
 				boolean populateExamples = false;
@@ -413,6 +414,11 @@ public void onEnable() {
 					populateLanguageFiles = true;
 				}
 
+				if (!aliasesFolder.isDirectory()) {
+					if (!aliasesFolder.mkdirs())
+						throw new IOException("Could not create the directory " + aliasesFolder);
+				}
+				
 				f = new ZipFile(getFile());
 				for (ZipEntry e : new EnumerationIterable<ZipEntry>(f.entries())) {
 					if (e.isDirectory())

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

@@ -4,6 +4,7 @@
 import ch.njol.skript.aliases.ItemType;
 import ch.njol.skript.bukkitutil.InventoryUtils;
 import ch.njol.skript.command.CommandEvent;
+import ch.njol.skript.entity.EntityData;
 import ch.njol.skript.events.bukkit.ScriptEvent;
 import ch.njol.skript.events.bukkit.SkriptStartEvent;
 import ch.njol.skript.events.bukkit.SkriptStopEvent;
@@ -170,6 +171,8 @@ public final class BukkitEventValues {
 			"Use 'attacker' and/or 'victim' in damage/death events", EntityDamageEvent.class, EntityDeathEvent.class);
 		EventValues.registerEventValue(EntityEvent.class, World.class, event -> event.getEntity().getWorld());
 		EventValues.registerEventValue(EntityEvent.class, Location.class, event -> event.getEntity().getLocation());
+		EventValues.registerEventValue(EntityEvent.class, EntityData.class, event -> EntityData.fromEntity(event.getEntity()),
+			TIME_NOW, "Use 'type of attacker/victim' in damage/death events.", EntityDamageEvent.class, EntityDeathEvent.class);
 		// EntityDamageEvent
 		EventValues.registerEventValue(EntityDamageEvent.class, DamageCause.class, EntityDamageEvent::getCause);
 		EventValues.registerEventValue(EntityDamageByEntityEvent.class, Projectile.class, event -> {

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

@@ -33,6 +33,7 @@
 import org.bukkit.block.Block;
 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.EntityDamageEvent.DamageCause;
@@ -588,6 +589,10 @@ public Relation compare(EnchantmentOffer eo, Experience exp) {
 			}
 		});
 
+		//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/JavaClasses.java

@@ -29,6 +29,14 @@ public class JavaClasses {
 
 	public static final int VARIABLENAME_NUMBERACCURACY = 8;
 
+	/**
+	 * The pattern for scientific notation.
+	 * <p>
+	 * The pattern is the letter {@code e} or {@code E} followed by a sign and one or more digits.
+	 * </p>
+	 */
+	public static final String SCIENTIFIC_PATTERN = "(?:[eE][+-]?\\d+)?";
+
 	/**
 	 * The format of an integer.
 	 * <p>
@@ -49,8 +57,8 @@ public class JavaClasses {
 	 * </p>
 	 */
 	public static final Pattern INTEGER_PATTERN =
-		Pattern.compile("(?<num>" + INTEGER_NUMBER_PATTERN + ")" +
-			"(?: (?:in )?(?:(?<rad>rad(?:ian)?s?)|deg(?:ree)?s?))?");
+		Pattern.compile("(?<num>%s%s)(?: (?:in )?(?:(?<rad>rad(?:ian)?)|deg(?:ree)?)s?)?"
+			.formatted(INTEGER_NUMBER_PATTERN, SCIENTIFIC_PATTERN));
 
 	/**
 	 * The format of a decimal number.
@@ -74,8 +82,8 @@ public class JavaClasses {
 	 * </p>
 	 */
 	public static final Pattern DECIMAL_PATTERN =
-		Pattern.compile("(?<num>" + DECIMAL_NUMBER_PATTERN + ")" +
-			"(?: (?:in )?(?:(?<rad>rad(?:ian)?s?)|deg(?:ree)?s?))?");
+		Pattern.compile("(?<num>%s%s)(?: (?:in )?(?:(?<rad>rad(?:ian)?)|deg(?:ree)?)s?)?"
+			.formatted(DECIMAL_NUMBER_PATTERN, SCIENTIFIC_PATTERN));
 
 	static {
 		Classes.registerClass(new ClassInfo<>(Object.class, "object")
@@ -94,7 +102,7 @@ public class JavaClasses {
 					"Please note that many expressions only need integers, i.e. " +
 						"will discard any fractional parts of any numbers without producing an error.",
 					"Radians will be converted to degrees.")
-				.usage("[-]###[.###] [[in ](rad[ian][s]|deg[ree][s])]</code> (any amount of digits; very large numbers will be truncated though)")
+				.usage("[-]###[.###] [e[+|-]###] [[in ](rad[ian][s]|deg[ree][s])]")
 				.examples(
 					"set the player's health to 5.5",
 					"set {_temp} to 2*{_temp} - 2.5",

src/main/java/ch/njol/skript/conditions/base/PropertyCondition.java

@@ -7,11 +7,9 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-
-import java.util.function.Predicate;
-import org.jetbrains.annotations.ApiStatus;
 import org.skriptlang.skript.registration.SyntaxInfo;
 import org.skriptlang.skript.registration.SyntaxRegistry;
 import org.skriptlang.skript.util.Priority;
@@ -206,6 +204,13 @@ protected PropertyType getPropertyType() {
 		return PropertyType.BE;
 	}
 
+	/**
+	 * Gets the expression this condition checks a property of.
+	 */
+	public final Expression<? extends T> getExpr() {
+		return expr;
+	}
+
 	/**
 	 * Sets the expression this condition checks a property of. No reference to the expression should be kept.
 	 *

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

@@ -1,61 +1,59 @@
 package ch.njol.skript.effects;
 
+import ch.njol.skript.doc.*;
+import ch.njol.skript.lang.EventRestrictedSyntax;
+import ch.njol.util.coll.CollectionUtils;
+import org.bukkit.entity.Item;
 import org.bukkit.event.Event;
 import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockDropItemEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.player.PlayerHarvestBlockEvent;
 import org.jetbrains.annotations.Nullable;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.doc.Description;
-import ch.njol.skript.doc.Events;
-import ch.njol.skript.doc.Examples;
-import ch.njol.skript.doc.Name;
-import ch.njol.skript.doc.RequiredPlugins;
-import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
 
 @Name("Cancel Drops")
-@Description("Cancels drops of items or experiences in a death or block break event. " +
-		"Please note that this doesn't keep items or experiences of a dead player. If you want to do that, " +
-		"use the <a href='effects.html#EffKeepInventory'>Keep Inventory / Experience</a> effect.")
-@Examples({"on death of a zombie:",
-		"\tif name of the entity is \"&cSpecial\":",
-		"\t\tcancel drops of items",
-		"",
-		"on break of a coal ore:",
-		"\tcancel the experience drops"})
-@Since("2.4")
+@Description({
+	"Cancels drops of items in a death, block break, block drop, and block harvest events.",
+	"The dropped experience can be cancelled in a death and block break events.",
+	"Please note that using this in a death event doesn't keep items or experience of a dead player. If you want to do that, "
+		+ "use the <a href='effects.html#EffKeepInventory'>Keep Inventory / Experience</a> effect."
+})
+@Example("""
+	on death of a zombie:
+		if name of the entity is "&cSpecial":
+			cancel drops of items
+	""")
+@Example("""
+	on break of a coal ore:
+		cancel the experience drops
+	""")
+@Example("""
+	on player block harvest:
+		cancel the item drops
+	""")
+@Since("2.4, INSERT VERSION (harvest event)")
 @RequiredPlugins("1.12.2 or newer (cancelling item drops of blocks)")
-@Events({"death", "break / mine"})
-public class EffCancelDrops extends Effect {
-
-	private static final boolean CAN_CANCEL_BLOCK_ITEM_DROPS = Skript.methodExists(BlockBreakEvent.class, "setDropItems", boolean.class);
+@Events({"death", "break / mine", "block drop", "harvest"})
+public class EffCancelDrops extends Effect implements EventRestrictedSyntax {
 
 	static {
 		Skript.registerEffect(EffCancelDrops.class,
-			"(cancel|clear|delete) [the] drops [of (1¦items|2¦[e]xp[erience][s])]",
-			"(cancel|clear|delete) [the] (1¦item|2¦[e]xp[erience]) drops");
+			"(cancel|clear|delete) [the] drops [of (items:items|xp:[e]xp[erience][s])]",
+			"(cancel|clear|delete) [the] (items:item|xp:[e]xp[erience]) drops");
 	}
 
 	private boolean cancelItems, cancelExps;
 
 	@Override
 	public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		cancelItems = parseResult.mark == 0 || parseResult.mark == 1;
-		cancelExps = parseResult.mark == 0 || parseResult.mark == 2;
-		if (getParser().isCurrentEvent(BlockBreakEvent.class)) {
-			if (cancelItems && !CAN_CANCEL_BLOCK_ITEM_DROPS) {
-				Skript.error("Cancelling drops of items in a block break event requires Minecraft 1.12 or newer");
-				return false;
-			}
-		} else if (!getParser().isCurrentEvent(EntityDeathEvent.class)) {
-			Skript.error("The cancel drops effect can't be used outside of a death" +
-				(CAN_CANCEL_BLOCK_ITEM_DROPS ? " or block break" : "") + " event");
-			return false;
-		}
+		cancelItems = !parseResult.hasTag("xp");
+		cancelExps = !parseResult.hasTag("items");
 		if (isDelayed.isTrue()) {
 			Skript.error("Can't cancel the drops anymore after the event has already passed");
 			return false;
@@ -64,24 +62,31 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	}
 
 	@Override
-	protected void execute(Event e) {
-		if (e instanceof EntityDeathEvent) {
-			EntityDeathEvent event = (EntityDeathEvent) e;
+	public Class<? extends Event>[] supportedEvents() {
+		return CollectionUtils.array(EntityDeathEvent.class, BlockBreakEvent.class, BlockDropItemEvent.class, PlayerHarvestBlockEvent.class);
+	}
+
+	@Override
+	protected void execute(Event event) {
+		if (event instanceof EntityDeathEvent deathEvent) {
 			if (cancelItems)
-				event.getDrops().clear();
+				deathEvent.getDrops().clear();
 			if (cancelExps)
-				event.setDroppedExp(0);
-		} else if (e instanceof BlockBreakEvent) {
-			BlockBreakEvent event = (BlockBreakEvent) e;
+				deathEvent.setDroppedExp(0);
+		} else if (event instanceof BlockBreakEvent breakEvent) {
 			if (cancelItems)
-				event.setDropItems(false);
+				breakEvent.setDropItems(false);
 			if (cancelExps)
-				event.setExpToDrop(0);
+				breakEvent.setExpToDrop(0);
+		} else if (event instanceof BlockDropItemEvent dropItemEvent) {
+			dropItemEvent.getItems().forEach(Item::remove);
+		} else if (event instanceof PlayerHarvestBlockEvent harvestBlockEvent) {
+			harvestBlockEvent.getItemsHarvested().clear();
 		}
 	}
 
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
+	public String toString(@Nullable Event event, boolean debug) {
 		if (cancelItems && !cancelExps)
 			return "cancel the drops of items";
 		else if (cancelExps && !cancelItems)