Merge branch 'dev/feature' into feature/enchant-with-levels

Author: sovdeeth

build.gradle

@@ -27,7 +27,7 @@ allprojects {
 dependencies {
 	shadow group: 'io.papermc', name: 'paperlib', version: '1.0.8'
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.1.0'
-	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.4.0'
+	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.4.1'
 
 	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.8-R0.1-SNAPSHOT'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'

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

@@ -30,7 +30,7 @@ public class EffVisualEffect extends Effect {
 	static {
 		Skript.registerEffect(EffVisualEffect.class,
 			"(play|show) %visualeffects% (on|%directions%) %entities/locations% [(to %-players%|in (radius|range) of %-number%)]",
-			"(play|show) %number% %visualeffects% (on|%directions%) %locations% [(to %-players%|in (radius|range) of %-number%)]");
+			"(play|show) %number% %visualeffects% (on|%directions%) %entities/locations% [(to %-players%|in (radius|range) of %-number%)]");
 	}
 
 	@SuppressWarnings("NotNullFieldNotInitialized")

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

@@ -1,20 +1,17 @@
 package ch.njol.skript.expressions;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.lang.KeyProviderExpression;
-import ch.njol.skript.lang.KeyedValue;
-import org.skriptlang.skript.lang.converter.ConverterInfo;
 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.Expression;
 import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.KeyProviderExpression;
+import ch.njol.skript.lang.KeyedValue;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
-import ch.njol.skript.lang.util.ConvertedExpression;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.registrations.Classes;
-import org.skriptlang.skript.lang.converter.Converters;
 import ch.njol.skript.sections.SecLoop;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Kleenean;
@@ -150,19 +147,6 @@ public boolean isSingle() {
 		return true;
 	}
 
-	@Override
-	@Nullable
-	@SuppressWarnings("unchecked")
-	protected <R> ConvertedExpression<Object, ? extends R> getConvertedExpr(Class<R>... to) {
-		if (isKeyedLoop && !isIndex) {
-			Class<R> superType = (Class<R>) Utils.getSuperType(to);
-			return new ConvertedExpression<>(this, superType,
-					new ConverterInfo<>(Object.class, superType, o -> Converters.convert(o, to), 0));
-		} else {
-			return super.getConvertedExpr(to);
-		}
-	}
-	
 	@Override
 	public Class<?> getReturnType() {
 		if (isIndex)

src/main/java/ch/njol/skript/util/Color.java

@@ -44,4 +44,11 @@ public interface Color extends YggdrasilExtendedSerializable {
 	 */
 	String getName();
 
+	/**
+	 * @return the color as an ARGB integer.
+	 */
+	default int asARGB() {
+		return asBukkitColor().asARGB();
+	}
+
 }

src/test/skript/tests/regressions/8108-exprloopvalue losing converter info.sk

@@ -0,0 +1,23 @@
+###
+this test converts an itemtype to itemstack, which is not AnyNamed.
+If the loop value loses its converter info, it will not be
+able to use the name of loop-value expression.
+This is due to the returned value being ItemStack, and failing
+the instanceof AnyNamed check.
+
+If the loop value retains its converter info, it will be able to
+convert to AnyNamed and use the name of loop-value expression.
+###
+
+
+test "expr loop value loses converter info":
+	set {_item::*} to asItemStack(phantom membrane named "Test")
+	loop {_item::*}:
+		# these should always pass
+		assert loop-value is a phantom membrane with "loop-value is not a phantom membrane"
+		assert loop-value is a phantom membrane named "Test" with "loop-value is not a phantom membrane named 'Test'"
+		# the critical assert
+		assert name of loop-value is "Test" with "name of loop-value is not 'Test'. ExprLoopValue may have lost converter info"
+
+local function asItemStack(i: item) :: item:
+    return {_i}