Merge master into dev/feature

.github/pull_request_template.md

@@ -2,6 +2,6 @@
 <!--- Describe your changes here. --->
 
 ---
-**Target Minecraft Versions:** <!-- 'any' means all supported versions -->
-**Requirements:** <!-- Required plugins, Minecraft versions, server software... -->
-**Related Issues:** <!-- Links to related issues -->
+**Target Minecraft Versions:** any <!-- 'any' means all supported versions -->
+**Requirements:** none <!-- Required plugins, server software... -->
+**Related Issues:** none <!-- Links to related issues -->

build.gradle

@@ -27,9 +27,9 @@ allprojects {
 dependencies {
 	shadow group: 'io.papermc', name: 'paperlib', version: '1.0.8'
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.0.2'
-	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.0'
+	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.1'
 
-	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.20.1-R0.1-SNAPSHOT'
+	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.20.2-R0.1-SNAPSHOT'
 	implementation group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version: '2.2.700'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
 	implementation group: 'com.sk89q.worldguard', name: 'worldguard-legacy', version: '7.0.0-SNAPSHOT'
@@ -226,7 +226,7 @@ void createTestTask(String name, String desc, String environments, int javaVersi
 		main = 'ch.njol.skript.test.platform.PlatformMain'
 		args = [
 			'build/test_runners',
-			junit ? 'src/test/skript/tests/junit' : 'src/test/skript/tests',
+			junit ? 'src/test/skript/junit' : 'src/test/skript/tests',
 			'src/test/resources/runner_data',
 			environments,
 			modifiers.contains(Modifiers.DEV_MODE),
@@ -250,7 +250,7 @@ void createTestTask(String name, String desc, String environments, int javaVersi
 	}
 }
 
-def latestEnv = 'java17/paper-1.20.1.json'
+def latestEnv = 'java17/paper-1.20.2.json'
 def latestJava = 17
 def oldestJava = 8
 
@@ -393,7 +393,7 @@ task nightlyRelease(type: ShadowJar) {
 
 javadoc {
 	dependsOn nightlyResources
-	
+
 	source = sourceSets.main.allJava
 
 	exclude("ch/njol/skript/conditions/**")

gradle.properties

@@ -1,10 +1,11 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+# Ensure encoding is consistent across systems.
+org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 
 groupid=ch.njol
 name=skript
 version=2.8.0-dev
 jarName=Skript.jar
-testEnv=java17/paper-1.20.1
+testEnv=java17/paper-1.20.2
 testEnvJavaVersion=17

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

@@ -591,6 +591,8 @@ public void run() {
 					tainted = true;
 					try {
 						getAddonInstance().loadClasses("ch.njol.skript.test.runner");
+						if (TestMode.JUNIT)
+							getAddonInstance().loadClasses("org.skriptlang.skript.test.junit.registration");
 					} catch (IOException e) {
 						Skript.exception("Failed to load testing environment.");
 						Bukkit.getServer().shutdown();
@@ -684,7 +686,6 @@ protected void afterErrors() {
 								TestTracker.testFailed("exception was thrown during execution");
 							}
 							if (TestMode.JUNIT) {
-								SkriptLogger.setVerbosity(Verbosity.DEBUG);
 								info("Running all JUnit tests...");
 								long milliseconds = 0, tests = 0, fails = 0, ignored = 0, size = 0;
 								try {
@@ -712,7 +713,7 @@ protected void afterErrors() {
 										// If JUnit failures are present, add them to the TestTracker.
 										junit.getFailures().forEach(failure -> {
 											String message = failure.getMessage() == null ? "" : " " + failure.getMessage();
-											TestTracker.testFailed("'" + test + "': " + message);
+											TestTracker.JUnitTestFailed(test, message);
 											Skript.exception(failure.getException(), "JUnit test '" + failure.getTestHeader() + " failed.");
 										});
 										SkriptJUnitTest.clearJUnitTest();
@@ -734,7 +735,7 @@ protected void afterErrors() {
 						// Delay server shutdown to stop the server from crashing because the current tick takes a long time due to all the tests
 						Bukkit.getScheduler().runTaskLater(Skript.this, () -> {
 							if (TestMode.JUNIT && !EffObjectives.isJUnitComplete())
-								TestTracker.testFailed(EffObjectives.getFailedObjectivesString());
+								EffObjectives.fail();
 
 							info("Collecting results to " + TestMode.RESULTS_FILE);
 							String results = new Gson().toJson(TestTracker.collectResults());
@@ -1261,7 +1262,7 @@ public static boolean isAcceptRegistrations() {
 	}
 
 	public static void checkAcceptRegistrations() {
-		if (!isAcceptRegistrations())
+		if (!isAcceptRegistrations() && !Skript.testing())
 			throw new SkriptAPIException("Registration can only be done during plugin initialization");
 	}
 

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

@@ -120,7 +120,10 @@ private static void check(Event event, EventPriority priority) {
 			boolean hasTrigger = false;
 			for (Trigger trigger : triggers) {
 				SkriptEvent triggerEvent = trigger.getEvent();
-				if (triggerEvent.getEventPriority() == priority && Boolean.TRUE.equals(Task.callSync(() -> triggerEvent.check(event)))) {
+				if (
+					triggerEvent.getEventPriority() == priority
+					&& triggerEvent.canExecuteAsynchronously() ? triggerEvent.check(event) : Boolean.TRUE.equals(Task.callSync(() -> triggerEvent.check(event)))
+				) {
 					hasTrigger = true;
 					break;
 				}
@@ -130,7 +133,7 @@ private static void check(Event event, EventPriority priority) {
 
 			logEventStart(event);
 		}
-		
+
 		boolean isCancelled = event instanceof Cancellable && ((Cancellable) event).isCancelled() && !listenCancelled.contains(event.getClass());
 		boolean isResultDeny = !(event instanceof PlayerInteractEvent && (((PlayerInteractEvent) event).getAction() == Action.LEFT_CLICK_AIR || ((PlayerInteractEvent) event).getAction() == Action.RIGHT_CLICK_AIR) && ((PlayerInteractEvent) event).useItemInHand() != Result.DENY);
 
@@ -155,15 +158,12 @@ private static void check(Event event, EventPriority priority) {
 			};
 
 			if (trigger.getEvent().canExecuteAsynchronously()) {
-				// check should be performed on the main thread
-				if (Boolean.FALSE.equals(Task.callSync(() -> triggerEvent.check(event))))
-					continue;
-				execute.run();
+				if (triggerEvent.check(event))
+					execute.run();
 			} else { // Ensure main thread
 				Task.callSync(() -> {
-					if (!triggerEvent.check(event))
-						return null;
-					execute.run();
+					if (triggerEvent.check(event))
+						execute.run();
 					return null; // we don't care about a return value
 				});
 			}