1.20.5 Support (part 2) (#6630)

.gitmodules

@@ -1,4 +1,3 @@
 [submodule "skript-aliases"]
 	path = skript-aliases
 	url = https://github.com/SkriptLang/skript-aliases
-	branch = patch/1.20.5-support

README.md

@@ -77,13 +77,15 @@ Skript has some tests written in Skript. Running them requires a Minecraft
 server, but our build script will create one for you. Running the tests is easy:
 
 ```
-./gradlew (quickTest|skriptTest|skriptTestJava8|skriptTestJava21)
+./gradlew (quickTest|skriptTest|skriptTestJava8|skriptTestJava17|skriptTestJava21)
 ```
 
 <code>quickTest</code> runs the test suite on newest supported server version.
-<code>skriptTestJava21</code> (1.17+) runs the tests on the latest supported Java version.
-<code>skriptTestJava8</code> (1.13-1.16) runs the tests on the oldest supported Java version.
-<code>skriptTest</code> runs both skriptTestJava8 and skriptTestJava21
+<code>skriptTestJava21</code> (1.20.6+) runs the tests on Java 21 supported versions.
+<code>skriptTestJava17</code> (1.17-1.20.4) runs the tests on Java 17 supported versions.
+<code>skriptTestJava8</code> (1.13-1.16) runs the tests on Java 8 supported versions.
+<code>skriptTest</code> runs the tests on all versions.
+That is, it runs skriptTestJava8, skriptTestJava17, and skriptTestJava21.
 
 By running the tests, you agree to Mojang's End User License Agreement.
 

build.gradle

@@ -71,7 +71,7 @@ task build(overwrite: true, type: ShadowJar) {
 	from sourceSets.main.output
 }
 
-// Excludes the tests for the build task. Should be using junit, junitJava21, junitJava8, skriptTest, quickTest.
+// Excludes the tests for the build task. Should be using junit, junitJava17, junitJava8, skriptTest, quickTest.
 // We do not want tests to run for building. That's time consuming and annoying. Especially in development.
 test {
 	exclude '**/*'

gradle.properties

@@ -7,5 +7,5 @@ groupid=ch.njol
 name=skript
 version=2.8.4
 jarName=Skript.jar
-testEnv=java21/paper-1.20.4
+testEnv=java21/paper-1.20.6
 testEnvJavaVersion=21

src/main/java/ch/njol/skript/events/SimpleEvents.java

@@ -426,14 +426,14 @@ public class SimpleEvents {
 				Skript.registerEvent("Entity Mount", SimpleEvent.class, mountEventClass, "mount[ing]")
 					.description("Called when entity starts riding another.")
 					.examples("on mount:",
-						"\tcancel event")
+							"\tcancel event")
 					.since("2.2-dev13b");
 			}
 			if (dismountEventClass != null) {
 				Skript.registerEvent("Entity Dismount", SimpleEvent.class, dismountEventClass, "dismount[ing]")
 					.description("Called when an entity dismounts.")
 					.examples("on dismount:",
-						"\tkill event-entity")
+							"\tkill event-entity")
 					.since("2.2-dev13b");
 			}
 		}

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

@@ -70,8 +70,6 @@ public enum PotionDataUtils {
 	WATER_BREATHING_LONG(PotionType.WATER_BREATHING, true, false, 9600, 0),
 	WEAKNESS(PotionType.WEAKNESS, false, false, 1800, 0),
 	WEAKNESS_LONG(PotionType.WEAKNESS, false, false, 4800, 0);
-
-
 
 	@Nullable
 	private String name;

src/test/skript/tests/regressions/3284-itemcrack particle.sk

@@ -1,3 +1,3 @@
-test "item crack particles" when running below minecraft "1.20.5":
+test "item crack particles" when running below minecraft "1.20.5": # item crack does not exist on 1.20.5
 	set {_loc} to location of spawn of world "world"
 	play diamond sword item crack at {_loc}