Merge branch 'dev/feature' into dev/ExprTestPlayer

Author: Absolutionism

.github/pull_request_template.md

@@ -1,7 +1,19 @@
-### Description
-<!--- Describe your changes here. --->
+### Problem
+<!--- Why is this PR necessary? What problems exist that needed solving?  --->
+
+
+### Solution
+<!--- Explain how your solution fixes the problem and summarize the major code changes.  --->
+
+
+### Testing Completed
+<!--- List test scripts/unit tests and any manual testing that was performed. If no test scripts or unit tests are present, explain why.  --->
+
+
+### Supporting Information
+<!--- Any related information, todos, breaking changes, or outstanding issues can be described here --->
+
 
 ---
-**Target Minecraft Versions:** any <!-- 'any' means all supported versions -->
-**Requirements:** none <!-- Required plugins, server software... -->
-**Related Issues:** none <!-- Links to related issues -->
+**Completes:** none <!-- Links to issues or discussions that should be completed when this PR is merged. -->
+**Related:** none <!-- Links to issues or discussions with related information -->

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.3.4'
+	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.4.0'
 
 	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.5-R0.1-SNAPSHOT'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'

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

@@ -101,7 +101,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 		debug(event, false);
 		for (SectionExitHandler section : sectionsToExit)
 			section.exit(event);
-		if (outerSection == null)
+		if (outerSection == null) // "stop trigger"
 			return null;
 		return outerSection instanceof LoopSection loopSection ? loopSection.getActualNext() : outerSection.getNext();
 	}
@@ -113,11 +113,15 @@ protected void execute(Event event) {
 
 	@Override
 	public @Nullable ExecutionIntent executionIntent() {
+		if (outerSection == null)
+			return ExecutionIntent.stopTrigger();
 		return ExecutionIntent.stopSections(breakLevels);
 	}
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
+		if (outerSection == null)
+			return "stop trigger";
 		return "stop " + breakLevels + " " + names[type];
 	}
 

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

@@ -1,6 +1,5 @@
 package ch.njol.skript.expressions;
 
-import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer.ChangeMode;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
@@ -15,6 +14,7 @@
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.script.ScriptWarning;
 
 @Name("No Damage Ticks")
 @Description("The number of ticks that an entity is invulnerable to damage for.")
@@ -32,7 +32,7 @@ public class ExprNoDamageTicks extends SimplePropertyExpression<LivingEntity, Lo
 
 	@Override
 	public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
-		Skript.warning("This expression is deprecated. Please use 'invulnerability time' instead of 'invulnerability ticks'.");
+		ScriptWarning.printDeprecationWarning("This expression is deprecated. Please use 'invulnerability time' instead of 'invulnerability ticks'.");
 		return super.init(expressions, matchedPattern, isDelayed, parseResult);
 	}
 

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

@@ -53,9 +53,9 @@ public static <T> Expression<T> defendExpression(Expression<?> expr) {
 	public static boolean hasUnparsedLiteral(Expression<?> expr) {
 		if (expr instanceof UnparsedLiteral) {
 			return true;
-		} else if (expr instanceof ExpressionList) {
-			return Stream.of(((ExpressionList) expr).getExpressions())
-					.anyMatch(e -> e instanceof UnparsedLiteral);
+		} else if (expr instanceof ExpressionList exprList) {
+			return Stream.of(exprList.getExpressions())
+					.anyMatch(LiteralUtils::hasUnparsedLiteral);
 		}
 		return false;
 	}

src/main/resources/lang/default.lang

@@ -2635,7 +2635,7 @@ types:
 	worldborder: worldborder¦s @a
 	inventory: inventor¦y¦ies @an
 	player: player¦s @a
-	offlineplayer: offline player¦s @a
+	offlineplayer: offline player¦s @an
 	commandsender: command sender¦s @a
 	inventoryholder: inventory holder¦s @an
 	gamemode: gamemode¦s @a
@@ -2650,7 +2650,7 @@ types:
 	enchantment: enchantment¦s @an
 	damagecause: damage cause¦s @a
 	teleportcause: teleport cause¦s @a
-	inventoryaction: inventory action¦s @a
+	inventoryaction: inventory action¦s @an
 	clicktype: click type¦s @a
 	vector: vector¦s @a
 	inventorytype: inventory type¦s @an
@@ -2683,7 +2683,7 @@ types:
 	textalignment: text alignment¦s @a
 	itemdisplaytransform: item display transform¦s @an
 	minecrafttag: minecraft tag¦s @a
-	experiencecooldownchangereason: experience cooldown change reason¦s @a
+	experiencecooldownchangereason: experience cooldown change reason¦s @an
 	inputkey: input key¦s @an
 	villagertype: villager type¦s @a
 	villagerprofession: villager profession¦s @a

src/test/skript/tests/regressions/2581-all potions are water.sk

@@ -1,5 +1,4 @@
-test "potion aliases" when minecraft version is not "1.9.4":
-	# Disabled on 1.9 - see #2587
+test "potion aliases":
 	assert speed potion is not water bottle with "potion alias: speed"
 	assert strength potion is not water bottle with "potion alias: strength"
 	assert long strength potion is not water bottle with "potion alias: long strength"

src/test/skript/tests/regressions/4938-time played.sk

@@ -1,6 +1,3 @@
 test "time played":
 	set {_time} to time played of "Notch" parsed as offlineplayer
-	if running minecraft "1.15":
-		assert {_time} is equal to 0 seconds with "Notch hacked your server and built a dirt house on your server (time: %{_time}%)"
-	else:
-		assert {_time} is not set with "Played time of offline players are not supported but seems like Notch is a hacker! (time: %{_time}%)"
+	assert {_time} is equal to 0 seconds with "Played time of offline players are not supported but seems like Notch is a hacker! (time: %{_time}%)"

src/test/skript/tests/regressions/6907-playsound entity method doesn't exist.sk

@@ -0,0 +1,4 @@
+test "invalid nested list throws exception":
+	parse:
+		set {_x} to any of (1, (1, (1, (abc))))
+	assert last parse logs contain "Can't understand this expression: 'any of (1, (1, (1, (abc))))'"