Update from upstream

.github/workflows/java-21-builds.yml

@@ -13,7 +13,7 @@ jobs:
         if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
         uses: ./.github/workflows/parallelize-tests.yml
         with:
-            environments: 1.21.3,1.21.4,1.21.5,1.21.8,1.21.10,1.21.11
+            environments: 1.21.4,1.21.5,1.21.8,1.21.10,1.21.11
             java_version: 21
             parallel_jobs: 3
 

.github/workflows/java-25-builds.yml

@@ -13,9 +13,9 @@ jobs:
         if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
         uses: ./.github/workflows/parallelize-tests.yml
         with:
-            environments: 26.1.2
+            environments: 26.1.2,26.2
             java_version: 25
-            parallel_jobs: 3
+            parallel_jobs: 1
 
     build:
         name: ${{ matrix.display }}

.github/workflows/junit-21-builds.yml

@@ -13,7 +13,7 @@ jobs:
         if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
         uses: ./.github/workflows/parallelize-tests.yml
         with:
-            environments: 1.21.3,1.21.4,1.21.5,1.21.8,1.21.10,1.21.11
+            environments: 1.21.4,1.21.5,1.21.8,1.21.10,1.21.11
             java_version: 21
             parallel_jobs: 3
 

.github/workflows/junit-25-builds.yml

@@ -13,9 +13,9 @@ jobs:
         if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
         uses: ./.github/workflows/parallelize-tests.yml
         with:
-            environments: 26.1.2
+            environments: 26.1.2,26.2
             java_version: 25
-            parallel_jobs: 3
+            parallel_jobs: 1
 
     build:
         name: ${{ matrix.display }}

build.gradle

@@ -30,10 +30,9 @@ allprojects {
 }
 
 dependencies {
-	shadow group: 'io.papermc', name: 'paperlib', version: '1.0.8'
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.2.1'
 
-	implementation group: 'io.papermc.paper', name: 'paper-api', version: '26.1.2.build.+'
+	implementation group: 'io.papermc.paper', name: 'paper-api', version: '26.2.build.+'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
 
 	// bundled with Minecraft 1.19.4+ for display entity transforms
@@ -107,11 +106,9 @@ tasks.withType(ShadowJar).configureEach {
 		project.configurations.shadow
 	]
 	dependencies {
-		include(dependency('io.papermc:paperlib'))
 		include(dependency('org.bstats:bstats-bukkit'))
 		include(dependency('org.bstats:bstats-base'))
 	}
-	relocate 'io.papermc.lib', 'ch.njol.skript.paperlib'
 	relocate 'org.bstats', 'ch.njol.skript.bstats'
 	manifest {
 		attributes(

gradle.properties

@@ -5,9 +5,9 @@ org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
-version=2.15.4
+version=2.16.0
 jarName=Skript.jar
-testEnv=java25/paper-26.1.2
+testEnv=java25/paper-26.2
 testEnvJavaVersion=25
 
 folia_build=1

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

@@ -424,7 +424,7 @@ protected Map<String, Variation> parseKeyVariations(String name) {
 		List<PatternSlot> slots = new ArrayList<>();
 
 		// Compute variation slots
-		for (int i = 0; i < name.length();) {
+		for (int i = 0; i < name.length(); i += Character.charCount(name.codePointAt(i))) {
 			int c = name.codePointAt(i);
 			if (c == '{') { // Found variation name start
 				varStart = i;
@@ -444,16 +444,16 @@ protected Map<String, Variation> parseKeyVariations(String name) {
 				VariationGroup vars = provider.getVariationGroup(varName);
 				if (vars == null) {
 					Skript.error(m_unknown_variation.toString(varName));
+					varStart = -1;
+					varEnd = i + 1;
 					continue;
 				}
 				slots.add(new VariationSlot(vars));
-				
+
 				// Variation name finished
 				varStart = -1;
 				varEnd = i + 1;
 			}
-
-			i += Character.charCount(c);
 		}
 
 		// Handle last non-variation slot
@@ -690,6 +690,10 @@ protected void loadSingleAlias(Map<String, Variation> variations, String item) {
 	 * @return Name fixed.
 	 */
 	protected String fixName(String name) {
+		if (name.isEmpty()) {
+			return "";
+		}
+
 		/*
 		 * General logic:
 		 *

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

@@ -657,9 +657,6 @@ public ItemData aliasCopy() {
 		return data;
 	}
 
-	// Can remove after 1.21.3 is the minimum supported version
-	private static final boolean HAS_CUSTOM_NAME = Skript.methodExists(PotionMeta.class, "hasCustomPotionName");
-
 	private static void copyPotionInfo(PotionMeta potionMeta, ItemData data) {
 		PotionMeta newMeta = (PotionMeta) itemFactory.getItemMeta(data.type);
 		if (newMeta.equals(potionMeta))
@@ -674,7 +671,7 @@ private static void copyPotionInfo(PotionMeta potionMeta, ItemData data) {
 		}
 		if (potionMeta.hasColor())
 			newMeta.setColor(potionMeta.getColor());
-		if (HAS_CUSTOM_NAME && potionMeta.hasCustomPotionName())
+		if (potionMeta.hasCustomPotionName())
 			newMeta.setCustomPotionName(potionMeta.getCustomPotionName());
 		data.itemFlags = ItemFlags.CHANGED_TAGS;
 		data.setItemMeta(newMeta);

src/main/java/ch/njol/skript/bukkitutil/HealthUtils.java

@@ -2,9 +2,6 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.util.Math2;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
 import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
 import org.bukkit.attribute.Attributable;
@@ -18,6 +15,9 @@
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
 public class HealthUtils {
 	private static final @Nullable Constructor<EntityDamageEvent> OLD_DAMAGE_EVENT_CONSTRUCTOR;
 
@@ -31,11 +31,7 @@ public class HealthUtils {
 
 	private static final Attribute MAX_HEALTH;
 	static {
-		if (Skript.isRunningMinecraft(1, 21, 3)) { // In 1.21.3, Attribute became an Interface
-			MAX_HEALTH = Registry.ATTRIBUTE.get(NamespacedKey.minecraft("max_health"));
-		} else {
-			MAX_HEALTH = (Attribute) Enum.valueOf((Class) Attribute.class, "GENERIC_MAX_HEALTH");
-		}
+		MAX_HEALTH = Registry.ATTRIBUTE.get(NamespacedKey.minecraft("max_health"));
 	}
 
 	/**

src/main/java/ch/njol/skript/classes/EnumClassInfo.java

@@ -3,8 +3,9 @@
 import ch.njol.skript.expressions.base.EventValueExpression;
 import ch.njol.skript.lang.DefaultExpression;
 import ch.njol.util.coll.iterator.ArrayIterator;
-import org.skriptlang.skript.lang.comparator.Comparators;
-import org.skriptlang.skript.lang.comparator.Relation;
+
+import java.util.Map;
+import java.util.function.Consumer;
 
 /**
  * This class can be used for an easier writing of ClassInfos that are enums,
@@ -20,17 +21,17 @@ public class EnumClassInfo<T extends Enum<T>> extends ClassInfo<T> {
 	 * @param languageNode The language node of the type
 	 */
 	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode) {
-		this(enumClass, codeName, languageNode, new EventValueExpression<>(enumClass), true);
+		this(enumClass, codeName, languageNode, new EventValueExpression<>(enumClass));
 	}
 
 	/**
 	 * @param enumClass The class
 	 * @param codeName The name used in patterns
 	 * @param languageNode The language node of the type
-	 * @param registerComparator Whether a default comparator should be registered for this enum's classinfo
+	 * @param parseCallback A consumer to run on a successful parse.
 	 */
-	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, boolean registerComparator) {
-		this(enumClass, codeName, languageNode, new EventValueExpression<>(enumClass), registerComparator);
+	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, Consumer<T> parseCallback) {
+		this(enumClass, codeName, languageNode, new EventValueExpression<>(enumClass), parseCallback);
 	}
 
 	/**
@@ -40,27 +41,49 @@ public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, b
 	 * @param defaultExpression The default expression of the type
 	 */
 	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, DefaultExpression<T> defaultExpression) {
-		this(enumClass, codeName, languageNode, defaultExpression, true);
+		this(enumClass, codeName, languageNode, defaultExpression, ignored -> {});
 	}
 
 	/**
 	 * @param enumClass The class
 	 * @param codeName The name used in patterns
 	 * @param languageNode The language node of the type
 	 * @param defaultExpression The default expression of the type
-	 * @param registerComparator Whether a default comparator should be registered for this enum's classinfo
+	 * @param parseCallback A consumer to run on a successful parse.
 	 */
-	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, DefaultExpression<T> defaultExpression, boolean registerComparator) {
+	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, DefaultExpression<T> defaultExpression, Consumer<T> parseCallback) {
 		super(enumClass, codeName);
-		EnumParser<T> enumParser = new EnumParser<>(enumClass, languageNode);
+		EnumParser<T> enumParser = new EnumParser<>(enumClass, languageNode, parseCallback);
 		usage(enumParser.getCombinedPatterns())
 			.serializer(new EnumSerializer<>(enumClass))
 			.defaultExpression(defaultExpression)
 			.supplier(() -> new ArrayIterator<>(enumClass.getEnumConstants()))
 			.parser(enumParser);
+	}
 
-		if (registerComparator)
-			Comparators.registerComparator(enumClass, enumClass, (o1, o2) -> Relation.get(o1.ordinal() - o2.ordinal()));
+	/**
+	 * @param enumClass The class
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param registerComparator Whether a default comparator should be registered for this enum's classinfo
+	 * @deprecated {@code registerComparator} is no longer necessary.
+	 */
+	@Deprecated(since = "2.16", forRemoval = true)
+	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, boolean registerComparator) {
+		this(enumClass, codeName, languageNode, new EventValueExpression<>(enumClass));
+	}
+
+	/**
+	 * @param enumClass The class
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param defaultExpression The default expression of the type
+	 * @param registerComparator Whether a default comparator should be registered for this enum's classinfo
+	 * @deprecated {@code registerComparator} is no longer necessary.
+	 */
+	@Deprecated(since = "2.16", forRemoval = true)
+	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, DefaultExpression<T> defaultExpression, boolean registerComparator) {
+		this(enumClass, codeName, languageNode, defaultExpression);
 	}
 
 }

src/main/java/ch/njol/skript/classes/EnumParser.java

@@ -11,6 +11,7 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.function.Consumer;
 
 /**
  * A {@link Parser} used for parsing and handling values representing an {@link Enum}
@@ -19,6 +20,8 @@ public class EnumParser<E extends Enum<E>> extends PatternedParser<E> implements
 
 	private final Class<E> enumClass;
 	private final String languageNode;
+	private final Consumer<E> parseCallback;
+
 	private String[] names;
 	protected final Map<String, E> parseMap = new HashMap<>();
 	private String[] patterns;
@@ -28,11 +31,21 @@ public class EnumParser<E extends Enum<E>> extends PatternedParser<E> implements
 	 * @param languageNode The {@link String} representing the languageNode for the {@link Enum}
 	 */
 	public EnumParser(Class<E> enumClass, String languageNode) {
+		this(enumClass, languageNode, ignored -> {});
+	}
+
+	/**
+	 * @param enumClass The {@link Enum} {@link Class} to be accessed.
+	 * @param languageNode The {@link String} representing the languageNode for the {@link Enum}
+	 * @param parseCallback A consumer to run on a successful parse.
+	 */
+	public EnumParser(Class<E> enumClass, String languageNode, Consumer<E> parseCallback) {
 		assert enumClass.isEnum() : enumClass;
 		assert !languageNode.isEmpty() && !languageNode.endsWith(".") : languageNode;
 
 		this.enumClass = enumClass;
 		this.languageNode = languageNode;
+		this.parseCallback = parseCallback;
 
 		refresh();
 		Language.addListener(this::refresh);
@@ -86,7 +99,11 @@ void refresh() {
 
 	@Override
 	public @Nullable E parse(String string, ParseContext context) {
-		return parseMap.get(string.toLowerCase(Locale.ENGLISH));
+		E element = parseMap.get(string.toLowerCase(Locale.ENGLISH));
+		if (element != null) {
+			parseCallback.accept(element);
+		}
+		return element;
 	}
 
 	@Override