Merge branch 'dev/patch' into dev/feature

Author: APickledWalrus

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

@@ -13,7 +13,7 @@ jobs:
         if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
         uses: ./.github/workflows/parallelize-tests.yml
         with:
-            environments: 26.1.1
+            environments: 26.1.2
             java_version: 25
             parallel_jobs: 3
 

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

@@ -13,7 +13,7 @@ jobs:
         if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
         uses: ./.github/workflows/parallelize-tests.yml
         with:
-            environments: 26.1.1
+            environments: 26.1.2
             java_version: 25
             parallel_jobs: 3
 

build.gradle

@@ -28,7 +28,7 @@ dependencies {
 	shadow group: 'io.papermc', name: 'paperlib', version: '1.0.8'
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.1.0'
 
-	implementation group: 'io.papermc.paper', name: 'paper-api', version: '26.1.1.build.+'
+	implementation group: 'io.papermc.paper', name: 'paper-api', version: '26.1.2.build.+'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
 
 	// bundled with Minecraft 1.19.4+ for display entity transforms

gradle.properties

@@ -7,5 +7,5 @@ groupid=ch.njol
 name=skript
 version=2.15.2
 jarName=Skript.jar
-testEnv=java25/paper-26.1.1
+testEnv=java25/paper-26.1.2
 testEnvJavaVersion=25

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

@@ -23,6 +23,7 @@
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionEffect;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.text.TextComponentParser;
 
 import java.io.IOException;
 import java.io.NotSerializableException;
@@ -242,8 +243,10 @@ public String toString(final boolean debug, final boolean plural) {
 		StringBuilder builder = new StringBuilder(Aliases.getMaterialName(this, plural));
 		ItemMeta meta = stack != null ? stack.getItemMeta() : null;
 		if (meta != null && meta.hasDisplayName()) {
-			builder.append(" ").append(m_named).append(" ");
-			builder.append(meta.getDisplayName());
+			builder.append(" ")
+				.append(m_named)
+				.append(" ")
+				.append(TextComponentParser.instance().toString(meta.displayName()));
 		}
 		return builder.toString();
 	}

src/main/java/ch/njol/skript/command/CommandUsage.java

@@ -2,8 +2,10 @@
 
 import ch.njol.skript.lang.VariableString;
 import ch.njol.skript.util.Utils;
+import net.kyori.adventure.text.Component;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.bukkit.text.TextComponentParser;
 
 /**
  * Holds info about the usage of a command.
@@ -63,6 +65,17 @@ public String getUsage(@Nullable Event event) {
 		return defaultUsage;
 	}
 
+	/**
+	 * @param event The event used to evaluate the usage message.
+	 * @return The evaluated usage message as an Adventure {@link Component} with
+	 *         Skript color tags ({@code <red>}, {@code &c}, etc.) parsed into real
+	 *         chat formatting via {@link TextComponentParser#parse(Object)}. Command
+	 *         usage strings are server-controlled, so unsafe tags are appropriate.
+	 */
+	public Component getUsageComponent(@Nullable Event event) {
+		return TextComponentParser.instance().parse(getUsage(event));
+	}
+
 	@Override
 	public String toString() {
 		return getUsage();

src/main/java/ch/njol/skript/command/ScriptCommand.java

@@ -337,7 +337,7 @@ boolean execute2(final ScriptCommandEvent event, final CommandSender sender, fin
 				final LogEntry e = log.getError();
 				if (e != null)
 					sender.sendMessage(ChatColor.DARK_RED + e.toString());
-				sender.sendMessage(usage.getUsage(event));
+				sender.sendMessage(usage.getUsageComponent(event));
 				log.clear();
 				return false;
 			}

src/main/java/ch/njol/skript/expressions/ExprAffectedEntities.java

@@ -74,19 +74,18 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 		if (!(event instanceof AreaEffectCloudApplyEvent areaEvent))
 			return;
 
-		LivingEntity[] entities = (LivingEntity[]) delta;
 		switch (mode) {
 			case REMOVE:
-				for (LivingEntity entity : entities) {
-					areaEvent.getAffectedEntities().remove(entity);
+				for (Object entity : delta) {
+					areaEvent.getAffectedEntities().remove((LivingEntity) entity);
 				}
 				break;
 			case SET:
 				areaEvent.getAffectedEntities().clear();
 				// FALLTHROUGH
 			case ADD:
-				for (LivingEntity entity : entities) {
-					areaEvent.getAffectedEntities().add(entity);
+				for (Object entity : delta) {
+					areaEvent.getAffectedEntities().add((LivingEntity) entity);
 				}
 				break;
 			case RESET, DELETE:

src/main/java/ch/njol/skript/expressions/ExprElement.java

@@ -10,7 +10,6 @@
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.simplification.SimplifiedLiteral;
 import ch.njol.skript.lang.util.SimpleExpression;
-import ch.njol.skript.registrations.Feature;
 import ch.njol.skript.util.LiteralUtils;
 import ch.njol.skript.util.Patterns;
 import ch.njol.util.Kleenean;
@@ -48,17 +47,11 @@
 public class ExprElement<T> extends SimpleExpression<T> implements KeyProviderExpression<T> {
 
 	private static final Patterns<ElementType[]> PATTERNS = new Patterns<>(new Object[][]{
-		{"[the] (first|1:last) element [out] of %objects%", new ElementType[] {ElementType.FIRST_ELEMENT, ElementType.LAST_ELEMENT}},
-		{"[the] (first|1:last) %integer% elements [out] of %objects%", new ElementType[] {ElementType.FIRST_X_ELEMENTS, ElementType.LAST_X_ELEMENTS}},
-		{"[a] random element [out] of %objects%", new ElementType[] {ElementType.RANDOM}},
-		{"[the] %integer%(st|nd|rd|th) [1:[to] last] element [out] of %objects%", new ElementType[] {ElementType.ORDINAL, ElementType.TAIL_END_ORDINAL}},
-		{"[the] elements (from|between) %integer% (to|and) %integer% [out] of %objects%", new ElementType[] {ElementType.RANGE}},
-
-		{"[the] (first|next|1:last) element (of|in) %queue%", new ElementType[] {ElementType.FIRST_ELEMENT, ElementType.LAST_ELEMENT}},
-		{"[the] (first|1:last) %integer% elements (of|in) %queue%", new ElementType[] {ElementType.FIRST_X_ELEMENTS, ElementType.LAST_X_ELEMENTS}},
-		{"[a] random element (of|in) %queue%", new ElementType[] {ElementType.RANDOM}},
-		{"[the] %integer%(st|nd|rd|th) [1:[to] last] element (of|in) %queue%", new ElementType[] {ElementType.ORDINAL, ElementType.TAIL_END_ORDINAL}},
-		{"[the] elements (from|between) %integer% (to|and) %integer% (of|in) %queue%", new ElementType[] {ElementType.RANGE}},
+			{"[the] (first|1:last) element [out] (of|in) %objects%", new ElementType[]{ElementType.FIRST_ELEMENT, ElementType.LAST_ELEMENT}},
+			{"[the] (first|1:last) %integer% elements [out] (of|in) %objects%", new ElementType[]{ElementType.FIRST_X_ELEMENTS, ElementType.LAST_X_ELEMENTS}},
+			{"[a] random element [out] (of|in) %objects%", new ElementType[]{ElementType.RANDOM}},
+			{"[the] %integer%(st|nd|rd|th) [1:[to] last] element [out] (of|in) %objects%", new ElementType[]{ElementType.ORDINAL, ElementType.TAIL_END_ORDINAL}},
+			{"[the] elements (from|between) %integer% (to|and) %integer% [out] (of|in) %objects%", new ElementType[]{ElementType.RANGE}},
 	});
 
 	static {
@@ -132,23 +125,16 @@ public <T> Iterator<T> apply(Iterator<T> iterator, int startIndex, int endIndex)
 	private final Map<Event, List<String>> cache = new WeakHashMap<>();
 
 	private Expression<? extends T> expr;
-	private	@Nullable Expression<Integer> startIndex, endIndex;
+	private @Nullable Expression<Integer> startIndex, endIndex;
 	private ElementType type;
-	private boolean queue;
 	private boolean keyed;
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
 		ElementType[] types = PATTERNS.getInfo(matchedPattern);
-		this.queue = matchedPattern > 4;
-		if (queue && !this.getParser().hasExperiment(Feature.QUEUES))
-			return false;
-		if (queue) {
-			this.expr = (Expression<T>) expressions[expressions.length - 1];
-		} else {
-			this.expr = LiteralUtils.defendExpression(expressions[expressions.length - 1]);
-		}
+		this.expr = LiteralUtils.defendExpression(expressions[expressions.length - 1]);
+
 		switch (type = types[parseResult.mark]) {
 			case RANGE:
 				endIndex = (Expression<Integer>) expressions[1];
@@ -160,21 +146,31 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 				break;
 		}
 		this.keyed = KeyProviderExpression.canReturnKeys(this.expr);
-		return queue || LiteralUtils.canInitSafely(expr);
+		return LiteralUtils.canInitSafely(expr);
 	}
 
 	@Override
 	protected T @Nullable [] get(Event event) {
-		if (queue)
-			return this.getFromQueue(event);
 		if (keyed) {
 			KeyedValue.UnzippedKeyValues<T> unzipped = KeyedValue.unzip(keyedIterator(event));
 			cache.put(event, unzipped.keys());
 			//noinspection unchecked
 			T[] empty = (T[]) Array.newInstance(getReturnType(), 0);
 			return unzipped.values().toArray(empty);
 		}
-		Iterator<? extends T> iterator = iterator(event);
+
+		Iterator<? extends T> iterator;
+		if (expr.isSingle()) {
+			T single = expr.getSingle(event);
+			if (single instanceof SkriptQueue queue) {
+				return this.getFromQueue(event, queue);
+			} else {
+				iterator = transformIterator(event, Iterators.singletonIterator(single));
+			}
+		} else {
+			iterator = transformIterator(event, expr.iterator(event));
+		}
+
 		assert iterator != null;
 		//noinspection unchecked
 		return Iterators.toArray(iterator, (Class<T>) getReturnType());
@@ -191,8 +187,13 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 
 	@Override
 	public @Nullable Iterator<? extends T> iterator(Event event) {
-		if (queue)
-			return Optional.ofNullable(getFromQueue(event)).map(Iterators::forArray).orElse(null);
+		if (expr.isSingle()) {
+			T single = expr.getSingle(event);
+			if (single instanceof SkriptQueue queue) {
+				return Optional.ofNullable(getFromQueue(event, queue)).map(Iterators::forArray).orElse(null);
+			}
+			return Iterators.singletonIterator(single);
+		}
 		Iterator<? extends T> iterator = expr.iterator(event);
 		return transformIterator(event, iterator);
 	}
@@ -224,8 +225,7 @@ private <A> Iterator<A> transformIterator(Event event, @Nullable Iterator<A> ite
 	}
 
 	@SuppressWarnings("unchecked")
-	private T @Nullable [] getFromQueue(Event event) {
-		SkriptQueue queue = (SkriptQueue) expr.getSingle(event);
+	private T @Nullable [] getFromQueue(Event event, SkriptQueue queue) {
 		if (queue == null)
 			return null;
 		Integer startIndex = 0, endIndex = 0;
@@ -242,11 +242,13 @@ private <A> Iterator<A> transformIterator(Event event, @Nullable Iterator<A> ite
 		return switch (type) {
 			case FIRST_ELEMENT -> CollectionUtils.array((T) queue.pollFirst());
 			case LAST_ELEMENT -> CollectionUtils.array((T) queue.pollLast());
-			case RANDOM -> CollectionUtils.array((T) queue.removeSafely(ThreadLocalRandom.current().nextInt(0, queue.size())));
+			case RANDOM ->
+					CollectionUtils.array((T) queue.removeSafely(ThreadLocalRandom.current().nextInt(0, queue.size())));
 			case ORDINAL -> CollectionUtils.array((T) queue.removeSafely(startIndex - 1));
 			case TAIL_END_ORDINAL -> CollectionUtils.array((T) queue.removeSafely(queue.size() - startIndex));
 			case FIRST_X_ELEMENTS -> CollectionUtils.array((T[]) queue.removeRangeSafely(0, startIndex));
-			case LAST_X_ELEMENTS -> CollectionUtils.array((T[]) queue.removeRangeSafely(queue.size() - startIndex, queue.size()));
+			case LAST_X_ELEMENTS ->
+					CollectionUtils.array((T[]) queue.removeRangeSafely(queue.size() - startIndex, queue.size()));
 			case RANGE -> {
 				boolean reverse = startIndex > endIndex;
 				T[] elements = CollectionUtils.array((T[]) queue.removeRangeSafely(Math.min(startIndex, endIndex) - 1, Math.max(startIndex, endIndex)));
@@ -284,7 +286,6 @@ public <R> Expression<? extends R> getConvertedExpression(Class<R>... to) {
 		exprElement.startIndex = startIndex;
 		exprElement.endIndex = endIndex;
 		exprElement.type = type;
-		exprElement.queue = queue;
 		return exprElement;
 	}
 
@@ -295,37 +296,33 @@ public boolean isSingle() {
 
 	@Override
 	public Class<? extends T> getReturnType() {
-		if (queue)
-			return (Class<? extends T>) Object.class;
-		return expr.getReturnType();
+		Class<? extends T> returnType = expr.getReturnType();
+		//noinspection unchecked
+		return returnType == SkriptQueue.class ? (Class<? extends T>) Object.class : returnType;
 	}
 
 	@Override
 	public Class<? extends T>[] possibleReturnTypes() {
-		if (!queue) {
-			return expr.possibleReturnTypes();
-		}
-		return super.possibleReturnTypes();
+		Class<? extends T> returnType = expr.getReturnType();
+		//noinspection unchecked
+		return returnType == SkriptQueue.class ? new Class[]{Object.class} : expr.possibleReturnTypes();
 	}
 
 	@Override
 	public boolean canReturn(Class<?> returnType) {
-		if (!queue) {
-			return expr.canReturn(returnType);
-		}
-		return super.canReturn(returnType);
+		return returnType == SkriptQueue.class || expr.canReturn(returnType);
 	}
-  
-  @Override
+
+	@Override
 	public Expression<? extends T> simplify() {
-		if (!queue && expr instanceof Literal<?>
-			&& type != ElementType.RANDOM
-			&& (startIndex == null || startIndex instanceof Literal<Integer>)
-			&& (endIndex == null || endIndex instanceof Literal<Integer>)) {
+		if (expr instanceof Literal<?>
+				&& type != ElementType.RANDOM
+				&& (startIndex == null || startIndex instanceof Literal<Integer>)
+				&& (endIndex == null || endIndex instanceof Literal<Integer>)) {
 			return SimplifiedLiteral.fromExpression(this);
 		}
 		return this;
-  }
+	}
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {

src/main/java/org/skriptlang/skript/bukkit/lang/eventvalue/ConvertedEventValue.java

@@ -191,6 +191,11 @@ public Time time() {
 		return source.excludedErrorMessage();
 	}
 
+	@Override
+	public boolean contextDependent() {
+		return source.contextDependent();
+	}
+
 	@Override
 	public boolean matches(EventValue<?, ?> eventValue) {
 		return matches(eventValue.eventClass(), eventValue.valueClass(), eventValue.patterns());